fix R8 engine optimization causing bugs and crashes

Change-Id: I77829af08494a4cde78ca80511823cf58bbb7edf
Signed-off-by: AbdAlMoniem AlHifnawy <hifnawy_moniem@hotmail.com>

Author: abdalmoniem

app/src/main/java/com/hifnawy/caffeinate/CaffeinateApplication.kt

@@ -16,6 +16,7 @@ import com.hifnawy.caffeinate.view.CheckBoxItem
 import com.hifnawy.caffeinate.view.Widget
 import java.util.Locale
 import kotlin.time.Duration
+import kotlin.time.Duration.Companion.seconds
 import timber.log.Timber as Log
 
 /**
@@ -53,6 +54,41 @@ class CaffeinateApplication : Application() {
      */
     private val sharedPreferences by lazy { SharedPrefsManager(this) }
 
+    /**
+     * Returns the current locale set by the user in the system settings.
+     *
+     * If the device is running Android 13 (API level 33) or later, the current locale is retrieved
+     * from the [resources.configuration.locales][android.content.res.Configuration.getLocales] list. Otherwise, the current locale is retrieved
+     * from the [getDefault][Locale.getDefault] method.
+     *
+     * @return the current locale set by the user in the system settings.
+     *
+     * @see android.content.res.Configuration
+     * @see Locale.getDefault
+     */
+    private val currentLocale: Locale
+        get() = when {
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> resources.configuration.locales[0]
+            else                                                  -> Locale.getDefault()
+        }
+
+    /**
+     * A list of [CheckBoxItem]s that represent the timeout durations the user can select from.
+     *
+     * This list is stored in the app's SharedPreferences and is loaded when the app is launched.
+     *
+     * The list of timeout durations is used to populate the [RecyclerView][androidx.recyclerview.widget.RecyclerView] in the "Choose timeout" dialog,
+     * which is shown when the user clicks the "Choose timeout" button in the app's UI.
+     *
+     * The list is also used to determine the next timeout duration to use when the current timeout duration is finished.
+     *
+     * @see CheckBoxItem
+     * @see android.content.SharedPreferences
+     * @see androidx.recyclerview.widget.RecyclerView
+     */
+    val timeoutCheckBoxes
+        get() = sharedPreferences.timeoutCheckBoxes
+
     /**
      * The first timeout duration that was selected by the user.
      *
@@ -62,7 +98,7 @@ class CaffeinateApplication : Application() {
      *
      * @return [Duration] the first timeout duration that was selected by the user, or [Duration.INFINITE] if no timeout duration was selected.
      */
-    val firstTimeout: Duration
+    val firstTimeout
         get() = timeoutCheckBoxes.first { checkBoxItem -> checkBoxItem.isChecked }.duration
 
     /**
@@ -73,7 +109,7 @@ class CaffeinateApplication : Application() {
      *
      * @return [Duration] the last timeout duration that was selected by the user.
      */
-    val lastTimeout: Duration
+    val lastTimeout
         get() = timeoutCheckBoxes.last { checkBoxItem -> checkBoxItem.isChecked }.duration
 
     /**
@@ -84,15 +120,14 @@ class CaffeinateApplication : Application() {
      *
      * @return [Duration] the previously selected timeout duration.
      */
-    val prevTimeout: Duration
-        get() {
-            val timeoutCheckBox = timeoutCheckBoxes.first { timeoutCheckBox -> timeoutCheckBox.duration == timeout }
+    val prevTimeout
+        get() = timeoutCheckBoxes.first { timeoutCheckBox -> timeoutCheckBox.duration == timeout }.let { timeoutCheckBox ->
             val index = timeoutCheckBoxes.indexOf(timeoutCheckBox)
             var prevIndex = (index - 1 + timeoutCheckBoxes.size) % timeoutCheckBoxes.size
 
             while (!timeoutCheckBoxes[prevIndex].isChecked) prevIndex = (prevIndex - 1 + timeoutCheckBoxes.size) % timeoutCheckBoxes.size
 
-            return timeoutCheckBoxes[prevIndex].duration
+            timeoutCheckBoxes[prevIndex].duration
         }
 
     /**
@@ -104,15 +139,14 @@ class CaffeinateApplication : Application() {
      *
      * @return [Duration] the next timeout duration that will be used when the KeepAwakeService is running.
      */
-    val nextTimeout: Duration
-        get() {
-            val timeoutCheckBox = timeoutCheckBoxes.first { timeoutCheckBox -> timeoutCheckBox.duration == timeout }
+    val nextTimeout
+        get() = timeoutCheckBoxes.first { timeoutCheckBox -> timeoutCheckBox.duration == timeout }.let { timeoutCheckBox ->
             val index = timeoutCheckBoxes.indexOf(timeoutCheckBox)
             var nextIndex = (index + 1) % timeoutCheckBoxes.size
 
             while (!timeoutCheckBoxes[nextIndex].isChecked) nextIndex = (nextIndex + 1) % timeoutCheckBoxes.size
 
-            return timeoutCheckBoxes[nextIndex].duration
+            timeoutCheckBoxes[nextIndex].duration
         }
 
     /**
@@ -126,7 +160,7 @@ class CaffeinateApplication : Application() {
      * @see com.hifnawy.caffeinate.controller.KeepAwakeService
      * @see SharedPrefsManager.timeouts
      */
-    var timeout: Duration = sharedPreferences.timeouts.first()
+    var timeout = 0.seconds
 
     /**
      * A list of observers that are notified whenever the status of the KeepAwakeService changes.
@@ -178,23 +212,6 @@ class CaffeinateApplication : Application() {
             }
         }
 
-    /**
-     * A list of [CheckBoxItem]s that represent the timeout durations the user can select from.
-     *
-     * This list is stored in the app's SharedPreferences and is loaded when the app is launched.
-     *
-     * The list of timeout durations is used to populate the [RecyclerView][androidx.recyclerview.widget.RecyclerView] in the "Choose timeout" dialog,
-     * which is shown when the user clicks the "Choose timeout" button in the app's UI.
-     *
-     * The list is also used to determine the next timeout duration to use when the current timeout duration is finished.
-     *
-     * @see CheckBoxItem
-     * @see android.content.SharedPreferences
-     * @see androidx.recyclerview.widget.RecyclerView
-     */
-    lateinit var timeoutCheckBoxes: MutableList<CheckBoxItem>
-        private set
-
     /**
      * The context of the application localized to the user's current locale.
      *
@@ -237,24 +254,6 @@ class CaffeinateApplication : Application() {
         Log.d("observers notified!")
     }
 
-    /**
-     * Returns the current locale set by the user in the system settings.
-     *
-     * If the device is running Android 13 (API level 33) or later, the current locale is retrieved
-     * from the [resources.configuration.locales][android.content.res.Configuration.getLocales] list. Otherwise, the current locale is retrieved
-     * from the [getDefault][Locale.getDefault] method.
-     *
-     * @return the current locale set by the user in the system settings.
-     *
-     * @see android.content.res.Configuration
-     * @see Locale.getDefault
-     */
-    private val currentLocale: Locale
-        get() = when {
-            Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> resources.configuration.locales[0]
-            else                                                  -> Locale.getDefault()
-        }
-
     /**
      * Applies the locale configuration set by the user.
      *
@@ -274,8 +273,6 @@ class CaffeinateApplication : Application() {
         @Suppress("AppBundleLocaleChanges")
         configuration.setLocale(currentLocale)
         localizedApplicationContext = createConfigurationContext(configuration)
-
-        timeoutCheckBoxes = sharedPreferences.timeoutCheckBoxes
     }
 
     /**

app/src/main/java/com/hifnawy/caffeinate/controller/SharedPrefsManager.kt

@@ -230,8 +230,7 @@ class SharedPrefsManager(private val caffeinateApplication: CaffeinateApplicatio
      *
      * @return [List] A list of [Duration] objects representing the available timeouts.
      */
-    // val timeouts by lazy { listOf(30.seconds, 5.minutes, 10.minutes, 15.minutes, 30.minutes, 60.minutes, 120.minutes, 240.minutes, 480.minutes, Duration.INFINITE) }
-    val timeouts by lazy { listOf(30.seconds, 5.minutes, 10.minutes, 15.minutes, 30.minutes, 60.minutes, Duration.INFINITE) }
+    private val timeouts by lazy { listOf(30.seconds, 5.minutes, 10.minutes, 15.minutes, 30.minutes, 60.minutes, Duration.INFINITE) }
 
     /**
      * Retrieves or sets whether all necessary permissions are granted.

app/src/main/java/com/hifnawy/caffeinate/view/CheckBoxAdapter.kt

@@ -10,6 +10,7 @@ import android.view.ViewGroup
 import android.view.animation.AnticipateOvershootInterpolator
 import android.widget.CheckBox
 import android.widget.ImageView
+import androidx.annotation.Keep
 import androidx.recyclerview.widget.RecyclerView
 import com.hifnawy.caffeinate.R
 import com.hifnawy.caffeinate.databinding.TimeoutCheckboxItemBinding
@@ -40,22 +41,27 @@ import kotlin.time.Duration
  *
  * @author AbdAlMoniem AlHifnawy
  */
+@Keep
 data class CheckBoxItem(
         /**
          * the text displayed in the CheckBox
          */
+        @Keep
         var text: String,
         /**
          * the checked state of the CheckBox
          */
+        @Keep
         var isChecked: Boolean,
         /**
          * the enabled state of the CheckBox. When the enabled state is false, the CheckBox is grayed out.
          */
+        @Keep
         var isEnabled: Boolean = false,
         /**
          * the duration associated with the item, which is used to sort the items in ascending order.
          */
+        @Keep
         var duration: Duration,
 ) : Serializable
 

app/src/main/java/com/hifnawy/caffeinate/view/WidgetConfigurationActivity.kt

@@ -8,17 +8,18 @@ import android.view.View
 import android.widget.FrameLayout
 import android.widget.RemoteViews
 import androidx.activity.enableEdgeToEdge
+import androidx.annotation.Keep
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.material.card.MaterialCardView
 import com.hifnawy.caffeinate.CaffeinateApplication
 import com.hifnawy.caffeinate.R
-import com.hifnawy.caffeinate.databinding.ActivityWidgetConfigurationBinding
 import com.hifnawy.caffeinate.controller.ServiceStatus
 import com.hifnawy.caffeinate.controller.ServiceStatusObserver
+import com.hifnawy.caffeinate.controller.SharedPrefsManager
+import com.hifnawy.caffeinate.databinding.ActivityWidgetConfigurationBinding
 import com.hifnawy.caffeinate.utils.ActivityExtensionFunctions.setActivityTheme
 import com.hifnawy.caffeinate.utils.MutableListExtensionFunctions.addObserver
 import com.hifnawy.caffeinate.utils.MutableListExtensionFunctions.removeObserver
-import com.hifnawy.caffeinate.controller.SharedPrefsManager
 import java.io.Serializable
 import timber.log.Timber as Log
 
@@ -211,4 +212,10 @@ class WidgetConfigurationActivity : AppCompatActivity(), ServiceStatusObserver {
  *
  * @author AbdAlMoniem AlHifnawy
  */
-data class WidgetConfiguration(val widgetId: Int, val showBackground: Boolean) : Serializable
+@Keep
+data class WidgetConfiguration(
+        @Keep
+        val widgetId: Int,
+        @Keep
+        val showBackground: Boolean
+) : Serializable

fastlane/metadata/android/en-US/changelogs/34.txt

@@ -1,3 +1,5 @@
+* fix R8 engine optimization causing bugs and crashes
+   >
 * privacy policy colors now match the app's theme
    >
 * preparing for play store release