fix: optimize guess dialog layout

klxiaoniu · Apr 4, 2024 · 2d70e30 · 2d70e30
1 parent 174eeec
commit 2d70e30
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 34 deletions.
diff --git a/app/src/main/res/drawable/error_warning_fill.xml b/app/src/main/res/drawable/error_warning_fill.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M12,22C6.477,22 2,17.523 2,12C2,6.477 6.477,2 12,2C17.523,2 22,6.477 22,12C22,17.523 17.523,22 12,22ZM11,15V17H13V15H11ZM11,7V13H13V7H11Z"
-      android:fillColor="?attr/colorControlNormal"/>
+    <path
+        android:fillColor="?attr/colorPrimary"
+        android:pathData="M12,22C6.477,22 2,17.523 2,12C2,6.477 6.477,2 12,2C17.523,2 22,6.477 22,12C22,17.523 17.523,22 12,22ZM11,15V17H13V15H11ZM11,7V13H13V7H11Z" />
 </vector>
diff --git a/app/src/main/res/layout/dialog_guess.xml b/app/src/main/res/layout/dialog_guess.xml
@@ -27,8 +27,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dp"
-        android:gravity="center"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:baselineAligned="false">
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/et_version_big"
@@ -47,13 +47,6 @@
                 android:singleLine="true" />
         </com.google.android.material.textfield.TextInputLayout>
 
-
-        <!--<Spinner
-            android:id="@+id/spinner_version"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:entries="@array/version" />-->
-
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/spinner_layout"
             style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
@@ -99,33 +92,15 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:backgroundTint="?android:colorBackground">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="4dp"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingStart="2dp"
-                android:paddingEnd="0dp"
-                android:src="@drawable/error_warning_fill"
-                app:tint="?attr/colorPrimary" />
-
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingStart="4dp"
-                android:paddingEnd="0dp"
+                android:layout_margin="4dp"
                 android:text="鉴于 QQ 测试版可能存在不可预知的稳定性问题，您在下载及使用该测试版本之前，必须明确并确保自身具备足够的风险识别和承受能力。根据相关条款，您使用本软件时应当已了解并同意，因下载或使用 QQ 测试版而可能产生的任何直接或间接损失、损害以及其他不利后果，均由您自行承担全部责任。"
                 android:textColor="?attr/colorPrimary"
-                android:textSize="11sp" />
-
-        </LinearLayout>
-
+                android:textSize="11sp"
+                android:drawablePadding="4dp"
+                app:drawableStartCompat="@drawable/error_warning_fill" />
     </com.google.android.material.card.MaterialCardView>
 
     <LinearLayout