refactor

xenonnn4w · Aug 15, 2024 · 380353a · 380353a
1 parent 4fd756b
commit 380353a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 15 deletions.
diff --git a/AnkiDroid/src/main/java/com/ichi2/widget/DeckPickerWidgetConfig.kt b/AnkiDroid/src/main/java/com/ichi2/widget/DeckPickerWidgetConfig.kt
@@ -179,7 +179,7 @@ class DeckPickerWidgetConfig : AnkiActivity(), DeckSelectionListener {
      * - **If decks are selected:** Sets the button text to "Save", saves the selected decks, updates the widget, and then finishes the activity.
      */
     private fun setupDoneButton() {
-        val doneButton = findViewById<Button>(R.id.done_button)
+        val doneButton = findViewById<Button>(R.id.submit_button)
         val saveText = getString(R.string.save).uppercase()
         val cancelText = getString(R.string.dialog_cancel).uppercase()
 

diff --git a/AnkiDroid/src/main/res/layout/widget_deck_picker_config.xml b/AnkiDroid/src/main/res/layout/widget_deck_picker_config.xml
@@ -57,18 +57,17 @@
             android:layout_alignParentBottom="true"
             >
 
+            <!-- Save / Cancel -->
             <Button
-                android:id="@+id/done_button"
-                android:layout_width="130dp"
+                android:id="@+id/submit_button"
+                android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:layout_marginEnd="20dp"
-                android:background="@android:color/transparent"
-                android:clickable="true"
-                android:paddingStart="2dp"
-                android:paddingTop="0dp"
-                android:text="@string/save"
-                android:textColor="@color/material_blue_A700"
-                android:textSize="20sp" />
+                android:textSize="@dimen/abc_text_size_button_material"
+                style="@style/Widget.Material3.Button.TextButton"
+                android:singleLine="true"
+                android:padding="3dp"
+                android:layout_gravity="center"
+                android:text="@string/save" />
 
         </RelativeLayout>
 

diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/widget/DeckPickerWidgetConfigTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/widget/DeckPickerWidgetConfigTest.kt
@@ -28,7 +28,6 @@ import com.ichi2.anki.R
 import com.ichi2.anki.RobolectricTest
 import com.ichi2.anki.dialogs.DeckSelectionDialog
 import com.ichi2.widget.DeckPickerWidgetConfig
-import com.ichi2.widget.WidgetConfigScreenAdapter
 import com.ichi2.widget.WidgetPreferences
 import org.junit.Before
 import org.junit.Test
@@ -121,9 +120,6 @@ class DeckPickerWidgetConfigTest : RobolectricTest() {
      */
     @Test
     fun testUpdateViewVisibility() {
-        activity.deckAdapter = WidgetConfigScreenAdapter { _, _ ->
-        }
-
         val noDecksPlaceholder = activity.findViewById<View>(R.id.no_decks_placeholder)
         val widgetConfigContainer = activity.findViewById<View>(R.id.widgetConfigContainer)