Add more themes

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(),
         )
     }

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)
             }

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)

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,
                 )
             }

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"

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 =

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)

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,
 )

ui/src/main/java/dev/lucasnlm/antimine/ui/repository/Skins.kt

@@ -10,7 +10,7 @@ object Skins {
             file = "standard.png",
             canTint = true,
             isPremium = false,
-            hasPadding = true,
+            joinAreas = true,
             thumbnailImageRes = R.drawable.skin_standard,
         )
 
@@ -20,7 +20,7 @@ object Skins {
             file = "square.png",
             canTint = true,
             isPremium = true,
-            hasPadding = true,
+            joinAreas = true,
             thumbnailImageRes = R.drawable.skin_square,
         )
 
@@ -30,7 +30,7 @@ object Skins {
             file = "square-2.png",
             canTint = true,
             isPremium = true,
-            hasPadding = true,
+            joinAreas = true,
             thumbnailImageRes = R.drawable.skin_square_2,
         )
 
@@ -40,7 +40,7 @@ object Skins {
             file = "square-3.png",
             canTint = true,
             isPremium = true,
-            hasPadding = false,
+            joinAreas = false,
             thumbnailImageRes = R.drawable.skin_square_3,
             showPadding = false,
         )
@@ -51,7 +51,7 @@ object Skins {
             file = "classic.png",
             canTint = true,
             isPremium = true,
-            hasPadding = true,
+            joinAreas = true,
             thumbnailImageRes = R.drawable.skin_classic,
             background = 4,
         )
@@ -62,7 +62,7 @@ object Skins {
             file = "classic.png",
             canTint = false,
             isPremium = true,
-            hasPadding = true,
+            joinAreas = true,
             thumbnailImageRes = R.drawable.skin_classic,
             background = 4,
         )
@@ -73,7 +73,7 @@ object Skins {
             file = "glass.png",
             canTint = true,
             isPremium = true,
-            hasPadding = true,
+            joinAreas = true,
             thumbnailImageRes = R.drawable.skin_glass_2,
         )
 
@@ -83,7 +83,7 @@ object Skins {
             file = "stone.png",
             canTint = false,
             isPremium = true,
-            hasPadding = true,
+            joinAreas = true,
             thumbnailImageRes = R.drawable.skin_stone,
             background = 4,
         )
@@ -94,7 +94,7 @@ object Skins {
             file = "stone-2.png",
             canTint = true,
             isPremium = true,
-            hasPadding = true,
+            joinAreas = true,
             thumbnailImageRes = R.drawable.skin_stone_2,
             background = 4,
         )
@@ -105,11 +105,36 @@ object Skins {
             file = "standard.png",
             canTint = true,
             isPremium = true,
-            hasPadding = false,
+            joinAreas = false,
             thumbnailImageRes = R.drawable.skin_standard_no_connection,
             showPadding = false,
         )
 
+    private fun oldschool() =
+        AppSkin(
+            id = 10,
+            file = "oldschool.png",
+            canTint = true,
+            isPremium = true,
+            joinAreas = false,
+            backgroundOnAll = true,
+            thumbnailImageRes = R.drawable.oldschool,
+            showPadding = true,
+        )
+
+    private fun oldschool2() =
+        AppSkin(
+            id = 11,
+            file = "oldschool2.png",
+            canTint = false,
+            isPremium = true,
+            joinAreas = false,
+            backgroundOnAll = true,
+            thumbnailImageRes = R.drawable.oldschool2,
+            forceBackground = 0x7f8773,
+            showPadding = true,
+        )
+
     fun getAllSkins() =
         listOf(
             default(),
@@ -122,5 +147,7 @@ object Skins {
             square3(),
             stone2(),
             defaultNoJoin(),
+            oldschool(),
+            oldschool2(),
         )
 }