Package renaming (#86)

* Package renaming * Folder structure changes * Update filepicker
ARK-Builders · Oct 12, 2023 · da5e102 · da5e102
1 parent f1b12c9
commit da5e102
Show file tree

Hide file tree

Showing 39 changed files with 167 additions and 159 deletions.
diff --git 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/...ran/arkretouch/ExampleInstrumentedTest.kt → ...ers/arkretouch/ExampleInstrumentedTest.kt b/...ran/arkretouch/ExampleInstrumentedTest.kt → ...ers/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
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="space.taran.arkretouch">
+    package="dev.arkbuilders.arkretouch">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission
@@ -41,7 +41,7 @@
         </activity>
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="space.taran.arkretouch2.fileprovider"
+            android:authorities="dev.arkbuilders.arkretouch2.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true"
             >

diff --git a/...ce/taran/arkretouch/data/ImageDefaults.kt → ...builders/arkretouch/data/ImageDefaults.kt b/...ce/taran/arkretouch/data/ImageDefaults.kt → ...builders/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/...pace/taran/arkretouch/data/Preferences.kt → ...rkbuilders/arkretouch/data/Preferences.kt b/...pace/taran/arkretouch/data/Preferences.kt → ...rkbuilders/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/...space/taran/arkretouch/di/AppComponent.kt → ...arkbuilders/arkretouch/di/AppComponent.kt b/...space/taran/arkretouch/di/AppComponent.kt → ...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/...va/space/taran/arkretouch/di/DIManager.kt → ...ev/arkbuilders/arkretouch/di/DIManager.kt b/...va/space/taran/arkretouch/di/DIManager.kt → ...ev/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/...pace/taran/arkretouch/presentation/App.kt → ...rkbuilders/arkretouch/presentation/App.kt b/...pace/taran/arkretouch/presentation/App.kt → ...rkbuilders/arkretouch/presentation/App.kt
@@ -1,15 +1,15 @@
-package space.taran.arkretouch.presentation
+package dev.arkbuilders.arkretouch.presentation
 
 import android.app.Application
 import org.acra.config.dialog
 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/...etouch/presentation/drawing/EditCanvas.kt → ...etouch/presentation/drawing/EditCanvas.kt b/...etouch/presentation/drawing/EditCanvas.kt → ...etouch/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/...touch/presentation/drawing/EditManager.kt → ...touch/presentation/drawing/EditManager.kt b/...touch/presentation/drawing/EditManager.kt → ...touch/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/...ch/presentation/edit/ColorPickerDialog.kt → ...ch/presentation/edit/ColorPickerDialog.kt b/...ch/presentation/edit/ColorPickerDialog.kt → ...ch/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/...h/presentation/edit/ConfirmClearDialog.kt → ...h/presentation/edit/ConfirmClearDialog.kt b/...h/presentation/edit/ConfirmClearDialog.kt → ...h/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/...rkretouch/presentation/edit/EditScreen.kt → ...rkretouch/presentation/edit/EditScreen.kt b/...rkretouch/presentation/edit/EditScreen.kt → ...rkretouch/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/...etouch/presentation/edit/EditViewModel.kt → ...etouch/presentation/edit/EditViewModel.kt b/...etouch/presentation/edit/EditViewModel.kt → ...etouch/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/...uch/presentation/edit/MoreOptionsPopup.kt → ...uch/presentation/edit/MoreOptionsPopup.kt b/...uch/presentation/edit/MoreOptionsPopup.kt → ...uch/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/...resentation/edit/NewImageOptionsDialog.kt → ...resentation/edit/NewImageOptionsDialog.kt b/...resentation/edit/NewImageOptionsDialog.kt → ...resentation/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/...arkretouch/presentation/edit/Operation.kt → ...arkretouch/presentation/edit/Operation.kt b/...arkretouch/presentation/edit/Operation.kt → ...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/...touch/presentation/edit/SavePathDialog.kt → ...touch/presentation/edit/SavePathDialog.kt b/...touch/presentation/edit/SavePathDialog.kt → ...touch/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/...esentation/edit/TransparencyChessBoard.kt → ...esentation/edit/TransparencyChessBoard.kt b/...esentation/edit/TransparencyChessBoard.kt → ...esentation/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/...sentation/edit/blur/BlurIntensityPopup.kt → ...sentation/edit/blur/BlurIntensityPopup.kt b/...sentation/edit/blur/BlurIntensityPopup.kt → ...sentation/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/...h/presentation/edit/blur/BlurOperation.kt → ...h/presentation/edit/blur/BlurOperation.kt b/...h/presentation/edit/blur/BlurOperation.kt → ...h/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 {