Move radio item list building for SleepTimer into a separate function

SimpleMobileTools · Oct 13, 2023 · f25601d · f25601d
1 parent 4b7c435
commit f25601d
Showing 1 changed file with 16 additions and 11 deletions.
diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt
@@ -172,17 +172,7 @@ class MainActivity : ComponentActivity() {
         val lastSleepTimerSeconds by preferences.lastSleepTimerSecondsFlow.collectAsStateWithLifecycle(preferences.lastSleepTimerSeconds)
         val items by remember {
             derivedStateOf {
-                val finalItems = ArrayList(listOf(10, 30, 60, 5 * 60, 10 * 60, 30 * 60).map {
-                    RadioItem(it, secondsToString(it))
-                })
-
-                if (finalItems.none { it.id == lastSleepTimerSeconds }) {
-                    finalItems.add(RadioItem(lastSleepTimerSeconds, secondsToString(lastSleepTimerSeconds)))
-                }
-
-                finalItems.sortBy { it.id }
-                finalItems.add(RadioItem(-1, getString(com.simplemobiletools.commons.R.string.custom)))
-                finalItems.toImmutableList()
+                buildSleepTimerRadioItemsList(lastSleepTimerSeconds)
             }
         }
 
@@ -200,6 +190,21 @@ class MainActivity : ComponentActivity() {
         )
     }
 
+    private fun buildSleepTimerRadioItemsList(
+        lastSleepTimerSeconds: Int
+    ) = buildList<RadioItem> {
+        addAll(listOf(10, 30, 60, 5 * 60, 10 * 60, 30 * 60).map {
+            RadioItem(it, secondsToString(it))
+        })
+
+        if (none { it.id == lastSleepTimerSeconds }) {
+            add(RadioItem(lastSleepTimerSeconds, secondsToString(lastSleepTimerSeconds)))
+        }
+
+        sortBy { it.id }
+        add(RadioItem(-1, getString(com.simplemobiletools.commons.R.string.custom)))
+    }.toImmutableList()
+
     @Composable
     private fun AppLaunched(
         donateAlertDialogState: AlertDialogState = getDonateAlertDialogState(),