Skip to content

Commit ee56dfc

Browse files
lucasnlmlucasnlm
authored
Merge pull request #480 from lucasnlm/new-build
New build
2 parents 5354543 + b9a6523 commit ee56dfc

File tree

58 files changed

+530
-314
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+530
-314
lines changed

‎about/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ dependencies {
3939
implementation project(':i18n')
4040
implementation project(':preferences')
4141
implementation project(':ui')
42+
implementation project(':utils')
4243
implementation project(':tutorial')
4344
implementation project(':external')
4445

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

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import android.content.pm.ApplicationInfo
55
import android.content.pm.PackageInfo
66
import android.content.pm.PackageManager
77
import android.net.Uri
8-
import android.os.Build
98
import android.os.Bundle
109
import android.view.LayoutInflater
1110
import android.view.View
@@ -18,6 +17,7 @@ import dev.lucasnlm.antimine.about.viewmodel.AboutEvent
1817
import dev.lucasnlm.antimine.about.viewmodel.AboutViewModel
1918
import dev.lucasnlm.antimine.core.audio.GameAudioManager
2019
import dev.lucasnlm.antimine.core.models.Analytics
20+
import dev.lucasnlm.antimine.utils.BuildExt.androidTiramisu
2121
import dev.lucasnlm.external.AnalyticsManager
2222
import org.koin.android.ext.android.inject
2323
import org.koin.androidx.viewmodel.ext.android.sharedViewModel
@@ -36,10 +36,13 @@ class AboutInfoFragment : Fragment() {
3636
flags: Int = 0,
3737
): PackageInfo? {
3838
return runCatching {
39-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
40-
getPackageInfo(packageName, PackageManager.PackageInfoFlags.of(flags.toLong()))
41-
} else {
42-
getPackageInfo(packageName, flags)
39+
when {
40+
androidTiramisu() -> {
41+
getPackageInfo(packageName, PackageManager.PackageInfoFlags.of(flags.toLong()))
42+
}
43+
else -> {
44+
getPackageInfo(packageName, flags)
45+
}
4346
}
4447
}.getOrNull()
4548
}
@@ -49,12 +52,14 @@ class AboutInfoFragment : Fragment() {
4952
flags: Int = 0,
5053
): ApplicationInfo? {
5154
return runCatching {
52-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
53-
val applicationInfoFlags = PackageManager.ApplicationInfoFlags.of(flags.toLong())
54-
getApplicationInfo(packageName, applicationInfoFlags)
55-
} else {
56-
@Suppress("DEPRECATION")
57-
getApplicationInfo(packageName, flags)
55+
when {
56+
androidTiramisu() -> {
57+
val applicationInfoFlags = PackageManager.ApplicationInfoFlags.of(flags.toLong())
58+
getApplicationInfo(packageName, applicationInfoFlags)
59+
}
60+
else -> {
61+
getApplicationInfo(packageName, flags)
62+
}
5863
}
5964
}.getOrNull()
6065
}

‎app/build.gradle‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88

99
defaultConfig {
1010
// versionCode and versionName must be hardcoded to support F-droid
11-
versionCode 1705101
12-
versionName '17.5.10'
11+
versionCode 1705111
12+
versionName '17.5.11'
1313
minSdk 21
1414
targetSdk 34
1515
compileSdk 34
@@ -103,6 +103,7 @@ dependencies {
103103
implementation project(':control')
104104
implementation project(':about')
105105
implementation project(':ui')
106+
implementation project(':utils')
106107
implementation project(':preferences')
107108
implementation project(':themes')
108109
implementation project(':tutorial')

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

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import android.animation.ValueAnimator
55
import android.annotation.SuppressLint
66
import android.content.Intent
77
import android.content.res.ColorStateList
8-
import android.os.Build
98
import android.os.Bundle
109
import android.text.format.DateUtils
1110
import android.util.Log
@@ -29,10 +28,8 @@ import dev.lucasnlm.antimine.common.level.viewmodel.GameViewModel
2928
import dev.lucasnlm.antimine.control.ControlActivity
3029
import dev.lucasnlm.antimine.core.audio.GameAudioManager
3130
import dev.lucasnlm.antimine.core.cloud.CloudSaveManager
32-
import dev.lucasnlm.antimine.core.isPortrait
3331
import dev.lucasnlm.antimine.core.models.Analytics
3432
import dev.lucasnlm.antimine.core.models.Difficulty
35-
import dev.lucasnlm.antimine.core.serializableNonSafe
3633
import dev.lucasnlm.antimine.databinding.ActivityGameBinding
3734
import dev.lucasnlm.antimine.gameover.GameOverDialogFragment
3835
import dev.lucasnlm.antimine.gameover.WinGameDialogFragment
@@ -42,9 +39,12 @@ import dev.lucasnlm.antimine.gdx.GameContext
4239
import dev.lucasnlm.antimine.preferences.PreferencesRepository
4340
import dev.lucasnlm.antimine.preferences.models.ControlStyle
4441
import dev.lucasnlm.antimine.tutorial.TutorialActivity
42+
import dev.lucasnlm.antimine.ui.ext.ColorExt.toAndroidColor
4543
import dev.lucasnlm.antimine.ui.ext.SnackbarExt.showWarning
4644
import dev.lucasnlm.antimine.ui.ext.ThemedActivity
47-
import dev.lucasnlm.antimine.ui.ext.toAndroidColor
45+
import dev.lucasnlm.antimine.utils.BuildExt.androidNougat
46+
import dev.lucasnlm.antimine.utils.BundleExt.serializableNonSafe
47+
import dev.lucasnlm.antimine.utils.ContextExt.isPortrait
4848
import dev.lucasnlm.external.AdsManager
4949
import dev.lucasnlm.external.AnalyticsManager
5050
import dev.lucasnlm.external.FeatureFlagManager
@@ -54,7 +54,6 @@ import dev.lucasnlm.external.ReviewWrapperImpl
5454
import kotlinx.coroutines.CoroutineScope
5555
import kotlinx.coroutines.Dispatchers
5656
import kotlinx.coroutines.delay
57-
import kotlinx.coroutines.flow.collect
5857
import kotlinx.coroutines.flow.distinctUntilChangedBy
5958
import kotlinx.coroutines.flow.filter
6059
import kotlinx.coroutines.launch
@@ -675,10 +674,14 @@ class GameActivity :
675674
}
676675
isVisible = true
677676
max = TIP_COOLDOWN_MS.toInt()
678-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
679-
setProgress(dt.toInt(), true)
680-
} else {
681-
progress = dt.toInt()
677+
678+
when {
679+
androidNougat() -> {
680+
setProgress(dt.toInt(), true)
681+
}
682+
else -> {
683+
progress = dt.toInt()
684+
}
682685
}
683686
}
684687

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ val ViewModelModule =
2626
viewModel { PlayGamesViewModel(get(), get()) }
2727
viewModel { StatsViewModel(get(), get(), get(), get()) }
2828
viewModel { ThemeViewModel(get(), get()) }
29-
viewModel { MainViewModel(get(), get(), get(), get()) }
29+
viewModel { MainViewModel(get(), get(), get(), get(), get()) }
3030
viewModel { LocalizationViewModel(get(), get()) }
3131
viewModel {
3232
GameViewModel(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ import androidx.core.view.isVisible
1212
import androidx.fragment.app.FragmentManager
1313
import androidx.lifecycle.lifecycleScope
1414
import dev.lucasnlm.antimine.core.audio.GameAudioManagerImpl
15-
import dev.lucasnlm.antimine.core.dpToPx
1615
import dev.lucasnlm.antimine.core.models.Analytics
1716
import dev.lucasnlm.antimine.databinding.DonationRequestBinding
1817
import dev.lucasnlm.antimine.databinding.HexBannerBinding
1918
import dev.lucasnlm.antimine.databinding.MusicLinkBinding
2019
import dev.lucasnlm.antimine.preferences.PreferencesActivity
2120
import dev.lucasnlm.antimine.preferences.PreferencesRepository
21+
import dev.lucasnlm.antimine.utils.ContextExt.dpToPx
2222
import dev.lucasnlm.external.AdsManager
2323
import dev.lucasnlm.external.AnalyticsManager
2424
import dev.lucasnlm.external.BillingManager

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import android.app.Dialog
44
import android.content.Intent
55
import android.graphics.Color
66
import android.graphics.drawable.ColorDrawable
7-
import android.os.Build
87
import android.os.Bundle
98
import android.text.format.DateUtils
109
import android.view.KeyEvent
@@ -18,14 +17,15 @@ import dev.lucasnlm.antimine.R
1817
import dev.lucasnlm.antimine.common.level.viewmodel.GameEvent
1918
import dev.lucasnlm.antimine.common.level.viewmodel.GameViewModel
2019
import dev.lucasnlm.antimine.core.models.Analytics
21-
import dev.lucasnlm.antimine.core.parcelable
2220
import dev.lucasnlm.antimine.databinding.GameOverDialogBinding
2321
import dev.lucasnlm.antimine.gameover.model.CommonDialogState
2422
import dev.lucasnlm.antimine.gameover.model.GameResult
2523
import dev.lucasnlm.antimine.gameover.viewmodel.EndGameDialogEvent
2624
import dev.lucasnlm.antimine.gameover.viewmodel.EndGameDialogViewModel
2725
import dev.lucasnlm.antimine.themes.ThemeActivity
2826
import dev.lucasnlm.antimine.tutorial.TutorialActivity
27+
import dev.lucasnlm.antimine.utils.BuildExt.androidSnowCone
28+
import dev.lucasnlm.antimine.utils.BundleExt.parcelable
2929
import dev.lucasnlm.external.AnalyticsManager
3030
import dev.lucasnlm.external.FeatureFlagManager
3131
import kotlinx.coroutines.delay
@@ -216,8 +216,7 @@ class GameOverDialogFragment : CommonGameDialogFragment() {
216216

217217
window?.apply {
218218
setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
219-
220-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
219+
androidSnowCone {
221220
addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND)
222221
attributes?.blurBehindRadius = BACKGROUND_BLUR_RADIUS
223222
}

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import android.app.Dialog
44
import android.content.Intent
55
import android.graphics.Color
66
import android.graphics.drawable.ColorDrawable
7-
import android.os.Build
87
import android.os.Bundle
98
import android.view.KeyEvent
109
import android.view.LayoutInflater
@@ -16,13 +15,14 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
1615
import dev.lucasnlm.antimine.R
1716
import dev.lucasnlm.antimine.common.level.viewmodel.GameViewModel
1817
import dev.lucasnlm.antimine.core.models.Analytics
19-
import dev.lucasnlm.antimine.core.parcelable
2018
import dev.lucasnlm.antimine.databinding.WinDialogBinding
2119
import dev.lucasnlm.antimine.gameover.model.CommonDialogState
2220
import dev.lucasnlm.antimine.gameover.model.GameResult
2321
import dev.lucasnlm.antimine.gameover.viewmodel.EndGameDialogEvent
2422
import dev.lucasnlm.antimine.gameover.viewmodel.EndGameDialogViewModel
2523
import dev.lucasnlm.antimine.stats.StatsActivity
24+
import dev.lucasnlm.antimine.utils.BuildExt.androidSnowCone
25+
import dev.lucasnlm.antimine.utils.BundleExt.parcelable
2626
import dev.lucasnlm.external.AnalyticsManager
2727
import dev.lucasnlm.external.FeatureFlagManager
2828
import kotlinx.coroutines.launch
@@ -198,8 +198,7 @@ class WinGameDialogFragment : CommonGameDialogFragment() {
198198

199199
window?.apply {
200200
setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
201-
202-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
201+
androidSnowCone {
203202
addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND)
204203
attributes?.blurBehindRadius = BACKGROUND_BLUR_RADIUS
205204
}

0 commit comments

Comments
 (0)