From 58905c14a85563249efdfdba1031869e8b583b79 Mon Sep 17 00:00:00 2001
From: juntao <chenjuntao@ghzhushou.com>
Date: Wed, 25 Nov 2020 16:24:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E9=9A=90=E7=A7=81=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=971124UI=E8=B0=83=E6=95=B4=20https://gitlab.ghzs.com/pm/?=
 =?UTF-8?q?halo-app-issues/-/issues/1064?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/dialog_privacy_policy.xml | 252 +++++++++---------
 1 file changed, 133 insertions(+), 119 deletions(-)

diff --git a/app/src/main/res/layout/dialog_privacy_policy.xml b/app/src/main/res/layout/dialog_privacy_policy.xml
index e212b1b6b2..1855dc3dea 100644
--- a/app/src/main/res/layout/dialog_privacy_policy.xml
+++ b/app/src/main/res/layout/dialog_privacy_policy.xml
@@ -1,140 +1,154 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/dialog_privacy_background">
+    app:cardBackgroundColor="@color/white"
+    app:cardCornerRadius="8dp"
+    app:cardElevation="0dp">
 
-    <ImageView
-        android:id="@+id/head_background"
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:scaleType="fitXY"
-        android:src="@drawable/dialog_privacy_head"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:layout_height="match_parent"
+        android:background="@drawable/dialog_privacy_background">
 
-    <View
-        android:layout_width="0dp"
-        android:layout_height="4dp"
-        android:layout_marginBottom="2dp"
-        android:background="@drawable/dialog_privacy_title_underline"
-        app:layout_constraintBottom_toBottomOf="@id/title"
-        app:layout_constraintLeft_toLeftOf="@id/title"
-        app:layout_constraintRight_toRightOf="@id/title" />
+        <ImageView
+            android:id="@+id/head_background"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:scaleType="fitXY"
+            android:src="@drawable/dialog_privacy_head"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
-        android:id="@+id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="16dp"
-        android:layout_marginTop="52dp"
-        android:layout_marginRight="16dp"
-        android:textColor="@color/text_333333"
-        android:textSize="24sp"
-        android:textStyle="bold"
-        app:layout_constraintLeft_toLeftOf="@id/head_background"
-        app:layout_constraintTop_toTopOf="@id/head_background" />
+        <View
+            android:layout_width="0dp"
+            android:layout_height="4dp"
+            android:layout_marginBottom="2dp"
+            android:background="@drawable/dialog_privacy_title_underline"
+            app:layout_constraintBottom_toBottomOf="@id/title"
+            app:layout_constraintLeft_toLeftOf="@id/title"
+            app:layout_constraintRight_toRightOf="@id/title" />
 
-    <TextView
-        android:id="@+id/top_content"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="16dp"
-        android:layout_marginTop="4dp"
-        android:layout_marginRight="16dp"
-        android:includeFontPadding="false"
-        android:lineSpacingExtra="8dp"
-        android:textColor="@color/text_333333"
-        android:textSize="13sp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/head_background"
-        app:layout_goneMarginTop="16dp" />
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="16dp"
+            android:layout_marginTop="40dp"
+            android:layout_marginRight="16dp"
+            android:textColor="@color/text_333333"
+            android:textSize="24sp"
+            android:textStyle="bold"
+            app:layout_constraintLeft_toLeftOf="@id/head_background"
+            app:layout_constraintTop_toTopOf="@id/head_background"
+            tools:text="欢迎来到光环助手" />
 
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/link_content"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/top_content">
-
-        <LinearLayout
+        <TextView
+            android:id="@+id/top_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:layout_marginLeft="16dp"
+            android:layout_marginTop="28dp"
+            android:layout_marginRight="16dp"
+            android:includeFontPadding="false"
+            android:lineSpacingExtra="8dp"
+            android:textColor="@color/text_333333"
+            android:textSize="13sp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/title"
+            app:layout_goneMarginTop="16dp"
+            tools:text="为提供完整的" />
 
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/permissions_content"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginTop="12dp"
-                android:layout_marginRight="16dp"
-                android:layout_marginBottom="16dp"
-                android:layout_weight="1" />
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toTopOf="@id/link_content"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/top_content">
 
-            <TextView
-                android:id="@+id/bottom_content"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:layout_marginBottom="20dp"
-                android:includeFontPadding="false"
-                android:lineSpacingExtra="8dp"
-                android:textColor="@color/text_333333"
-                android:textSize="13sp" />
+                android:orientation="vertical">
 
-        </LinearLayout>
-    </FrameLayout>
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/permissions_content"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginTop="12dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginBottom="16dp"
+                    android:layout_weight="1" />
 
-    <TextView
-        android:id="@+id/link_content"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginBottom="20dp"
-        android:includeFontPadding="false"
-        android:lineSpacingExtra="8dp"
-        android:textColor="@color/text_333333"
-        android:textSize="11sp"
-        android:visibility="gone"
-        app:layout_constraintBottom_toTopOf="@id/allow_button"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent" />
+                <TextView
+                    android:id="@+id/bottom_content"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginBottom="20dp"
+                    android:includeFontPadding="false"
+                    android:lineSpacingExtra="8dp"
+                    android:textColor="@color/text_333333"
+                    android:textSize="13sp" />
 
-    <TextView
-        android:id="@+id/allow_button"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="12dp"
-        android:layout_marginRight="12dp"
-        android:background="@drawable/dialog_privacy_button"
-        android:gravity="center"
-        android:paddingBottom="16dp"
-        android:text="授权，开启光环"
-        android:textColor="@color/white"
-        android:textSize="14sp"
-        android:textStyle="bold"
-        android:layout_marginBottom="16dp"
-        app:layout_constraintBottom_toTopOf="@id/disallow_button" />
+            </LinearLayout>
+        </FrameLayout>
 
-    <TextView
-        android:id="@+id/disallow_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="12dp"
-        android:padding="4dp"
-        android:text="不同意并退出App"
-        android:textColor="@color/text_999999"
-        android:textSize="12sp"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent" />
+        <TextView
+            android:id="@+id/link_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_marginBottom="20dp"
+            android:includeFontPadding="false"
+            android:lineSpacingExtra="8dp"
+            android:textColor="@color/text_333333"
+            android:textSize="11sp"
+            android:visibility="gone"
+            tools:visibility="visible"
+            tools:text="你可以在"
+            app:layout_constraintBottom_toTopOf="@id/allow_button"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        <TextView
+            android:id="@+id/allow_button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="12dp"
+            android:layout_marginRight="12dp"
+            android:layout_marginBottom="16dp"
+            android:background="@drawable/dialog_privacy_button"
+            android:gravity="center"
+            android:paddingBottom="16dp"
+            android:text="授权，开启光环"
+            android:textColor="@color/white"
+            android:textSize="14sp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toTopOf="@id/disallow_button" />
+
+        <TextView
+            android:id="@+id/disallow_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="12dp"
+            android:padding="4dp"
+            android:text="不同意并退出App"
+            android:textColor="@color/text_999999"
+            android:textSize="12sp"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.cardview.widget.CardView>
\ No newline at end of file