opt: Remove unused layouts and format

ReChronoRain · Dec 28, 2024 · efc4f7e · efc4f7e
1 parent 8c124e8
commit efc4f7e
Show file tree

Hide file tree

Showing 18 changed files with 174 additions and 291 deletions.
diff --git a/app/src/main/res/layout/fragment_content.xml b/app/src/main/res/layout/fragment_content.xml
@@ -16,5 +16,7 @@
             android:id="@+id/vp_fragments"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
+
     </fan.springback.view.SpringBackLayout>
+
 </FrameLayout>
diff --git a/app/src/main/res/layout/headtip_warn.xml b/app/src/main/res/layout/headtip_warn.xml
@@ -33,59 +33,59 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:clickable="false"
-    android:clipChildren="false"
-    android:gravity="center_vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center_vertical"
-    android:background="@drawable/headtip_warn_background">
+    android:background="@drawable/headtip_warn_background"
+    android:clickable="false"
+    android:clipChildren="false"
+    android:gravity="center_vertical">
 
     <include layout="@layout/image_frame" />
 
     <RelativeLayout
-        android:gravity="center_vertical"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_weight="1.0">
+        android:layout_weight="1.0"
+        android:gravity="center_vertical">
 
         <TextView
-            xmlns:android="http://schemas.android.com/apk/res/android"
             android:id="@android:id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textColor="#FF0000"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:paddingTop="14dp"
-            android:paddingBottom="14dp"
-            android:inputType="textMultiLine"
-            android:textIsSelectable="true"
-            android:enabled="false"
             android:clickable="true"
+            android:enabled="false"
             android:focusable="false"
             android:focusableInTouchMode="false"
+            android:inputType="textMultiLine"
             android:longClickable="true"
-            />
+            android:paddingLeft="16dp"
+            android:paddingTop="14dp"
+            android:paddingRight="16dp"
+            android:paddingBottom="14dp"
+            android:textColor="#FF0000"
+            android:textIsSelectable="true" />
+
     </RelativeLayout>
 
     <!-- Preference should place its actual preference widget here. -->
     <LinearLayout
         android:id="@android:id/widget_frame"
-        android:gravity="center"
-        android:clipChildren="false"
-        android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:minWidth="@dimen/miuix_preference_widget_width" />
+        android:clipChildren="false"
+        android:gravity="center"
+        android:minWidth="@dimen/miuix_preference_widget_width"
+        android:orientation="vertical" />
 
     <ImageView
         android:id="@+id/arrow_right"
-        android:gravity="center"
-        android:layout_gravity="center|end"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_gravity="center|end"
+        android:gravity="center"
+        android:importantForAccessibility="no"
         android:src="@drawable/miuix_preference_icon_arrow_right" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_about_info.xml b/app/src/main/res/layout/item_about_info.xml
@@ -7,12 +7,11 @@
     android:clipChildren="false"
     android:gravity="center_vertical"
     android:minHeight="@dimen/miuix_preference_item_min_height"
-    android:paddingStart="@dimen/preference_item_padding"
-    android:paddingEnd="@dimen/preference_item_padding">
+    android:paddingHorizontal="@dimen/preference_item_padding">
 
     <RelativeLayout
         style="@style/Widget.PreferenceItem"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_weight="1.0"
@@ -29,7 +28,8 @@
             android:minWidth="60dp"
             android:textAlignment="viewStart"
             android:textAppearance="@style/TextAppearance.PreferenceList"
-            android:textSize="17dp" />
+            android:textSize="17sp" />
+
     </RelativeLayout>
 
     <TextView
@@ -41,10 +41,9 @@
         android:fadingEdge="horizontal"
         android:gravity="end"
         android:maxLines="1"
-        android:paddingTop="@dimen/miuix_preference_item_padding_top"
-        android:paddingBottom="@dimen/miuix_preference_item_padding_bottom"
+        android:paddingVertical="@dimen/miuix_preference_item_padding_top"
         android:textAppearance="@style/TextAppearance.PreferenceList.Secondary"
-        android:textSize="14dp" />
+        android:textSize="14sp" />
 
     <ImageView
         android:id="@+id/arrow_right"
@@ -53,5 +52,7 @@
         android:layout_gravity="center|end"
         android:layout_marginStart="@dimen/miuix_preference_item_padding_inner"
         android:gravity="center"
+        android:importantForAccessibility="no"
         android:src="@drawable/miuix_preference_icon_arrow_right" />
-</LinearLayout>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_card_tile.xml b/app/src/main/res/layout/item_card_tile.xml
@@ -23,33 +23,34 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:background="@drawable/card_tile_background"
         android:layout_gravity="bottom"
-        android:layout_marginEnd="13dp">
+        android:layout_marginEnd="13dp"
+        android:background="@drawable/card_tile_background"
+        android:orientation="horizontal">
 
         <ImageView
             android:id="@android:id/icon"
             android:layout_width="@dimen/item_card_tile_icon_size"
-            android:layout_height="@dimen/item_card_tile_icon_size" />
+            android:layout_height="@dimen/item_card_tile_icon_size"
+            android:importantForAccessibility="no" />
 
         <TextView
             android:id="@android:id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
             android:textColor="@color/white"
             android:textSize="@dimen/preference_checkbox_title_text_size"
-            android:textStyle="bold"
-            android:layout_gravity="center_vertical"/>
+            android:textStyle="bold" />
 
     </LinearLayout>
 
     <CheckBox
         android:id="@+id/tile_mark"
         android:layout_width="@dimen/card_tile_item_edit_mark_size"
         android:layout_height="@dimen/card_tile_item_edit_mark_size"
-        android:layout_margin="@dimen/card_tile_item_edit_margin"
         android:layout_gravity="end"
-        android:button="@drawable/ic_card_tile_mark"/>
+        android:layout_margin="@dimen/card_tile_item_edit_margin"
+        android:button="@drawable/ic_card_tile_mark" />
 
-</FrameLayout>
+</FrameLayout>
diff --git a/app/src/main/res/layout/item_location.xml b/app/src/main/res/layout/item_location.xml
@@ -17,56 +17,56 @@
   ~ Copyright (C) 2023-2024 HyperCeiler Contributions
   -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:minHeight="?android:listPreferredItemHeight"
+    android:orientation="vertical"
     android:paddingVertical="10dp"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:minHeight="?android:listPreferredItemHeight">
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
 
     <TextView
         android:id="@android:id/title"
-        android:textSize="18sp"
-        android:textColor="@android:color/black"
-        android:ellipsize="end"
-        android:gravity="start"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:maxLines="3" />
+        android:ellipsize="end"
+        android:gravity="start"
+        android:maxLines="3"
+        android:textColor="@android:color/black"
+        android:textSize="18sp" />
 
     <LinearLayout
-        android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
 
         <TextView
             android:id="@+id/region_code"
-            android:textSize="13sp"
-            android:textColor="@android:color/secondary_text_light"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:textColor="@android:color/secondary_text_light"
+            android:textSize="13sp" />
 
         <TextView
             android:id="@+id/base_station"
-            android:textSize="13sp"
-            android:textColor="@android:color/secondary_text_light"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:textColor="@android:color/secondary_text_light"
+            android:textSize="13sp" />
 
         <TextView
             android:id="@+id/longitude_latitude"
-            android:textSize="13sp"
-            android:textColor="@android:color/secondary_text_light"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:textColor="@android:color/secondary_text_light"
+            android:textSize="13sp" />
 
         <TextView
             android:id="@android:id/summary"
-            android:textSize="13sp"
-            android:textColor="@android:color/secondary_text_light"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:textColor="@android:color/secondary_text_light"
+            android:textSize="13sp" />
 
     </LinearLayout>
 

diff --git a/app/src/main/res/layout/item_mutiplechoice.xml b/app/src/main/res/layout/item_mutiplechoice.xml
@@ -18,12 +18,11 @@
   -->
 <fan.androidbase.widget.CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@android:id/text1"
-    android:gravity="center_vertical"
+    style="@style/Widget.AlertDialogListItem.MultiChoice"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:singleLine="true"
-    android:textDirection="locale"
-    android:paddingStart="@dimen/miuix_appcompat_dialog_list_item_padding_start"
-    android:paddingEnd="@dimen/miuix_appcompat_dialog_list_item_padding_end"
+    android:gravity="center_vertical"
     android:minHeight="@dimen/miuix_appcompat_dialog_list_preferred_item_height"
-    style="@style/Widget.AlertDialogListItem.MultiChoice" />
+    android:paddingHorizontal="@dimen/miuix_appcompat_dialog_list_item_padding_start"
+    android:singleLine="true"
+    android:textDirection="locale" />
diff --git a/app/src/main/res/layout/item_search_result.xml b/app/src/main/res/layout/item_search_result.xml
@@ -19,52 +19,47 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:descendantFocusability="blocksDescendants"
     android:orientation="horizontal"
     android:paddingHorizontal="25dp"
-    android:paddingVertical="10dp"
-    android:descendantFocusability="blocksDescendants">
+    android:paddingVertical="10dp">
 
     <ImageView
         android:id="@android:id/icon"
-        android:visibility="gone"
         android:layout_width="50dp"
         android:layout_height="50dp"
-        android:layout_gravity="center_vertical" />
+        android:layout_gravity="center_vertical"
+        android:importantForAccessibility="no"
+        android:visibility="gone" />
 
     <LinearLayout
-        android:layout_width="match_parent"
+        android:id="@+id/container"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:orientation="horizontal">
+        android:layout_marginStart="15dp"
+        android:layout_marginEnd="15dp"
+        android:layout_weight="1"
+        android:orientation="vertical">
 
-        <LinearLayout
-            android:id="@+id/container"
-            android:layout_width="0dp"
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
             android:layout_gravity="center_vertical"
-            android:layout_marginStart="15dp"
-            android:layout_marginEnd="15dp"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@android:id/title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:singleLine="true"
-                android:textSize="18sp"
-                android:textAppearance="@style/TextAppearance.List"/>
+            android:singleLine="true"
+            android:textAppearance="@style/TextAppearance.List"
+            android:textSize="18sp" />
 
-            <TextView
-                android:id="@android:id/summary"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:singleLine="true"
-                android:textSize="14.5sp"
-                android:textAppearance="@style/TextAppearance.List.Secondary"/>
+        <TextView
+            android:id="@android:id/summary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:singleLine="true"
+            android:textAppearance="@style/TextAppearance.List.Secondary"
+            android:textSize="14.5sp" />
 
-        </LinearLayout>
     </LinearLayout>
+
 </LinearLayout>
diff --git a/app/src/main/res/layout/layout_effect_bg.xml b/app/src/main/res/layout/layout_effect_bg.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/bgEffectView"
-    android:background="@android:color/transparent"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" />
+    android:layout_height="match_parent"
+    android:background="@android:color/transparent"
+    android:orientation="horizontal" />
diff --git a/app/src/main/res/layout/layout_version_card.xml b/app/src/main/res/layout/layout_version_card.xml
@@ -101,8 +101,7 @@
         android:layout_height="50dp"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
-        android:layout_marginStart="28dp"
-        android:layout_marginEnd="28dp"
+        android:layout_marginHorizontal="28dp"
         android:layout_marginBottom="@dimen/update_btn_margin_bottom"
         android:alpha="0.0">