refactor

xenonnn4w · Aug 11, 2024 · f815709 · f815709
1 parent d5fc262
commit f815709
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 16 deletions.
diff --git a/AnkiDroid/src/main/java/com/ichi2/widget/DeckPickerWidgetConfig.kt b/AnkiDroid/src/main/java/com/ichi2/widget/DeckPickerWidgetConfig.kt
@@ -92,7 +92,11 @@ class DeckPickerWidgetConfig : AnkiActivity(), DeckSelectionListener {
             itemTouchHelper.attachToRecyclerView(this)
         }
 
-        findViewById<Button>(R.id.done_button).setOnClickListener {
+        val doneButton = findViewById<Button>(R.id.done_button)
+        val saveText = getString(R.string.save).uppercase()
+        doneButton.text = saveText
+
+        doneButton.setOnClickListener {
             saveSelectedDecksToPreferencesDeckPickerWidget()
             hasUnsavedChanges = false // Reset flag after saving
 

diff --git a/AnkiDroid/src/main/res/drawable/widget_deck_picker_drawable.jpg b/AnkiDroid/src/main/res/drawable/widget_deck_picker_drawable.jpg
diff --git a/AnkiDroid/src/main/res/layout/widget_deck_picker_config.xml b/AnkiDroid/src/main/res/layout/widget_deck_picker_config.xml
@@ -1,6 +1,4 @@
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/root_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -55,21 +53,23 @@
         <RelativeLayout
             android:id="@+id/buttonBackgroundLayer"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="45dp"
             android:layout_alignParentBottom="true"
-            android:padding="16dp">
+            >
 
-            <com.google.android.material.button.MaterialButton
+            <Button
                 android:id="@+id/done_button"
-                style="@style/Widget.MaterialComponents.Button"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="-6dp"
-                android:layout_marginEnd="250dp"
-                android:padding="16dp"
+                android:layout_width="88dp"
+                android:layout_height="match_parent"
+                android:layout_marginEnd="20dp"
+                android:background="@android:color/transparent"
+                android:clickable="true"
+                android:paddingStart="12dp"
+                android:paddingTop="0dp"
                 android:text="@string/save"
-                app:cornerRadius="8dp"
-                app:elevation="4dp" />
+                android:textColor="@color/material_blue_A700"
+                android:textSize="20sp" />
+
         </RelativeLayout>
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -82,4 +82,4 @@
             android:layout_marginBottom="40dp"
             android:src="@drawable/ic_add_white" />
     </RelativeLayout>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/AnkiDroid/src/main/res/layout/widget_item_deck_main.xml b/AnkiDroid/src/main/res/layout/widget_item_deck_main.xml
@@ -20,6 +20,7 @@
         android:textSize="22sp"
         android:ellipsize="end"
         android:maxLines="1"
+        android:singleLine="true"
         tools:text="Deck1" />
 
     <TextView