Refactored app flow and album logic

Author: Anthonyy232

app/src/main/java/com/anthonyla/paperize/core/WallpaperUtil.kt

@@ -419,26 +419,21 @@ suspend fun getWallpaperFromFolder(folderUri: String, context: Context): List<Wa
 }
 
 /**
- * Get the last modified date of a folder
- * @param folderUri URI of the folder
- * @param context Android context
+ * Get the folder name from the folder URI
  */
-suspend fun getFolderLastModified(folderUri: String, context: Context): Long = withContext(Dispatchers.IO) {
-    val contentResolver = context.contentResolver
-    val projection = arrayOf(
-        DocumentsContract.Document.COLUMN_LAST_MODIFIED,
-    )
-    val childrenUri = DocumentsContract.buildChildDocumentsUriUsingTree(
-        folderUri.toUri(),
-        DocumentsContract.getTreeDocumentId(folderUri.toUri())
-    )
-    val cursor = contentResolver.query(childrenUri, projection, null, null, null)
-    cursor?.use {
-        if (it.moveToFirst()) {
-            return@use it.getLong(it.getColumnIndexOrThrow(DocumentsContract.Document.COLUMN_LAST_MODIFIED))
+suspend fun getFolderMetadata(folderUri: String, context: Context): Metadata = withContext(Dispatchers.IO) {
+    return@withContext try {
+        val uri = folderUri.toUri()
+        try {
+            val file = DocumentFileCompat.fromTreeUri(context, uri)
+            Metadata(file?.name?.substringBeforeLast('.', file.name).toString(), file?.lastModified ?: 0)
+        } catch (_: Exception) {
+            val file = DocumentFile.fromTreeUri(context, uri)
+            Metadata(file?.name?.substringBeforeLast('.', file.name.toString()) ?: "", file?.lastModified() ?: 0)
         }
+    } catch (_: Exception) {
+        Metadata("", 0)
     }
-    return@withContext 0
 }
 
 /**
@@ -451,13 +446,13 @@ suspend fun getImageMetadata(context: Context, uriString: String): Metadata = wi
         val uri = uriString.toUri()
         try {
             val file = DocumentFileCompat.fromSingleUri(context, uri)
-            return@withContext Metadata(file?.name?.substringBeforeLast('.', file.name).toString(), file?.lastModified ?: 0)
+            Metadata(file?.name?.substringBeforeLast('.', file.name).toString(), file?.lastModified ?: 0)
         } catch (_: Exception) {
             val file = DocumentFile.fromSingleUri(context, uri)
-            return@withContext Metadata(file?.name?.substringBeforeLast('.', file.name.toString()) ?: "", file?.lastModified() ?: 0)
+            Metadata(file?.name?.substringBeforeLast('.', file.name.toString()) ?: "", file?.lastModified() ?: 0)
         }
     } catch (_: Exception) {
-        return@withContext Metadata("", 0)
+        Metadata("", 0)
     }
 }
 
@@ -482,33 +477,24 @@ suspend fun findFirstValidUri(
     return@withContext null
 }
 
-/**
- * Get the folder name from the folder URI
- */
-suspend fun getFolderNameFromUri(folderUri: String, context: Context): String? = withContext(Dispatchers.IO) {
-    return@withContext try {
-        DocumentFileCompat.fromTreeUri(context, folderUri.toUri())?.name
-    } catch (_: Exception) {
-        DocumentFile.fromTreeUri(context, folderUri.toUri())?.name
-    }
-}
-
 /**
  * Check if a URI is valid
  */
 fun isValidUri(context: Context, uriString: String?): Boolean {
     val uri = uriString?.decompress("content://com.android.externalstorage.documents/")?.toUri()
-    if (uri == null) { return false }
+        ?: return false
     return try {
         DocumentFileCompat.fromSingleUri(context, uri)?.exists() ?: false
     } catch (_: Exception) {
         DocumentFile.fromSingleUri(context, uri)?.exists() ?: false
     }
 }
 
+/**
+ * Check if a URI is a directory
+ */
 fun isDirectory(context: Context, uriString: String?): Boolean {
-    val uri = uriString?.toUri()
-    if (uri == null) { return false }
+    val uri = uriString?.toUri() ?: return false
     return try {
         DocumentFileCompat.fromSingleUri(context, uri)?.isDirectory() ?: false
     } catch (_: Exception) {

app/src/main/java/com/anthonyla/paperize/feature/wallpaper/presentation/MainActivity.kt

@@ -20,20 +20,22 @@ import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.Surface
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.core.animation.doOnEnd
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import androidx.core.view.WindowCompat
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.compose.LifecycleEventEffect
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.lifecycle.lifecycleScope
 import com.anthonyla.paperize.core.SettingsConstants
 import com.anthonyla.paperize.core.Type
 import com.anthonyla.paperize.data.settings.SettingsDataStore
+import com.anthonyla.paperize.feature.wallpaper.presentation.album.AlbumsViewModel
 import com.anthonyla.paperize.feature.wallpaper.presentation.settings_screen.SettingsEvent
 import com.anthonyla.paperize.feature.wallpaper.presentation.settings_screen.SettingsState
 import com.anthonyla.paperize.feature.wallpaper.presentation.settings_screen.SettingsViewModel
@@ -42,7 +44,6 @@ import com.anthonyla.paperize.feature.wallpaper.wallpaper_alarmmanager.Wallpaper
 import com.anthonyla.paperize.feature.wallpaper.wallpaper_alarmmanager.WallpaperAlarmSchedulerImpl
 import com.anthonyla.paperize.feature.wallpaper.wallpaper_alarmmanager.WallpaperReceiver
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import javax.inject.Inject
 
@@ -51,6 +52,7 @@ import javax.inject.Inject
 class MainActivity : ComponentActivity() {
     @Inject lateinit var settingsDataStoreImpl: SettingsDataStore
     private val settingsViewModel: SettingsViewModel by viewModels()
+
     private val context = this
     override fun onCreate(savedInstanceState: Bundle?) {
         enableEdgeToEdge(
@@ -79,9 +81,11 @@ class MainActivity : ComponentActivity() {
             val isFirstLaunch = runBlocking { settingsDataStoreImpl.getBoolean(SettingsConstants.FIRST_LAUNCH) } ?: true
             val scheduler = WallpaperAlarmSchedulerImpl(context)
 
-            LifecycleEventEffect(Lifecycle.Event.ON_CREATE) {
-                lifecycleScope.launch {
+            var hasScheduleRun by remember { mutableStateOf(false) }
+            LaunchedEffect(settingsState.value) {
+                if (!hasScheduleRun && settingsState.value.initialized) {
                     handleWallpaperScheduling(settingsState.value, scheduler)
+                    hasScheduleRun = true
                 }
             }