Merge branch 'ankidroid:main' into main

Author: criticalAY

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

@@ -21,6 +21,9 @@ import com.ichi2.anki.reviewer.ReviewerUi.ControlBlock
 class MockReviewerUi : ReviewerUi {
     override var isDisplayingAnswer = false
         private set
+
+    override fun isActionButton(id: Int): Boolean = throw UnsupportedOperationException()
+
     override val controlBlocked: ControlBlock?
         get() = null
 

AnkiDroid/src/androidTest/java/com/ichi2/ui/ActionBarOverflowTest.kt

@@ -118,7 +118,6 @@ import kotlin.math.abs
 @KotlinCleanup("lots to deal with")
 abstract class AbstractFlashcardViewer :
     NavigationDrawerActivity(),
-    ReviewerUi,
     ViewerCommand.CommandProcessor,
     TagsDialogListener,
     WhiteboardMultiTouchMethods,
@@ -147,7 +146,7 @@ abstract class AbstractFlashcardViewer :
     private var mScrollingButtons = false
     private var mGesturesEnabled = false
     private var mLargeAnswerButtons = false
-    private var mAnswerButtonsPosition: String? = "bottom"
+    protected var mAnswerButtonsPosition: String? = "bottom"
     private var mDoubleTapTimeInterval = DEFAULT_DOUBLE_TAP_TIME_INTERVAL
 
     // Android WebView
@@ -242,7 +241,7 @@ abstract class AbstractFlashcardViewer :
     private val mCardLock: ReadWriteLock = ReentrantReadWriteLock()
 
     /** whether controls are currently blocked, and how long we expect them to be  */
-    override var controlBlocked = ControlBlock.SLOW
+    open var controlBlocked = ControlBlock.SLOW
 
     /** Preference: Whether the user wants press back twice to return to the main screen"  */
     private var mExitViaDoubleTapBack = false
@@ -2538,10 +2537,10 @@ abstract class AbstractFlashcardViewer :
         GetCard().runWithHandler(answerCardHandler(false))
     }
 
-    override val isDisplayingAnswer
+    val isDisplayingAnswer
         get() = displayAnswer
 
-    override val isControlBlocked: Boolean
+    open val isControlBlocked: Boolean
         get() = controlBlocked !== ControlBlock.UNBLOCKED
 
     @VisibleForTesting(otherwise = VisibleForTesting.NONE)

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

@@ -558,9 +558,7 @@ class DeckOptionsActivity :
     }
 
     // TODO Tracked in https://github.com/ankidroid/Anki-Android/issues/5019
-    @KotlinCleanup("remove reduntant val res = resources")
     override fun updateSummaries() {
-        val res = resources
         // for all text preferences, set summary as current database value
         for (key in pref.mValues.keys) {
             val pref = findPreference(key)
@@ -569,7 +567,7 @@ class DeckOptionsActivity :
                 val count = optionsGroupCount
                 // Escape "%" in groupName as it's treated as a token
                 groupName = groupName.replace("%".toRegex(), "%%")
-                pref!!.summary = res.getQuantityString(R.plurals.deck_conf_group_summ, count, groupName, count)
+                pref!!.summary = resources.getQuantityString(R.plurals.deck_conf_group_summ, count, groupName, count)
                 continue
             }
 
@@ -596,7 +594,7 @@ class DeckOptionsActivity :
         }
         // Update summaries of preference items that don't have values (aren't in mValues)
         val subDeckCount = subdeckCount
-        findPreference("confSetSubdecks").summary = res.getQuantityString(R.plurals.deck_conf_set_subdecks_summ, subDeckCount, subDeckCount)
+        findPreference("confSetSubdecks").summary = resources.getQuantityString(R.plurals.deck_conf_set_subdecks_summ, subDeckCount, subDeckCount)
     }
 
     // TODO Tracked in https://github.com/ankidroid/Anki-Android/issues/5019

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

@@ -1689,7 +1689,6 @@ class NoteEditor : AnkiActivity(), DeckSelectionListener, SubtitleListener, Tags
             toolbar.visibility = View.VISIBLE
         }
         toolbar.clearCustomItems()
-        val clozeIcon = toolbar.clozeIcon
         if (mEditorNote!!.model().isCloze) {
             val clozeFormatter = Toolbar.TextFormatter { s: String ->
                 val stringFormat = Toolbar.StringFormat()
@@ -1704,10 +1703,11 @@ class NoteEditor : AnkiActivity(), DeckSelectionListener, SubtitleListener, Tags
                 }
                 stringFormat
             }
-            clozeIcon!!.setOnClickListener { toolbar.onFormat(clozeFormatter) }
-            clozeIcon.visibility = View.VISIBLE
-        } else {
-            clozeIcon!!.visibility = View.GONE
+
+            val clozeDrawable = ResourcesCompat.getDrawable(resources, R.drawable.ic_cloze_black_24dp, null)
+            clozeDrawable!!.setTint(Themes.getColorFromAttr(this@NoteEditor, R.attr.toolbarIconColor))
+            val clozeButton = toolbar.insertItem(0, clozeDrawable, Runnable { toolbar.onFormat(clozeFormatter) })
+            clozeButton.contentDescription = resources.getString(R.string.insert_cloze)
         }
         val buttons = toolbarButtons
         for (b in buttons) {

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

@@ -82,15 +82,11 @@ import com.ichi2.libanki.utils.TimeManager
 import com.ichi2.themes.Themes
 import com.ichi2.themes.Themes.currentTheme
 import com.ichi2.themes.Themes.getColorFromAttr
+import com.ichi2.utils.*
 import com.ichi2.utils.AndroidUiUtils.isRunningOnTv
-import com.ichi2.utils.Computation
 import com.ichi2.utils.HandlerUtils.getDefaultLooper
-import com.ichi2.utils.KotlinCleanup
 import com.ichi2.utils.Permissions.canRecordAudio
 import com.ichi2.utils.ViewGroupUtils.setRenderWorkaround
-import com.ichi2.utils.iconAlpha
-import com.ichi2.utils.increaseHorizontalPaddingOfOverflowMenuIcons
-import com.ichi2.utils.tintOverflowMenuIcons
 import com.ichi2.widget.WidgetStatus.update
 import net.ankiweb.rsdroid.BackendFactory
 import timber.log.Timber
@@ -99,7 +95,9 @@ import java.lang.ref.WeakReference
 import java.util.function.Consumer
 
 @KotlinCleanup("too many to count")
-open class Reviewer : AbstractFlashcardViewer() {
+open class Reviewer :
+    AbstractFlashcardViewer(),
+    ReviewerUi {
     private var mHasDrawerSwipeConflicts = false
     private var mShowWhiteboard = true
     private var mPrefFullscreenReview = false
@@ -157,6 +155,8 @@ open class Reviewer : AbstractFlashcardViewer() {
         }
     }
 
+    override fun isActionButton(id: Int): Boolean = mToolbar.isActionButton(id)
+
     override fun onCreate(savedInstanceState: Bundle?) {
         if (showedActivityFailedScreen(savedInstanceState)) {
             return
@@ -201,7 +201,7 @@ open class Reviewer : AbstractFlashcardViewer() {
                 return CardMarker.FLAG_NONE
             }
             val isShownInActionBar = mActionButtons.isShownInActionBar(ActionButtons.RES_FLAG)
-            return if (isShownInActionBar != null && isShownInActionBar && !mPrefFullscreenReview) {
+            return if (isShownInActionBar && !mPrefFullscreenReview) {
                 CardMarker.FLAG_NONE
             } else actualValue
         }
@@ -230,7 +230,7 @@ open class Reviewer : AbstractFlashcardViewer() {
         val isShownInActionBar = mActionButtons.isShownInActionBar(ActionButtons.RES_MARK)
         // If we don't know, show it.
         // Otherwise, if it's in the action bar, don't show it again.
-        return isShownInActionBar == null || !isShownInActionBar || mPrefFullscreenReview
+        return !isShownInActionBar || mPrefFullscreenReview
     }
 
     protected open fun onMark(card: Card?) {
@@ -436,6 +436,7 @@ open class Reviewer : AbstractFlashcardViewer() {
                 } else {
                     mColorPalette!!.visibility = View.GONE
                 }
+                updateWhiteboardEditorPosition()
             }
             R.id.action_save_whiteboard -> {
                 Timber.i("Reviewer:: Save whiteboard button pressed")
@@ -1042,6 +1043,26 @@ open class Reviewer : AbstractFlashcardViewer() {
         updateScreenCounts()
     }
 
+    private fun updateWhiteboardEditorPosition() {
+        mAnswerButtonsPosition = AnkiDroidApp.getSharedPrefs(this)
+            .getString("answerButtonPosition", "bottom")
+        val layoutParams: RelativeLayout.LayoutParams
+        when (mAnswerButtonsPosition) {
+            "none", "top" -> {
+                layoutParams = mColorPalette!!.layoutParams as RelativeLayout.LayoutParams
+                layoutParams.removeRule(RelativeLayout.ABOVE)
+                layoutParams.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM)
+                mColorPalette!!.layoutParams = layoutParams
+            }
+            "bottom" -> {
+                layoutParams = mColorPalette!!.layoutParams as RelativeLayout.LayoutParams
+                layoutParams.removeRule(RelativeLayout.ALIGN_PARENT_BOTTOM)
+                layoutParams.addRule(RelativeLayout.ABOVE, R.id.bottom_area_layout)
+                mColorPalette!!.layoutParams = layoutParams
+            }
+        }
+    }
+
     protected fun updateScreenCounts() {
         if (currentCard == null) return
         super.updateActionBar()

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

@@ -68,14 +68,6 @@ class Toolbar : FrameLayout {
     private val mCustomButtons: MutableList<View> = ArrayList()
     private val mRows: MutableList<LinearLayout> = ArrayList()
 
-    /**
-     * TODO HACK until API 21 - can be removed once tested.
-     *
-     * inside NoteEditor: use [insertItem] instead of accessing this
-     * and remove [R.id.note_editor_toolbar_button_cloze] from [R.layout.note_editor_toolbar]
-     */
-    var clozeIcon: View? = null
-        private set
     private var mStringPaint: Paint? = null
 
     constructor(context: Context) : super(context)
@@ -92,7 +84,6 @@ class Toolbar : FrameLayout {
         }
         mToolbar = findViewById(R.id.editor_toolbar_internal)
         mToolbarLayout = findViewById(R.id.toolbar_layout)
-        clozeIcon = findViewById(R.id.note_editor_toolbar_button_cloze)
         setupDefaultButtons()
     }
 

AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/Toolbar.kt

@@ -17,16 +17,13 @@ package com.ichi2.anki.reviewer
 
 import android.content.SharedPreferences
 import android.view.Menu
-import android.view.MenuItem
 import androidx.annotation.IdRes
 import com.ichi2.anki.R
-import com.ichi2.ui.ActionBarOverflow
-import timber.log.Timber
 
-class ActionButtons(reviewerUi: ReviewerUi) {
+class ActionButtons(private val reviewerUi: ReviewerUi) {
     // DEFECT: This should be private - it breaks the law of demeter, but it'll be a large refactoring to get
     // to this point
-    val status: ActionButtonStatus
+    val status: ActionButtonStatus = ActionButtonStatus(reviewerUi)
     private var mMenu: Menu? = null
     fun setup(preferences: SharedPreferences) {
         status.setup(preferences)
@@ -38,44 +35,7 @@ class ActionButtons(reviewerUi: ReviewerUi) {
         mMenu = menu
     }
 
-    fun isShownInActionBar(@IdRes resId: Int): Boolean? {
-        val menuItem = findMenuItem(resId) ?: return null
-        // firstly, see if we can definitively determine whether the action is visible.
-        val isActionButton = ActionBarOverflow.isActionButton(menuItem)
-        return isActionButton ?: isLikelyActionButton(resId)
-        // If not, use heuristics based on preferences.
-    }
-
-    private fun findMenuItem(@IdRes resId: Int): MenuItem? {
-        return if (mMenu == null) {
-            null
-        } else mMenu!!.findItem(resId)
-    }
-
-    private fun isLikelyActionButton(@IdRes resourceId: Int): Boolean {
-        /*
-        https://github.com/ankidroid/Anki-Android/pull/5918#issuecomment-609484093
-        Heuristic approach: Show the item in the top bar unless the corresponding menu item is set to "always" show.
-
-        There are two scenarios where the heuristic fails:
-
-        1. An item is set to 'if room' but is actually visible in the toolbar
-        2. An item is set to 'always' but is actually not visible in the toolbar
-
-        Failure scenario one is totally acceptable IMO as it just falls back to the current behavior.
-        Failure scenario two is not ideal, but it should only happen in the pathological case where the user has gone
-        and explicitly changed the preferences to set more items to 'always' than there is room for in the toolbar.
-
-        In any case, both failure scenarios only happen if the user deviated from the default settings in strange ways.
-         */
-        val status = status.getByMenuResourceId(resourceId)
-        if (status == null) {
-            Timber.w("Failed to get status for resource: %d", resourceId)
-            // If we return "true", we may hide the flag/mark status completely. False is safer.
-            return false
-        }
-        return status == ActionButtonStatus.SHOW_AS_ACTION_ALWAYS
-    }
+    fun isShownInActionBar(@IdRes id: Int): Boolean = reviewerUi.isActionButton(id)
 
     companion object {
         @IdRes
@@ -84,8 +44,4 @@ class ActionButtons(reviewerUi: ReviewerUi) {
         @IdRes
         val RES_MARK = R.id.action_mark_card
     }
-
-    init {
-        status = ActionButtonStatus(reviewerUi)
-    }
 }

AnkiDroid/src/main/java/com/ichi2/anki/reviewer/ActionButtons.kt

@@ -15,6 +15,7 @@
  */
 
 package com.ichi2.anki.reviewer
+import androidx.annotation.IdRes
 
 interface ReviewerUi {
     /** How to block UI buttons.  */
@@ -36,4 +37,5 @@ interface ReviewerUi {
     val controlBlocked: ControlBlock?
     val isControlBlocked: Boolean
     val isDisplayingAnswer: Boolean
+    fun isActionButton(@IdRes id: Int): Boolean
 }