Merge pull request #21 from Javernaut/refactoring/activity-result-api

Single Activity approach

Author: Javernaut

app/build.gradle.kts

@@ -141,6 +141,7 @@ dependencies {
     implementation(libs.androidx.window)
     implementation(libs.androidx.datastore.preferences)
     implementation(libs.androidx.navigation.compose)
+    implementation(libs.androidx.hilt.navigation.compose)
 
     implementation(libs.mediafile)
 }

app/src/debug/AndroidManifest.xml

@@ -1,16 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <activity
             android:name="com.javernaut.whatthecodec.compose.playground.ComposePlaygroundActivity"
             android:exported="true"
             android:windowSoftInputMode="adjustResize" />
-        <activity
-            android:name=".settings.SettingsActivity"
-            android:exported="true"
-            tools:replace="android:exported" />
     </application>
 
 </manifest>

app/src/debug/java/com/javernaut/whatthecodec/compose/playground/ComposePlaygroundActivity.kt

@@ -0,0 +1,61 @@
+package com.javernaut.whatthecodec.compose.playground
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import androidx.hilt.navigation.compose.hiltViewModel
+import com.javernaut.whatthecodec.compose.theme.WhatTheCodecTheme
+import com.javernaut.whatthecodec.home.presentation.MediaFileArgument
+import com.javernaut.whatthecodec.home.presentation.MediaFileViewModel
+import com.javernaut.whatthecodec.home.ui.screen.EmptyHomeScreen
+import com.javernaut.whatthecodec.home.ui.screen.pickAudioFile
+import com.javernaut.whatthecodec.home.ui.screen.pickVideoFile
+import dagger.hilt.android.AndroidEntryPoint
+import io.github.javernaut.mediafile.creator.MediaType
+import kotlinx.coroutines.flow.emptyFlow
+
+@AndroidEntryPoint
+class ComposePlaygroundActivity : ComponentActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge()
+        super.onCreate(savedInstanceState)
+
+        setContent {
+            WhatTheCodecTheme.Dynamic {
+                val viewModel = hiltViewModel<MediaFileViewModel>()
+
+                val onAudioIconClick = pickAudioFile(
+                    permissionDenied = viewModel::onPermissionDenied
+                ) {
+                    viewModel.openMediaFile(
+                        MediaFileArgument(
+                            it.toString(),
+                            MediaType.AUDIO
+                        )
+                    )
+                }
+
+                val onVideoIconClick = pickVideoFile(
+                    permissionDenied = viewModel::onPermissionDenied
+                ) {
+                    viewModel.openMediaFile(
+                        MediaFileArgument(
+                            it.toString(),
+                            MediaType.VIDEO
+                        )
+                    )
+                }
+
+                EmptyHomeScreen(
+                    onVideoIconClick = onVideoIconClick,
+                    onAudioIconClick = onAudioIconClick,
+                    onSettingsClicked = {
+
+                    }, emptyFlow()
+                )
+            }
+        }
+    }
+}

app/src/main/AndroidManifest.xml

@@ -18,7 +18,6 @@
         <activity
             android:name="com.javernaut.whatthecodec.home.ui.RootActivity"
             android:exported="true"
-            android:launchMode="singleTop"
             android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -32,12 +31,6 @@
                 <data android:mimeType="audio/*" />
             </intent-filter>
         </activity>
-        <activity
-            android:name="com.javernaut.whatthecodec.settings.SettingsActivity"
-            android:exported="false"
-            android:label="@string/settings_title"
-            android:parentActivityName="com.javernaut.whatthecodec.settings.SettingsActivity"
-            android:windowSoftInputMode="adjustResize" />
     </application>
 
 </manifest>

app/src/main/java/com/javernaut/whatthecodec/compose/playground/ComposePlaygroundActivity.kt

@@ -16,7 +16,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
 import androidx.core.content.getSystemService
 import androidx.core.view.WindowCompat
-import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.hilt.navigation.compose.hiltViewModel
 import com.javernaut.whatthecodec.compose.common.SystemBroadcastReceiver
 import com.javernaut.whatthecodec.compose.theme.dynamic.AppTheme
 import com.javernaut.whatthecodec.compose.theme.dynamic.ThemeViewModel
@@ -36,7 +36,7 @@ object WhatTheCodecTheme {
 
     @Composable
     fun Dynamic(
-        themeViewModel: ThemeViewModel = viewModel(),
+        themeViewModel: ThemeViewModel = hiltViewModel(),
         content: @Composable () -> Unit
     ) {
         val appTheme by themeViewModel.appTheme.collectAsState()

app/src/main/java/com/javernaut/whatthecodec/compose/theme/WhatTheCodecTheme.kt

@@ -34,8 +34,6 @@ class MediaFileViewModel @Inject constructor(
     private val savedStateHandle: SavedStateHandle
 ) : ViewModel() {
 
-    private var pendingMediaFileArgument: MediaFileArgument? = null
-
     private var _preview = MutableStateFlow<Preview>(NotYetEvaluated)
     private var _mediaFile = MutableStateFlow<MediaFile?>(null)
     private var _screenState = MutableStateFlow<ScreenState?>(null)
@@ -44,8 +42,6 @@ class MediaFileViewModel @Inject constructor(
     private val _screenMessageChannel = Channel<ScreenMessage>()
 
     init {
-        pendingMediaFileArgument = savedStateHandle[KEY_MEDIA_FILE_ARGUMENT]
-
         viewModelScope.launch {
             combine(
                 _mediaFile.onEach {
@@ -70,6 +66,10 @@ class MediaFileViewModel @Inject constructor(
                 }
             }.collect(_screenState)
         }
+
+        savedStateHandle.get<MediaFileArgument>(KEY_MEDIA_FILE_ARGUMENT)?.let {
+            openMediaFile(it)
+        }
     }
 
     /**
@@ -91,15 +91,7 @@ class MediaFileViewModel @Inject constructor(
         }
     }
 
-    fun applyPendingMediaFileIfNeeded() {
-        if (pendingMediaFileArgument != null) {
-            openMediaFile(pendingMediaFileArgument!!)
-        }
-    }
-
     fun openMediaFile(argument: MediaFileArgument) {
-        clearPendingUri()
-
         val newMediaFile = mediaFileProvider.obtainMediaFile(argument)
         if (newMediaFile != null) {
             savedStateHandle.set(KEY_MEDIA_FILE_ARGUMENT, argument)
@@ -160,10 +152,6 @@ class MediaFileViewModel @Inject constructor(
         _preview.value = preview
     }
 
-    private fun clearPendingUri() {
-        pendingMediaFileArgument = null
-    }
-
     private fun computeFrameMetrics(): FrameMetrics? {
         val videoStream = _mediaFile.value?.videoStream