Merge pull request #358 from lucasnlm/release-15-4-0

Bump dependencies
lucasnlm · Jan 18, 2022 · a4c4022 · a4c4022
2 parents 77b1e71 + a1ffdc0
commit a4c4022
Show file tree

Hide file tree

Showing 83 changed files with 283 additions and 466 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -33,8 +33,7 @@ jobs:
           java-version: 1.8
       - name: Build with Gradle
         run: |
-          ./gradlew assembleDebug
-          ./gradlew testGoogleDebugUnitTest --stacktrace
+          ./gradlew testFossDebugUnitTest --stacktrace
 
 
   fdroid:

diff --git a/about/build.gradle b/about/build.gradle
@@ -45,27 +45,27 @@ dependencies {
     implementation 'com.google.android.material:material:1.4.0'
 
     // AndroidX
-    implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.activity:activity-ktx:1.3.1'
-    implementation 'androidx.fragment:fragment-ktx:1.3.6'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.activity:activity-ktx:1.4.0'
+    implementation 'androidx.fragment:fragment-ktx:1.4.0'
 
     // RecyclerView
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
 
     // Constraint
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
 
     // Lifecycle
-    api 'android.arch.lifecycle:extensions:1.1.1'
+    implementation 'android.arch.lifecycle:extensions:1.1.1'
     implementation 'android.arch.lifecycle:viewmodel:1.1.1'
 
     // Koin
     implementation 'io.insert-koin:koin-android:3.1.2'
     testImplementation 'io.insert-koin:koin-test:3.1.2'
 
     // Coroutines
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2'
     testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.2'
 
     // Kotlin Lib

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 1504001
-        versionName '15.4.0'
+        versionCode 1505001
+        versionName '15.5.0'
         minSdkVersion 21
         targetSdkVersion 31
         multiDexEnabled true
@@ -126,13 +126,12 @@ dependencies {
     fossImplementation project(':foss')
 
     // AndroidX
-    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'androidx.preference:preference-ktx:1.1.1'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'androidx.activity:activity-ktx:1.3.1'
-    implementation 'androidx.fragment:fragment-ktx:1.3.6'
-    implementation 'androidx.work:work-runtime-ktx:2.7.1'
+    implementation 'androidx.activity:activity-ktx:1.4.0'
+    implementation 'androidx.fragment:fragment-ktx:1.4.0'
 
     // Lifecycle
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0'
@@ -141,10 +140,10 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-common-java8:2.4.0'
 
     // Room
-    implementation 'androidx.room:room-ktx:2.3.0'
+    implementation 'androidx.room:room-ktx:2.4.1'
 
     // Constraint
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
 
     // Google
     implementation 'com.google.android.material:material:1.4.0'
@@ -154,7 +153,7 @@ dependencies {
     testImplementation 'io.insert-koin:koin-test:3.1.2'
 
     // Kotlin
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2'
     implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.30'
     testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.2'
 
@@ -166,7 +165,6 @@ dependencies {
     testImplementation 'androidx.test:rules:1.4.0'
     testImplementation 'androidx.test:runner:1.4.0'
     testImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    testImplementation 'androidx.test.espresso:espresso-contrib:3.4.0'
     testImplementation 'androidx.fragment:fragment-testing:1.4.0'
     testImplementation 'org.robolectric:robolectric:4.5.1'
     testImplementation 'androidx.test.ext:junit:1.1.3'
@@ -179,10 +177,9 @@ dependencies {
     androidTestImplementation 'androidx.test:core:1.4.0'
     androidTestImplementation 'androidx.test:core-ktx:1.4.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.4.0'
     androidTestImplementation 'androidx.test:runner:1.4.0'
     androidTestImplementation 'androidx.test:rules:1.4.0'
-    androidTestUtil 'androidx.test:orchestrator:1.4.0'
+    androidTestUtil 'androidx.test:orchestrator:1.4.1'
 }
 
 tasks.withType(Test) {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -15,10 +15,6 @@
 
     <uses-permission android:name="android.permission.VIBRATE" />
 
-    <uses-feature
-        android:name="android.software.leanback"
-        android:required="false" />
-
     <uses-feature
         android:glEsVersion="0x00020000"
         android:required="true" />

diff --git a/app/src/main/java/dev/lucasnlm/antimine/GameActivity.kt b/app/src/main/java/dev/lucasnlm/antimine/GameActivity.kt
@@ -170,6 +170,7 @@ class GameActivity :
                     if (it.turn == 0) {
                         setOpenControlSwitcherIcon()
                         warning?.dismiss()
+                        warning = null
                     }
 
                     val color = usingTheme.palette.covered.toAndroidColor(168)
@@ -191,7 +192,7 @@ class GameActivity :
                     tapToBegin.visibility = View.GONE
                 }
 
-                if (it.turn < 1 && it.saveId == 0L && !it.isLoadingMap) {
+                if (it.turn < 1 && it.saveId == 0L && !it.isLoadingMap && it.showTutorial) {
                     val color = usingTheme.palette.covered.toAndroidColor(168)
                     val tint = ColorStateList.valueOf(color)
                     val controlText = gameViewModel.getControlDescription(applicationContext)
@@ -414,8 +415,10 @@ class GameActivity :
         tapToBegin.apply {
             setTextColor(usingTheme.palette.background.toAndroidColor(255))
         }
-        controlsToast.apply {
-            setTextColor(usingTheme.palette.background.toAndroidColor(255))
+        if (preferencesRepository.showTutorialButton()) {
+            controlsToast.apply {
+                setTextColor(usingTheme.palette.background.toAndroidColor(255))
+            }
         }
     }
 

diff --git a/app/src/main/java/dev/lucasnlm/antimine/cloud/CloudSaveManagerImpl.kt b/app/src/main/java/dev/lucasnlm/antimine/cloud/CloudSaveManagerImpl.kt
@@ -55,6 +55,8 @@ class CloudSaveManagerImpl(
                     doubleClickTimeout = preferencesRepository.getDoubleClickTimeout().toInt(),
                     allowTapNumbers = preferencesRepository.allowTapOnNumbers().toInt(),
                     highlightNumbers = preferencesRepository.dimNumbers().toInt(),
+                    leftHanded = preferencesRepository.leftHandedMode().toInt(),
+                    dimNumbers = preferencesRepository.dimNumbers().toInt(),
                 )
             }
         } catch (e: Exception) {

diff --git a/app/src/main/java/dev/lucasnlm/antimine/main/MainActivity.kt b/app/src/main/java/dev/lucasnlm/antimine/main/MainActivity.kt
@@ -1,7 +1,6 @@
 package dev.lucasnlm.antimine.main
 
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.util.Log
 import android.view.View
@@ -313,22 +312,6 @@ class MainActivity : ThematicActivity(R.layout.activity_main) {
             }
         )
 
-        val moreGamesDeeplink = playGamesManager.moreGameDeeplink()
-        if (moreGamesDeeplink.isNotBlank()) {
-            moreGames.bind(
-                theme = usingTheme,
-                text = R.string.more_games,
-                startIcon = R.drawable.more_games,
-                onAction = {
-                    analyticsManager.sentEvent(Analytics.MoreGames)
-                    val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(moreGamesDeeplink))
-                    startActivity(browserIntent)
-                }
-            )
-        } else {
-            moreGames.visibility = View.GONE
-        }
-
         translation.bind(
             theme = usingTheme,
             text = R.string.translation,

diff --git a/app/src/main/java/dev/lucasnlm/antimine/main/viewmodel/MainViewModel.kt b/app/src/main/java/dev/lucasnlm/antimine/main/viewmodel/MainViewModel.kt
@@ -91,6 +91,8 @@ class MainViewModel(
             setUnlockedThemes(unlockedThemes)
             setSquareDivider(squareDivider)
             setDoubleClickTimeout(doubleClickTimeout.toLong())
+            setLeftHandedMode(leftHanded != 0)
+            setDimNumbers(dimNumbers != 0)
         }
 
         cloudSave.stats.mapNotNull {

diff --git a/app/src/main/res/drawable/more_games.xml b/app/src/main/res/drawable/more_games.xml
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -185,12 +185,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="8dp" />
 
-            <dev.lucasnlm.antimine.ui.view.CardButtonView
-                android:id="@+id/moreGames"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"/>
-
             <dev.lucasnlm.antimine.ui.view.CardButtonView
                 android:id="@+id/translation"
                 android:layout_width="match_parent"

diff --git a/app/src/test/java/dev/lucasnlm/antimine/di/TestAppModule.kt b/app/src/test/java/dev/lucasnlm/antimine/di/TestAppModule.kt
@@ -71,8 +71,6 @@ val AppModule = module {
             override fun shouldRequestLogin(): Boolean = false
 
             override fun signInToFirebase(activity: Activity) {}
-
-            override fun moreGameDeeplink(): String = ""
         }
     } bind IPlayGamesManager::class
 

diff --git a/app/src/test/java/dev/lucasnlm/antimine/mocks/MockPreferencesRepository.kt b/app/src/test/java/dev/lucasnlm/antimine/mocks/MockPreferencesRepository.kt
@@ -176,4 +176,8 @@ class MockPreferencesRepository : IPreferencesRepository {
     override fun dimNumbers(): Boolean = false
 
     override fun setDimNumbers(value: Boolean) { }
+
+    override fun setLeftHandedMode(enabled: Boolean) {}
+
+    override fun leftHandedMode(): Boolean = false
 }
diff --git a/common/build.gradle b/common/build.gradle
@@ -42,40 +42,40 @@ dependencies {
     implementation project(':sgtatham')
 
     // AndroidX
-    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'androidx.preference:preference-ktx:1.1.1'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    implementation 'androidx.activity:activity-ktx:1.3.1'
-    implementation 'androidx.fragment:fragment-ktx:1.3.6'
+    implementation 'androidx.activity:activity-ktx:1.4.0'
+    implementation 'androidx.fragment:fragment-ktx:1.4.0'
 
     // Google
     implementation 'com.google.android.material:material:1.4.0'
 
     // Constraint
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
 
     // Lifecycle
-    api 'android.arch.lifecycle:extensions:1.1.1'
+    implementation 'android.arch.lifecycle:extensions:1.1.1'
     implementation 'android.arch.lifecycle:viewmodel:1.1.1'
 
     // Koin
     implementation 'io.insert-koin:koin-android:3.1.2'
     testImplementation 'io.insert-koin:koin-test:3.1.2'
 
     // Room
-    api 'androidx.room:room-runtime:2.3.0'
-    api 'androidx.room:room-ktx:2.3.0'
-    kapt 'androidx.room:room-compiler:2.3.0'
-    testImplementation 'androidx.room:room-testing:2.3.0'
+    api 'androidx.room:room-runtime:2.4.1'
+    api 'androidx.room:room-ktx:2.4.1'
+    kapt 'androidx.room:room-compiler:2.4.1'
+    testImplementation 'androidx.room:room-testing:2.4.1'
 
     // Moshi - Json
     api 'com.squareup.moshi:moshi:1.11.0'
     api 'com.squareup.moshi:moshi-kotlin:1.11.0'
     kapt 'com.squareup.moshi:moshi-kotlin-codegen:1.11.0'
 
     // Coroutines
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2'
     testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.2'
 
     // Kotlin Lib
@@ -93,7 +93,7 @@ dependencies {
     // AndroidJUnitRunner and JUnit Rules
     androidTestImplementation 'androidx.test:runner:1.4.0'
     androidTestImplementation 'androidx.test:rules:1.4.0'
-    androidTestUtil 'androidx.test:orchestrator:1.4.0'
+    androidTestUtil 'androidx.test:orchestrator:1.4.1'
 }
 
 tasks.withType(Test) {