Added 5 new languages with a new dropdown menu, extracted hardcoded texts and added icons to sorting menu

app/src/main/java/com/yogeshpaliyal/deepr/MainActivity.kt

@@ -1,5 +1,6 @@
 package com.yogeshpaliyal.deepr
 
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import androidx.activity.ComponentActivity
@@ -19,14 +20,20 @@ import androidx.navigation3.runtime.NavEntry
 import androidx.navigation3.runtime.rememberSavedStateNavEntryDecorator
 import androidx.navigation3.ui.NavDisplay
 import androidx.navigation3.ui.rememberSceneSetupNavEntryDecorator
+import com.yogeshpaliyal.deepr.preference.AppPreferenceDataStore
 import com.yogeshpaliyal.deepr.ui.screens.AboutUs
 import com.yogeshpaliyal.deepr.ui.screens.AboutUsScreen
 import com.yogeshpaliyal.deepr.ui.screens.Settings
 import com.yogeshpaliyal.deepr.ui.screens.SettingsScreen
 import com.yogeshpaliyal.deepr.ui.screens.home.Home
 import com.yogeshpaliyal.deepr.ui.screens.home.HomeScreen
 import com.yogeshpaliyal.deepr.ui.theme.DeeprTheme
+import com.yogeshpaliyal.deepr.util.LanguageUtil
+import com.yogeshpaliyal.deepr.viewmodel.AccountViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.runBlocking
+import org.koin.androidx.viewmodel.ext.android.viewModel
 
 data class SharedLink(
     val url: String,
@@ -35,6 +42,28 @@ data class SharedLink(
 
 class MainActivity : ComponentActivity() {
     val sharingLink = MutableStateFlow<SharedLink?>(null)
+    private val accountViewModel: AccountViewModel by viewModel()
+
+    override fun attachBaseContext(newBase: Context?) {
+        super.attachBaseContext(
+            newBase?.let { context ->
+                try {
+                    val preferenceDataStore = AppPreferenceDataStore(context)
+                    val languageCode =
+                        runBlocking {
+                            preferenceDataStore.getLanguageCode.first()
+                        }
+                    if (languageCode.isNotEmpty()) {
+                        LanguageUtil.updateLocale(context, languageCode)
+                    } else {
+                        context
+                    }
+                } catch (e: Exception) {
+                    context
+                }
+            },
+        )
+    }
 
     @OptIn(ExperimentalMaterial3Api::class)
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/com/yogeshpaliyal/deepr/preference/AppPreferenceDataStore.kt

@@ -23,6 +23,7 @@ class AppPreferenceDataStore(
         private val SYNC_ENABLED = booleanPreferencesKey("sync_enabled")
         private val SYNC_FILE_PATH = stringPreferencesKey("sync_file_path")
         private val LAST_SYNC_TIME = longPreferencesKey("last_sync_time")
+        private val LANGUAGE_CODE = stringPreferencesKey("language_code")
     }
 
     val getSortingOrder: Flow<@SortType String> =
@@ -50,6 +51,11 @@ class AppPreferenceDataStore(
             preferences[LAST_SYNC_TIME] ?: 0L // Default to 0 (never synced)
         }
 
+    val getLanguageCode: Flow<String> =
+        context.appDataStore.data.map { preferences ->
+            preferences[LANGUAGE_CODE] ?: "" // Default to system language
+        }
+
     suspend fun setSortingOrder(order: @SortType String) {
         context.appDataStore.edit { prefs ->
             prefs[SORTING_ORDER] = order
@@ -79,4 +85,10 @@ class AppPreferenceDataStore(
             prefs[LAST_SYNC_TIME] = timestamp
         }
     }
+
+    suspend fun setLanguageCode(code: String) {
+        context.appDataStore.edit { prefs ->
+            prefs[LANGUAGE_CODE] = code
+        }
+    }
 }

app/src/main/java/com/yogeshpaliyal/deepr/ui/components/LanguageSelectionDialog.kt

@@ -0,0 +1,107 @@
+package com.yogeshpaliyal.deepr.ui.components
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.ListItem
+import androidx.compose.material3.ListItemDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.RadioButton
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.yogeshpaliyal.deepr.R
+import com.yogeshpaliyal.deepr.util.LanguageUtil
+
+@Composable
+fun LanguageSelectionDialog(
+    currentLanguageCode: String,
+    onLanguageSelect: (String) -> Unit,
+    onDismiss: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    AlertDialog(
+        modifier = modifier,
+        onDismissRequest = onDismiss,
+        title = {
+            Text(
+                text = stringResource(R.string.language_dialog_title),
+                style = MaterialTheme.typography.headlineSmall,
+            )
+        },
+        text = {
+            Column {
+                LanguageUtil.availableLanguages.forEach { language ->
+                    val displayName =
+                        if (language.code == LanguageUtil.SYSTEM_DEFAULT) {
+                            stringResource(R.string.system_default)
+                        } else {
+                            language.nativeName
+                        }
+
+                    val supportingText =
+                        if (language.code == LanguageUtil.SYSTEM_DEFAULT) {
+                            null // No supporting text for system default
+                        } else if (language.name != language.nativeName) {
+                            language.name
+                        } else {
+                            null
+                        }
+
+                    ListItem(
+                        modifier =
+                            Modifier
+                                .fillMaxWidth()
+                                .clip(RoundedCornerShape(8.dp))
+                                .clickable {
+                                    onLanguageSelect(language.code)
+                                    onDismiss()
+                                }.padding(vertical = 4.dp),
+                        headlineContent = {
+                            Text(
+                                text = displayName,
+                                style = MaterialTheme.typography.bodyLarge,
+                            )
+                        },
+                        supportingContent =
+                            supportingText?.let { text ->
+                                {
+                                    Text(
+                                        text = text,
+                                        style = MaterialTheme.typography.bodyMedium,
+                                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                                    )
+                                }
+                            },
+                        trailingContent = {
+                            RadioButton(
+                                selected = currentLanguageCode == language.code,
+                                onClick = {
+                                    onLanguageSelect(language.code)
+                                    onDismiss()
+                                },
+                            )
+                        },
+                        colors =
+                            ListItemDefaults.colors(
+                                containerColor = Color.Transparent,
+                            ),
+                    )
+                }
+            }
+        },
+        confirmButton = {
+            TextButton(onClick = onDismiss) {
+                Text(stringResource(R.string.cancel))
+            }
+        },
+    )
+}

app/src/main/java/com/yogeshpaliyal/deepr/ui/screens/AboutUs.kt

@@ -27,10 +27,13 @@ import androidx.compose.runtime.snapshots.SnapshotStateList
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.scale
+import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
 import com.yogeshpaliyal.deepr.BuildConfig
 import com.yogeshpaliyal.deepr.R
@@ -48,6 +51,8 @@ fun AboutUsScreen(
     backStack: SnapshotStateList<Any>,
     modifier: Modifier = Modifier,
 ) {
+    val isRtl = LocalLayoutDirection.current == LayoutDirection.Rtl
+
     Scaffold(modifier = modifier.fillMaxSize(), topBar = {
         Column {
             TopAppBar(
@@ -61,6 +66,7 @@ fun AboutUsScreen(
                         Icon(
                             TablerIcons.ArrowLeft,
                             contentDescription = stringResource(R.string.back),
+                            modifier = if (isRtl) Modifier.scale(-1f, 1f) else Modifier,
                         )
                     }
                 },

app/src/main/java/com/yogeshpaliyal/deepr/ui/screens/Settings.kt

@@ -31,25 +31,35 @@ import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
 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.runtime.snapshots.SnapshotStateList
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
 import com.yogeshpaliyal.deepr.BuildConfig
+import com.yogeshpaliyal.deepr.MainActivity
 import com.yogeshpaliyal.deepr.R
+import com.yogeshpaliyal.deepr.ui.components.LanguageSelectionDialog
+import com.yogeshpaliyal.deepr.util.LanguageUtil
 import com.yogeshpaliyal.deepr.viewmodel.AccountViewModel
 import compose.icons.TablerIcons
 import compose.icons.tablericons.ArrowLeft
 import compose.icons.tablericons.Download
 import compose.icons.tablericons.FileText
 import compose.icons.tablericons.InfoCircle
+import compose.icons.tablericons.Language
 import compose.icons.tablericons.Refresh
 import compose.icons.tablericons.Settings
 import compose.icons.tablericons.Upload
@@ -82,6 +92,10 @@ fun SettingsScreen(
     // Collect the shortcut icon preference state
     val useLinkBasedIcons by viewModel.useLinkBasedIcons.collectAsStateWithLifecycle()
 
+    // Collect language preference state
+    val languageCode by viewModel.languageCode.collectAsStateWithLifecycle()
+    var showLanguageDialog by remember { mutableStateOf(false) }
+
     // Collect sync preference states
     val syncEnabled by viewModel.syncEnabled.collectAsStateWithLifecycle()
     val syncFilePath by viewModel.syncFilePath.collectAsStateWithLifecycle()
@@ -139,12 +153,20 @@ fun SettingsScreen(
                         Text(stringResource(R.string.settings))
                     },
                     navigationIcon = {
+                        val isRtl = LocalLayoutDirection.current == LayoutDirection.Rtl
+
                         IconButton(onClick = {
                             backStack.removeLastOrNull()
                         }) {
                             Icon(
                                 TablerIcons.ArrowLeft,
                                 contentDescription = stringResource(R.string.back),
+                                modifier =
+                                    if (isRtl) {
+                                        Modifier.graphicsLayer(scaleX = -1f)
+                                    } else {
+                                        Modifier
+                                    },
                             )
                         }
                     },
@@ -332,6 +354,33 @@ fun SettingsScreen(
                 )
                 HorizontalDivider()
 
+                // Language Selection Setting
+                ListItem(
+                    modifier =
+                        Modifier.clickable {
+                            showLanguageDialog = true
+                        },
+                    headlineContent = { Text(stringResource(R.string.language)) },
+                    supportingContent = {
+                        Text(
+                            if (languageCode.isEmpty()) {
+                                stringResource(R.string.system_default)
+                            } else {
+                                LanguageUtil.getLanguageNativeName(languageCode).ifEmpty {
+                                    stringResource(R.string.system_default)
+                                }
+                            },
+                        )
+                    },
+                    leadingContent = {
+                        Icon(
+                            TablerIcons.Language,
+                            contentDescription = stringResource(R.string.language),
+                        )
+                    },
+                )
+                HorizontalDivider()
+
                 ListItem(
                     modifier =
                         Modifier.clickable(true) {
@@ -368,5 +417,21 @@ fun SettingsScreen(
                 Spacer(modifier = Modifier.height(16.dp))
             }
         }
+
+        // Language Selection Dialog
+        if (showLanguageDialog) {
+            LanguageSelectionDialog(
+                currentLanguageCode = languageCode,
+                onLanguageSelect = { selectedLanguageCode ->
+                    viewModel.setLanguageCode(selectedLanguageCode)
+                    showLanguageDialog = false
+                    // Recreate activity to apply language change
+                    (context as? MainActivity)?.let { activity ->
+                        activity.recreate()
+                    }
+                },
+                onDismiss = { showLanguageDialog = false },
+            )
+        }
     }
 }