Refactor: Clean up code and enable buildConfig

MihaiCristianCondrea · MihaiCristianCondrea · commit 18db33425995 · 2025-10-05T09:22:26.000+03:00
- Enabled `buildConfig = true` in `app/build.gradle.kts` to allow conditional logic based on build types.
- Set the initial notification timeout to 10 seconds in debug builds for easier testing.
- Refactored `SleepAudioWorker.kt` by removing an unnecessary version check and moving the `buildFocusRequest` function to be a private top-level function.
- Cleaned up unused imports in `SleepNotificationReceiver.kt`.
- Improved code formatting in `app/build.gradle.kts`.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -20,7 +20,32 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         @Suppress("UnstableApiUsage")
         androidResources.localeFilters += listOf(
-            "ar-rEG" , "bg-rBG" , "bn-rBD" , "de-rDE" , "en" , "es-rGQ" , "es-rMX" , "fil-rPH" , "fr-rFR" , "hi-rIN" , "hu-rHU" , "in-rID" , "it-rIT" , "ja-rJP" , "ko-rKR" , "pl-rPL" , "pt-rBR" , "ro-rRO" , "ru-rRU" , "sv-rSE" , "th-rTH" , "tr-rTR" , "uk-rUA" , "ur-rPK" , "vi-rVN" , "zh-rTW"
+            "ar-rEG",
+            "bg-rBG",
+            "bn-rBD",
+            "de-rDE",
+            "en",
+            "es-rGQ",
+            "es-rMX",
+            "fil-rPH",
+            "fr-rFR",
+            "hi-rIN",
+            "hu-rHU",
+            "in-rID",
+            "it-rIT",
+            "ja-rJP",
+            "ko-rKR",
+            "pl-rPL",
+            "pt-rBR",
+            "ro-rRO",
+            "ru-rRU",
+            "sv-rSE",
+            "th-rTH",
+            "tr-rTR",
+            "uk-rUA",
+            "ur-rPK",
+            "vi-rVN",
+            "zh-rTW"
         )
     }
 
@@ -64,10 +89,16 @@ android {
     buildTypes.forEach { buildType ->
         with(receiver = buildType) {
             multiDexEnabled = true
-            proguardFiles(getDefaultProguardFile(name = "proguard-android-optimize.txt") , "proguard-rules.pro")
+            proguardFiles(
+                getDefaultProguardFile(name = "proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
         }
     }
 
+    buildFeatures {
+        buildConfig = true
+    }
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_21
diff --git a/app/src/main/kotlin/com/d4rk/musicsleeptimer/plus/notifications/SleepNotification.kt b/app/src/main/kotlin/com/d4rk/musicsleeptimer/plus/notifications/SleepNotification.kt
@@ -12,6 +12,8 @@ import android.content.Context
 import android.content.Intent
 import android.graphics.drawable.Icon
 import android.os.Build
+import java.util.concurrent.TimeUnit.SECONDS
+import com.d4rk.musicsleeptimer.plus.BuildConfig
 import com.d4rk.musicsleeptimer.plus.R
 import com.d4rk.musicsleeptimer.plus.notifications.SleepNotification.Action.CANCEL
 import com.d4rk.musicsleeptimer.plus.notifications.SleepNotification.Action.DECREMENT
@@ -28,92 +30,98 @@ import java.util.concurrent.TimeUnit.MILLISECONDS
 import java.util.concurrent.TimeUnit.MINUTES
 
 object SleepNotification {
-    private val TIMEOUT_INITIAL_MILLIS : Long = MINUTES.toMillis(30)
-    private val TIMEOUT_INCREMENT_MILLIS : Long = MINUTES.toMillis(10)
-    private val TIMEOUT_DECREMENT_MILLIS : Long = MINUTES.toMillis(10)
+    private val TIMEOUT_INITIAL_MILLIS: Long =
+        if (BuildConfig.DEBUG) SECONDS.toMillis(10) else MINUTES.toMillis(30)
+    private val TIMEOUT_INCREMENT_MILLIS: Long = MINUTES.toMillis(10)
+    private val TIMEOUT_DECREMENT_MILLIS: Long = MINUTES.toMillis(10)
 
-    private enum class Action(private val value : String) {
+    private enum class Action(private val value: String) {
         CANCEL("com.d4rk.musicsleeptimer.plus.notifications.SleepNotification.Action.CANCEL") {
-            override fun title(context : Context) = context.getText(android.R.string.cancel)
-        } ,
+            override fun title(context: Context) = context.getText(android.R.string.cancel)
+        },
         INCREMENT("com.d4rk.musicsleeptimer.plus.notifications.SleepNotification.Action.INCREMENT") {
-            override fun title(context : Context) = context.getString(
-                R.string.notification_action_increment , MILLISECONDS.toMinutes(TIMEOUT_INCREMENT_MILLIS)
+            override fun title(context: Context) = context.getString(
+                R.string.notification_action_increment,
+                MILLISECONDS.toMinutes(TIMEOUT_INCREMENT_MILLIS)
             )
-        } ,
+        },
         DECREMENT("com.d4rk.musicsleeptimer.plus.notifications.SleepNotification.Action.DECREMENT") {
-            override fun title(context : Context) = context.getString(
-                R.string.notification_action_decrement , MILLISECONDS.toMinutes(TIMEOUT_DECREMENT_MILLIS)
+            override fun title(context: Context) = context.getString(
+                R.string.notification_action_decrement,
+                MILLISECONDS.toMinutes(TIMEOUT_DECREMENT_MILLIS)
             )
-        } , ;
+        }, ;
 
         companion object {
-            fun parse(value : String?) : Action? = entries.firstOrNull { it.value == value }
+            fun parse(value: String?): Action? = entries.firstOrNull { it.value == value }
         }
 
-        fun intent(context : Context) : Intent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+        fun intent(context: Context): Intent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             serviceIntent(context)
         } else {
             broadcastIntent(context)
         }
 
         @RequiresApi(Build.VERSION_CODES.N)
-        private fun serviceIntent(context : Context) : Intent =
-            Intent(context , SleepTileService::class.java).setAction(value)
+        private fun serviceIntent(context: Context): Intent =
+            Intent(context, SleepTileService::class.java).setAction(value)
 
-        private fun broadcastIntent(context : Context) : Intent =
-            Intent(context , SleepNotificationReceiver::class.java).setAction(value)
+        private fun broadcastIntent(context: Context): Intent =
+            Intent(context, SleepNotificationReceiver::class.java).setAction(value)
 
-        fun pendingIntent(context : Context , cancel : Boolean = false) : PendingIntent? {
+        fun pendingIntent(context: Context, cancel: Boolean = false): PendingIntent? {
             val requestCode = value.hashCode()
             val intent = intent(context)
             val pendingIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                PendingIntent.getService(context , requestCode , intent , FLAG_IMMUTABLE)
+                PendingIntent.getService(context, requestCode, intent, FLAG_IMMUTABLE)
             } else {
-                PendingIntent.getBroadcast(context , requestCode , intent , FLAG_IMMUTABLE)
+                PendingIntent.getBroadcast(context, requestCode, intent, FLAG_IMMUTABLE)
             }
             return pendingIntent.apply { if (cancel) cancel() }
         }
 
-        fun action(context : Context , cancel : Boolean = false) : Notification.Action.Builder = Notification.Action.Builder(
-            Icon.createWithResource(context , 0) , title(context) , pendingIntent(context , cancel)
-        )
+        fun action(context: Context, cancel: Boolean = false): Notification.Action.Builder =
+            Notification.Action.Builder(
+                Icon.createWithResource(context, 0), title(context), pendingIntent(context, cancel)
+            )
 
-        abstract fun title(context : Context) : CharSequence?
+        abstract fun title(context: Context): CharSequence?
     }
 
-    fun Context.notificationManager() : NotificationManager? = getSystemService(NotificationManager::class.java)
+    fun Context.notificationManager(): NotificationManager? =
+        getSystemService(NotificationManager::class.java)
 
-    fun Context.find() = notificationManager()?.activeNotifications?.firstOrNull { it.id == R.id.notification_id }?.notification
+    fun Context.find() =
+        notificationManager()?.activeNotifications?.firstOrNull { it.id == R.id.notification_id }?.notification
 
-    fun Context.handle(intent : Intent?) = when (Action.parse(intent?.action)) {
+    fun Context.handle(intent: Intent?) = when (Action.parse(intent?.action)) {
         INCREMENT -> update(TIMEOUT_INCREMENT_MILLIS)
-        DECREMENT -> update(- TIMEOUT_DECREMENT_MILLIS)
+        DECREMENT -> update(-TIMEOUT_DECREMENT_MILLIS)
         CANCEL -> cancel()
         null -> Unit
     }
 
     fun Context.toggle() = if (find() == null) show() else cancel()
     private fun Context.cancel() = notificationManager()?.cancel(R.id.notification_id) ?: Unit
-    private fun Context.update(timeout : Long) = find()?.let {
+    private fun Context.update(timeout: Long) = find()?.let {
         it.`when` - currentTimeMillis()
     }?.let {
-        if (it > - timeout) it + timeout else it
+        if (it > -timeout) it + timeout else it
     }?.let {
         show(it)
     }
 
-    private fun Context.show(timeout : Long = TIMEOUT_INITIAL_MILLIS) {
+    private fun Context.show(timeout: Long = TIMEOUT_INITIAL_MILLIS) {
         require(timeout > 0)
-        val eta : Long = currentTimeMillis() + timeout
-        val builder : Notification.Builder = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        val eta: Long = currentTimeMillis() + timeout
+        val builder: Notification.Builder = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             Notification.Builder(this, getString(R.string.notification_channel_id))
         } else {
             @Suppress("DEPRECATION")
             Notification.Builder(this)
         }
 
-        val notification : Notification = builder
+        val notification: Notification = builder
             .setCategory(CATEGORY_EVENT)
             .setVisibility(VISIBILITY_PUBLIC)
             .setOnlyAlertOnce(true)
@@ -150,9 +158,9 @@ object SleepNotification {
 
     private fun Context.createNotificationChannel() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val id : String = getString(R.string.notification_channel_id)
-            val name : CharSequence = getString(R.string.app_name)
-            val channel : NotificationChannel = NotificationChannel(id, name, IMPORTANCE_LOW).apply {
+            val id: String = getString(R.string.notification_channel_id)
+            val name: CharSequence = getString(R.string.app_name)
+            val channel: NotificationChannel = NotificationChannel(id, name, IMPORTANCE_LOW).apply {
                 setBypassDnd(true)
                 lockscreenVisibility = VISIBILITY_PUBLIC
             }
diff --git a/app/src/main/kotlin/com/d4rk/musicsleeptimer/plus/receivers/SleepNotificationReceiver.kt b/app/src/main/kotlin/com/d4rk/musicsleeptimer/plus/receivers/SleepNotificationReceiver.kt
@@ -4,7 +4,6 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import com.d4rk.musicsleeptimer.plus.notifications.SleepNotification
-import com.d4rk.musicsleeptimer.plus.notifications.SleepNotification.handle
 
 class SleepNotificationReceiver : BroadcastReceiver() {
     override fun onReceive(context : Context , intent : Intent?) {
diff --git a/app/src/main/kotlin/com/d4rk/musicsleeptimer/plus/workers/SleepAudioWorker.kt b/app/src/main/kotlin/com/d4rk/musicsleeptimer/plus/workers/SleepAudioWorker.kt
@@ -67,14 +67,14 @@ class SleepAudioWorker(
         val canAdjustVolume: Boolean = !audioManager.isVolumeFixed && initialVolume > 0
 
         val playbackStoppedLatch = CountDownLatch(1)
-        val focusRequest: AudioFocusRequest = audioManager.buildFocusRequest(
+        val focusRequest: AudioFocusRequest = buildFocusRequest(
             attributes = attributes,
             playbackStoppedLatch = playbackStoppedLatch
         )
 
         var playbackCallback: AudioManager.AudioPlaybackCallback? = null
-        var focusGranted: Boolean = false
-        var playbackStopped: Boolean = false
+        var focusGranted = false
+        var playbackStopped = false
 
         return try {
             playbackCallback = audioManager.registerPlaybackStopCallback(playbackStoppedLatch)
@@ -106,10 +106,10 @@ class SleepAudioWorker(
             playbackStopped = playbackStopped || !audioManager.isMusicActive
 
             Result.success()
-        } catch (interrupted: InterruptedException) {
+        } catch (_: InterruptedException) {
             Thread.currentThread().interrupt()
             Result.failure()
-        } catch (error: Throwable) {
+        } catch (_: Throwable) {
             Result.failure()
         } finally {
             playbackCallback?.let(audioManager::unregisterAudioPlaybackCallback)
@@ -133,7 +133,7 @@ class SleepAudioWorker(
             .build()
     }
 
-    private fun AudioManager.buildFocusRequest(
+    private fun buildFocusRequest(
         attributes: AudioAttributes,
         playbackStoppedLatch: CountDownLatch
     ): AudioFocusRequest {
@@ -157,10 +157,6 @@ class SleepAudioWorker(
     private fun AudioManager.registerPlaybackStopCallback(
         playbackStoppedLatch: CountDownLatch
     ): AudioManager.AudioPlaybackCallback? {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-            return null
-        }
-
         val callback = object : AudioManager.AudioPlaybackCallback() {
             override fun onPlaybackConfigChanged(configs: MutableList<AudioPlaybackConfiguration>) {
                 if (configs.none(::isRelevantPlaybackActive)) {
