Merge pull request #8 from ezn24/codex/update-version-number-with-build-date-6pi8fv

Persist last output folder, clear default input, embed logs, black launcher foreground, and time-based versioning

Author: ezn24

app/src/main/java/com/github/ezn24/TransYou/MainActivity.kt

@@ -44,7 +44,6 @@ import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
 import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -60,7 +59,6 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.window.Dialog
 import androidx.core.os.LocaleListCompat
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.booleanPreferencesKey
@@ -180,7 +178,10 @@ private fun AppScaffold(settingsRepository: SettingsRepository) {
                 .padding(padding),
         ) {
             composable(Routes.Transcode.route) {
-                TranscodeScreen(snackbarHostState = snackbarHostState)
+                TranscodeScreen(
+                    snackbarHostState = snackbarHostState,
+                    settingsRepository = settingsRepository,
+                )
             }
             composable(Routes.Settings.route) {
                 SettingsScreen(settingsRepository = settingsRepository)
@@ -197,15 +198,16 @@ private enum class Routes(val route: String) {
 @Composable
 private fun TranscodeScreen(
     snackbarHostState: SnackbarHostState,
+    settingsRepository: SettingsRepository,
 ) {
     val context = LocalContext.current
     val coroutineScope = rememberCoroutineScope()
     val logEntries = remember { mutableStateListOf<String>() }
     var isTranscoding by rememberSaveable { mutableStateOf(false) }
-    var showLogs by rememberSaveable { mutableStateOf(false) }
+    val persistedOutputFolder by settingsRepository.lastOutputFolderFlow.collectAsStateWithLifecycle("")
 
-    var inputFile by rememberSaveable { mutableStateOf("/storage/emulated/0/Movies/input.mov") }
-    var outputFolder by rememberSaveable { mutableStateOf("/storage/emulated/0/Movies") }
+    var inputFile by rememberSaveable { mutableStateOf("") }
+    var outputFolder by rememberSaveable(persistedOutputFolder) { mutableStateOf(persistedOutputFolder) }
     var outputNamePattern by rememberSaveable { mutableStateOf(OutputNamePattern.DATE_ONLY) }
     var customNameTemplate by rememberSaveable { mutableStateOf("{input_file_name}.convert.{input_format}.to.{output_format}") }
     var customDateFormat by rememberSaveable { mutableStateOf("yyyyMMdd") }
@@ -238,6 +240,7 @@ private fun TranscodeScreen(
         onResult = { uri ->
             if (uri != null) {
                 outputFolder = uri.toString()
+                coroutineScope.launch { settingsRepository.setLastOutputFolder(outputFolder) }
             }
         },
     )
@@ -326,7 +329,10 @@ private fun TranscodeScreen(
         SectionCard(title = stringResource(id = R.string.section_output)) {
             OutlinedTextField(
                 value = outputFolder,
-                onValueChange = { outputFolder = it },
+                onValueChange = {
+                    outputFolder = it
+                    coroutineScope.launch { settingsRepository.setLastOutputFolder(it) }
+                },
                 label = { Text(stringResource(id = R.string.output_folder)) },
                 modifier = Modifier.fillMaxWidth(),
             )
@@ -490,17 +496,20 @@ private fun TranscodeScreen(
             }
         }
 
-        SectionCard(title = stringResource(id = R.string.section_command)) {
-            TextButton(onClick = { showLogs = true }) {
-                Text(text = stringResource(id = R.string.view_logs))
-            }
-            Spacer(modifier = Modifier.height(12.dp))
-            if (logEntries.isEmpty()) {
-                Text(text = stringResource(id = R.string.log_empty))
-            } else {
-                logEntries.takeLast(8).forEach { entry ->
-                    Text(text = entry)
-                }
+        Card(modifier = Modifier.fillMaxWidth()) {
+            Column(modifier = Modifier.padding(16.dp)) {
+                OutlinedTextField(
+                    value = if (logEntries.isEmpty()) {
+                        stringResource(id = R.string.log_empty)
+                    } else {
+                        logEntries.takeLast(8).joinToString(separator = "\n")
+                    },
+                    onValueChange = {},
+                    label = { Text(text = stringResource(id = R.string.log_title)) },
+                    modifier = Modifier.fillMaxWidth(),
+                    readOnly = true,
+                    minLines = 6,
+                )
             }
         }
 
@@ -586,30 +595,7 @@ private fun TranscodeScreen(
         }
     }
 
-    if (showLogs) {
-        Dialog(onDismissRequest = { showLogs = false }) {
-            Card(modifier = Modifier.fillMaxWidth()) {
-                Column(modifier = Modifier.padding(16.dp)) {
-                    Text(
-                        text = stringResource(id = R.string.log_title),
-                        style = MaterialTheme.typography.titleMedium,
-                    )
-                    Spacer(modifier = Modifier.height(12.dp))
-                    if (logEntries.isEmpty()) {
-                        Text(text = stringResource(id = R.string.log_empty))
-                    } else {
-                        logEntries.forEach { entry ->
-                            Text(text = entry)
-                        }
-                    }
-                    Spacer(modifier = Modifier.height(12.dp))
-                    FilledTonalButton(onClick = { showLogs = false }) {
-                        Text(text = stringResource(id = R.string.close))
-                    }
-                }
-            }
-        }
-    }
+
 }
 
 @Composable
@@ -756,6 +742,7 @@ private class SettingsRepository(private val context: Context) {
     private val themeKey = stringPreferencesKey("theme_mode")
     private val pureBlackKey = booleanPreferencesKey("pure_black")
     private val languageKey = stringPreferencesKey("language")
+    private val lastOutputFolderKey = stringPreferencesKey("last_output_folder")
 
     val themeModeFlow: Flow<ThemeMode> = context.dataStore.data.map { prefs ->
         val value = prefs[themeKey]
@@ -771,6 +758,10 @@ private class SettingsRepository(private val context: Context) {
         AppLanguage.entries.firstOrNull { it.name == value } ?: AppLanguage.SYSTEM
     }
 
+    val lastOutputFolderFlow: Flow<String> = context.dataStore.data.map { prefs ->
+        prefs[lastOutputFolderKey] ?: ""
+    }
+
     suspend fun setThemeMode(mode: ThemeMode) {
         updatePreference(themeKey, mode.name)
     }
@@ -783,6 +774,10 @@ private class SettingsRepository(private val context: Context) {
         updatePreference(languageKey, language.name)
     }
 
+    suspend fun setLastOutputFolder(path: String) {
+        updatePreference(lastOutputFolderKey, path)
+    }
+
     private suspend fun <T> updatePreference(key: Preferences.Key<T>, value: T) {
         context.dataStore.edit { prefs ->
             prefs[key] = value

app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -4,9 +4,9 @@
     android:viewportWidth="108"
     android:viewportHeight="108">
     <path
-        android:fillColor="#1B1B1B" 
+        android:fillColor="#000000"
         android:pathData="M37,44h34a3,3 0 0 1 3,3v0a3,3 0 0 1 -3,3h-34a3,3 0 0 1 -3,-3v0a3,3 0 0 1 3,-3z" />
     <path
-        android:fillColor="#1B1B1B"
+        android:fillColor="#000000"
         android:pathData="M37,58h34a3,3 0 0 1 3,3v0a3,3 0 0 1 -3,3h-34a3,3 0 0 1 -3,-3v0a3,3 0 0 1 3,-3z" />
 </vector>

app/src/main/res/values-v31/colors.xml

@@ -0,0 +1,3 @@
+<resources>
+    <color name="ic_launcher_background">@android:color/system_accent1_200</color>
+</resources>