chore: cleanup project infrastructure

you-apps · May 2, 2024 · 6560f05 · 6560f05
1 parent 604cee7
commit 6560f05
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 17 deletions.
diff --git a/...ava/com/bnyro/wallpaper/enums/TriState.kt → ...a/com/bnyro/wallpaper/enums/MultiState.kt b/...ava/com/bnyro/wallpaper/enums/TriState.kt → ...a/com/bnyro/wallpaper/enums/MultiState.kt
@@ -1,5 +1,8 @@
 package com.bnyro.wallpaper.enums
 
 enum class MultiState {
-    RUNNING, SUCCESS, ERROR, IDLE
+    RUNNING,
+    SUCCESS,
+    ERROR,
+    IDLE
 }
diff --git a/...ava/com/bnyro/wallpaper/util/ImageZoom.kt → ...java/com/bnyro/wallpaper/ext/ImageZoom.kt b/...ava/com/bnyro/wallpaper/util/ImageZoom.kt → ...java/com/bnyro/wallpaper/ext/ImageZoom.kt
@@ -1,4 +1,4 @@
-package com.bnyro.wallpaper.util
+package com.bnyro.wallpaper.ext
 
 import androidx.compose.foundation.gestures.awaitEachGesture
 import androidx.compose.foundation.gestures.awaitFirstDown
@@ -13,7 +13,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.input.pointer.pointerInput
 
-class ZoomState() {
+class ZoomState {
     var scale by mutableFloatStateOf(1f)
     var offsetX by mutableFloatStateOf(1f)
     var offsetY by mutableFloatStateOf(1f)

diff --git a/...com/bnyro/wallpaper/util/ShimmerEffect.kt → .../com/bnyro/wallpaper/ext/ShimmerEffect.kt b/...com/bnyro/wallpaper/util/ShimmerEffect.kt → .../com/bnyro/wallpaper/ext/ShimmerEffect.kt
@@ -1,4 +1,4 @@
-package com.bnyro.wallpaper.util
+package com.bnyro.wallpaper.ext
 
 import androidx.compose.animation.core.RepeatMode
 import androidx.compose.animation.core.animateFloat

diff --git a/.../bnyro/wallpaper/enums/WallpaperConfig.kt → ...om/bnyro/wallpaper/obj/WallpaperConfig.kt b/.../bnyro/wallpaper/enums/WallpaperConfig.kt → ...om/bnyro/wallpaper/obj/WallpaperConfig.kt
@@ -1,5 +1,7 @@
-package com.bnyro.wallpaper.enums
+package com.bnyro.wallpaper.obj
 
+import com.bnyro.wallpaper.enums.WallpaperSource
+import com.bnyro.wallpaper.enums.WallpaperTarget
 import com.bnyro.wallpaper.ui.nav.DrawerScreens
 
 data class WallpaperConfig(

diff --git a/app/src/main/java/com/bnyro/wallpaper/ui/components/ShimmerGrid.kt b/app/src/main/java/com/bnyro/wallpaper/ui/components/ShimmerGrid.kt
@@ -11,7 +11,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.unit.dp
-import com.bnyro.wallpaper.util.shimmer
+import com.bnyro.wallpaper.ext.shimmer
 
 @Composable
 fun ShimmerGrid() {

diff --git a/app/src/main/java/com/bnyro/wallpaper/ui/components/WallpaperChangerPref.kt b/app/src/main/java/com/bnyro/wallpaper/ui/components/WallpaperChangerPref.kt
@@ -32,7 +32,7 @@ import androidx.compose.ui.unit.dp
 import androidx.core.net.toUri
 import androidx.documentfile.provider.DocumentFile
 import com.bnyro.wallpaper.R
-import com.bnyro.wallpaper.enums.WallpaperConfig
+import com.bnyro.wallpaper.obj.WallpaperConfig
 import com.bnyro.wallpaper.enums.WallpaperSource
 import com.bnyro.wallpaper.enums.WallpaperTarget
 import com.bnyro.wallpaper.ui.components.prefs.CheckboxPref

diff --git a/app/src/main/java/com/bnyro/wallpaper/ui/components/WallpaperFilterEditor.kt b/app/src/main/java/com/bnyro/wallpaper/ui/components/WallpaperFilterEditor.kt
@@ -45,9 +45,9 @@ import com.bnyro.wallpaper.ui.components.prefs.CheckboxPref
 import com.bnyro.wallpaper.ui.components.prefs.ListPreference
 import com.bnyro.wallpaper.ui.models.WallpaperHelperModel
 import com.bnyro.wallpaper.util.Preferences
-import com.bnyro.wallpaper.util.rememberZoomState
-import com.bnyro.wallpaper.util.zoomArea
-import com.bnyro.wallpaper.util.zoomImage
+import com.bnyro.wallpaper.ext.rememberZoomState
+import com.bnyro.wallpaper.ext.zoomArea
+import com.bnyro.wallpaper.ext.zoomImage
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable

diff --git a/app/src/main/java/com/bnyro/wallpaper/ui/components/WallpaperView.kt b/app/src/main/java/com/bnyro/wallpaper/ui/components/WallpaperView.kt
@@ -44,9 +44,9 @@ import com.bnyro.wallpaper.ui.components.bottombar.WallpaperViewTopBar
 import com.bnyro.wallpaper.ui.components.dialogs.MultiStateDialog
 import com.bnyro.wallpaper.ui.components.infosheet.WallpaperInfoSheet
 import com.bnyro.wallpaper.ui.models.WallpaperHelperModel
-import com.bnyro.wallpaper.util.rememberZoomState
-import com.bnyro.wallpaper.util.zoomArea
-import com.bnyro.wallpaper.util.zoomImage
+import com.bnyro.wallpaper.ext.rememberZoomState
+import com.bnyro.wallpaper.ext.zoomArea
+import com.bnyro.wallpaper.ext.zoomImage
 import java.time.Instant
 
 @Composable

diff --git a/app/src/main/java/com/bnyro/wallpaper/ui/pages/SettingsPage.kt b/app/src/main/java/com/bnyro/wallpaper/ui/pages/SettingsPage.kt
@@ -23,7 +23,7 @@ import androidx.compose.ui.unit.dp
 import androidx.work.NetworkType
 import com.bnyro.wallpaper.R
 import com.bnyro.wallpaper.enums.ThemeMode
-import com.bnyro.wallpaper.enums.WallpaperConfig
+import com.bnyro.wallpaper.obj.WallpaperConfig
 import com.bnyro.wallpaper.enums.WallpaperTarget
 import com.bnyro.wallpaper.ext.formatBinarySize
 import com.bnyro.wallpaper.ext.formatMinutes

diff --git a/app/src/main/java/com/bnyro/wallpaper/util/BackgroundWorker.kt b/app/src/main/java/com/bnyro/wallpaper/util/BackgroundWorker.kt
@@ -5,7 +5,7 @@ import android.graphics.Bitmap
 import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
 import com.bnyro.wallpaper.db.DatabaseHolder
-import com.bnyro.wallpaper.enums.WallpaperConfig
+import com.bnyro.wallpaper.obj.WallpaperConfig
 import com.bnyro.wallpaper.enums.WallpaperSource
 import com.bnyro.wallpaper.ext.awaitQuery
 import kotlinx.coroutines.Dispatchers

diff --git a/app/src/main/java/com/bnyro/wallpaper/util/LocalWallpaperHelper.kt b/app/src/main/java/com/bnyro/wallpaper/util/LocalWallpaperHelper.kt
@@ -3,7 +3,7 @@ package com.bnyro.wallpaper.util
 import android.content.Context
 import androidx.core.net.toUri
 import androidx.documentfile.provider.DocumentFile
-import com.bnyro.wallpaper.enums.WallpaperConfig
+import com.bnyro.wallpaper.obj.WallpaperConfig
 
 object LocalWallpaperHelper {
     private fun getAllFilesInCurrentDir(directory: DocumentFile?): List<DocumentFile> {

diff --git a/app/src/main/java/com/bnyro/wallpaper/util/Preferences.kt b/app/src/main/java/com/bnyro/wallpaper/util/Preferences.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import android.content.SharedPreferences
 import android.util.Log
 import com.bnyro.wallpaper.App
-import com.bnyro.wallpaper.enums.WallpaperConfig
+import com.bnyro.wallpaper.obj.WallpaperConfig
 import com.bnyro.wallpaper.enums.WallpaperTarget
 import com.bnyro.wallpaper.ui.nav.DrawerScreens
 import com.fasterxml.jackson.core.type.TypeReference