Refactor packages structure

app/src/main/AndroidManifest.xml

@@ -19,7 +19,7 @@
         android:name=".App"
         tools:targetApi="31">
         <activity
-            android:name=".main.RootActivity"
+            android:name="dev.arkbuilders.arkretouch.presentation.main.RootActivity"
             android:exported="true"
             android:windowSoftInputMode="adjustResize"
             android:theme="@style/Theme.ARKRetouch">

app/src/main/java/dev/arkbuilders/arkretouch/editing/model/DrawPath.kt → app/src/main/java/dev/arkbuilders/arkretouch/data/model/DrawPath.kt

@@ -1,4 +1,4 @@
-package dev.arkbuilders.arkretouch.editing.model
+package dev.arkbuilders.arkretouch.data.model
 
 import androidx.compose.ui.graphics.Paint
 import androidx.compose.ui.graphics.Path

app/src/main/java/dev/arkbuilders/arkretouch/editing/model/EditingState.kt → app/src/main/java/dev/arkbuilders/arkretouch/data/model/EditingState.kt

@@ -1,4 +1,4 @@
-package dev.arkbuilders.arkretouch.editing.model
+package dev.arkbuilders.arkretouch.data.model
 
 import androidx.compose.ui.graphics.Color
 

app/src/main/java/dev/arkbuilders/arkretouch/storage/ImageDefaults.kt → app/src/main/java/dev/arkbuilders/arkretouch/data/model/ImageDefaults.kt

@@ -1,4 +1,4 @@
-package dev.arkbuilders.arkretouch.storage
+package dev.arkbuilders.arkretouch.data.model
 
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.IntSize
@@ -7,7 +7,7 @@ import kotlinx.serialization.Serializable
 /**
  * We use serialization for these classes because we write them to storage as JSON text,
  * To convert them correctly we use [kotlinx.serialization.encodeToString] and [kotlinx.serialization.decodeFromString] which requires an object to be [@Serializable]
- * Refer here [dev.arkbuilders.arkretouch.storage.OldStorageRepository.persistDefaults]
+ * Refer here [dev.arkbuilders.arkretouch.data.OldStorageRepository.persistDefaults]
 */
 
 @Serializable

app/src/main/java/dev/arkbuilders/arkretouch/editing/model/ImageViewParams.kt → app/src/main/java/dev/arkbuilders/arkretouch/data/model/ImageViewParams.kt

@@ -1,7 +1,7 @@
-package dev.arkbuilders.arkretouch.editing.model
+package dev.arkbuilders.arkretouch.data.model
 
 import androidx.compose.ui.unit.IntSize
-import dev.arkbuilders.arkretouch.presentation.edit.resize.ResizeOperation
+import dev.arkbuilders.arkretouch.editing.resize.ResizeOperation
 
 class ImageViewParams(
     val drawArea: IntSize,

app/src/main/java/dev/arkbuilders/arkretouch/editing/repository/FilesRepository.kt → app/src/main/java/dev/arkbuilders/arkretouch/data/repo/FilesRepository.kt

@@ -1,4 +1,4 @@
-package dev.arkbuilders.arkretouch.editing.repository
+package dev.arkbuilders.arkretouch.data.repo
 
 import androidx.core.content.FileProvider
 import android.content.Context

app/src/main/java/dev/arkbuilders/arkretouch/storage/OldStorageRepository.kt → app/src/main/java/dev/arkbuilders/arkretouch/data/repo/OldStorageRepository.kt

@@ -1,7 +1,9 @@
-package dev.arkbuilders.arkretouch.storage
+package dev.arkbuilders.arkretouch.data.repo
 
 import androidx.compose.ui.graphics.Color
 import android.content.Context
+import dev.arkbuilders.arkretouch.data.model.ImageDefaults
+import dev.arkbuilders.arkretouch.data.model.Resolution
 import java.io.IOException
 import java.nio.file.Files
 import kotlin.io.path.exists

app/src/main/java/dev/arkbuilders/arkretouch/di/EditModule.kt

@@ -1,8 +1,8 @@
 package dev.arkbuilders.arkretouch.di
 
 import dev.arkbuilders.arkretouch.di.common.InjectionModule
-import dev.arkbuilders.arkretouch.editing.ui.main.EditViewModel
-import dev.arkbuilders.arkretouch.storage.Resolution
+import dev.arkbuilders.arkretouch.presentation.viewmodels.EditViewModel
+import dev.arkbuilders.arkretouch.data.model.Resolution
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.dsl.module
 import java.nio.file.Path

app/src/main/java/dev/arkbuilders/arkretouch/di/common/CommonModule.kt

@@ -1,7 +1,7 @@
 package dev.arkbuilders.arkretouch.di.common
 
-import dev.arkbuilders.arkretouch.editing.repository.FilesRepository
-import dev.arkbuilders.arkretouch.storage.OldStorageRepository
+import dev.arkbuilders.arkretouch.data.repo.FilesRepository
+import dev.arkbuilders.arkretouch.data.repo.OldStorageRepository
 import org.koin.core.module.dsl.singleOf
 import org.koin.dsl.module
 

app/src/main/java/dev/arkbuilders/arkretouch/editing/model/Operation.kt → app/src/main/java/dev/arkbuilders/arkretouch/editing/Operation.kt

@@ -1,4 +1,4 @@
-package dev.arkbuilders.arkretouch.editing.model
+package dev.arkbuilders.arkretouch.editing
 
 interface Operation {
     fun apply()

app/src/main/java/dev/arkbuilders/arkretouch/editing/ui/blur/BlurOperation.kt → app/src/main/java/dev/arkbuilders/arkretouch/editing/blur/BlurOperation.kt

@@ -1,4 +1,4 @@
-package dev.arkbuilders.arkretouch.editing.ui.blur
+package dev.arkbuilders.arkretouch.editing.blur
 
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.geometry.Offset
@@ -13,7 +13,7 @@ import android.content.Context
 import android.graphics.Bitmap
 import com.hoko.blur.processor.HokoBlurBuild
 import dev.arkbuilders.arkretouch.editing.manager.EditManager
-import dev.arkbuilders.arkretouch.editing.model.Operation
+import dev.arkbuilders.arkretouch.editing.Operation
 import java.util.Stack
 
 class BlurOperation(

app/src/main/java/dev/arkbuilders/arkretouch/editing/ui/crop/CropOperation.kt → app/src/main/java/dev/arkbuilders/arkretouch/editing/crop/CropOperation.kt

@@ -1,8 +1,8 @@
-package dev.arkbuilders.arkretouch.editing.ui.crop
+package dev.arkbuilders.arkretouch.editing.crop
 
 import androidx.compose.ui.graphics.asImageBitmap
 import dev.arkbuilders.arkretouch.editing.manager.EditManager
-import dev.arkbuilders.arkretouch.editing.model.Operation
+import dev.arkbuilders.arkretouch.editing.Operation
 import dev.arkbuilders.arkretouch.utils.crop
 
 class CropOperation(

app/src/main/java/dev/arkbuilders/arkretouch/editing/ui/crop/CropWindow.kt → app/src/main/java/dev/arkbuilders/arkretouch/editing/crop/CropWindow.kt

@@ -1,4 +1,4 @@
-package dev.arkbuilders.arkretouch.editing.ui.crop
+package dev.arkbuilders.arkretouch.editing.crop
 
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.geometry.Offset
@@ -10,16 +10,16 @@ import androidx.compose.ui.graphics.PaintingStyle
 import androidx.compose.ui.unit.IntSize
 import android.graphics.Bitmap
 import dev.arkbuilders.arkretouch.editing.manager.EditManager
-import dev.arkbuilders.arkretouch.editing.ui.crop.AspectRatio.CROP_2_3
-import dev.arkbuilders.arkretouch.editing.ui.crop.AspectRatio.CROP_4_5
-import dev.arkbuilders.arkretouch.editing.ui.crop.AspectRatio.CROP_9_16
-import dev.arkbuilders.arkretouch.editing.ui.crop.AspectRatio.CROP_SQUARE
-import dev.arkbuilders.arkretouch.editing.ui.crop.AspectRatio.isCropFree
-import dev.arkbuilders.arkretouch.editing.ui.crop.AspectRatio.isCropSquare
-import dev.arkbuilders.arkretouch.editing.ui.crop.AspectRatio.isCrop_2_3
-import dev.arkbuilders.arkretouch.editing.ui.crop.AspectRatio.isCrop_4_5
-import dev.arkbuilders.arkretouch.editing.ui.crop.AspectRatio.isCrop_9_16
-import dev.arkbuilders.arkretouch.presentation.edit.resize.ResizeOperation
+import dev.arkbuilders.arkretouch.presentation.views.AspectRatio.CROP_2_3
+import dev.arkbuilders.arkretouch.presentation.views.AspectRatio.CROP_4_5
+import dev.arkbuilders.arkretouch.presentation.views.AspectRatio.CROP_9_16
+import dev.arkbuilders.arkretouch.presentation.views.AspectRatio.CROP_SQUARE
+import dev.arkbuilders.arkretouch.presentation.views.AspectRatio.isCropFree
+import dev.arkbuilders.arkretouch.presentation.views.AspectRatio.isCropSquare
+import dev.arkbuilders.arkretouch.presentation.views.AspectRatio.isCrop_2_3
+import dev.arkbuilders.arkretouch.presentation.views.AspectRatio.isCrop_4_5
+import dev.arkbuilders.arkretouch.presentation.views.AspectRatio.isCrop_9_16
+import dev.arkbuilders.arkretouch.editing.resize.ResizeOperation
 import timber.log.Timber
 
 class CropWindow(private val editManager: EditManager) {

app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/draw/DrawOperation.kt → app/src/main/java/dev/arkbuilders/arkretouch/editing/draw/DrawOperation.kt

@@ -1,8 +1,8 @@
-package dev.arkbuilders.arkretouch.presentation.edit.draw
+package dev.arkbuilders.arkretouch.editing.draw
 
 import androidx.compose.ui.graphics.Path
 import dev.arkbuilders.arkretouch.editing.manager.EditManager
-import dev.arkbuilders.arkretouch.editing.model.Operation
+import dev.arkbuilders.arkretouch.editing.Operation
 
 class DrawOperation(private val editManager: EditManager) : Operation {
     private var path = Path()

app/src/main/java/dev/arkbuilders/arkretouch/editing/manager/EditManager.kt

@@ -14,19 +14,19 @@ import androidx.compose.ui.graphics.PaintingStyle
 import androidx.compose.ui.graphics.Path
 import androidx.compose.ui.unit.IntSize
 import android.graphics.Matrix
-import dev.arkbuilders.arkretouch.editing.model.DrawPath
-import dev.arkbuilders.arkretouch.editing.model.ImageViewParams
-import dev.arkbuilders.arkretouch.editing.model.Operation
-import dev.arkbuilders.arkretouch.editing.ui.blur.BlurOperation
-import dev.arkbuilders.arkretouch.editing.ui.crop.CropOperation
-import dev.arkbuilders.arkretouch.editing.ui.crop.CropWindow
-import dev.arkbuilders.arkretouch.editing.ui.main.fitBackground
-import dev.arkbuilders.arkretouch.editing.ui.main.fitImage
-import dev.arkbuilders.arkretouch.presentation.edit.draw.DrawOperation
-import dev.arkbuilders.arkretouch.presentation.edit.resize.ResizeOperation
-import dev.arkbuilders.arkretouch.presentation.edit.rotate.RotateOperation
-import dev.arkbuilders.arkretouch.storage.ImageDefaults
-import dev.arkbuilders.arkretouch.storage.Resolution
+import dev.arkbuilders.arkretouch.data.model.DrawPath
+import dev.arkbuilders.arkretouch.data.model.ImageViewParams
+import dev.arkbuilders.arkretouch.editing.Operation
+import dev.arkbuilders.arkretouch.editing.blur.BlurOperation
+import dev.arkbuilders.arkretouch.editing.crop.CropOperation
+import dev.arkbuilders.arkretouch.editing.crop.CropWindow
+import dev.arkbuilders.arkretouch.presentation.viewmodels.fitBackground
+import dev.arkbuilders.arkretouch.presentation.viewmodels.fitImage
+import dev.arkbuilders.arkretouch.editing.draw.DrawOperation
+import dev.arkbuilders.arkretouch.editing.resize.ResizeOperation
+import dev.arkbuilders.arkretouch.editing.rotate.RotateOperation
+import dev.arkbuilders.arkretouch.data.model.ImageDefaults
+import dev.arkbuilders.arkretouch.data.model.Resolution
 import dev.arkbuilders.arkretouch.utils.copy
 import dev.arkbuilders.arkretouch.utils.defaultPaint
 import timber.log.Timber

app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/resize/ResizeOperation.kt → app/src/main/java/dev/arkbuilders/arkretouch/editing/resize/ResizeOperation.kt

@@ -1,12 +1,12 @@
-package dev.arkbuilders.arkretouch.presentation.edit.resize
+package dev.arkbuilders.arkretouch.editing.resize
 
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.unit.IntSize
 import android.graphics.Bitmap
 import dev.arkbuilders.arkretouch.editing.manager.EditManager
-import dev.arkbuilders.arkretouch.editing.model.Operation
+import dev.arkbuilders.arkretouch.editing.Operation
 import dev.arkbuilders.arkretouch.utils.resize
 import java.lang.NullPointerException
 

app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/rotate/RotateOperation.kt → app/src/main/java/dev/arkbuilders/arkretouch/editing/rotate/RotateOperation.kt

@@ -1,8 +1,8 @@
-package dev.arkbuilders.arkretouch.presentation.edit.rotate
+package dev.arkbuilders.arkretouch.editing.rotate
 
 import android.graphics.Matrix
 import dev.arkbuilders.arkretouch.editing.manager.EditManager
-import dev.arkbuilders.arkretouch.editing.model.Operation
+import dev.arkbuilders.arkretouch.editing.Operation
 import dev.arkbuilders.arkretouch.utils.rotate
 
 class RotateOperation(private val editManager: EditManager) : Operation {

app/src/main/java/dev/arkbuilders/arkretouch/editing/ui/canvas/BackgroundCanvas.kt → app/src/main/java/dev/arkbuilders/arkretouch/presentation/canvas/BackgroundCanvas.kt

@@ -1,4 +1,4 @@
-package dev.arkbuilders.arkretouch.editing.ui.canvas
+package dev.arkbuilders.arkretouch.presentation.canvas
 
 import androidx.compose.foundation.Canvas
 import androidx.compose.runtime.Composable

app/src/main/java/dev/arkbuilders/arkretouch/editing/ui/canvas/DrawCanvas.kt → app/src/main/java/dev/arkbuilders/arkretouch/presentation/canvas/DrawCanvas.kt

@@ -1,4 +1,4 @@
-package dev.arkbuilders.arkretouch.editing.ui.canvas
+package dev.arkbuilders.arkretouch.presentation.canvas
 
 import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.layout.fillMaxSize
@@ -19,9 +19,9 @@ import androidx.compose.ui.unit.toSize
 import android.graphics.Matrix
 import android.graphics.PointF
 import android.view.MotionEvent
-import dev.arkbuilders.arkretouch.editing.ui.crop.CropWindow.Companion.computeDeltaX
-import dev.arkbuilders.arkretouch.editing.ui.crop.CropWindow.Companion.computeDeltaY
-import dev.arkbuilders.arkretouch.editing.ui.main.EditViewModel
+import dev.arkbuilders.arkretouch.editing.crop.CropWindow.Companion.computeDeltaX
+import dev.arkbuilders.arkretouch.editing.crop.CropWindow.Companion.computeDeltaY
+import dev.arkbuilders.arkretouch.presentation.viewmodels.EditViewModel
 
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable

app/src/main/java/dev/arkbuilders/arkretouch/editing/ui/canvas/EditCanvas.kt → app/src/main/java/dev/arkbuilders/arkretouch/presentation/canvas/EditCanvas.kt

@@ -1,4 +1,4 @@
-package dev.arkbuilders.arkretouch.editing.ui.canvas
+package dev.arkbuilders.arkretouch.presentation.canvas
 
 import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.gestures.awaitFirstDown
@@ -18,9 +18,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.input.pointer.pointerInput
-import dev.arkbuilders.arkretouch.editing.ui.main.EditViewModel
-import dev.arkbuilders.arkretouch.picker.toDp
-import dev.arkbuilders.arkretouch.presentation.edit.TransparencyChessBoardCanvas
+import dev.arkbuilders.arkretouch.presentation.viewmodels.EditViewModel
+import dev.arkbuilders.arkretouch.presentation.picker.toDp
+import dev.arkbuilders.arkretouch.presentation.views.TransparencyChessBoardCanvas
 import dev.arkbuilders.arkretouch.utils.calculateRotationFromOneFingerGesture
 
 @Composable

app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/ColorPickerDialog.kt → app/src/main/java/dev/arkbuilders/arkretouch/presentation/dialogs/ColorPickerDialog.kt

@@ -1,4 +1,4 @@
-package dev.arkbuilders.arkretouch.presentation.edit
+package dev.arkbuilders.arkretouch.presentation.dialogs
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.core.tween

app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/ConfirmClearDialog.kt → app/src/main/java/dev/arkbuilders/arkretouch/presentation/dialogs/ConfirmClearDialog.kt

@@ -1,4 +1,4 @@
-package dev.arkbuilders.arkretouch.presentation.edit
+package dev.arkbuilders.arkretouch.presentation.dialogs
 
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.AlertDialog

app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/NewImageOptionsDialog.kt → app/src/main/java/dev/arkbuilders/arkretouch/presentation/dialogs/NewImageOptionsDialog.kt

@@ -1,4 +1,4 @@
-package dev.arkbuilders.arkretouch.presentation.edit
+package dev.arkbuilders.arkretouch.presentation.dialogs
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
@@ -36,10 +36,10 @@ import androidx.compose.ui.window.Dialog
 import androidx.core.text.isDigitsOnly
 import dev.arkbuilders.arkretouch.R
 import dev.arkbuilders.arkretouch.editing.manager.EditManager
-import dev.arkbuilders.arkretouch.presentation.edit.resize.Hint
-import dev.arkbuilders.arkretouch.presentation.edit.resize.delayHidingHint
-import dev.arkbuilders.arkretouch.storage.Resolution
-import dev.arkbuilders.arkretouch.ui.theme.Gray
+import dev.arkbuilders.arkretouch.presentation.views.Hint
+import dev.arkbuilders.arkretouch.presentation.views.delayHidingHint
+import dev.arkbuilders.arkretouch.data.model.Resolution
+import dev.arkbuilders.arkretouch.presentation.theme.Gray
 
 @Composable
 fun NewImageOptionsDialog(

app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/SavePathDialog.kt → app/src/main/java/dev/arkbuilders/arkretouch/presentation/dialogs/SavePathDialog.kt

@@ -1,4 +1,4 @@
-package dev.arkbuilders.arkretouch.presentation.edit
+package dev.arkbuilders.arkretouch.presentation.dialogs
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable

app/src/main/java/dev/arkbuilders/arkretouch/main/MainScreen.kt → app/src/main/java/dev/arkbuilders/arkretouch/presentation/main/MainScreen.kt

@@ -1,4 +1,4 @@
-package dev.arkbuilders.arkretouch.main
+package dev.arkbuilders.arkretouch.presentation.main
 
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.compose.runtime.Composable
@@ -14,9 +14,9 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navArgument
-import dev.arkbuilders.arkretouch.editing.ui.main.EditScreen
-import dev.arkbuilders.arkretouch.picker.PickerScreen
-import dev.arkbuilders.arkretouch.storage.Resolution
+import dev.arkbuilders.arkretouch.presentation.screens.EditScreen
+import dev.arkbuilders.arkretouch.presentation.picker.PickerScreen
+import dev.arkbuilders.arkretouch.data.model.Resolution
 import dev.arkbuilders.arkretouch.utils.permission.PermissionsHelper
 import dev.arkbuilders.arkretouch.utils.permission.isWritePermissionGranted
 import kotlin.io.path.Path

app/src/main/java/dev/arkbuilders/arkretouch/main/RootActivity.kt → app/src/main/java/dev/arkbuilders/arkretouch/presentation/main/RootActivity.kt

@@ -1,9 +1,9 @@
-package dev.arkbuilders.arkretouch.main
+package dev.arkbuilders.arkretouch.presentation.main
 
 import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import dev.arkbuilders.arkretouch.ui.theme.ARKRetouchTheme
+import dev.arkbuilders.arkretouch.presentation.theme.ARKRetouchTheme
 
 private const val REAL_PATH_KEY = "real_file_path_2"
 

app/src/main/java/dev/arkbuilders/arkretouch/picker/FilePickerScreen.kt → app/src/main/java/dev/arkbuilders/arkretouch/presentation/picker/FilePickerScreen.kt

@@ -1,4 +1,4 @@
-package dev.arkbuilders.arkretouch.picker
+package dev.arkbuilders.arkretouch.presentation.picker
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
@@ -38,9 +38,9 @@ import dev.arkbuilders.arkfilepicker.presentation.filepicker.ArkFilePickerFragme
 import dev.arkbuilders.arkfilepicker.presentation.filepicker.ArkFilePickerMode
 import dev.arkbuilders.arkfilepicker.presentation.onArkPathPicked
 import dev.arkbuilders.arkretouch.R
-import dev.arkbuilders.arkretouch.storage.Resolution
-import dev.arkbuilders.arkretouch.ui.theme.Purple500
-import dev.arkbuilders.arkretouch.ui.theme.Purple700
+import dev.arkbuilders.arkretouch.data.model.Resolution
+import dev.arkbuilders.arkretouch.presentation.theme.Purple500
+import dev.arkbuilders.arkretouch.presentation.theme.Purple700
 import dev.arkbuilders.arkretouch.utils.permission.isWritePermissionGranted
 import dev.arkbuilders.arkretouch.utils.permission.requestWritePermissions
 import java.nio.file.Path

app/src/main/java/dev/arkbuilders/arkretouch/editing/ui/blur/BlurIntensityPopup.kt → app/src/main/java/dev/arkbuilders/arkretouch/presentation/popups/BlurIntensityPopup.kt

@@ -1,4 +1,4 @@
-package dev.arkbuilders.arkretouch.editing.ui.blur
+package dev.arkbuilders.arkretouch.presentation.popups
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth

app/src/main/java/dev/arkbuilders/arkretouch/presentation/edit/MoreOptionsPopup.kt → app/src/main/java/dev/arkbuilders/arkretouch/presentation/popups/MoreOptionsPopup.kt

@@ -1,4 +1,4 @@
-package dev.arkbuilders.arkretouch.presentation.edit
+package dev.arkbuilders.arkretouch.presentation.popups
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -23,7 +23,7 @@ import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Popup
 import androidx.compose.ui.window.PopupProperties
 import dev.arkbuilders.arkretouch.R
-import dev.arkbuilders.arkretouch.picker.toPx
+import dev.arkbuilders.arkretouch.presentation.picker.toPx
 
 @Composable
 fun MoreOptionsPopup(