Merge pull request #489 from lucasnlm/fix-lint

lucasnlm · web-flow · commit bfa75a129131 · 2023-12-24T12:31:38.000-03:00
Add new theme and fix bugs
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -13,8 +13,8 @@ android {
 
     defaultConfig {
         // versionCode and versionName must be hardcoded to support F-droid
-        versionCode = 1706031
-        versionName = "17.6.3"
+        versionCode = 1706041
+        versionName = "17.6.4"
         minSdk = libs.versions.minSdk.get().toInt()
         targetSdk = libs.versions.targetSdk.get().toInt()
         compileSdk = libs.versions.compileSdk.get().toInt()
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -12,6 +12,10 @@
         android:smallScreens="true"
         android:xlargeScreens="true" />
 
+    <uses-permission
+        android:name="${applicationId}.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION"
+        tools:node="remove" />
+
     <uses-permission android:name="android.permission.VIBRATE" />
 
     <uses-feature
diff --git a/app/src/main/java/dev/lucasnlm/antimine/custom/CustomLevelDialogFragment.kt b/app/src/main/java/dev/lucasnlm/antimine/custom/CustomLevelDialogFragment.kt
@@ -5,12 +5,10 @@ import android.content.DialogInterface
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
-import android.view.animation.AnimationUtils
 import androidx.appcompat.app.AppCompatDialogFragment
 import androidx.core.widget.doAfterTextChanged
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.textfield.TextInputEditText
-import dev.lucasnlm.antimine.R
 import dev.lucasnlm.antimine.core.models.Difficulty
 import dev.lucasnlm.antimine.custom.viewmodel.CreateGameViewModel
 import dev.lucasnlm.antimine.custom.viewmodel.CustomEvent
@@ -127,56 +125,6 @@ class CustomLevelDialogFragment : AppCompatDialogFragment() {
         }.create()
     }
 
-    private fun checkLimitFeedbacks(): Boolean {
-        val wantedWidth = binding.mapWidth.text.toString().toIntOrNull()
-        var allValid = true
-        if (wantedWidth == null) {
-            binding.mapWidth.startAnimation(AnimationUtils.loadAnimation(context, R.anim.fast_shake))
-            allValid = false
-        } else if (wantedWidth >= MAX_WIDTH) {
-            binding.mapWidth.setText(MAX_WIDTH.toString())
-            binding.mapWidth.startAnimation(AnimationUtils.loadAnimation(context, R.anim.fast_shake))
-            allValid = false
-        } else if (wantedWidth <= MIN_WIDTH) {
-            binding.mapWidth.setText(MIN_WIDTH.toString())
-            binding.mapWidth.startAnimation(AnimationUtils.loadAnimation(context, R.anim.fast_shake))
-            allValid = false
-        }
-
-        val wantedHeight = binding.mapHeight.text.toString().toIntOrNull()
-        if (wantedHeight == null) {
-            binding.mapHeight.startAnimation(AnimationUtils.loadAnimation(context, R.anim.fast_shake))
-            allValid = false
-        } else if (wantedHeight >= MAX_HEIGHT) {
-            binding.mapHeight.setText(MAX_HEIGHT.toString())
-            binding.mapHeight.startAnimation(AnimationUtils.loadAnimation(context, R.anim.fast_shake))
-            allValid = false
-        } else if (wantedHeight <= MIN_HEIGHT) {
-            binding.mapHeight.setText(MIN_HEIGHT.toString())
-            binding.mapHeight.startAnimation(AnimationUtils.loadAnimation(context, R.anim.fast_shake))
-            allValid = false
-        }
-
-        if (allValid && wantedWidth != null && wantedHeight != null) {
-            val wantedMines = binding.mapMines.text.toString().toIntOrNull()
-            val maxMines = wantedWidth * wantedHeight - MIN_SAFE_AREA
-            if (wantedMines == null) {
-                binding.mapMines.startAnimation(AnimationUtils.loadAnimation(context, R.anim.fast_shake))
-                allValid = false
-            } else if (wantedMines >= maxMines) {
-                binding.mapMines.setText((wantedWidth * wantedHeight - MIN_SAFE_AREA).toString())
-                binding.mapMines.startAnimation(AnimationUtils.loadAnimation(context, R.anim.fast_shake))
-                allValid = false
-            } else if (wantedMines <= MIN_MINES) {
-                binding.mapMines.setText(MIN_MINES.toString())
-                binding.mapMines.startAnimation(AnimationUtils.loadAnimation(context, R.anim.fast_shake))
-                allValid = false
-            }
-        }
-
-        return allValid
-    }
-
     override fun onDismiss(dialog: DialogInterface) {
         if (activity is DialogInterface.OnDismissListener) {
             (activity as DialogInterface.OnDismissListener).onDismiss(dialog)
diff --git a/app/src/main/java/dev/lucasnlm/antimine/stats/viewmodel/StatsViewModel.kt b/app/src/main/java/dev/lucasnlm/antimine/stats/viewmodel/StatsViewModel.kt
@@ -25,7 +25,12 @@ class StatsViewModel(
     private val expertSize = sizeOf(Difficulty.Expert)
     private val intermediateSize = sizeOf(Difficulty.Intermediate)
     private val beginnerSize = sizeOf(Difficulty.Beginner)
-    private val standardSize = minefieldRepository.baseStandardSize(dimensionRepository, 0)
+    private val standardSize =
+        minefieldRepository.baseStandardSize(
+            dimensionRepository = dimensionRepository,
+            progressiveMines = 0,
+            limitToMax = false,
+        )
 
     private fun sizeOf(difficulty: Difficulty): Minefield {
         return minefieldRepository.fromDifficulty(
diff --git a/app/src/test/java/dev/lucasnlm/antimine/mocks/FixedMinefieldRepository.kt b/app/src/test/java/dev/lucasnlm/antimine/mocks/FixedMinefieldRepository.kt
@@ -10,6 +10,7 @@ class FixedMinefieldRepository : MinefieldRepository {
     override fun baseStandardSize(
         dimensionRepository: DimensionRepository,
         progressiveMines: Int,
+        limitToMax: Boolean,
     ): Minefield = Minefield(9, 9, 9 + progressiveMines)
 
     override fun fromDifficulty(
diff --git a/app/src/test/java/dev/lucasnlm/antimine/stats/viewmodel/StatsViewModelTest.kt b/app/src/test/java/dev/lucasnlm/antimine/stats/viewmodel/StatsViewModelTest.kt
@@ -42,7 +42,7 @@ class StatsViewModelTest : IntentViewModelTest() {
     override fun setup() {
         super.setup()
         every { prefsRepository.isPremiumEnabled() } returns false
-        every { minefieldRepository.baseStandardSize(any(), any()) } returns Minefield(6, 12, 9)
+        every { minefieldRepository.baseStandardSize(any(), any(), any()) } returns Minefield(6, 12, 9)
         every { minefieldRepository.fromDifficulty(any(), any(), any()) } returns Minefield(6, 12, 9)
     }
 
diff --git a/common/src/main/java/dev/lucasnlm/antimine/common/level/repository/MinefieldRepository.kt b/common/src/main/java/dev/lucasnlm/antimine/common/level/repository/MinefieldRepository.kt
@@ -15,6 +15,7 @@ interface MinefieldRepository {
     fun baseStandardSize(
         dimensionRepository: DimensionRepository,
         progressiveMines: Int,
+        limitToMax: Boolean,
     ): Minefield
 
     /**
diff --git a/common/src/main/java/dev/lucasnlm/antimine/common/level/repository/MinefieldRepositoryImpl.kt b/common/src/main/java/dev/lucasnlm/antimine/common/level/repository/MinefieldRepositoryImpl.kt
@@ -4,11 +4,13 @@ import dev.lucasnlm.antimine.core.models.Difficulty
 import dev.lucasnlm.antimine.core.repository.DimensionRepository
 import dev.lucasnlm.antimine.preferences.PreferencesRepository
 import dev.lucasnlm.antimine.preferences.models.Minefield
+import java.lang.Integer.min
 
 class MinefieldRepositoryImpl : MinefieldRepository {
     override fun baseStandardSize(
         dimensionRepository: DimensionRepository,
         progressiveMines: Int,
+        limitToMax: Boolean,
     ): Minefield {
         val fieldSize = dimensionRepository.areaSize()
         val horizontalGap =
@@ -33,7 +35,13 @@ class MinefieldRepositoryImpl : MinefieldRepository {
         val fitWidth = calculatedWidth.coerceAtLeast(MIN_STANDARD_WIDTH)
         val fitHeight = calculatedHeight.coerceAtLeast(MIN_STANDARD_HEIGHT)
         val fieldArea = fitWidth * fitHeight
-        val fitMines = ((fieldArea * CUSTOM_LEVEL_MINE_RATIO).toInt() + progressiveMines)
+        val maxMines =
+            if (limitToMax) {
+                (fieldArea * 0.75).toInt()
+            } else {
+                Int.MAX_VALUE
+            }
+        val fitMines = min(maxMines, ((fieldArea * CUSTOM_LEVEL_MINE_RATIO).toInt() + progressiveMines))
         return Minefield(fitWidth, fitHeight, fitMines)
     }
 
@@ -49,7 +57,12 @@ class MinefieldRepositoryImpl : MinefieldRepository {
             Difficulty.Expert -> expertMinefield
             Difficulty.Master -> masterMinefield
             Difficulty.Legend -> legendMinefield
-            Difficulty.FixedSize -> baseStandardSize(dimensionRepository, preferencesRepository.getProgressiveValue())
+            Difficulty.FixedSize ->
+                baseStandardSize(
+                    dimensionRepository = dimensionRepository,
+                    progressiveMines = preferencesRepository.getProgressiveValue(),
+                    limitToMax = true,
+                )
             Difficulty.Custom -> preferencesRepository.customGameMode()
         }
 
@@ -59,8 +72,9 @@ class MinefieldRepositoryImpl : MinefieldRepository {
     ): Minefield {
         var result: Minefield =
             baseStandardSize(
-                dimensionRepository,
-                preferencesRepository.getProgressiveValue(),
+                dimensionRepository = dimensionRepository,
+                progressiveMines = preferencesRepository.getProgressiveValue(),
+                limitToMax = false,
             )
         var resultWidth = result.width
         var resultHeight = result.height
diff --git a/common/src/main/java/dev/lucasnlm/antimine/common/level/view/GameRenderFragment.kt b/common/src/main/java/dev/lucasnlm/antimine/common/level/view/GameRenderFragment.kt
@@ -74,7 +74,7 @@ open class GameRenderFragment : AndroidFragmentApplication() {
             navigationBarHeight = dimensionRepository.navigationBarHeight().toFloat(),
             appBarWithStatusHeight = dimensionRepository.actionBarSizeWithStatus().toFloat(),
             appBarHeight = appBarHeight(context),
-            joinAreas = themeRepository.getSkin().hasPadding,
+            joinAreas = themeRepository.getSkin().joinAreas,
             appSkin = themeRepository.getSkin(),
         )
     }
diff --git a/gdx/src/main/assets/glass.png b/gdx/src/main/assets/glass.png
diff --git a/gdx/src/main/assets/oldschool.png b/gdx/src/main/assets/oldschool.png
diff --git a/gdx/src/main/assets/oldschool2.png b/gdx/src/main/assets/oldschool2.png
diff --git a/gdx/src/main/java/dev/lucasnlm/antimine/gdx/GameApplicationListener.kt b/gdx/src/main/java/dev/lucasnlm/antimine/gdx/GameApplicationListener.kt
@@ -159,7 +159,8 @@ class GameApplicationListener(
 
         minefieldStage.run {
             val currentTheme = gameRenderingContext.theme
-            currentTheme.palette.background.run {
+            val backgroundColor = gameRenderingContext.appSkin.forceBackground ?: currentTheme.palette.background
+            backgroundColor.run {
                 Gdx.gl.glClearColor(red(), green(), blue(), 1f)
                 Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT)
             }
diff --git a/gdx/src/main/java/dev/lucasnlm/antimine/gdx/GameContext.kt b/gdx/src/main/java/dev/lucasnlm/antimine/gdx/GameContext.kt
@@ -36,10 +36,14 @@ object GameContext {
     fun refreshColors(theme: AppTheme) {
         GameContext.apply {
             backgroundColor =
-                if (theme.isDarkTheme && canTintAreas) {
-                    theme.palette.covered.toGdxColor(0.035f * zoomLevelAlpha)
+                if (canTintAreas) {
+                    if (theme.isDarkTheme) {
+                        theme.palette.covered.toGdxColor(0.035f * zoomLevelAlpha)
+                    } else {
+                        theme.palette.background.toInverseBackOrWhite(0.1f * zoomLevelAlpha)
+                    }
                 } else {
-                    theme.palette.background.toInverseBackOrWhite(0.1f * zoomLevelAlpha)
+                    Color.WHITE
                 }
             coveredAreaColor = theme.palette.covered.toGdxColor(1.0f)
             coveredMarkedAreaColor = theme.palette.covered.toGdxColor(1.0f).dim(0.6f)
diff --git a/gdx/src/main/java/dev/lucasnlm/antimine/gdx/actors/AreaActor.kt b/gdx/src/main/java/dev/lucasnlm/antimine/gdx/actors/AreaActor.kt
@@ -128,8 +128,9 @@ class AreaActor(
         isOdd: Boolean,
     ) {
         val area = this.area ?: return
+        val backgroundOnAll = gameRenderingContext.appSkin.backgroundOnAll
 
-        if (!isOdd && !area.isCovered && GameContext.zoomLevelAlpha > 0.0f) {
+        if ((backgroundOnAll || !isOdd) && !area.isCovered && GameContext.zoomLevelAlpha > 0.0f) {
             GameContext.gameTextures?.areaBackground?.let {
                 batch.drawRegion(
                     texture = it,
@@ -264,11 +265,16 @@ class AreaActor(
                         },
                 )
             } else if (area.hasMine) {
-                val color = gameRenderingContext.theme.palette.uncovered
+                val color =
+                    if (gameRenderingContext.appSkin.canTint) {
+                        gameRenderingContext.theme.palette.covered.toInverseBackOrWhite(1.0f)
+                    } else {
+                        Color.WHITE
+                    }
                 drawAsset(
                     batch = batch,
                     texture = it.mine,
-                    color = color.toInverseBackOrWhite(1.0f),
+                    color = color,
                     scale = BASE_ICON_SCALE,
                 )
             }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -32,7 +32,7 @@ mockk = "1.13.5"
 multidex = "2.0.1"
 okhttp = "4.10.0"
 orchestrator = "1.4.2"
-playServicesAds = "22.5.0"
+playServicesAds = "22.6.0"
 playServicesAuth = "20.7.0"
 playServicesGames = "23.1.0"
 playServicesInstantapps = "18.0.1"
diff --git a/themes/src/main/java/dev/lucasnlm/antimine/themes/ThemeActivity.kt b/themes/src/main/java/dev/lucasnlm/antimine/themes/ThemeActivity.kt
@@ -98,7 +98,7 @@ class ThemeActivity : ThemedActivity() {
                 if (size.widthPixels > size.heightPixels) {
                     2
                 } else {
-                    5
+                    4
                 }
 
             val themeAdapter =
diff --git a/themes/src/main/java/dev/lucasnlm/antimine/themes/view/SkinAdapter.kt b/themes/src/main/java/dev/lucasnlm/antimine/themes/view/SkinAdapter.kt
@@ -94,7 +94,7 @@ class SkinAdapter(
                 } else {
                     setColorFilter(Color.WHITE, PorterDuff.Mode.MULTIPLY)
                 }
-                if (!skin.hasPadding) {
+                if (!skin.joinAreas) {
                     setPadding(0, 0, 0, 0)
                 } else {
                     setPadding(paddingValue, paddingValue, paddingValue, paddingValue)
diff --git a/ui/src/main/java/dev/lucasnlm/antimine/ui/model/AppSkin.kt b/ui/src/main/java/dev/lucasnlm/antimine/ui/model/AppSkin.kt
@@ -1,5 +1,6 @@
 package dev.lucasnlm.antimine.ui.model
 
+import androidx.annotation.ColorInt
 import androidx.annotation.DrawableRes
 
 /**
@@ -9,7 +10,7 @@ import androidx.annotation.DrawableRes
  * @property thumbnailImageRes The resource id of the skin.
  * @property canTint Whether the skin can be tinted.
  * @property isPremium Whether the skin is premium.
- * @property hasPadding Whether the skin has padding.
+ * @property joinAreas Whether the skin has padding.
  * @property background The background of the skin.
  * @property showPadding Whether the skin should show padding.
  */
@@ -19,7 +20,9 @@ data class AppSkin(
     @DrawableRes val thumbnailImageRes: Int,
     val canTint: Boolean,
     val isPremium: Boolean,
-    val hasPadding: Boolean,
+    val joinAreas: Boolean,
     val background: Int = 0,
     val showPadding: Boolean = true,
+    val backgroundOnAll: Boolean = false,
+    @ColorInt val forceBackground: Int? = null,
 )
diff --git a/ui/src/main/java/dev/lucasnlm/antimine/ui/repository/Skins.kt b/ui/src/main/java/dev/lucasnlm/antimine/ui/repository/Skins.kt
diff --git a/ui/src/main/res/drawable/oldschool.png b/ui/src/main/res/drawable/oldschool.png
diff --git a/ui/src/main/res/drawable/oldschool2.png b/ui/src/main/res/drawable/oldschool2.png

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ class StatsViewModelTest : IntentViewModelTest() {`
`42`	`42`	`override fun setup() {`
`43`	`43`	`super.setup()`
`44`	`44`	`every { prefsRepository.isPremiumEnabled() } returns false`
`45`		`- every { minefieldRepository.baseStandardSize(any(), any()) } returns Minefield(6, 12, 9)`
	`45`	`+ every { minefieldRepository.baseStandardSize(any(), any(), any()) } returns Minefield(6, 12, 9)`
`46`	`46`	`every { minefieldRepository.fromDifficulty(any(), any(), any()) } returns Minefield(6, 12, 9)`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ open class GameRenderFragment : AndroidFragmentApplication() {`
`74`	`74`	`navigationBarHeight = dimensionRepository.navigationBarHeight().toFloat(),`
`75`	`75`	`appBarWithStatusHeight = dimensionRepository.actionBarSizeWithStatus().toFloat(),`
`76`	`76`	`appBarHeight = appBarHeight(context),`
`77`		`- joinAreas = themeRepository.getSkin().hasPadding,`
	`77`	`+ joinAreas = themeRepository.getSkin().joinAreas,`
`78`	`78`	`appSkin = themeRepository.getSkin(),`
`79`	`79`	`)`
`80`	`80`	`}`