New build

about/build.gradle

@@ -39,6 +39,7 @@ dependencies {
     implementation project(':i18n')
     implementation project(':preferences')
     implementation project(':ui')
+    implementation project(':utils')
     implementation project(':tutorial')
     implementation project(':external')
 

about/src/main/java/dev/lucasnlm/antimine/about/views/AboutInfoFragment.kt

@@ -5,7 +5,6 @@ import android.content.pm.ApplicationInfo
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.net.Uri
-import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -18,6 +17,7 @@ import dev.lucasnlm.antimine.about.viewmodel.AboutEvent
 import dev.lucasnlm.antimine.about.viewmodel.AboutViewModel
 import dev.lucasnlm.antimine.core.audio.GameAudioManager
 import dev.lucasnlm.antimine.core.models.Analytics
+import dev.lucasnlm.antimine.utils.BuildExt.androidTiramisu
 import dev.lucasnlm.external.AnalyticsManager
 import org.koin.android.ext.android.inject
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
@@ -36,10 +36,13 @@ class AboutInfoFragment : Fragment() {
         flags: Int = 0,
     ): PackageInfo? {
         return runCatching {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                getPackageInfo(packageName, PackageManager.PackageInfoFlags.of(flags.toLong()))
-            } else {
-                getPackageInfo(packageName, flags)
+            when {
+                androidTiramisu() -> {
+                    getPackageInfo(packageName, PackageManager.PackageInfoFlags.of(flags.toLong()))
+                }
+                else -> {
+                    getPackageInfo(packageName, flags)
+                }
             }
         }.getOrNull()
     }
@@ -49,12 +52,14 @@ class AboutInfoFragment : Fragment() {
         flags: Int = 0,
     ): ApplicationInfo? {
         return runCatching {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                val applicationInfoFlags = PackageManager.ApplicationInfoFlags.of(flags.toLong())
-                getApplicationInfo(packageName, applicationInfoFlags)
-            } else {
-                @Suppress("DEPRECATION")
-                getApplicationInfo(packageName, flags)
+            when {
+                androidTiramisu() -> {
+                    val applicationInfoFlags = PackageManager.ApplicationInfoFlags.of(flags.toLong())
+                    getApplicationInfo(packageName, applicationInfoFlags)
+                }
+                else -> {
+                    getApplicationInfo(packageName, flags)
+                }
             }
         }.getOrNull()
     }

app/build.gradle

@@ -8,8 +8,8 @@ android {
 
     defaultConfig {
         // versionCode and versionName must be hardcoded to support F-droid
-        versionCode 1705101
-        versionName '17.5.10'
+        versionCode 1705111
+        versionName '17.5.11'
         minSdk 21
         targetSdk 34
         compileSdk 34
@@ -103,6 +103,7 @@ dependencies {
     implementation project(':control')
     implementation project(':about')
     implementation project(':ui')
+    implementation project(':utils')
     implementation project(':preferences')
     implementation project(':themes')
     implementation project(':tutorial')

app/src/main/java/dev/lucasnlm/antimine/GameActivity.kt

@@ -5,7 +5,6 @@ import android.animation.ValueAnimator
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.content.res.ColorStateList
-import android.os.Build
 import android.os.Bundle
 import android.text.format.DateUtils
 import android.util.Log
@@ -29,10 +28,8 @@ import dev.lucasnlm.antimine.common.level.viewmodel.GameViewModel
 import dev.lucasnlm.antimine.control.ControlActivity
 import dev.lucasnlm.antimine.core.audio.GameAudioManager
 import dev.lucasnlm.antimine.core.cloud.CloudSaveManager
-import dev.lucasnlm.antimine.core.isPortrait
 import dev.lucasnlm.antimine.core.models.Analytics
 import dev.lucasnlm.antimine.core.models.Difficulty
-import dev.lucasnlm.antimine.core.serializableNonSafe
 import dev.lucasnlm.antimine.databinding.ActivityGameBinding
 import dev.lucasnlm.antimine.gameover.GameOverDialogFragment
 import dev.lucasnlm.antimine.gameover.WinGameDialogFragment
@@ -42,9 +39,12 @@ import dev.lucasnlm.antimine.gdx.GameContext
 import dev.lucasnlm.antimine.preferences.PreferencesRepository
 import dev.lucasnlm.antimine.preferences.models.ControlStyle
 import dev.lucasnlm.antimine.tutorial.TutorialActivity
+import dev.lucasnlm.antimine.ui.ext.ColorExt.toAndroidColor
 import dev.lucasnlm.antimine.ui.ext.SnackbarExt.showWarning
 import dev.lucasnlm.antimine.ui.ext.ThemedActivity
-import dev.lucasnlm.antimine.ui.ext.toAndroidColor
+import dev.lucasnlm.antimine.utils.BuildExt.androidNougat
+import dev.lucasnlm.antimine.utils.BundleExt.serializableNonSafe
+import dev.lucasnlm.antimine.utils.ContextExt.isPortrait
 import dev.lucasnlm.external.AdsManager
 import dev.lucasnlm.external.AnalyticsManager
 import dev.lucasnlm.external.FeatureFlagManager
@@ -54,7 +54,6 @@ import dev.lucasnlm.external.ReviewWrapperImpl
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.distinctUntilChangedBy
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.launch
@@ -675,10 +674,14 @@ class GameActivity :
                     }
                     isVisible = true
                     max = TIP_COOLDOWN_MS.toInt()
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                        setProgress(dt.toInt(), true)
-                    } else {
-                        progress = dt.toInt()
+
+                    when {
+                        androidNougat() -> {
+                            setProgress(dt.toInt(), true)
+                        }
+                        else -> {
+                            progress = dt.toInt()
+                        }
                     }
                 }
 

app/src/main/java/dev/lucasnlm/antimine/di/ViewModelModule.kt

@@ -26,7 +26,7 @@ val ViewModelModule =
         viewModel { PlayGamesViewModel(get(), get()) }
         viewModel { StatsViewModel(get(), get(), get(), get()) }
         viewModel { ThemeViewModel(get(), get()) }
-        viewModel { MainViewModel(get(), get(), get(), get()) }
+        viewModel { MainViewModel(get(), get(), get(), get(), get()) }
         viewModel { LocalizationViewModel(get(), get()) }
         viewModel {
             GameViewModel(

app/src/main/java/dev/lucasnlm/antimine/gameover/CommonGameDialogFragment.kt

@@ -12,13 +12,13 @@ import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.lifecycleScope
 import dev.lucasnlm.antimine.core.audio.GameAudioManagerImpl
-import dev.lucasnlm.antimine.core.dpToPx
 import dev.lucasnlm.antimine.core.models.Analytics
 import dev.lucasnlm.antimine.databinding.DonationRequestBinding
 import dev.lucasnlm.antimine.databinding.HexBannerBinding
 import dev.lucasnlm.antimine.databinding.MusicLinkBinding
 import dev.lucasnlm.antimine.preferences.PreferencesActivity
 import dev.lucasnlm.antimine.preferences.PreferencesRepository
+import dev.lucasnlm.antimine.utils.ContextExt.dpToPx
 import dev.lucasnlm.external.AdsManager
 import dev.lucasnlm.external.AnalyticsManager
 import dev.lucasnlm.external.BillingManager

app/src/main/java/dev/lucasnlm/antimine/gameover/GameOverDialogFragment.kt

@@ -4,7 +4,6 @@ import android.app.Dialog
 import android.content.Intent
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
-import android.os.Build
 import android.os.Bundle
 import android.text.format.DateUtils
 import android.view.KeyEvent
@@ -18,14 +17,15 @@ import dev.lucasnlm.antimine.R
 import dev.lucasnlm.antimine.common.level.viewmodel.GameEvent
 import dev.lucasnlm.antimine.common.level.viewmodel.GameViewModel
 import dev.lucasnlm.antimine.core.models.Analytics
-import dev.lucasnlm.antimine.core.parcelable
 import dev.lucasnlm.antimine.databinding.GameOverDialogBinding
 import dev.lucasnlm.antimine.gameover.model.CommonDialogState
 import dev.lucasnlm.antimine.gameover.model.GameResult
 import dev.lucasnlm.antimine.gameover.viewmodel.EndGameDialogEvent
 import dev.lucasnlm.antimine.gameover.viewmodel.EndGameDialogViewModel
 import dev.lucasnlm.antimine.themes.ThemeActivity
 import dev.lucasnlm.antimine.tutorial.TutorialActivity
+import dev.lucasnlm.antimine.utils.BuildExt.androidSnowCone
+import dev.lucasnlm.antimine.utils.BundleExt.parcelable
 import dev.lucasnlm.external.AnalyticsManager
 import dev.lucasnlm.external.FeatureFlagManager
 import kotlinx.coroutines.delay
@@ -216,8 +216,7 @@ class GameOverDialogFragment : CommonGameDialogFragment() {
 
             window?.apply {
                 setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                androidSnowCone {
                     addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND)
                     attributes?.blurBehindRadius = BACKGROUND_BLUR_RADIUS
                 }

app/src/main/java/dev/lucasnlm/antimine/gameover/WinGameDialogFragment.kt

@@ -4,7 +4,6 @@ import android.app.Dialog
 import android.content.Intent
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
-import android.os.Build
 import android.os.Bundle
 import android.view.KeyEvent
 import android.view.LayoutInflater
@@ -16,13 +15,14 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dev.lucasnlm.antimine.R
 import dev.lucasnlm.antimine.common.level.viewmodel.GameViewModel
 import dev.lucasnlm.antimine.core.models.Analytics
-import dev.lucasnlm.antimine.core.parcelable
 import dev.lucasnlm.antimine.databinding.WinDialogBinding
 import dev.lucasnlm.antimine.gameover.model.CommonDialogState
 import dev.lucasnlm.antimine.gameover.model.GameResult
 import dev.lucasnlm.antimine.gameover.viewmodel.EndGameDialogEvent
 import dev.lucasnlm.antimine.gameover.viewmodel.EndGameDialogViewModel
 import dev.lucasnlm.antimine.stats.StatsActivity
+import dev.lucasnlm.antimine.utils.BuildExt.androidSnowCone
+import dev.lucasnlm.antimine.utils.BundleExt.parcelable
 import dev.lucasnlm.external.AnalyticsManager
 import dev.lucasnlm.external.FeatureFlagManager
 import kotlinx.coroutines.launch
@@ -198,8 +198,7 @@ class WinGameDialogFragment : CommonGameDialogFragment() {
 
             window?.apply {
                 setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                androidSnowCone {
                     addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND)
                     attributes?.blurBehindRadius = BACKGROUND_BLUR_RADIUS
                 }