Merge branch 'main' into cardBrowser2

Author: Scapesfear

AnkiDroid/build.gradle

@@ -85,8 +85,8 @@ android {
         //
         // This ensures the correct ordering between the various types of releases (dev < alpha < beta < release) which is
         // needed for upgrades to be offered correctly.
-        versionCode=22100105
-        versionName="2.21alpha5"
+        versionCode=22100108
+        versionName="2.21alpha8"
         minSdk libs.versions.minSdk.get().toInteger()
 
         // After #13695: change .tests_emulator.yml
@@ -256,6 +256,30 @@ android {
 play {
     serviceAccountCredentials.set(file("${homePath}/src/AnkiDroid-GCP-Publish-Credentials.json"))
     track.set('alpha')
+
+    // any time we bump minSdk we want Play Store to retain the old artifacts by version code,
+    // so that they remain available for older devices
+    retain {
+        artifacts.set([
+                20700300L, // (2.7, minSdk 10, universal APK)
+                20804300L, // (2.8.4, minSdk 10, universal APK)
+                21004300L, // (2.10.4, minSdk 15, universal APK)
+                // release-2.14 minSdk 16: missing and not re-publishable, see issue 17791
+                121603300L, // (2.16.3, minSdk 21, ABI armeabi-v7a)
+                221603300L, // (2.16.3, minSdk 21, ABI x86)
+                321603300L, // (2.16.3, minSdk 21, ABI arm64-v8a)
+                421603300L, // (2.16.3, minSdk 21, ABI x86_64)
+                121904300L, // (2.19.4, minSdk 23, ABI armeabi-v7a)
+                221904300L, // (2.19.4, minSdk 23, ABI x86)
+                321904300L, // (2.19.4, minSdk 23, ABI arm64-v8a)
+                421904300L, // (2.19.4, minSdk 23, ABI x86_64)
+        ])
+    }
+
+    // If you retain APKs in a release with different names as we do above,
+    // the plugin + Play Store has no idea how to name the release except by date.
+    // release name is developer only, but sane names really help, so set one
+    releaseName.set(android.defaultConfig.versionName)
 }
 
 // Install Git pre-commit hook for Ktlint

AnkiDroid/jacoco.gradle

@@ -99,7 +99,7 @@ else
     classDir += "Debug"
 
 // Our merge report task
-def testReport = tasks.register('jacocoTestReport', JacocoReport) {
+tasks.register('jacocoTestReport', JacocoReport) {
     def htmlOutDir = project.layout.buildDirectory.dir("reports/jacoco/$name/html").get().asFile
 
     doLast {
@@ -120,14 +120,12 @@ def testReport = tasks.register('jacocoTestReport', JacocoReport) {
             '**/*.exec',
             '**/*.ec'
     ])
-}
-testReport.configure {
     dependsOn('testPlayDebugUnitTest')
     dependsOn("connectedPlay${rootProject.androidTestVariantName}AndroidTest")
 }
 
 // A unit-test only report task
-def unitTestReport = tasks.register('jacocoUnitTestReport', JacocoReport) {
+tasks.register('jacocoUnitTestReport', JacocoReport) {
     def htmlOutDir = layout.buildDirectory.dir("reports/jacoco/$name/html").get().asFile
 
     doLast {
@@ -148,11 +146,11 @@ def unitTestReport = tasks.register('jacocoUnitTestReport', JacocoReport) {
             '**/*.exec'
 
     ])
+    dependsOn('testPlayDebugUnitTest')
 }
-unitTestReport.configure { dependsOn('testPlayDebugUnitTest') }
 
 // A connected android tests only report task
-def androidTestReport = tasks.register('jacocoAndroidTestReport', JacocoReport) {
+tasks.register('jacocoAndroidTestReport', JacocoReport) {
     def htmlOutDir = layout.buildDirectory.dir("reports/jacoco/$name/html").get().asFile
 
     doLast {
@@ -172,10 +170,9 @@ def androidTestReport = tasks.register('jacocoAndroidTestReport', JacocoReport)
     executionData.from = fileTree(dir: project.layout.buildDirectory, includes: [
             '**/*.ec'
     ])
+    dependsOn("connectedPlay${rootProject.androidTestVariantName}AndroidTest")
 }
 
-androidTestReport.configure { dependsOn("connectedPlay${rootProject.androidTestVariantName}AndroidTest") }
-
 // Issue 16640 - some emulators run, but register zero coverage
 tasks.register('assertNonzeroAndroidTestCoverage') {
     doLast {

AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/ContentProviderTest.kt

@@ -30,6 +30,7 @@ import com.ichi2.anki.FlashCardsContract
 import com.ichi2.anki.provider.pureAnswer
 import com.ichi2.anki.testutil.DatabaseUtils.cursorFillWindow
 import com.ichi2.anki.testutil.GrantStoragePermission.storagePermission
+import com.ichi2.anki.testutil.addNote
 import com.ichi2.anki.testutil.grantPermissions
 import com.ichi2.libanki.Card
 import com.ichi2.libanki.DeckId
@@ -569,10 +570,10 @@ class ContentProviderTest : InstrumentedTest() {
         val noteTypeUri = cr.insert(FlashCardsContract.Model.CONTENT_URI, cv)
         assertNotNull("Check inserted note type isn't null", noteTypeUri)
         assertNotNull("Check last path segment exists", noteTypeUri!!.lastPathSegment)
-        val mid = noteTypeUri.lastPathSegment!!.toLong()
+        val noteTypeId = noteTypeUri.lastPathSegment!!.toLong()
         var col = reopenCol()
         try {
-            var noteType = col.notetypes.get(mid)
+            var noteType = col.notetypes.get(noteTypeId)
             assertNotNull("Check note type", noteType)
             assertEquals("Check note type name", TEST_NOTE_TYPE_NAME, noteType!!.getString("name"))
             assertEquals(
@@ -601,7 +602,7 @@ class ContentProviderTest : InstrumentedTest() {
                 greaterThan(0),
             )
             col = reopenCol()
-            noteType = col.notetypes.get(mid)
+            noteType = col.notetypes.get(noteTypeId)
             assertNotNull("Check note type", noteType)
             assertEquals("Check css", TEST_NOTE_TYPE_CSS, noteType!!.getString("css"))
             // Update each of the templates in note type (to test updating NOTE_TYPES_ID_TEMPLATES_ID Uri)
@@ -625,7 +626,7 @@ class ContentProviderTest : InstrumentedTest() {
                     greaterThan(0),
                 )
                 col = reopenCol()
-                noteType = col.notetypes.get(mid)
+                noteType = col.notetypes.get(noteTypeId)
                 assertNotNull("Check note type", noteType)
                 val template = noteType!!.tmpls[i]
                 assertEquals(
@@ -642,7 +643,7 @@ class ContentProviderTest : InstrumentedTest() {
             // Delete the note type (this will force a full-sync)
             col.modSchemaNoCheck()
             try {
-                val noteType = col.notetypes.get(mid)
+                val noteType = col.notetypes.get(noteTypeId)
                 assertNotNull("Check note type", noteType)
                 col.notetypes.rem(noteType!!)
             } catch (e: ConfirmModSchemaException) {

AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/InstrumentedTest.kt

@@ -25,6 +25,7 @@ import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.UiDevice
 import androidx.test.uiautomator.UiSelector
 import com.ichi2.anki.CollectionManager
+import com.ichi2.anki.testutil.addNote
 import com.ichi2.anki.utils.EnsureAllFilesAccessRule
 import com.ichi2.annotations.DuplicatedCode
 import com.ichi2.libanki.Card

AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/libanki/MediaTest.kt

@@ -19,6 +19,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.BackupManager
 import com.ichi2.anki.tests.InstrumentedTest
 import com.ichi2.anki.testutil.GrantStoragePermission
+import com.ichi2.anki.testutil.addNote
 import com.ichi2.libanki.Collection
 import com.ichi2.libanki.Media
 import com.ichi2.libanki.exception.EmptyMediaException

AnkiDroid/src/androidTest/java/com/ichi2/anki/testutil/CollectionUtils.kt

@@ -0,0 +1,26 @@
+/*
+ *  Copyright (c) 2025 David Allison <davidallisongithub@gmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify it under
+ *  the terms of the GNU General Public License as published by the Free Software
+ *  Foundation; either version 3 of the License, or (at your option) any later
+ *  version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ *  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ *  PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with
+ *  this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.ichi2.anki.testutil
+
+import com.ichi2.libanki.Collection
+import com.ichi2.libanki.Note
+
+// todo: duplicated & used in unit tests
+fun Collection.addNote(note: Note): Int {
+    addNote(note, note.notetype.did)
+    return note.numberOfCards(this)
+}

AnkiDroid/src/main/java/com/ichi2/anim/ActivityTransitionAnimation.kt

@@ -31,7 +31,7 @@ object ActivityTransitionAnimation {
                 }
             Direction.RIGHT -> activity.overridePendingTransition(R.anim.slide_right_in, R.anim.slide_right_out)
             Direction.LEFT -> activity.overridePendingTransition(R.anim.slide_left_in, R.anim.slide_left_out)
-            Direction.FADE -> activity.overridePendingTransition(R.anim.fade_out, R.anim.fade_in)
+            Direction.FADE -> activity.overridePendingTransition(R.anim.fade_in, R.anim.fade_out)
             Direction.UP -> activity.overridePendingTransition(R.anim.slide_up_in, R.anim.slide_up_out)
             Direction.DOWN -> activity.overridePendingTransition(R.anim.slide_down_in, R.anim.slide_down_out)
             Direction.NONE -> activity.overridePendingTransition(R.anim.none, R.anim.none)
@@ -73,7 +73,7 @@ object ActivityTransitionAnimation {
                 }
             Direction.RIGHT -> ActivityOptionsCompat.makeCustomAnimation(activity, R.anim.slide_right_in, R.anim.slide_right_out)
             Direction.LEFT -> ActivityOptionsCompat.makeCustomAnimation(activity, R.anim.slide_left_in, R.anim.slide_left_out)
-            Direction.FADE -> ActivityOptionsCompat.makeCustomAnimation(activity, R.anim.fade_out, R.anim.fade_in)
+            Direction.FADE -> ActivityOptionsCompat.makeCustomAnimation(activity, R.anim.fade_in, R.anim.fade_out)
             Direction.UP -> ActivityOptionsCompat.makeCustomAnimation(activity, R.anim.slide_up_in, R.anim.slide_up_out)
             Direction.DOWN -> ActivityOptionsCompat.makeCustomAnimation(activity, R.anim.slide_down_in, R.anim.slide_down_out)
             Direction.NONE -> ActivityOptionsCompat.makeCustomAnimation(activity, R.anim.none, R.anim.none)

AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.kt

@@ -121,6 +121,7 @@ import com.ichi2.anki.reviewer.MotionEventHandler
 import com.ichi2.anki.reviewer.PreviousAnswerIndicator
 import com.ichi2.anki.servicelayer.LanguageHintService.applyLanguageHint
 import com.ichi2.anki.servicelayer.NoteService.isMarked
+import com.ichi2.anki.settings.Prefs
 import com.ichi2.anki.snackbar.BaseSnackbarBuilderProvider
 import com.ichi2.anki.snackbar.SnackbarBuilder
 import com.ichi2.anki.snackbar.showSnackbar
@@ -1226,7 +1227,7 @@ abstract class AbstractFlashcardViewer :
         // mDeckFilename = preferences.getString("deckFilename", "");
         minimalClickSpeed = preferences.getInt("showCardAnswerButtonTime", 0)
         fullscreenMode = fromPreference(preferences)
-        relativeButtonSize = preferences.getInt("answerButtonSize", 100)
+        relativeButtonSize = Prefs.answerButtonsSize
         tts.enabled = preferences.getBoolean("tts", false)
         doubleScrolling = preferences.getBoolean("double_scrolling", false)
         prefShowTopbar = preferences.getBoolean("showTopbar", true)