Merge branch 'ankidroid:main' into main

Author: DebugWithAryan

AnkiDroid/build.gradle

@@ -418,7 +418,6 @@ dependencies {
     implementation libs.androidx.exifinterface
     implementation libs.androidx.fragment.ktx
     implementation libs.androidx.lifecycle.process
-    implementation libs.androidx.media
     implementation libs.androidx.preference.ktx
     implementation libs.androidx.recyclerview
     implementation libs.androidx.sqlite.framework

AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/SoundTagPlayer.kt

@@ -17,15 +17,18 @@
 package com.ichi2.anki.cardviewer
 
 import android.content.Context
-import android.media.AudioAttributes
 import android.media.AudioManager
 import android.media.MediaPlayer
 import android.net.Uri
 import androidx.annotation.CheckResult
+import androidx.annotation.OptIn
 import androidx.annotation.VisibleForTesting
 import androidx.core.net.toUri
-import androidx.media.AudioFocusRequestCompat
-import androidx.media.AudioManagerCompat
+import androidx.media3.common.AudioAttributes
+import androidx.media3.common.C.AUDIO_CONTENT_TYPE_MUSIC
+import androidx.media3.common.audio.AudioFocusRequestCompat
+import androidx.media3.common.audio.AudioManagerCompat
+import androidx.media3.common.util.UnstableApi
 import com.ichi2.anki.AnkiDroidApp
 import com.ichi2.anki.CollectionManager.withCol
 import com.ichi2.anki.common.annotations.NeedsTest
@@ -39,6 +42,7 @@ import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 
 /** Player for (`[sound:...]`): [SoundOrVideoTag]  */
+@OptIn(UnstableApi::class)
 @NeedsTest("CardSoundConfig.autoplay should mean that video also isn't played automatically")
 class SoundTagPlayer(
     private val soundUriBase: String,
@@ -49,7 +53,7 @@ class SoundTagPlayer(
     private val music =
         AudioAttributes
             .Builder()
-            .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
+            .setContentType(AUDIO_CONTENT_TYPE_MUSIC)
             .build()
 
     /**
@@ -118,7 +122,7 @@ class SoundTagPlayer(
                 } else {
                     (soundUriBase + Uri.encode(tag.filename)).toUri()
                 }
-            setAudioAttributes(music)
+            setAudioAttributes(music.platformAudioAttributes)
             setOnErrorListener { mp, what, extra ->
                 Timber.w("Media error %d", what)
                 abandonAudioFocus()

AnkiDroid/src/test/java/com/ichi2/anki/previewer/PreviewerScreenshotTest.kt

@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+package com.ichi2.anki.previewer
+
+import androidx.test.core.app.ActivityScenario
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.ScreenshotTest
+import com.ichi2.anki.browser.IdsFile
+import com.ichi2.testutils.createTransientDirectory
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class PreviewerScreenshotTest : ScreenshotTest() {
+    @Test
+    fun baseState() {
+        val note = addBasicAndReversedNote()
+        val intent =
+            PreviewerFragment.getIntent(
+                targetContext,
+                idsFile = IdsFile(createTransientDirectory(), note.cardIds(col)),
+                currentIndex = 0,
+            )
+
+        ActivityScenario.launch<CardViewerActivity>(intent).use { scenario ->
+            scenario.onActivity {
+                captureScreen("base")
+            }
+        }
+    }
+}

AnkiDroid/src/test/java/com/ichi2/anki/previewer/TemplatePreviewerScreenshotTest.kt

@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+package com.ichi2.anki.previewer
+
+import androidx.test.core.app.ActivityScenario
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.NotetypeFile
+import com.ichi2.anki.ScreenshotTest
+import com.ichi2.testutils.createTransientDirectory
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class TemplatePreviewerScreenshotTest : ScreenshotTest() {
+    @Test
+    fun baseState() {
+        val notetype = col.notetypes.basic
+        val notetypeFile = NotetypeFile(createTransientDirectory(), notetype)
+        val arguments =
+            TemplatePreviewerArguments(
+                notetypeFile = notetypeFile,
+                fields = listOf("Front", "Back"),
+                tags = emptyList(),
+            )
+
+        val intent = TemplatePreviewerPage.getIntent(targetContext, arguments)
+
+        ActivityScenario.launch<CardViewerActivity>(intent).use { scenario ->
+            scenario.onActivity {
+                captureScreen("base")
+            }
+        }
+    }
+}

gradle/libs.versions.toml

@@ -43,8 +43,6 @@ androidxExifinterface = "1.4.2"
 androidxFragmentKtx = "1.8.9"
 # https://developer.android.com/jetpack/androidx/releases/lifecycle
 androidxLifecycleProcess = "2.10.0"
-# https://developer.android.com/jetpack/androidx/releases/media
-androidxMedia = "1.7.1"
 # https://developer.android.com/jetpack/androidx/releases/media3
 androidxMedia3 = "1.10.0"
 # https://developer.android.com/jetpack/androidx/releases/preference
@@ -146,7 +144,6 @@ androidx-media3-ui = { module = "androidx.media3:media3-ui", version.ref = "andr
 androidx-media3-exoplayer-dash = { module = "androidx.media3:media3-exoplayer-dash", version.ref = "androidxMedia3" }
 androidx-media3-exoplayer = { module = "androidx.media3:media3-exoplayer", version.ref = "androidxMedia3" }
 androidx-preference-ktx = { module = "androidx.preference:preference-ktx", version.ref = "androidxPreferenceKtx" }
-androidx-media = { module = "androidx.media:media", version.ref = "androidxMedia" }
 androidx-uiautomator = { module = "androidx.test.uiautomator:uiautomator", version.ref = "androidxTestUiAutomator" }
 androidx-webkit = { module = "androidx.webkit:webkit", version.ref = "androidxWebkit" }
 androidx-viewpager2 = { module = "androidx.viewpager2:viewpager2", version.ref = "androidxViewpager2" }

lint-rules/README.md

@@ -0,0 +1,38 @@
+# Lint Rules Module
+
+This module contains custom Android lint checks for AnkiDroid.
+
+## How to add a new lint check
+
+1. Create a new .kt file in com.ichi2.anki.lint/
+2. Create a class that extends Detector
+3. Define an Issue object with:
+   - id - unique identifier
+   - briefDescription - short summary
+   - explanation - detailed description
+   - category - use constants from Category class
+   - priority - use constants from Priority class
+   - severity - use constants from Severity class
+4. Add the issue to IssueRegistry.kt
+
+See DirectDateFormatDetector.kt for a small example.
+Link: https://github.com/ankidroid/Anki-Android/blob/main/lint-rules/src/main/java/com/ichi2/anki/lint/DirectDateFormatDetector.kt
+
+## How to run checks locally
+
+### Terminal
+
+./gradlew :lint-rules:assemble
+
+This refreshes the checks in the IDE. Alternatively, run ./gradlew lint to check the whole codebase.
+
+### Android Studio
+
+1. Make changes in lint-rules/
+2. Build -> Rebuild Project
+3. Restart Android Studio
+4. Analyze -> Run Inspection by Name -> Type "Lint"
+
+## Documentation
+
+Custom Lint Rules Documentation: https://github.com/googlesamples/android-custom-lint-rules