Develop - translations and optimization

app/src/main/java/com/sameerasw/essentials/FeatureSettingsActivity.kt

@@ -31,6 +31,10 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
+import androidx.compose.ui.input.nestedscroll.NestedScrollSource
+import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalView
@@ -44,26 +48,32 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import com.sameerasw.essentials.domain.HapticFeedbackType
 import com.sameerasw.essentials.domain.registry.FeatureRegistry
 import com.sameerasw.essentials.ui.components.EssentialsFloatingToolbar
+import com.sameerasw.essentials.ui.components.animations.LottieFeatureAnimation
 import com.sameerasw.essentials.ui.components.cards.FeatureCard
 import com.sameerasw.essentials.ui.components.containers.RoundedCardContainer
 import com.sameerasw.essentials.ui.components.linkActions.LinkPickerScreen
 import com.sameerasw.essentials.ui.components.sheets.PermissionsBottomSheet
 import com.sameerasw.essentials.ui.composables.configs.AlwaysOnDisplaySettingsUI
-import com.sameerasw.essentials.ui.composables.configs.EssentialsOnDisplaySettingsUI
 import com.sameerasw.essentials.ui.composables.configs.AppLockSettingsUI
 import com.sameerasw.essentials.ui.composables.configs.BatteriesSettingsUI
 import com.sameerasw.essentials.ui.composables.configs.BatteryNotificationSettingsUI
 import com.sameerasw.essentials.ui.composables.configs.ButtonRemapSettingsUI
 import com.sameerasw.essentials.ui.composables.configs.CaffeinateSettingsUI
+import com.sameerasw.essentials.ui.composables.configs.CalendarSyncSettingsUI
 import com.sameerasw.essentials.ui.composables.configs.DynamicNightLightSettingsUI
+import com.sameerasw.essentials.ui.composables.configs.EssentialsOnDisplaySettingsUI
+import com.sameerasw.essentials.ui.composables.configs.FlashlightPulseSettingsUI
+import com.sameerasw.essentials.ui.composables.configs.FreezeSettingsUI
 import com.sameerasw.essentials.ui.composables.configs.KeyboardSettingsUI
 import com.sameerasw.essentials.ui.composables.configs.LiveWallpaperSettingsUI
 import com.sameerasw.essentials.ui.composables.configs.LocationReachedSettingsUI
+import com.sameerasw.essentials.ui.composables.configs.LockScreenClockSettingsUI
 import com.sameerasw.essentials.ui.composables.configs.MapsPowerSavingSettingsUI
 import com.sameerasw.essentials.ui.composables.configs.NotificationLightingSettingsUI
 import com.sameerasw.essentials.ui.composables.configs.OtherCustomizationsSettingsUI
 import com.sameerasw.essentials.ui.composables.configs.QuickSettingsTilesSettingsUI
 import com.sameerasw.essentials.ui.composables.configs.RefreshRateSettingsUI
+import com.sameerasw.essentials.ui.composables.configs.RemoteLockSettingsUI
 import com.sameerasw.essentials.ui.composables.configs.ScreenLockedSecuritySettingsUI
 import com.sameerasw.essentials.ui.composables.configs.ScreenOffWidgetSettingsUI
 import com.sameerasw.essentials.ui.composables.configs.ShutUpSettingsUI
@@ -72,26 +82,16 @@ import com.sameerasw.essentials.ui.composables.configs.SoundModeTileSettingsUI
 import com.sameerasw.essentials.ui.composables.configs.StatusBarIconSettingsUI
 import com.sameerasw.essentials.ui.composables.configs.TextAnimationsSettingsUI
 import com.sameerasw.essentials.ui.composables.configs.WatchSettingsUI
-import com.sameerasw.essentials.ui.composables.configs.FreezeSettingsUI
-import com.sameerasw.essentials.ui.composables.configs.CalendarSyncSettingsUI
-import com.sameerasw.essentials.ui.composables.configs.RemoteLockSettingsUI
-import com.sameerasw.essentials.ui.composables.configs.FlashlightPulseSettingsUI
-import com.sameerasw.essentials.ui.composables.configs.LockScreenClockSettingsUI
-import com.sameerasw.essentials.ui.components.animations.LottieFeatureAnimation
 import com.sameerasw.essentials.ui.modifiers.BlurDirection
 import com.sameerasw.essentials.ui.modifiers.progressiveBlur
 import com.sameerasw.essentials.ui.theme.EssentialsTheme
 import com.sameerasw.essentials.utils.BiometricSecurityHelper
+import com.sameerasw.essentials.utils.HapticUtil
 import com.sameerasw.essentials.viewmodels.CaffeinateViewModel
 import com.sameerasw.essentials.viewmodels.MainViewModel
 import com.sameerasw.essentials.viewmodels.StatusBarIconViewModel
 import com.sameerasw.essentials.viewmodels.WatchViewModel
 import kotlinx.coroutines.delay
-import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
-import androidx.compose.ui.input.nestedscroll.NestedScrollSource
-import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.geometry.Offset
-import com.sameerasw.essentials.utils.HapticUtil
 
 @OptIn(ExperimentalMaterial3Api::class)
 class FeatureSettingsActivity : AppCompatActivity() {
@@ -353,7 +353,10 @@ class FeatureSettingsActivity : AppCompatActivity() {
 
                     val nestedScrollConnection = remember {
                         object : NestedScrollConnection {
-                            override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset {
+                            override fun onPreScroll(
+                                available: Offset,
+                                source: NestedScrollSource
+                            ): Offset {
                                 val delta = available.y
                                 if (delta < 0 && headerHeight > minHeaderHeight) {
                                     val oldHeight = headerHeight
@@ -377,11 +380,11 @@ class FeatureSettingsActivity : AppCompatActivity() {
                                     headerHeight = with(density) {
                                         (oldHeight.toPx() + delta).toDp()
                                     }.coerceAtMost(maxHeaderHeight)
-                                    
+
                                     if (headerHeight == maxHeaderHeight && oldHeight < maxHeaderHeight) {
                                         HapticUtil.performLightHaptic(view)
                                     }
-                                    
+
                                     val produced = headerHeight - oldHeight
                                     return Offset(0f, with(density) { produced.toPx() })
                                 }
@@ -416,7 +419,11 @@ class FeatureSettingsActivity : AppCompatActivity() {
                                     height = with(LocalDensity.current) { 150.dp.toPx() },
                                     direction = BlurDirection.BOTTOM
                                 )
-                                .then(if (hasScroll) Modifier.nestedScroll(nestedScrollConnection).verticalScroll(rememberScrollState()) else Modifier)
+                                .then(
+                                    if (hasScroll) Modifier
+                                        .nestedScroll(nestedScrollConnection)
+                                        .verticalScroll(rememberScrollState()) else Modifier
+                                )
                         ) {
                             // Top padding for status bar
                             if (featureId != "Quick settings tiles" && featureId != "Location reached") {

app/src/main/java/com/sameerasw/essentials/MainActivity.kt

@@ -23,35 +23,19 @@ import androidx.compose.animation.fadeOut
 import androidx.compose.animation.slideInVertically
 import androidx.compose.animation.slideOutVertically
 import androidx.compose.animation.togetherWith
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.statusBars
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material3.Button
-import androidx.compose.material3.CircularWavyProgressIndicator
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.FloatingToolbarDefaults
 import androidx.compose.material3.FloatingToolbarExitDirection.Companion.Bottom
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ProgressIndicatorDefaults
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -61,9 +45,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.scale
-import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.res.painterResource
@@ -73,16 +55,11 @@ import androidx.compose.ui.zIndex
 import androidx.core.animation.doOnEnd
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.WindowCompat
-import coil.compose.AsyncImage
 import com.sameerasw.essentials.data.repository.SettingsRepository
 import com.sameerasw.essentials.domain.DIYTabs
 import com.sameerasw.essentials.domain.registry.initPermissionRegistry
 import com.sameerasw.essentials.ui.components.EssentialsFloatingToolbar
 import com.sameerasw.essentials.ui.components.ToolbarItem
-import com.sameerasw.essentials.ui.components.cards.TrackedRepoCard
-import com.sameerasw.essentials.ui.components.containers.RoundedCardContainer
-import com.sameerasw.essentials.ui.components.menus.SegmentedDropdownMenu
-import com.sameerasw.essentials.ui.components.menus.SegmentedDropdownMenuItem
 import com.sameerasw.essentials.ui.components.sheets.AddRepoBottomSheet
 import com.sameerasw.essentials.ui.components.sheets.GitHubAuthSheet
 import com.sameerasw.essentials.ui.components.sheets.InstructionsBottomSheet
@@ -101,9 +78,6 @@ import com.sameerasw.essentials.viewmodels.GitHubAuthViewModel
 import com.sameerasw.essentials.viewmodels.LocationReachedViewModel
 import com.sameerasw.essentials.viewmodels.MainViewModel
 import kotlinx.coroutines.launch
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
 
 class MainActivity : AppCompatActivity() {
     val viewModel: MainViewModel by viewModels()
@@ -254,7 +228,6 @@ class MainActivity : AppCompatActivity() {
 
                     var showGitHubAuthSheet by remember { mutableStateOf(false) }
                     var showNewAutomationSheet by remember { mutableStateOf(false) }
-                    var showFabProfileMenu by remember { mutableStateOf(false) }
                     val gitHubToken by viewModel.gitHubToken
                     val gitHubUser by gitHubAuthViewModel.currentUser
                     val isOnboardingCompleted by viewModel.isOnboardingCompleted
@@ -368,19 +341,13 @@ class MainActivity : AppCompatActivity() {
                         )
                     }
 
-                    val refreshingRepoIds by updatesViewModel.refreshingRepoIds
                     val updateProgress by updatesViewModel.updateProgress
-                    val animatedProgress by animateFloatAsState(
-                        targetValue = if (updateProgress > 0) updateProgress else 0f,
-                        animationSpec = ProgressIndicatorDefaults.ProgressAnimationSpec,
-                        label = "Progress"
-                    )
 
                     var showAddRepoSheet by remember { mutableStateOf(false) }
                     var repoToShowReleaseNotesFullName by remember { mutableStateOf<String?>(null) }
                     val trackedRepos by updatesViewModel.trackedRepos
 
-                    val exportLauncher = rememberLauncherForActivityResult(
+                    rememberLauncherForActivityResult(
                         contract = ActivityResultContracts.CreateDocument("application/json")
                     ) { uri ->
                         uri?.let {
@@ -395,7 +362,7 @@ class MainActivity : AppCompatActivity() {
                         }
                     }
 
-                    val importLauncher = rememberLauncherForActivityResult(
+                    rememberLauncherForActivityResult(
                         contract = ActivityResultContracts.OpenDocument()
                     ) { uri ->
                         uri?.let {

app/src/main/java/com/sameerasw/essentials/data/repository/SettingsRepository.kt

@@ -179,8 +179,10 @@ class SettingsRepository(private val context: Context) {
         const val KEY_AMBIENT_MUSIC_GLANCE_CLOCK_WEIGHT = "ambient_music_glance_clock_weight"
         const val KEY_AMBIENT_MUSIC_GLANCE_CLOCK_WIDTH = "ambient_music_glance_clock_width"
         const val KEY_AMBIENT_MUSIC_GLANCE_CLOCK_ROUNDNESS = "ambient_music_glance_clock_roundness"
-        const val KEY_AMBIENT_MUSIC_GLANCE_FORCE_FILL_WHILE_CHARGING = "ambient_music_glance_force_fill_while_charging"
-        const val KEY_AMBIENT_MUSIC_GLANCE_RESPECT_NOTIFICATIONS = "ambient_music_glance_respect_notifications"
+        const val KEY_AMBIENT_MUSIC_GLANCE_FORCE_FILL_WHILE_CHARGING =
+            "ambient_music_glance_force_fill_while_charging"
+        const val KEY_AMBIENT_MUSIC_GLANCE_RESPECT_NOTIFICATIONS =
+            "ambient_music_glance_respect_notifications"
         const val KEY_CALENDAR_SYNC_ENABLED = "calendar_sync_enabled"
         const val KEY_CALENDAR_SYNC_SELECTED_CALENDARS = "calendar_sync_selected_calendars"
         const val KEY_CALENDAR_SYNC_PERIODIC_ENABLED = "calendar_sync_periodic_enabled"
@@ -1163,7 +1165,11 @@ class SettingsRepository(private val context: Context) {
                         shouldRestoreInfinityPeakOnRefreshRateReset()
                     )
                 } else if (mode == com.sameerasw.essentials.utils.RefreshRateUtils.MODE_RANGE && min > 0f && peak > 0f) {
-                    com.sameerasw.essentials.utils.RefreshRateUtils.applyRangeRefreshRate(context, min, peak)
+                    com.sameerasw.essentials.utils.RefreshRateUtils.applyRangeRefreshRate(
+                        context,
+                        min,
+                        peak
+                    )
                 } else if (fixed > 0f || peak > 0f) {
                     com.sameerasw.essentials.utils.RefreshRateUtils.applyFixedRefreshRate(
                         context,
@@ -1243,30 +1249,52 @@ class SettingsRepository(private val context: Context) {
         val json = gson.toJson(presets)
         putString(KEY_PRIVATE_DNS_PRESETS, json)
     }
+
     fun resetPrivateDnsPresets() {
         savePrivateDnsPresets(getDefaultDnsPresets())
     }
 
-    fun getAmbientMusicGlanceAlbumArtMode(): String = prefs.getString(KEY_AMBIENT_MUSIC_GLANCE_ALBUM_ART_MODE, "default") ?: "default"
-    fun setAmbientMusicGlanceAlbumArtMode(mode: String) = prefs.edit().putString(KEY_AMBIENT_MUSIC_GLANCE_ALBUM_ART_MODE, mode).apply()
+    fun getAmbientMusicGlanceAlbumArtMode(): String =
+        prefs.getString(KEY_AMBIENT_MUSIC_GLANCE_ALBUM_ART_MODE, "default") ?: "default"
+
+    fun setAmbientMusicGlanceAlbumArtMode(mode: String) =
+        prefs.edit().putString(KEY_AMBIENT_MUSIC_GLANCE_ALBUM_ART_MODE, mode).apply()
+
+    fun getAmbientMusicGlanceClockSize(): Int =
+        prefs.getInt(KEY_AMBIENT_MUSIC_GLANCE_CLOCK_SIZE, 80)
+
+    fun setAmbientMusicGlanceClockSize(size: Int) =
+        prefs.edit().putInt(KEY_AMBIENT_MUSIC_GLANCE_CLOCK_SIZE, size).apply()
+
+    fun getAmbientMusicGlanceClockWeight(): Int =
+        prefs.getInt(KEY_AMBIENT_MUSIC_GLANCE_CLOCK_WEIGHT, 400)
+
+    fun setAmbientMusicGlanceClockWeight(weight: Int) =
+        prefs.edit().putInt(KEY_AMBIENT_MUSIC_GLANCE_CLOCK_WEIGHT, weight).apply()
+
+    fun getAmbientMusicGlanceClockWidth(): Int =
+        prefs.getInt(KEY_AMBIENT_MUSIC_GLANCE_CLOCK_WIDTH, 100)
+
+    fun setAmbientMusicGlanceClockWidth(width: Int) =
+        prefs.edit().putInt(KEY_AMBIENT_MUSIC_GLANCE_CLOCK_WIDTH, width).apply()
 
-    fun getAmbientMusicGlanceClockSize(): Int = prefs.getInt(KEY_AMBIENT_MUSIC_GLANCE_CLOCK_SIZE, 80)
-    fun setAmbientMusicGlanceClockSize(size: Int) = prefs.edit().putInt(KEY_AMBIENT_MUSIC_GLANCE_CLOCK_SIZE, size).apply()
+    fun getAmbientMusicGlanceClockRoundness(): Int =
+        prefs.getInt(KEY_AMBIENT_MUSIC_GLANCE_CLOCK_ROUNDNESS, 50)
 
-    fun getAmbientMusicGlanceClockWeight(): Int = prefs.getInt(KEY_AMBIENT_MUSIC_GLANCE_CLOCK_WEIGHT, 400)
-    fun setAmbientMusicGlanceClockWeight(weight: Int) = prefs.edit().putInt(KEY_AMBIENT_MUSIC_GLANCE_CLOCK_WEIGHT, weight).apply()
+    fun setAmbientMusicGlanceClockRoundness(roundness: Int) =
+        prefs.edit().putInt(KEY_AMBIENT_MUSIC_GLANCE_CLOCK_ROUNDNESS, roundness).apply()
 
-    fun getAmbientMusicGlanceClockWidth(): Int = prefs.getInt(KEY_AMBIENT_MUSIC_GLANCE_CLOCK_WIDTH, 100)
-    fun setAmbientMusicGlanceClockWidth(width: Int) = prefs.edit().putInt(KEY_AMBIENT_MUSIC_GLANCE_CLOCK_WIDTH, width).apply()
+    fun isAmbientMusicGlanceForceFillWhileChargingEnabled(): Boolean =
+        prefs.getBoolean(KEY_AMBIENT_MUSIC_GLANCE_FORCE_FILL_WHILE_CHARGING, false)
 
-    fun getAmbientMusicGlanceClockRoundness(): Int = prefs.getInt(KEY_AMBIENT_MUSIC_GLANCE_CLOCK_ROUNDNESS, 50)
-    fun setAmbientMusicGlanceClockRoundness(roundness: Int) = prefs.edit().putInt(KEY_AMBIENT_MUSIC_GLANCE_CLOCK_ROUNDNESS, roundness).apply()
+    fun setAmbientMusicGlanceForceFillWhileChargingEnabled(enabled: Boolean) =
+        prefs.edit().putBoolean(KEY_AMBIENT_MUSIC_GLANCE_FORCE_FILL_WHILE_CHARGING, enabled).apply()
 
-    fun isAmbientMusicGlanceForceFillWhileChargingEnabled(): Boolean = prefs.getBoolean(KEY_AMBIENT_MUSIC_GLANCE_FORCE_FILL_WHILE_CHARGING, false)
-    fun setAmbientMusicGlanceForceFillWhileChargingEnabled(enabled: Boolean) = prefs.edit().putBoolean(KEY_AMBIENT_MUSIC_GLANCE_FORCE_FILL_WHILE_CHARGING, enabled).apply()
+    fun isAmbientMusicGlanceRespectNotificationsEnabled(): Boolean =
+        prefs.getBoolean(KEY_AMBIENT_MUSIC_GLANCE_RESPECT_NOTIFICATIONS, true)
 
-    fun isAmbientMusicGlanceRespectNotificationsEnabled(): Boolean = prefs.getBoolean(KEY_AMBIENT_MUSIC_GLANCE_RESPECT_NOTIFICATIONS, true)
-    fun setAmbientMusicGlanceRespectNotificationsEnabled(enabled: Boolean) = prefs.edit().putBoolean(KEY_AMBIENT_MUSIC_GLANCE_RESPECT_NOTIFICATIONS, enabled).apply()
+    fun setAmbientMusicGlanceRespectNotificationsEnabled(enabled: Boolean) =
+        prefs.edit().putBoolean(KEY_AMBIENT_MUSIC_GLANCE_RESPECT_NOTIFICATIONS, enabled).apply()
 
     // Notification Glance Settings
 

app/src/main/java/com/sameerasw/essentials/domain/diy/Action.kt

@@ -82,8 +82,10 @@ sealed interface Action {
     enum class SoundModeType {
         @SerializedName("SOUND")
         SOUND,
+
         @SerializedName("VIBRATE")
         VIBRATE,
+
         @SerializedName("SILENT")
         SILENT
     }

app/src/main/java/com/sameerasw/essentials/domain/diy/Automation.kt

@@ -19,8 +19,10 @@ data class Automation(
     enum class Type {
         @SerializedName("TRIGGER")
         TRIGGER,
+
         @SerializedName("STATE")
         STATE,
+
         @SerializedName("APP")
         APP
     }