Merge pull request #361 from lucasnlm/update-16

Update 16
lucasnlm · Jan 30, 2022 · da036c4 · da036c4
2 parents a4c4022 + 4e45c8f
commit da036c4
Show file tree

Hide file tree

Showing 84 changed files with 485 additions and 135 deletions.
diff --git a/about/build.gradle b/about/build.gradle
@@ -42,7 +42,7 @@ dependencies {
     implementation project(':tutorial')
 
     // Google
-    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'com.google.android.material:material:1.5.0'
 
     // AndroidX
     implementation 'androidx.appcompat:appcompat:1.4.1'

diff --git a/app/build.gradle b/app/build.gradle
@@ -15,8 +15,8 @@ android {
 
     defaultConfig {
         // versionCode and versionName must be hardcoded to support F-droid
-        versionCode 1505001
-        versionName '15.5.0'
+        versionCode 1506001
+        versionName '15.6.0'
         minSdkVersion 21
         targetSdkVersion 31
         multiDexEnabled true
@@ -91,6 +91,7 @@ android {
         googleInstant {
             dimension 'version'
             applicationId 'dev.lucasnlm.antimine'
+            versionNameSuffix "-inst"
         }
 
         foss {
@@ -146,7 +147,7 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
 
     // Google
-    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'com.google.android.material:material:1.5.0'
 
     // Koin
     implementation 'io.insert-koin:koin-android:3.1.2'

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -44,10 +44,6 @@
         android:theme="@style/AppTheme"
         tools:targetApi="lollipop">
 
-<!--        <meta-data-->
-<!--            android:name="com.google.android.gms.instant.flavor"-->
-<!--            android:value="1337" />-->
-
         <uses-library
             android:name="org.apache.http.legacy"
             android:required="false"/>

diff --git a/app/src/main/java/dev/lucasnlm/antimine/MainApplication.kt b/app/src/main/java/dev/lucasnlm/antimine/MainApplication.kt
@@ -35,7 +35,7 @@ open class MainApplication : MultiDexApplication() {
             sentEvent(Analytics.Open)
         }
 
-        if (featureFlagManager.isFoos) {
+        if (featureFlagManager.isFoss) {
             preferencesRepository.setPremiumFeatures(true)
         } else {
             adsManager.start(this)

diff --git a/app/src/main/java/dev/lucasnlm/antimine/gameover/GameOverDialogFragment.kt b/app/src/main/java/dev/lucasnlm/antimine/gameover/GameOverDialogFragment.kt
@@ -171,7 +171,28 @@ class GameOverDialogFragment : AppCompatDialogFragment() {
                                 dismissAllowingStateLoss()
                             }
 
-                            if (!preferencesRepository.isPremiumEnabled() &&
+                            if (featureFlagManager.isFoss && preferencesRepository.requestDonation()) {
+                                adFrame.visibility = View.VISIBLE
+
+                                val view = View.inflate(context, R.layout.donation_request, null)
+                                view.setOnClickListener {
+                                    activity?.let {
+                                        lifecycleScope.launch {
+                                            billingManager.charge(it)
+                                            preferencesRepository.setRequestDonation(false)
+                                        }
+                                    }
+                                }
+
+                                adFrame.addView(
+                                    view,
+                                    FrameLayout.LayoutParams(
+                                        FrameLayout.LayoutParams.MATCH_PARENT,
+                                        FrameLayout.LayoutParams.WRAP_CONTENT,
+                                        Gravity.CENTER_HORIZONTAL
+                                    )
+                                )
+                            } else if (!preferencesRepository.isPremiumEnabled() &&
                                 featureFlagManager.isBannerAdEnabled
                             ) {
                                 adFrame.visibility = View.VISIBLE

diff --git a/app/src/main/java/dev/lucasnlm/antimine/gameover/WinGameDialogFragment.kt b/app/src/main/java/dev/lucasnlm/antimine/gameover/WinGameDialogFragment.kt
@@ -158,7 +158,28 @@ class WinGameDialogFragment : AppCompatDialogFragment() {
                                 )
                             }
 
-                            if (!preferencesRepository.isPremiumEnabled() &&
+                            if (featureFlagManager.isFoss && preferencesRepository.requestDonation()) {
+                                adFrame.visibility = View.VISIBLE
+
+                                val view = View.inflate(context, R.layout.donation_request, null)
+                                view.setOnClickListener {
+                                    activity?.let {
+                                        lifecycleScope.launch {
+                                            billingManager.charge(it)
+                                            preferencesRepository.setRequestDonation(false)
+                                        }
+                                    }
+                                }
+
+                                adFrame.addView(
+                                    view,
+                                    FrameLayout.LayoutParams(
+                                        FrameLayout.LayoutParams.MATCH_PARENT,
+                                        FrameLayout.LayoutParams.WRAP_CONTENT,
+                                        Gravity.CENTER_HORIZONTAL
+                                    )
+                                )
+                            } else if (!preferencesRepository.isPremiumEnabled() &&
                                 featureFlagManager.isBannerAdEnabled
                             ) {
                                 adFrame.visibility = View.VISIBLE

diff --git a/app/src/main/java/dev/lucasnlm/antimine/main/MainActivity.kt b/app/src/main/java/dev/lucasnlm/antimine/main/MainActivity.kt
@@ -237,7 +237,7 @@ class MainActivity : ThematicActivity(R.layout.activity_main) {
         )
 
         removeAds.visibility = View.GONE
-        if (featureFlagManager.isFoos) {
+        if (featureFlagManager.isFoss) {
             removeAds.apply {
                 visibility = View.VISIBLE
                 bind(

diff --git a/app/src/main/res/drawable/money.xml b/app/src/main/res/drawable/money.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M11.8,10.9c-2.27,-0.59 -3,-1.2 -3,-2.15 0,-1.09 1.01,-1.85 2.7,-1.85 1.42,0 2.13,0.54 2.39,1.4 0.12,0.4 0.45,0.7 0.87,0.7h0.3c0.66,0 1.13,-0.65 0.9,-1.27 -0.42,-1.18 -1.4,-2.16 -2.96,-2.54V4.5c0,-0.83 -0.67,-1.5 -1.5,-1.5S10,3.67 10,4.5v0.66c-1.94,0.42 -3.5,1.68 -3.5,3.61 0,2.31 1.91,3.46 4.7,4.13 2.5,0.6 3,1.48 3,2.41 0,0.69 -0.49,1.79 -2.7,1.79 -1.65,0 -2.5,-0.59 -2.83,-1.43 -0.15,-0.39 -0.49,-0.67 -0.9,-0.67h-0.28c-0.67,0 -1.14,0.68 -0.89,1.3 0.57,1.39 1.9,2.21 3.4,2.53v0.67c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5v-0.65c1.95,-0.37 3.5,-1.5 3.5,-3.55 0,-2.84 -2.43,-3.81 -4.7,-4.4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_play_arrow.xml b/app/src/main/res/drawable/round_play_arrow.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M8,6.82v10.36c0,0.79 0.87,1.27 1.54,0.84l8.14,-5.18c0.62,-0.39 0.62,-1.29 0,-1.69L9.54,5.98C8.87,5.55 8,6.03 8,6.82z"/>
+</vector>
diff --git a/app/src/main/res/layout/donation_request.xml b/app/src/main/res/layout/donation_request.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
+    android:clickable="true"
+    android:contentDescription="@string/donation"
+    android:focusable="true"
+    android:padding="16dp">
+
+    <ImageView
+        android:id="@+id/money"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:importantForAccessibility="no"
+        android:src="@drawable/money"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="@color/accent" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="8dp"
+        android:importantForAccessibility="no"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toEndOf="@+id/money"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/donate_request"
+            android:textColor="?colorOnBackground" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/donate_help"
+            android:textColor="?colorOnBackground" />
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/test/java/dev/lucasnlm/antimine/mocks/MockPreferencesRepository.kt b/app/src/test/java/dev/lucasnlm/antimine/mocks/MockPreferencesRepository.kt
@@ -180,4 +180,8 @@ class MockPreferencesRepository : IPreferencesRepository {
     override fun setLeftHandedMode(enabled: Boolean) {}
 
     override fun leftHandedMode(): Boolean = false
+
+    override fun setRequestDonation(request: Boolean) {}
+
+    override fun requestDonation(): Boolean = true
 }
diff --git a/common/build.gradle b/common/build.gradle
@@ -49,7 +49,7 @@ dependencies {
     implementation 'androidx.fragment:fragment-ktx:1.4.0'
 
     // Google
-    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'com.google.android.material:material:1.5.0'
 
     // Constraint
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'

diff --git a/common/src/main/java/dev/lucasnlm/antimine/common/level/GameController.kt b/common/src/main/java/dev/lucasnlm/antimine/common/level/GameController.kt
@@ -310,6 +310,9 @@ class GameController {
     fun isGameOver(): Boolean =
         hasIsolatedAllMines() || (explodedMinesCount() > errorTolerance)
 
+    fun hasOpenMines(): Boolean =
+        mines().firstOrNull { it.hasMine && !it.isCovered } != null
+
     fun remainingMines(): Int {
         val flagsCount = field.count { it.isCovered && it.mark.isFlag() }
         val minesCount = mines().count()

diff --git a/common/src/main/java/dev/lucasnlm/antimine/common/level/di/LevelModule.kt b/common/src/main/java/dev/lucasnlm/antimine/common/level/di/LevelModule.kt
@@ -46,6 +46,6 @@ val LevelModule = module {
     } bind IMinefieldRepository::class
 
     single {
-        TipRepository(get())
+        TipRepository(get(), get())
     } bind ITipRepository::class
 }
diff --git a/common/src/main/java/dev/lucasnlm/antimine/common/level/repository/TipRepository.kt b/common/src/main/java/dev/lucasnlm/antimine/common/level/repository/TipRepository.kt
@@ -1,6 +1,7 @@
 package dev.lucasnlm.antimine.common.level.repository
 
 import dev.lucasnlm.antimine.preferences.IPreferencesRepository
+import dev.lucasnlm.external.IFeatureFlagManager
 
 interface ITipRepository {
     fun setExtraTips(amount: Int)
@@ -10,7 +11,8 @@ interface ITipRepository {
 }
 
 class TipRepository(
-    private val preferencesRepository: IPreferencesRepository
+    private val preferencesRepository: IPreferencesRepository,
+    private val featureFlagManager: IFeatureFlagManager,
 ) : ITipRepository {
     override fun setExtraTips(amount: Int) {
         preferencesRepository.setExtraTips(amount)
@@ -37,15 +39,18 @@ class TipRepository(
     }
 
     override fun increaseTip(amount: Int) {
-        val newValue = (preferencesRepository.getTips() + amount).coerceAtMost(MAX_TIPS).coerceAtLeast(0)
+        val newValue =
+            (preferencesRepository.getTips() + amount)
+                .coerceAtMost(getMaxTips())
+                .coerceAtLeast(0)
         preferencesRepository.setTips(newValue)
     }
 
     override fun getTotalTips(): Int {
         return preferencesRepository.getExtraTips() + preferencesRepository.getTips()
     }
 
-    companion object {
-        const val MAX_TIPS = 25
+    private fun getMaxTips(): Int {
+        return if (featureFlagManager.isFoss) 100 else 25
     }
 }