UI优化

app/src/main/res/layout/activity_mine.xml

@@ -1,203 +1,210 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:fillViewport="true"
-    android:fitsSystemWindows="true"
-    android:background="@color/white">
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+    <include layout="@layout/view_toolbar"/>
 
-    <LinearLayout
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
-        <include layout="@layout/view_toolbar"/>
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:fillViewport="true"
+        android:fitsSystemWindows="true"
+        android:background="@color/white">
 
-
-        <!--管理员才能看到此界面-->
         <LinearLayout
-            android:id="@+id/ll_admin"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <com.google.android.material.textfield.TextInputLayout
+
+            <!--管理员才能看到此界面-->
+            <LinearLayout
+                android:id="@+id/ll_admin"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/margin_default"
-                android:layout_marginEnd="@dimen/margin_default"
-                android:layout_marginTop="@dimen/margin_default"
-                android:hint="@string/mine_upgrade_account"
-                app:boxBackgroundMode="outline"
-                app:boxCornerRadiusBottomEnd="4dp"
-                app:boxCornerRadiusBottomStart="4dp"
-                app:boxCornerRadiusTopEnd="4dp"
-                app:boxCornerRadiusTopStart="4dp"
-                app:boxStrokeWidth="@dimen/width_stroke"
-                app:boxStrokeWidthFocused="@dimen/width_stroke"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/et_email"
+                android:orientation="vertical">
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/margin_default"
+                    android:layout_marginEnd="@dimen/margin_default"
+                    android:layout_marginTop="@dimen/margin_default"
+                    android:hint="@string/mine_upgrade_account"
+                    app:boxBackgroundMode="outline"
+                    app:boxCornerRadiusBottomEnd="4dp"
+                    app:boxCornerRadiusBottomStart="4dp"
+                    app:boxCornerRadiusTopEnd="4dp"
+                    app:boxCornerRadiusTopStart="4dp"
+                    app:boxStrokeWidth="@dimen/width_stroke"
+                    app:boxStrokeWidthFocused="@dimen/width_stroke"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/et_email"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textSize="@dimen/text_normal_s"
+                        android:inputType="textEmailAddress"
+                        android:maxLength="50"/>
+                </com.google.android.material.textfield.TextInputLayout>
+
+                <android.widget.Button
+                    android:id="@+id/btn_set_vip"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:minHeight="0dp"
+                    android:layout_margin="@dimen/margin_default"
+                    android:paddingTop="@dimen/padding_full_width"
+                    android:paddingBottom="@dimen/padding_full_width"
+                    android:text="@string/mine_upgrade_vip"
+                    android:textColor="@color/white"
+                    android:textStyle="bold"
+                    android:background="@drawable/selector_btn"
+                    style="?android:attr/borderlessButtonStyle"/>
+
+                <include layout="@layout/view_divider_common"/>
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/til_zfb"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:textSize="@dimen/text_normal_s"
-                    android:inputType="textEmailAddress"
-                    android:maxLength="50"/>
-            </com.google.android.material.textfield.TextInputLayout>
+                    android:layout_marginStart="@dimen/margin_default"
+                    android:layout_marginEnd="@dimen/margin_default"
+                    android:layout_marginTop="@dimen/margin_default"
+                    android:hint="@string/mine_new_pay_account"
+                    app:boxBackgroundMode="outline"
+                    app:boxCornerRadiusBottomEnd="4dp"
+                    app:boxCornerRadiusBottomStart="4dp"
+                    app:boxCornerRadiusTopEnd="4dp"
+                    app:boxCornerRadiusTopStart="4dp"
+                    app:boxStrokeWidth="@dimen/width_stroke"
+                    app:boxStrokeWidthFocused="@dimen/width_stroke"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/et_zfb"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textSize="@dimen/text_normal_s"
+                        android:inputType="textEmailAddress"
+                        android:maxLength="50"/>
+                </com.google.android.material.textfield.TextInputLayout>
+
+                <android.widget.Button
+                    android:id="@+id/btn_set_zfb"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:minHeight="0dp"
+                    android:layout_margin="@dimen/margin_default"
+                    android:paddingTop="@dimen/padding_full_width"
+                    android:paddingBottom="@dimen/padding_full_width"
+                    android:text="@string/mine_set_new_pay"
+                    android:textColor="@color/white"
+                    android:textStyle="bold"
+                    android:background="@drawable/selector_btn"
+                    style="?android:attr/borderlessButtonStyle"/>
+
+                <include layout="@layout/view_divider_common"/>
+
+                <TextView
+                    android:id="@+id/tv_add_photo"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/height_tool_bar"
+                    android:background="?attr/selectableItemBackground"
+                    android:gravity="center_vertical"
+                    android:paddingStart="@dimen/activity_horizontal_margin"
+                    android:paddingEnd="@dimen/activity_horizontal_margin"
+                    android:textColor="@color/black_text"
+                    android:visibility="gone"/>
 
-            <android.widget.Button
-                android:id="@+id/btn_set_vip"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:minHeight="0dp"
-                android:layout_margin="@dimen/margin_default"
-                android:paddingTop="@dimen/padding_full_width"
-                android:paddingBottom="@dimen/padding_full_width"
-                android:text="@string/mine_upgrade_vip"
-                android:textColor="@color/white"
-                android:textStyle="bold"
-                android:background="@drawable/selector_btn"
-                style="?android:attr/borderlessButtonStyle"/>
+                <!--<include layout="@layout/view_divider_common"/>-->
 
-            <include layout="@layout/view_divider_common"/>
 
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/til_zfb"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/margin_default"
-                android:layout_marginEnd="@dimen/margin_default"
-                android:layout_marginTop="@dimen/margin_default"
-                android:hint="@string/mine_new_pay_account"
-                app:boxBackgroundMode="outline"
-                app:boxCornerRadiusBottomEnd="4dp"
-                app:boxCornerRadiusBottomStart="4dp"
-                app:boxCornerRadiusTopEnd="4dp"
-                app:boxCornerRadiusTopStart="4dp"
-                app:boxStrokeWidth="@dimen/width_stroke"
-                app:boxStrokeWidthFocused="@dimen/width_stroke"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/et_zfb"
+                <Switch
+                    android:id="@+id/switch_rest"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textSize="@dimen/text_normal_s"
-                    android:inputType="textEmailAddress"
-                    android:maxLength="50"/>
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <android.widget.Button
-                android:id="@+id/btn_set_zfb"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:minHeight="0dp"
-                android:layout_margin="@dimen/margin_default"
-                android:paddingTop="@dimen/padding_full_width"
-                android:paddingBottom="@dimen/padding_full_width"
-                android:text="@string/mine_set_new_pay"
-                android:textColor="@color/white"
-                android:textStyle="bold"
-                android:background="@drawable/selector_btn"
-                style="?android:attr/borderlessButtonStyle"/>
+                    android:layout_height="@dimen/height_tool_bar"
+                    android:gravity="center_vertical"
+                    android:layout_marginStart="@dimen/margin_default"
+                    android:layout_marginEnd="@dimen/margin_default"
+                    android:text="@string/mine_limit_data"/>
 
-            <include layout="@layout/view_divider_common"/>
+                <include layout="@layout/view_divider_common" />
 
-            <TextView
-                android:id="@+id/tv_add_photo"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/height_tool_bar"
-                android:background="?attr/selectableItemBackground"
-                android:gravity="center_vertical"
-                android:paddingStart="@dimen/activity_horizontal_margin"
-                android:paddingEnd="@dimen/activity_horizontal_margin"
-                android:textColor="@color/black_text"
-                android:visibility="gone"/>
+                <Switch
+                    android:id="@+id/switch_walk"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/height_tool_bar"
+                    android:gravity="center_vertical"
+                    android:layout_marginStart="@dimen/margin_default"
+                    android:layout_marginEnd="@dimen/margin_default"
+                    android:text="@string/mine_walk_next_time"/>
 
-            <!--<include layout="@layout/view_divider_common"/>-->
+                <include layout="@layout/view_divider_common" />
 
+                <Switch
+                    android:id="@+id/switch_ad"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/height_tool_bar"
+                    android:gravity="center_vertical"
+                    android:layout_marginStart="@dimen/margin_default"
+                    android:layout_marginEnd="@dimen/margin_default"
+                    android:text="@string/mine_ad_mode"/>
 
-            <Switch
-                android:id="@+id/switch_rest"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/height_tool_bar"
-                android:gravity="center_vertical"
-                android:layout_marginStart="@dimen/margin_default"
-                android:layout_marginEnd="@dimen/margin_default"
-                android:text="@string/mine_limit_data"/>
+                <include layout="@layout/view_divider_common" />
 
-            <include layout="@layout/view_divider_common" />
+                <android.widget.Button
+                    android:id="@+id/btn_ali_go"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:minHeight="0dp"
+                    android:layout_margin="@dimen/margin_default"
+                    android:paddingTop="@dimen/padding_full_width"
+                    android:paddingBottom="@dimen/padding_full_width"
+                    android:text="@string/mine_ali_go"
+                    android:textColor="@color/white"
+                    android:textStyle="bold"
+                    android:background="@drawable/selector_btn"
+                    style="?android:attr/borderlessButtonStyle"/>
+            </LinearLayout>
 
-            <Switch
-                android:id="@+id/switch_walk"
+            <TextView
+                android:id="@+id/tv_my_fav"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/height_tool_bar"
+                android:background="?attr/selectableItemBackground"
                 android:gravity="center_vertical"
-                android:layout_marginStart="@dimen/margin_default"
-                android:layout_marginEnd="@dimen/margin_default"
-                android:text="@string/mine_walk_next_time"/>
+                android:paddingStart="@dimen/activity_horizontal_margin"
+                android:paddingEnd="@dimen/activity_horizontal_margin"
+                android:text="@string/mine_my_star"
+                android:textColor="@color/black_text" />
 
             <include layout="@layout/view_divider_common" />
 
-            <Switch
-                android:id="@+id/switch_ad"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/height_tool_bar"
-                android:gravity="center_vertical"
-                android:layout_marginStart="@dimen/margin_default"
-                android:layout_marginEnd="@dimen/margin_default"
-                android:text="@string/mine_ad_mode"/>
 
-            <include layout="@layout/view_divider_common" />
 
             <android.widget.Button
-                android:id="@+id/btn_ali_go"
+                android:id="@+id/btn_exit_login"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:minHeight="0dp"
-                android:layout_margin="@dimen/margin_default"
+                android:layout_marginTop="@dimen/margin_default"
+                android:layout_marginBottom="@dimen/margin_default"
+                android:layout_marginStart="@dimen/margin_default"
+                android:layout_marginEnd="@dimen/margin_default"
                 android:paddingTop="@dimen/padding_full_width"
                 android:paddingBottom="@dimen/padding_full_width"
-                android:text="@string/mine_ali_go"
+                android:text="@string/mine_exit_account"
                 android:textColor="@color/white"
                 android:textStyle="bold"
-                android:background="@drawable/selector_btn"
+                android:background="@drawable/selector_btn_exit"
                 style="?android:attr/borderlessButtonStyle"/>
         </LinearLayout>
 
-        <TextView
-            android:id="@+id/tv_my_fav"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/height_tool_bar"
-            android:background="?attr/selectableItemBackground"
-            android:gravity="center_vertical"
-            android:paddingStart="@dimen/activity_horizontal_margin"
-            android:paddingEnd="@dimen/activity_horizontal_margin"
-            android:text="@string/mine_my_star"
-            android:textColor="@color/black_text" />
 
-        <include layout="@layout/view_divider_common" />
+    </ScrollView>
 
-
-
-        <android.widget.Button
-            android:id="@+id/btn_exit_login"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="0dp"
-            android:layout_marginTop="@dimen/margin_default"
-            android:layout_marginBottom="@dimen/margin_default"
-            android:layout_marginStart="@dimen/margin_default"
-            android:layout_marginEnd="@dimen/margin_default"
-            android:paddingTop="@dimen/padding_full_width"
-            android:paddingBottom="@dimen/padding_full_width"
-            android:text="@string/mine_exit_account"
-            android:textColor="@color/white"
-            android:textStyle="bold"
-            android:background="@drawable/selector_btn_exit"
-            style="?android:attr/borderlessButtonStyle"/>
-    </LinearLayout>
-
-
-</ScrollView>
+</LinearLayout>

app/src/main/res/values/strings.xml

@@ -97,5 +97,5 @@
     <string name="about_privacy">Privacy permissions &amp; Service items</string>
     <string name="menu_finish">FINISH</string>
     <string name="mine_ali_go">Ali Go</string>
-    <string name="mine_confirm_aligo">确定执行此不可逆转的操作？</string>
+    <string name="mine_confirm_aligo">Sure to proceed?</string>
 </resources>