From da5e102f603125e5749b36d8096832d4e0b40209 Mon Sep 17 00:00:00 2001 From: Kirill Taran Date: Fri, 13 Oct 2023 00:42:01 +0300 Subject: [PATCH] Package renaming (#86) * Package renaming * Folder structure changes * Update filepicker --- app/build.gradle | 4 +-- .../arkretouch/ExampleInstrumentedTest.kt | 4 +-- app/src/main/AndroidManifest.xml | 4 +-- .../arkretouch/data/ImageDefaults.kt | 2 +- .../arkretouch/data/Preferences.kt | 2 +- .../arkretouch/di/AppComponent.kt | 4 +-- .../arkbuilders}/arkretouch/di/DIManager.kt | 2 +- .../arkretouch/presentation/App.kt | 10 +++---- .../presentation/drawing/EditCanvas.kt | 14 ++++----- .../presentation/drawing/EditManager.kt | 28 ++++++++--------- .../presentation/edit/ColorPickerDialog.kt | 4 +-- .../presentation/edit/ConfirmClearDialog.kt | 2 +- .../presentation/edit/EditScreen.kt | 30 +++++++++---------- .../presentation/edit/EditViewModel.kt | 14 ++++----- .../presentation/edit/MoreOptionsPopup.kt | 6 ++-- .../edit/NewImageOptionsDialog.kt | 14 ++++----- .../arkretouch/presentation/edit/Operation.kt | 2 +- .../presentation/edit/SavePathDialog.kt | 14 ++++----- .../edit/TransparencyChessBoard.kt | 4 +-- .../edit/blur/BlurIntensityPopup.kt | 6 ++-- .../presentation/edit/blur/BlurOperation.kt | 6 ++-- .../edit/crop/CropAspectRatiosMenu.kt | 18 +++++------ .../presentation/edit/crop/CropOperation.kt | 8 ++--- .../presentation/edit/crop/CropWindow.kt | 24 +++++++-------- .../presentation/edit/draw/DrawOperation.kt | 6 ++-- .../presentation/edit/resize/ResizeInput.kt | 6 ++-- .../edit/resize/ResizeOperation.kt | 8 ++--- .../edit/rotate/RotateOperation.kt | 8 ++--- .../presentation/main/MainActivity.kt | 14 ++++----- .../presentation/picker/FilePickerScreen.kt | 22 +++++++------- .../arkretouch/presentation/theme/Color.kt | 2 +- .../arkretouch/presentation/theme/Shape.kt | 2 +- .../arkretouch/presentation/theme/Theme.kt | 2 +- .../arkretouch/presentation/theme/Type.kt | 2 +- .../presentation/utils/ImageHelper.kt | 8 ++--- .../presentation/utils/PermissionsHelper.kt | 4 +-- .../arkretouch/presentation/utils/Utils.kt | 4 +-- .../arkretouch/ExampleUnitTest.kt | 2 +- settings.gradle | 10 ++++++- 39 files changed, 167 insertions(+), 159 deletions(-) rename app/src/androidTest/java/{space/taran => dev/arkbuilders}/arkretouch/ExampleInstrumentedTest.kt (84%) rename app/src/main/java/{space/taran => dev/arkbuilders}/arkretouch/data/ImageDefaults.kt (92%) rename app/src/main/java/{space/taran => dev/arkbuilders}/arkretouch/data/Preferences.kt (98%) rename app/src/main/java/{space/taran => dev/arkbuilders}/arkretouch/di/AppComponent.kt (80%) rename app/src/main/java/{space/taran => dev/arkbuilders}/arkretouch/di/DIManager.kt (86%) rename app/src/main/java/{space/taran => dev/arkbuilders}/arkretouch/presentation/App.kt (81%) rename app/src/main/java/{space/taran => dev/arkbuilders}/arkretouch/presentation/drawing/EditCanvas.kt (95%) rename app/src/main/java/{space/taran => dev/arkbuilders}/arkretouch/presentation/drawing/EditManager.kt (95%) rename app/src/main/java/{space/taran => dev/arkbuilders}/arkretouch/presentation/edit/ColorPickerDialog.kt (99%) rename app/src/main/java/{space/taran => dev/arkbuilders}/arkretouch/presentation/edit/ConfirmClearDialog.kt (96%) rename app/src/main/java/{space/taran => dev/arkbuilders}/arkretouch/presentation/edit/EditScreen.kt (97%) rename app/src/main/java/{space/taran => dev/arkbuilders}/arkretouch/presentation/edit/EditViewModel.kt (97%) rename app/src/main/java/{space/taran => dev/arkbuilders}/arkretouch/presentation/edit/MoreOptionsPopup.kt (96%) rename app/src/main/java/{space/taran => dev/arkbuilders}/arkretouch/presentation/edit/NewImageOptionsDialog.kt (96%) rename app/src/main/java/{space/taran => dev/arkbuilders}/arkretouch/presentation/edit/Operation.kt (57%) rename app/src/main/java/{space/taran => dev/arkbuilders}/arkretouch/presentation/edit/SavePathDialog.kt (94%) rename app/src/main/java/{space/taran => dev/arkbuilders}/arkretouch/presentation/edit/TransparencyChessBoard.kt (96%) rename app/src/main/java/{space/taran => dev/arkbuilders}/arkretouch/presentation/edit/blur/BlurIntensityPopup.kt (91%) rename app/src/main/java/{space/taran => dev/arkbuilders}/arkretouch/presentation/edit/blur/BlurOperation.kt (96%) rename app/src/main/java/{space/taran => dev/arkbuilders}/arkretouch/presentation/edit/crop/CropAspectRatiosMenu.kt (93%) rename app/src/main/java/{space/taran => dev/arkbuilders}/arkretouch/presentation/edit/crop/CropOperation.kt (85%) rename app/src/main/java/{space/taran => dev/arkbuilders}/arkretouch/presentation/edit/crop/CropWindow.kt (93%) rename app/src/main/java/{space/taran => dev/arkbuilders}/arkretouch/presentation/edit/draw/DrawOperation.kt (79%) rename app/src/main/java/{space/taran => dev/arkbuilders}/arkretouch/presentation/edit/resize/ResizeInput.kt (97%) rename app/src/main/java/{space/taran => dev/arkbuilders}/arkretouch/presentation/edit/resize/ResizeOperation.kt (93%) rename app/src/main/java/{space/taran => dev/arkbuilders}/arkretouch/presentation/edit/rotate/RotateOperation.kt (80%) rename app/src/main/java/{space/taran => dev/arkbuilders}/arkretouch/presentation/main/MainActivity.kt (91%) rename app/src/main/java/{space/taran => dev/arkbuilders}/arkretouch/presentation/picker/FilePickerScreen.kt (87%) rename app/src/main/java/{space/taran => dev/arkbuilders}/arkretouch/presentation/theme/Color.kt (79%) rename app/src/main/java/{space/taran => dev/arkbuilders}/arkretouch/presentation/theme/Shape.kt (83%) rename app/src/main/java/{space/taran => dev/arkbuilders}/arkretouch/presentation/theme/Theme.kt (95%) rename app/src/main/java/{space/taran => dev/arkbuilders}/arkretouch/presentation/theme/Type.kt (93%) rename app/src/main/java/{space/taran => dev/arkbuilders}/arkretouch/presentation/utils/ImageHelper.kt (69%) rename app/src/main/java/{space/taran => dev/arkbuilders}/arkretouch/presentation/utils/PermissionsHelper.kt (93%) rename app/src/main/java/{space/taran => dev/arkbuilders}/arkretouch/presentation/utils/Utils.kt (96%) rename app/src/test/java/{space/taran => dev/arkbuilders}/arkretouch/ExampleUnitTest.kt (90%) diff --git a/app/build.gradle b/app/build.gradle index 9110ad0..e3587d5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,7 +16,7 @@ android { def password = System.getenv("ACRA_PASS") ?: "" def uri = System.getenv("ACRA_URI") ?: "" - applicationId "space.taran.arkretouch2" + applicationId "dev.arkbuilders.arkretouch2" minSdk 26 targetSdk 32 versionCode 1 @@ -99,7 +99,7 @@ dependencies { implementation 'com.godaddy.android.colorpicker:compose-color-picker:0.5.1' - implementation 'com.github.ARK-Builders:ark-filepicker:c6d66141c1' + implementation 'dev.arkbuilders:arkfilepicker:0.1.1' implementation "androidx.navigation:navigation-compose:2.5.2" implementation "ch.acra:acra-http:5.9.3" diff --git a/app/src/androidTest/java/space/taran/arkretouch/ExampleInstrumentedTest.kt b/app/src/androidTest/java/dev/arkbuilders/arkretouch/ExampleInstrumentedTest.kt similarity index 84% rename from app/src/androidTest/java/space/taran/arkretouch/ExampleInstrumentedTest.kt rename to app/src/androidTest/java/dev/arkbuilders/arkretouch/ExampleInstrumentedTest.kt index 3345859..3544aec 100644 --- a/app/src/androidTest/java/space/taran/arkretouch/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/dev/arkbuilders/arkretouch/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package space.taran.arkretouch +package dev.arkbuilders.arkretouch import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 @@ -18,6 +18,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("space.taran.arkretouch", appContext.packageName) + assertEquals("dev.arkbuilders.arkretouch", appContext.packageName) } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index be9c240..710084c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + package="dev.arkbuilders.arkretouch"> diff --git a/app/src/main/java/space/taran/arkretouch/data/ImageDefaults.kt b/app/src/main/java/dev/arkbuilders/arkretouch/data/ImageDefaults.kt similarity index 92% rename from app/src/main/java/space/taran/arkretouch/data/ImageDefaults.kt rename to app/src/main/java/dev/arkbuilders/arkretouch/data/ImageDefaults.kt index 342e937..1718e9b 100644 --- a/app/src/main/java/space/taran/arkretouch/data/ImageDefaults.kt +++ b/app/src/main/java/dev/arkbuilders/arkretouch/data/ImageDefaults.kt @@ -1,4 +1,4 @@ -package space.taran.arkretouch.data +package dev.arkbuilders.arkretouch.data import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.IntSize diff --git a/app/src/main/java/space/taran/arkretouch/data/Preferences.kt b/app/src/main/java/dev/arkbuilders/arkretouch/data/Preferences.kt similarity index 98% rename from app/src/main/java/space/taran/arkretouch/data/Preferences.kt rename to app/src/main/java/dev/arkbuilders/arkretouch/data/Preferences.kt index 8c7bedb..771a608 100644 --- a/app/src/main/java/space/taran/arkretouch/data/Preferences.kt +++ b/app/src/main/java/dev/arkbuilders/arkretouch/data/Preferences.kt @@ -1,4 +1,4 @@ -package space.taran.arkretouch.data +package dev.arkbuilders.arkretouch.data import android.content.Context import androidx.compose.ui.graphics.Color diff --git a/app/src/main/java/space/taran/arkretouch/di/AppComponent.kt b/app/src/main/java/dev/arkbuilders/arkretouch/di/AppComponent.kt similarity index 80% rename from app/src/main/java/space/taran/arkretouch/di/AppComponent.kt rename to app/src/main/java/dev/arkbuilders/arkretouch/di/AppComponent.kt index e7d9b93..a8419a9 100644 --- a/app/src/main/java/space/taran/arkretouch/di/AppComponent.kt +++ b/app/src/main/java/dev/arkbuilders/arkretouch/di/AppComponent.kt @@ -1,10 +1,10 @@ -package space.taran.arkretouch.di +package dev.arkbuilders.arkretouch.di import android.app.Application import android.content.Context import dagger.BindsInstance import dagger.Component -import space.taran.arkretouch.presentation.edit.EditViewModelFactory +import dev.arkbuilders.arkretouch.presentation.edit.EditViewModelFactory import javax.inject.Singleton @Singleton diff --git a/app/src/main/java/space/taran/arkretouch/di/DIManager.kt b/app/src/main/java/dev/arkbuilders/arkretouch/di/DIManager.kt similarity index 86% rename from app/src/main/java/space/taran/arkretouch/di/DIManager.kt rename to app/src/main/java/dev/arkbuilders/arkretouch/di/DIManager.kt index ccfb116..618bd33 100644 --- a/app/src/main/java/space/taran/arkretouch/di/DIManager.kt +++ b/app/src/main/java/dev/arkbuilders/arkretouch/di/DIManager.kt @@ -1,4 +1,4 @@ -package space.taran.arkretouch.di +package dev.arkbuilders.arkretouch.di import android.app.Application diff --git a/app/src/main/java/space/taran/arkretouch/presentation/App.kt b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/App.kt similarity index 81% rename from app/src/main/java/space/taran/arkretouch/presentation/App.kt rename to app/src/main/java/dev/arkbuilders/arkretouch/presentation/App.kt index 99838d0..b5d888e 100644 --- a/app/src/main/java/space/taran/arkretouch/presentation/App.kt +++ b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/App.kt @@ -1,4 +1,4 @@ -package space.taran.arkretouch.presentation +package dev.arkbuilders.arkretouch.presentation import android.app.Application import org.acra.config.dialog @@ -6,10 +6,10 @@ import org.acra.config.httpSender import org.acra.data.StringFormat import org.acra.ktx.initAcra import org.acra.sender.HttpSender -import space.taran.arkretouch.BuildConfig -import space.taran.arkretouch.R -import space.taran.arkfilepicker.folders.FoldersRepo -import space.taran.arkretouch.di.DIManager +import dev.arkbuilders.arkretouch.BuildConfig +import dev.arkbuilders.arkretouch.R +import dev.arkbuilders.arkfilepicker.folders.FoldersRepo +import dev.arkbuilders.arkretouch.di.DIManager import timber.log.Timber class App : Application() { diff --git a/app/src/main/java/space/taran/arkretouch/presentation/drawing/EditCanvas.kt b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/drawing/EditCanvas.kt similarity index 95% rename from app/src/main/java/space/taran/arkretouch/presentation/drawing/EditCanvas.kt rename to app/src/main/java/dev/arkbuilders/arkretouch/presentation/drawing/EditCanvas.kt index 8f3231f..3c52585 100644 --- a/app/src/main/java/space/taran/arkretouch/presentation/drawing/EditCanvas.kt +++ b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/drawing/EditCanvas.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalComposeUiApi::class) -package space.taran.arkretouch.presentation.drawing +package dev.arkbuilders.arkretouch.presentation.drawing import android.graphics.Matrix import android.graphics.PointF @@ -35,12 +35,12 @@ import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.ui.input.pointer.pointerInteropFilter import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.unit.toSize -import space.taran.arkretouch.presentation.edit.EditViewModel -import space.taran.arkretouch.presentation.edit.TransparencyChessBoardCanvas -import space.taran.arkretouch.presentation.edit.crop.CropWindow.Companion.computeDeltaX -import space.taran.arkretouch.presentation.edit.crop.CropWindow.Companion.computeDeltaY -import space.taran.arkretouch.presentation.picker.toDp -import space.taran.arkretouch.presentation.utils.calculateRotationFromOneFingerGesture +import dev.arkbuilders.arkretouch.presentation.edit.EditViewModel +import dev.arkbuilders.arkretouch.presentation.edit.TransparencyChessBoardCanvas +import dev.arkbuilders.arkretouch.presentation.edit.crop.CropWindow.Companion.computeDeltaX +import dev.arkbuilders.arkretouch.presentation.edit.crop.CropWindow.Companion.computeDeltaY +import dev.arkbuilders.arkretouch.presentation.picker.toDp +import dev.arkbuilders.arkretouch.presentation.utils.calculateRotationFromOneFingerGesture @Composable fun EditCanvas(viewModel: EditViewModel) { diff --git a/app/src/main/java/space/taran/arkretouch/presentation/drawing/EditManager.kt b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/drawing/EditManager.kt similarity index 95% rename from app/src/main/java/space/taran/arkretouch/presentation/drawing/EditManager.kt rename to app/src/main/java/dev/arkbuilders/arkretouch/presentation/drawing/EditManager.kt index d7bcc3d..4dd4bf3 100644 --- a/app/src/main/java/space/taran/arkretouch/presentation/drawing/EditManager.kt +++ b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/drawing/EditManager.kt @@ -1,4 +1,4 @@ -package space.taran.arkretouch.presentation.drawing +package dev.arkbuilders.arkretouch.presentation.drawing import android.graphics.Matrix import androidx.compose.runtime.MutableState @@ -14,18 +14,18 @@ import androidx.compose.ui.graphics.Path import androidx.compose.ui.graphics.StrokeCap import androidx.compose.ui.graphics.StrokeJoin import androidx.compose.ui.unit.IntSize -import space.taran.arkretouch.data.ImageDefaults -import space.taran.arkretouch.data.Resolution -import space.taran.arkretouch.presentation.edit.ImageViewParams -import space.taran.arkretouch.presentation.edit.Operation -import space.taran.arkretouch.presentation.edit.blur.BlurOperation -import space.taran.arkretouch.presentation.edit.crop.CropOperation -import space.taran.arkretouch.presentation.edit.crop.CropWindow -import space.taran.arkretouch.presentation.edit.draw.DrawOperation -import space.taran.arkretouch.presentation.edit.fitBackground -import space.taran.arkretouch.presentation.edit.fitImage -import space.taran.arkretouch.presentation.edit.resize.ResizeOperation -import space.taran.arkretouch.presentation.edit.rotate.RotateOperation +import dev.arkbuilders.arkretouch.data.ImageDefaults +import dev.arkbuilders.arkretouch.data.Resolution +import dev.arkbuilders.arkretouch.presentation.edit.ImageViewParams +import dev.arkbuilders.arkretouch.presentation.edit.Operation +import dev.arkbuilders.arkretouch.presentation.edit.blur.BlurOperation +import dev.arkbuilders.arkretouch.presentation.edit.crop.CropOperation +import dev.arkbuilders.arkretouch.presentation.edit.crop.CropWindow +import dev.arkbuilders.arkretouch.presentation.edit.draw.DrawOperation +import dev.arkbuilders.arkretouch.presentation.edit.fitBackground +import dev.arkbuilders.arkretouch.presentation.edit.fitImage +import dev.arkbuilders.arkretouch.presentation.edit.resize.ResizeOperation +import dev.arkbuilders.arkretouch.presentation.edit.rotate.RotateOperation import timber.log.Timber import java.util.Stack @@ -429,7 +429,7 @@ class EditManager { fun addDrawPath(path: Path) { drawPaths.add( - space.taran.arkretouch.presentation.drawing.DrawPath( + dev.arkbuilders.arkretouch.presentation.drawing.DrawPath( path, currentPaint.copy().apply { strokeWidth = drawPaint.value.strokeWidth diff --git a/app/src/main/java/space/taran/arkretouch/presentation/edit/ColorPickerDialog.kt b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/ColorPickerDialog.kt similarity index 99% rename from app/src/main/java/space/taran/arkretouch/presentation/edit/ColorPickerDialog.kt rename to app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/ColorPickerDialog.kt index 3d9cfe9..d5b1aae 100644 --- a/app/src/main/java/space/taran/arkretouch/presentation/edit/ColorPickerDialog.kt +++ b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/ColorPickerDialog.kt @@ -1,4 +1,4 @@ -package space.taran.arkretouch.presentation.edit +package dev.arkbuilders.arkretouch.presentation.edit import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.core.tween @@ -48,7 +48,7 @@ import com.godaddy.android.colorpicker.ClassicColorPicker import com.godaddy.android.colorpicker.HsvColor import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch -import space.taran.arkretouch.R +import dev.arkbuilders.arkretouch.R @Composable fun ColorPickerDialog( diff --git a/app/src/main/java/space/taran/arkretouch/presentation/edit/ConfirmClearDialog.kt b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/ConfirmClearDialog.kt similarity index 96% rename from app/src/main/java/space/taran/arkretouch/presentation/edit/ConfirmClearDialog.kt rename to app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/ConfirmClearDialog.kt index a3ec5f3..2fe0177 100644 --- a/app/src/main/java/space/taran/arkretouch/presentation/edit/ConfirmClearDialog.kt +++ b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/ConfirmClearDialog.kt @@ -1,4 +1,4 @@ -package space.taran.arkretouch.presentation.edit +package dev.arkbuilders.arkretouch.presentation.edit import androidx.compose.foundation.layout.padding import androidx.compose.material.AlertDialog diff --git a/app/src/main/java/space/taran/arkretouch/presentation/edit/EditScreen.kt b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/EditScreen.kt similarity index 97% rename from app/src/main/java/space/taran/arkretouch/presentation/edit/EditScreen.kt rename to app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/EditScreen.kt index 8063707..e201480 100644 --- a/app/src/main/java/space/taran/arkretouch/presentation/edit/EditScreen.kt +++ b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/EditScreen.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalComposeUiApi::class) -package space.taran.arkretouch.presentation.edit +package dev.arkbuilders.arkretouch.presentation.edit import android.view.MotionEvent import android.widget.Toast @@ -62,20 +62,20 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.fragment.app.FragmentManager import androidx.lifecycle.viewmodel.compose.viewModel -import space.taran.arkretouch.R -import space.taran.arkretouch.data.Resolution -import space.taran.arkretouch.di.DIManager -import space.taran.arkretouch.presentation.drawing.EditCanvas -import space.taran.arkretouch.presentation.edit.blur.BlurIntensityPopup -import space.taran.arkretouch.presentation.edit.crop.CropAspectRatiosMenu -import space.taran.arkretouch.presentation.edit.resize.Hint -import space.taran.arkretouch.presentation.edit.resize.ResizeInput -import space.taran.arkretouch.presentation.edit.resize.delayHidingHint -import space.taran.arkretouch.presentation.picker.toPx -import space.taran.arkretouch.presentation.theme.Gray -import space.taran.arkretouch.presentation.utils.askWritePermissions -import space.taran.arkretouch.presentation.utils.getActivity -import space.taran.arkretouch.presentation.utils.isWritePermGranted +import dev.arkbuilders.arkretouch.R +import dev.arkbuilders.arkretouch.data.Resolution +import dev.arkbuilders.arkretouch.di.DIManager +import dev.arkbuilders.arkretouch.presentation.drawing.EditCanvas +import dev.arkbuilders.arkretouch.presentation.edit.blur.BlurIntensityPopup +import dev.arkbuilders.arkretouch.presentation.edit.crop.CropAspectRatiosMenu +import dev.arkbuilders.arkretouch.presentation.edit.resize.Hint +import dev.arkbuilders.arkretouch.presentation.edit.resize.ResizeInput +import dev.arkbuilders.arkretouch.presentation.edit.resize.delayHidingHint +import dev.arkbuilders.arkretouch.presentation.picker.toPx +import dev.arkbuilders.arkretouch.presentation.theme.Gray +import dev.arkbuilders.arkretouch.presentation.utils.askWritePermissions +import dev.arkbuilders.arkretouch.presentation.utils.getActivity +import dev.arkbuilders.arkretouch.presentation.utils.isWritePermGranted import java.nio.file.Path @Composable diff --git a/app/src/main/java/space/taran/arkretouch/presentation/edit/EditViewModel.kt b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/EditViewModel.kt similarity index 97% rename from app/src/main/java/space/taran/arkretouch/presentation/edit/EditViewModel.kt rename to app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/EditViewModel.kt index e37f6de..956ee1d 100644 --- a/app/src/main/java/space/taran/arkretouch/presentation/edit/EditViewModel.kt +++ b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/EditViewModel.kt @@ -1,4 +1,4 @@ -package space.taran.arkretouch.presentation.edit +package dev.arkbuilders.arkretouch.presentation.edit import android.content.Context import android.content.Intent @@ -38,12 +38,12 @@ import dagger.assisted.AssistedInject import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.launch -import space.taran.arkretouch.R -import space.taran.arkretouch.data.Preferences -import space.taran.arkretouch.data.Resolution -import space.taran.arkretouch.di.DIManager -import space.taran.arkretouch.presentation.drawing.EditManager -import space.taran.arkretouch.presentation.edit.resize.ResizeOperation +import dev.arkbuilders.arkretouch.R +import dev.arkbuilders.arkretouch.data.Preferences +import dev.arkbuilders.arkretouch.data.Resolution +import dev.arkbuilders.arkretouch.di.DIManager +import dev.arkbuilders.arkretouch.presentation.drawing.EditManager +import dev.arkbuilders.arkretouch.presentation.edit.resize.ResizeOperation import timber.log.Timber import java.io.File import java.nio.file.Path diff --git a/app/src/main/java/space/taran/arkretouch/presentation/edit/MoreOptionsPopup.kt b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/MoreOptionsPopup.kt similarity index 96% rename from app/src/main/java/space/taran/arkretouch/presentation/edit/MoreOptionsPopup.kt rename to app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/MoreOptionsPopup.kt index 1d450f1..3aa5e3b 100644 --- a/app/src/main/java/space/taran/arkretouch/presentation/edit/MoreOptionsPopup.kt +++ b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/MoreOptionsPopup.kt @@ -1,4 +1,4 @@ -package space.taran.arkretouch.presentation.edit +package dev.arkbuilders.arkretouch.presentation.edit import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -22,8 +22,8 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.compose.ui.window.Popup import androidx.compose.ui.window.PopupProperties -import space.taran.arkretouch.R -import space.taran.arkretouch.presentation.picker.toPx +import dev.arkbuilders.arkretouch.R +import dev.arkbuilders.arkretouch.presentation.picker.toPx @Composable fun MoreOptionsPopup( diff --git a/app/src/main/java/space/taran/arkretouch/presentation/edit/NewImageOptionsDialog.kt b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/NewImageOptionsDialog.kt similarity index 96% rename from app/src/main/java/space/taran/arkretouch/presentation/edit/NewImageOptionsDialog.kt rename to app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/NewImageOptionsDialog.kt index 5950a25..7fba923 100644 --- a/app/src/main/java/space/taran/arkretouch/presentation/edit/NewImageOptionsDialog.kt +++ b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/NewImageOptionsDialog.kt @@ -1,4 +1,4 @@ -package space.taran.arkretouch.presentation.edit +package dev.arkbuilders.arkretouch.presentation.edit import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -34,12 +34,12 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog import androidx.core.text.isDigitsOnly -import space.taran.arkretouch.R -import space.taran.arkretouch.data.Resolution -import space.taran.arkretouch.presentation.drawing.EditManager -import space.taran.arkretouch.presentation.edit.resize.Hint -import space.taran.arkretouch.presentation.edit.resize.delayHidingHint -import space.taran.arkretouch.presentation.theme.Gray +import dev.arkbuilders.arkretouch.R +import dev.arkbuilders.arkretouch.data.Resolution +import dev.arkbuilders.arkretouch.presentation.drawing.EditManager +import dev.arkbuilders.arkretouch.presentation.edit.resize.Hint +import dev.arkbuilders.arkretouch.presentation.edit.resize.delayHidingHint +import dev.arkbuilders.arkretouch.presentation.theme.Gray @Composable fun NewImageOptionsDialog( diff --git a/app/src/main/java/space/taran/arkretouch/presentation/edit/Operation.kt b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/Operation.kt similarity index 57% rename from app/src/main/java/space/taran/arkretouch/presentation/edit/Operation.kt rename to app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/Operation.kt index 06685b6..bffb639 100644 --- a/app/src/main/java/space/taran/arkretouch/presentation/edit/Operation.kt +++ b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/Operation.kt @@ -1,4 +1,4 @@ -package space.taran.arkretouch.presentation.edit +package dev.arkbuilders.arkretouch.presentation.edit interface Operation { fun apply() diff --git a/app/src/main/java/space/taran/arkretouch/presentation/edit/SavePathDialog.kt b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/SavePathDialog.kt similarity index 94% rename from app/src/main/java/space/taran/arkretouch/presentation/edit/SavePathDialog.kt rename to app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/SavePathDialog.kt index 2f1add6..5dc3df8 100644 --- a/app/src/main/java/space/taran/arkretouch/presentation/edit/SavePathDialog.kt +++ b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/SavePathDialog.kt @@ -1,4 +1,4 @@ -package space.taran.arkretouch.presentation.edit +package dev.arkbuilders.arkretouch.presentation.edit import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -34,12 +34,12 @@ import androidx.compose.ui.platform.LocalLifecycleOwner import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import space.taran.arkfilepicker.ArkFilePickerConfig -import space.taran.arkfilepicker.presentation.filepicker.ArkFilePickerFragment -import space.taran.arkfilepicker.presentation.filepicker.ArkFilePickerMode -import space.taran.arkfilepicker.presentation.onArkPathPicked -import space.taran.arkretouch.R -import space.taran.arkretouch.presentation.utils.findNotExistCopyName +import dev.arkbuilders.arkfilepicker.ArkFilePickerConfig +import dev.arkbuilders.arkfilepicker.presentation.filepicker.ArkFilePickerFragment +import dev.arkbuilders.arkfilepicker.presentation.filepicker.ArkFilePickerMode +import dev.arkbuilders.arkfilepicker.presentation.onArkPathPicked +import dev.arkbuilders.arkretouch.R +import dev.arkbuilders.arkretouch.presentation.utils.findNotExistCopyName import kotlin.io.path.name import androidx.compose.material.CircularProgressIndicator import androidx.compose.runtime.key diff --git a/app/src/main/java/space/taran/arkretouch/presentation/edit/TransparencyChessBoard.kt b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/TransparencyChessBoard.kt similarity index 96% rename from app/src/main/java/space/taran/arkretouch/presentation/edit/TransparencyChessBoard.kt rename to app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/TransparencyChessBoard.kt index 36769d1..3644e32 100644 --- a/app/src/main/java/space/taran/arkretouch/presentation/edit/TransparencyChessBoard.kt +++ b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/TransparencyChessBoard.kt @@ -1,4 +1,4 @@ -package space.taran.arkretouch.presentation.edit +package dev.arkbuilders.arkretouch.presentation.edit import android.graphics.Matrix import androidx.compose.runtime.Composable @@ -14,7 +14,7 @@ import androidx.compose.ui.graphics.Paint import androidx.compose.ui.graphics.drawscope.drawIntoCanvas import androidx.compose.ui.graphics.nativeCanvas import androidx.compose.ui.unit.toSize -import space.taran.arkretouch.presentation.drawing.EditManager +import dev.arkbuilders.arkretouch.presentation.drawing.EditManager private class TransparencyChessBoard { fun create(boardSize: Size, canvas: Canvas, matrix: Matrix) { diff --git a/app/src/main/java/space/taran/arkretouch/presentation/edit/blur/BlurIntensityPopup.kt b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/blur/BlurIntensityPopup.kt similarity index 91% rename from app/src/main/java/space/taran/arkretouch/presentation/edit/blur/BlurIntensityPopup.kt rename to app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/blur/BlurIntensityPopup.kt index 75285fd..a196c42 100644 --- a/app/src/main/java/space/taran/arkretouch/presentation/edit/blur/BlurIntensityPopup.kt +++ b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/blur/BlurIntensityPopup.kt @@ -1,4 +1,4 @@ -package space.taran.arkretouch.presentation.edit.blur +package dev.arkbuilders.arkretouch.presentation.edit.blur import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxWidth @@ -11,8 +11,8 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import space.taran.arkretouch.R -import space.taran.arkretouch.presentation.drawing.EditManager +import dev.arkbuilders.arkretouch.R +import dev.arkbuilders.arkretouch.presentation.drawing.EditManager @Composable fun BlurIntensityPopup( diff --git a/app/src/main/java/space/taran/arkretouch/presentation/edit/blur/BlurOperation.kt b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/blur/BlurOperation.kt similarity index 96% rename from app/src/main/java/space/taran/arkretouch/presentation/edit/blur/BlurOperation.kt rename to app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/blur/BlurOperation.kt index 6234a4d..6b6a6d9 100644 --- a/app/src/main/java/space/taran/arkretouch/presentation/edit/blur/BlurOperation.kt +++ b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/blur/BlurOperation.kt @@ -1,4 +1,4 @@ -package space.taran.arkretouch.presentation.edit.blur +package dev.arkbuilders.arkretouch.presentation.edit.blur import android.content.Context import android.graphics.Bitmap @@ -12,8 +12,8 @@ import androidx.compose.ui.graphics.asAndroidBitmap import androidx.compose.ui.graphics.asImageBitmap import androidx.compose.ui.unit.IntOffset import com.hoko.blur.processor.HokoBlurBuild -import space.taran.arkretouch.presentation.drawing.EditManager -import space.taran.arkretouch.presentation.edit.Operation +import dev.arkbuilders.arkretouch.presentation.drawing.EditManager +import dev.arkbuilders.arkretouch.presentation.edit.Operation import java.util.Stack class BlurOperation(private val editManager: EditManager) : Operation { diff --git a/app/src/main/java/space/taran/arkretouch/presentation/edit/crop/CropAspectRatiosMenu.kt b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/crop/CropAspectRatiosMenu.kt similarity index 93% rename from app/src/main/java/space/taran/arkretouch/presentation/edit/crop/CropAspectRatiosMenu.kt rename to app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/crop/CropAspectRatiosMenu.kt index 5f8ef7f..544a6c3 100644 --- a/app/src/main/java/space/taran/arkretouch/presentation/edit/crop/CropAspectRatiosMenu.kt +++ b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/crop/CropAspectRatiosMenu.kt @@ -1,4 +1,4 @@ -package space.taran.arkretouch.presentation.edit.crop +package dev.arkbuilders.arkretouch.presentation.edit.crop import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Row @@ -25,14 +25,14 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.vectorResource import androidx.compose.ui.unit.dp -import space.taran.arkretouch.R -import space.taran.arkretouch.presentation.edit.crop.AspectRatio.aspectRatios -import space.taran.arkretouch.presentation.edit.crop.AspectRatio.isChanged -import space.taran.arkretouch.presentation.edit.crop.AspectRatio.isCropFree -import space.taran.arkretouch.presentation.edit.crop.AspectRatio.isCropSquare -import space.taran.arkretouch.presentation.edit.crop.AspectRatio.isCrop_9_16 -import space.taran.arkretouch.presentation.edit.crop.AspectRatio.isCrop_2_3 -import space.taran.arkretouch.presentation.edit.crop.AspectRatio.isCrop_4_5 +import dev.arkbuilders.arkretouch.R +import dev.arkbuilders.arkretouch.presentation.edit.crop.AspectRatio.aspectRatios +import dev.arkbuilders.arkretouch.presentation.edit.crop.AspectRatio.isChanged +import dev.arkbuilders.arkretouch.presentation.edit.crop.AspectRatio.isCropFree +import dev.arkbuilders.arkretouch.presentation.edit.crop.AspectRatio.isCropSquare +import dev.arkbuilders.arkretouch.presentation.edit.crop.AspectRatio.isCrop_9_16 +import dev.arkbuilders.arkretouch.presentation.edit.crop.AspectRatio.isCrop_2_3 +import dev.arkbuilders.arkretouch.presentation.edit.crop.AspectRatio.isCrop_4_5 @Composable fun CropAspectRatiosMenu( diff --git a/app/src/main/java/space/taran/arkretouch/presentation/edit/crop/CropOperation.kt b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/crop/CropOperation.kt similarity index 85% rename from app/src/main/java/space/taran/arkretouch/presentation/edit/crop/CropOperation.kt rename to app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/crop/CropOperation.kt index 651cad9..b3c9711 100644 --- a/app/src/main/java/space/taran/arkretouch/presentation/edit/crop/CropOperation.kt +++ b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/crop/CropOperation.kt @@ -1,9 +1,9 @@ -package space.taran.arkretouch.presentation.edit.crop +package dev.arkbuilders.arkretouch.presentation.edit.crop import androidx.compose.ui.graphics.asImageBitmap -import space.taran.arkretouch.presentation.drawing.EditManager -import space.taran.arkretouch.presentation.edit.Operation -import space.taran.arkretouch.presentation.utils.crop +import dev.arkbuilders.arkretouch.presentation.drawing.EditManager +import dev.arkbuilders.arkretouch.presentation.edit.Operation +import dev.arkbuilders.arkretouch.presentation.utils.crop class CropOperation( private val editManager: EditManager diff --git a/app/src/main/java/space/taran/arkretouch/presentation/edit/crop/CropWindow.kt b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/crop/CropWindow.kt similarity index 93% rename from app/src/main/java/space/taran/arkretouch/presentation/edit/crop/CropWindow.kt rename to app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/crop/CropWindow.kt index 869b367..3bf9a14 100644 --- a/app/src/main/java/space/taran/arkretouch/presentation/edit/crop/CropWindow.kt +++ b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/crop/CropWindow.kt @@ -1,4 +1,4 @@ -package space.taran.arkretouch.presentation.edit.crop +package dev.arkbuilders.arkretouch.presentation.edit.crop import android.graphics.Bitmap import androidx.compose.runtime.mutableStateOf @@ -9,17 +9,17 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Paint import androidx.compose.ui.graphics.PaintingStyle import androidx.compose.ui.unit.IntSize -import space.taran.arkretouch.presentation.drawing.EditManager -import space.taran.arkretouch.presentation.edit.crop.AspectRatio.CROP_2_3 -import space.taran.arkretouch.presentation.edit.crop.AspectRatio.CROP_4_5 -import space.taran.arkretouch.presentation.edit.crop.AspectRatio.CROP_9_16 -import space.taran.arkretouch.presentation.edit.crop.AspectRatio.CROP_SQUARE -import space.taran.arkretouch.presentation.edit.crop.AspectRatio.isCropFree -import space.taran.arkretouch.presentation.edit.crop.AspectRatio.isCropSquare -import space.taran.arkretouch.presentation.edit.crop.AspectRatio.isCrop_2_3 -import space.taran.arkretouch.presentation.edit.crop.AspectRatio.isCrop_4_5 -import space.taran.arkretouch.presentation.edit.crop.AspectRatio.isCrop_9_16 -import space.taran.arkretouch.presentation.edit.resize.ResizeOperation +import dev.arkbuilders.arkretouch.presentation.drawing.EditManager +import dev.arkbuilders.arkretouch.presentation.edit.crop.AspectRatio.CROP_2_3 +import dev.arkbuilders.arkretouch.presentation.edit.crop.AspectRatio.CROP_4_5 +import dev.arkbuilders.arkretouch.presentation.edit.crop.AspectRatio.CROP_9_16 +import dev.arkbuilders.arkretouch.presentation.edit.crop.AspectRatio.CROP_SQUARE +import dev.arkbuilders.arkretouch.presentation.edit.crop.AspectRatio.isCropFree +import dev.arkbuilders.arkretouch.presentation.edit.crop.AspectRatio.isCropSquare +import dev.arkbuilders.arkretouch.presentation.edit.crop.AspectRatio.isCrop_2_3 +import dev.arkbuilders.arkretouch.presentation.edit.crop.AspectRatio.isCrop_4_5 +import dev.arkbuilders.arkretouch.presentation.edit.crop.AspectRatio.isCrop_9_16 +import dev.arkbuilders.arkretouch.presentation.edit.resize.ResizeOperation import timber.log.Timber class CropWindow(private val editManager: EditManager) { diff --git a/app/src/main/java/space/taran/arkretouch/presentation/edit/draw/DrawOperation.kt b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/draw/DrawOperation.kt similarity index 79% rename from app/src/main/java/space/taran/arkretouch/presentation/edit/draw/DrawOperation.kt rename to app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/draw/DrawOperation.kt index ce70704..4f91250 100644 --- a/app/src/main/java/space/taran/arkretouch/presentation/edit/draw/DrawOperation.kt +++ b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/draw/DrawOperation.kt @@ -1,8 +1,8 @@ -package space.taran.arkretouch.presentation.edit.draw +package dev.arkbuilders.arkretouch.presentation.edit.draw import androidx.compose.ui.graphics.Path -import space.taran.arkretouch.presentation.drawing.EditManager -import space.taran.arkretouch.presentation.edit.Operation +import dev.arkbuilders.arkretouch.presentation.drawing.EditManager +import dev.arkbuilders.arkretouch.presentation.edit.Operation class DrawOperation(private val editManager: EditManager) : Operation { private var path = Path() diff --git a/app/src/main/java/space/taran/arkretouch/presentation/edit/resize/ResizeInput.kt b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/resize/ResizeInput.kt similarity index 97% rename from app/src/main/java/space/taran/arkretouch/presentation/edit/resize/ResizeInput.kt rename to app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/resize/ResizeInput.kt index 89061bb..2642344 100644 --- a/app/src/main/java/space/taran/arkretouch/presentation/edit/resize/ResizeInput.kt +++ b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/resize/ResizeInput.kt @@ -1,4 +1,4 @@ -package space.taran.arkretouch.presentation.edit.resize +package dev.arkbuilders.arkretouch.presentation.edit.resize import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.core.tween @@ -34,8 +34,8 @@ import androidx.core.text.isDigitsOnly import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.delay import kotlinx.coroutines.launch -import space.taran.arkretouch.R -import space.taran.arkretouch.presentation.drawing.EditManager +import dev.arkbuilders.arkretouch.R +import dev.arkbuilders.arkretouch.presentation.drawing.EditManager @Composable fun ResizeInput(isVisible: Boolean, editManager: EditManager) { diff --git a/app/src/main/java/space/taran/arkretouch/presentation/edit/resize/ResizeOperation.kt b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/resize/ResizeOperation.kt similarity index 93% rename from app/src/main/java/space/taran/arkretouch/presentation/edit/resize/ResizeOperation.kt rename to app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/resize/ResizeOperation.kt index 68b4fc6..f7388ff 100644 --- a/app/src/main/java/space/taran/arkretouch/presentation/edit/resize/ResizeOperation.kt +++ b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/resize/ResizeOperation.kt @@ -1,13 +1,13 @@ -package space.taran.arkretouch.presentation.edit.resize +package dev.arkbuilders.arkretouch.presentation.edit.resize import android.graphics.Bitmap import androidx.compose.runtime.mutableStateOf import androidx.compose.ui.graphics.ImageBitmap import androidx.compose.ui.graphics.asImageBitmap import androidx.compose.ui.unit.IntSize -import space.taran.arkretouch.presentation.drawing.EditManager -import space.taran.arkretouch.presentation.edit.Operation -import space.taran.arkretouch.presentation.utils.resize +import dev.arkbuilders.arkretouch.presentation.drawing.EditManager +import dev.arkbuilders.arkretouch.presentation.edit.Operation +import dev.arkbuilders.arkretouch.presentation.utils.resize import java.lang.NullPointerException class ResizeOperation(private val editManager: EditManager) : Operation { diff --git a/app/src/main/java/space/taran/arkretouch/presentation/edit/rotate/RotateOperation.kt b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/rotate/RotateOperation.kt similarity index 80% rename from app/src/main/java/space/taran/arkretouch/presentation/edit/rotate/RotateOperation.kt rename to app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/rotate/RotateOperation.kt index 0798c11..55aa5eb 100644 --- a/app/src/main/java/space/taran/arkretouch/presentation/edit/rotate/RotateOperation.kt +++ b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/rotate/RotateOperation.kt @@ -1,9 +1,9 @@ -package space.taran.arkretouch.presentation.edit.rotate +package dev.arkbuilders.arkretouch.presentation.edit.rotate import android.graphics.Matrix -import space.taran.arkretouch.presentation.drawing.EditManager -import space.taran.arkretouch.presentation.edit.Operation -import space.taran.arkretouch.presentation.utils.rotate +import dev.arkbuilders.arkretouch.presentation.drawing.EditManager +import dev.arkbuilders.arkretouch.presentation.edit.Operation +import dev.arkbuilders.arkretouch.presentation.utils.rotate class RotateOperation(private val editManager: EditManager) : Operation { diff --git a/app/src/main/java/space/taran/arkretouch/presentation/main/MainActivity.kt b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/main/MainActivity.kt similarity index 91% rename from app/src/main/java/space/taran/arkretouch/presentation/main/MainActivity.kt rename to app/src/main/java/dev/arkbuilders/arkretouch/presentation/main/MainActivity.kt index 1f71d19..96c36c8 100644 --- a/app/src/main/java/space/taran/arkretouch/presentation/main/MainActivity.kt +++ b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/main/MainActivity.kt @@ -1,4 +1,4 @@ -package space.taran.arkretouch.presentation.main +package dev.arkbuilders.arkretouch.presentation.main import android.os.Bundle import androidx.activity.compose.rememberLauncherForActivityResult @@ -17,12 +17,12 @@ import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController import androidx.navigation.navArgument -import space.taran.arkretouch.data.Resolution -import space.taran.arkretouch.presentation.utils.PermissionsHelper -import space.taran.arkretouch.presentation.edit.EditScreen -import space.taran.arkretouch.presentation.utils.isWritePermGranted -import space.taran.arkretouch.presentation.picker.PickerScreen -import space.taran.arkretouch.presentation.theme.ARKRetouchTheme +import dev.arkbuilders.arkretouch.data.Resolution +import dev.arkbuilders.arkretouch.presentation.utils.PermissionsHelper +import dev.arkbuilders.arkretouch.presentation.edit.EditScreen +import dev.arkbuilders.arkretouch.presentation.utils.isWritePermGranted +import dev.arkbuilders.arkretouch.presentation.picker.PickerScreen +import dev.arkbuilders.arkretouch.presentation.theme.ARKRetouchTheme import kotlin.io.path.Path private const val REAL_PATH_KEY = "real_file_path_2" diff --git a/app/src/main/java/space/taran/arkretouch/presentation/picker/FilePickerScreen.kt b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/picker/FilePickerScreen.kt similarity index 87% rename from app/src/main/java/space/taran/arkretouch/presentation/picker/FilePickerScreen.kt rename to app/src/main/java/dev/arkbuilders/arkretouch/presentation/picker/FilePickerScreen.kt index 00aa5af..98ed2d8 100644 --- a/app/src/main/java/space/taran/arkretouch/presentation/picker/FilePickerScreen.kt +++ b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/picker/FilePickerScreen.kt @@ -1,4 +1,4 @@ -package space.taran.arkretouch.presentation.picker +package dev.arkbuilders.arkretouch.presentation.picker import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -33,16 +33,16 @@ import androidx.compose.ui.unit.IntSize import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.fragment.app.FragmentManager -import space.taran.arkfilepicker.ArkFilePickerConfig -import space.taran.arkfilepicker.presentation.filepicker.ArkFilePickerFragment -import space.taran.arkfilepicker.presentation.filepicker.ArkFilePickerMode -import space.taran.arkfilepicker.presentation.onArkPathPicked -import space.taran.arkretouch.R -import space.taran.arkretouch.data.Resolution -import space.taran.arkretouch.presentation.utils.askWritePermissions -import space.taran.arkretouch.presentation.utils.isWritePermGranted -import space.taran.arkretouch.presentation.theme.Purple500 -import space.taran.arkretouch.presentation.theme.Purple700 +import dev.arkbuilders.arkfilepicker.ArkFilePickerConfig +import dev.arkbuilders.arkfilepicker.presentation.filepicker.ArkFilePickerFragment +import dev.arkbuilders.arkfilepicker.presentation.filepicker.ArkFilePickerMode +import dev.arkbuilders.arkfilepicker.presentation.onArkPathPicked +import dev.arkbuilders.arkretouch.R +import dev.arkbuilders.arkretouch.data.Resolution +import dev.arkbuilders.arkretouch.presentation.utils.askWritePermissions +import dev.arkbuilders.arkretouch.presentation.utils.isWritePermGranted +import dev.arkbuilders.arkretouch.presentation.theme.Purple500 +import dev.arkbuilders.arkretouch.presentation.theme.Purple700 import java.nio.file.Path @Composable diff --git a/app/src/main/java/space/taran/arkretouch/presentation/theme/Color.kt b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/theme/Color.kt similarity index 79% rename from app/src/main/java/space/taran/arkretouch/presentation/theme/Color.kt rename to app/src/main/java/dev/arkbuilders/arkretouch/presentation/theme/Color.kt index 6ff763f..93c2ca7 100644 --- a/app/src/main/java/space/taran/arkretouch/presentation/theme/Color.kt +++ b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/theme/Color.kt @@ -1,4 +1,4 @@ -package space.taran.arkretouch.presentation.theme +package dev.arkbuilders.arkretouch.presentation.theme import androidx.compose.ui.graphics.Color diff --git a/app/src/main/java/space/taran/arkretouch/presentation/theme/Shape.kt b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/theme/Shape.kt similarity index 83% rename from app/src/main/java/space/taran/arkretouch/presentation/theme/Shape.kt rename to app/src/main/java/dev/arkbuilders/arkretouch/presentation/theme/Shape.kt index 425189d..d9e83e1 100644 --- a/app/src/main/java/space/taran/arkretouch/presentation/theme/Shape.kt +++ b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/theme/Shape.kt @@ -1,4 +1,4 @@ -package space.taran.arkretouch.presentation.theme +package dev.arkbuilders.arkretouch.presentation.theme import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.Shapes diff --git a/app/src/main/java/space/taran/arkretouch/presentation/theme/Theme.kt b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/theme/Theme.kt similarity index 95% rename from app/src/main/java/space/taran/arkretouch/presentation/theme/Theme.kt rename to app/src/main/java/dev/arkbuilders/arkretouch/presentation/theme/Theme.kt index 54289b1..e000615 100644 --- a/app/src/main/java/space/taran/arkretouch/presentation/theme/Theme.kt +++ b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/theme/Theme.kt @@ -1,4 +1,4 @@ -package space.taran.arkretouch.presentation.theme +package dev.arkbuilders.arkretouch.presentation.theme import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material.MaterialTheme diff --git a/app/src/main/java/space/taran/arkretouch/presentation/theme/Type.kt b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/theme/Type.kt similarity index 93% rename from app/src/main/java/space/taran/arkretouch/presentation/theme/Type.kt rename to app/src/main/java/dev/arkbuilders/arkretouch/presentation/theme/Type.kt index 8e56d9e..8d5bd33 100644 --- a/app/src/main/java/space/taran/arkretouch/presentation/theme/Type.kt +++ b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/theme/Type.kt @@ -1,4 +1,4 @@ -package space.taran.arkretouch.presentation.theme +package dev.arkbuilders.arkretouch.presentation.theme import androidx.compose.material.Typography import androidx.compose.ui.text.TextStyle diff --git a/app/src/main/java/space/taran/arkretouch/presentation/utils/ImageHelper.kt b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/utils/ImageHelper.kt similarity index 69% rename from app/src/main/java/space/taran/arkretouch/presentation/utils/ImageHelper.kt rename to app/src/main/java/dev/arkbuilders/arkretouch/presentation/utils/ImageHelper.kt index caf22fc..ddb3994 100644 --- a/app/src/main/java/space/taran/arkretouch/presentation/utils/ImageHelper.kt +++ b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/utils/ImageHelper.kt @@ -1,10 +1,10 @@ -package space.taran.arkretouch.presentation.utils +package dev.arkbuilders.arkretouch.presentation.utils import android.graphics.Bitmap import android.graphics.Matrix -import space.taran.arkretouch.presentation.edit.crop.CropWindow -import space.taran.arkretouch.presentation.edit.resize.ResizeOperation -import space.taran.arkretouch.presentation.edit.rotate.RotateOperation +import dev.arkbuilders.arkretouch.presentation.edit.crop.CropWindow +import dev.arkbuilders.arkretouch.presentation.edit.resize.ResizeOperation +import dev.arkbuilders.arkretouch.presentation.edit.rotate.RotateOperation fun Bitmap.crop(cropParams: CropWindow.CropParams): Bitmap = Bitmap.createBitmap( this, diff --git a/app/src/main/java/space/taran/arkretouch/presentation/utils/PermissionsHelper.kt b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/utils/PermissionsHelper.kt similarity index 93% rename from app/src/main/java/space/taran/arkretouch/presentation/utils/PermissionsHelper.kt rename to app/src/main/java/dev/arkbuilders/arkretouch/presentation/utils/PermissionsHelper.kt index e619fa7..f3c57d9 100644 --- a/app/src/main/java/space/taran/arkretouch/presentation/utils/PermissionsHelper.kt +++ b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/utils/PermissionsHelper.kt @@ -1,4 +1,4 @@ -package space.taran.arkretouch.presentation.utils +package dev.arkbuilders.arkretouch.presentation.utils import android.Manifest import android.annotation.TargetApi @@ -11,7 +11,7 @@ import android.provider.Settings import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.contract.ActivityResultContract import androidx.activity.result.contract.ActivityResultContracts -import space.taran.arkretouch.BuildConfig +import dev.arkbuilders.arkretouch.BuildConfig object PermissionsHelper { fun writePermContract(): ActivityResultContract { diff --git a/app/src/main/java/space/taran/arkretouch/presentation/utils/Utils.kt b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/utils/Utils.kt similarity index 96% rename from app/src/main/java/space/taran/arkretouch/presentation/utils/Utils.kt rename to app/src/main/java/dev/arkbuilders/arkretouch/presentation/utils/Utils.kt index a01fba8..6f8a5d6 100644 --- a/app/src/main/java/space/taran/arkretouch/presentation/utils/Utils.kt +++ b/app/src/main/java/dev/arkbuilders/arkretouch/presentation/utils/Utils.kt @@ -1,4 +1,4 @@ -package space.taran.arkretouch.presentation.utils +package dev.arkbuilders.arkretouch.presentation.utils import android.Manifest import android.content.Context @@ -14,7 +14,7 @@ import androidx.compose.ui.geometry.Offset import androidx.compose.ui.input.pointer.PointerEvent import androidx.core.app.ActivityCompat import androidx.core.content.ContextCompat -import space.taran.arkretouch.BuildConfig +import dev.arkbuilders.arkretouch.BuildConfig import java.nio.file.Path import kotlin.io.path.exists import kotlin.io.path.extension diff --git a/app/src/test/java/space/taran/arkretouch/ExampleUnitTest.kt b/app/src/test/java/dev/arkbuilders/arkretouch/ExampleUnitTest.kt similarity index 90% rename from app/src/test/java/space/taran/arkretouch/ExampleUnitTest.kt rename to app/src/test/java/dev/arkbuilders/arkretouch/ExampleUnitTest.kt index 9953493..43b11f8 100644 --- a/app/src/test/java/space/taran/arkretouch/ExampleUnitTest.kt +++ b/app/src/test/java/dev/arkbuilders/arkretouch/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package space.taran.arkretouch +package dev.arkbuilders.arkretouch import org.junit.Assert.assertEquals import org.junit.Test diff --git a/settings.gradle b/settings.gradle index 5d463b8..813a4b6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -10,7 +10,15 @@ dependencyResolutionManagement { repositories { google() mavenCentral() - maven { url 'https://jitpack.io' } + + maven { + name = "GitHubPackages" + url = "https://maven.pkg.github.com/ARK-Builders/ark-filepicker" + credentials { + username = "token" + password = "\u0037\u0066\u0066\u0036\u0030\u0039\u0033\u0066\u0032\u0037\u0033\u0036\u0033\u0037\u0064\u0036\u0037\u0066\u0038\u0030\u0034\u0039\u0062\u0030\u0039\u0038\u0039\u0038\u0066\u0034\u0066\u0034\u0031\u0064\u0062\u0033\u0064\u0033\u0038\u0065" + } + } } } rootProject.name = "ARK Retouch"