HapeLee 1 год назад
Родитель
Сommit
cf7b8446cd

+ 1 - 1
app/src/main/java/io/legato/kazusa/ui/book/source/manage/BookSourceActivity.kt

@@ -608,7 +608,7 @@ class BookSourceActivity : VMBaseActivity<ActivityBookSourceBinding, BookSourceV
             ?.toMutableList() ?: mutableListOf()
         alert(titleResource = R.string.import_on_line) {
             val alertBinding = DialogEditTextBinding.inflate(layoutInflater).apply {
-                editView.hint = "url"
+                editLayout.hint = "URL"
                 editView.setFilterValues(cacheUrls)
                 editView.delCallBack = {
                     cacheUrls.remove(it)

+ 2 - 1
app/src/main/res/layout/dialog_book_group_edit.xml

@@ -55,6 +55,7 @@
                 android:id="@+id/til_group_name"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                style="@style/Widget.Material3.TextInputLayout.FilledBox.Dense"
                 android:layout_marginStart="8dp"
                 android:hint="@string/group_name"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -71,7 +72,7 @@
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/til_sort_menu"
-            style="@style/Widget.Material3.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu"
+            style="@style/Widget.Material3.TextInputLayout.FilledBox.Dense.ExposedDropdownMenu"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"

+ 2 - 0
app/src/main/res/layout/dialog_edit_text.xml

@@ -7,8 +7,10 @@
     android:paddingHorizontal="16dp">
 
     <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/edit_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        style="@style/Widget.Material3.TextInputLayout.FilledBox"
         android:layout_marginTop="8dp">
 
         <io.legato.kazusa.ui.widget.text.AutoCompleteTextView

+ 19 - 22
app/src/main/res/layout/item_source_import.xml

@@ -9,40 +9,37 @@
 
     <io.legato.kazusa.lib.theme.view.ThemeCheckBox
         android:id="@+id/cb_source_name"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:maxLines="1"
-        android:singleLine="true"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintHorizontal_bias="0"
-        app:layout_constraintHorizontal_chainStyle="packed"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toLeftOf="@+id/tv_source_state"
+        android:maxLines="2"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/tv_source_state"
         app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
         tools:ignore="TouchTargetSizeCheck" />
 
-    <TextView
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/tv_source_state"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="8dp"
+        android:layout_height="40dp"
+        style="@style/Widget.Material3Expressive.Button.IconButton.Outlined"
+        android:minWidth="0dp"
+        android:textSize="11sp"
         android:singleLine="true"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintHorizontal_chainStyle="packed"
-        app:layout_constraintLeft_toRightOf="@id/cb_source_name"
-        app:layout_constraintRight_toLeftOf="@id/tv_open"
+        app:layout_constraintStart_toEndOf="@id/cb_source_name"
+        app:layout_constraintEnd_toStartOf="@id/tv_open"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/tv_open"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="12dp"
-        android:padding="8dp"
-        android:text="@string/open"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        style="@style/Widget.Material3Expressive.Button.IconButton.Tonal"
+        app:icon="@drawable/ic_edit"
+        app:iconGravity="textStart"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>