diff --git a/app/src/main/java/com/gh/common/util/DialogUtils.java b/app/src/main/java/com/gh/common/util/DialogUtils.java index 41201a231d..3f1ff53978 100644 --- a/app/src/main/java/com/gh/common/util/DialogUtils.java +++ b/app/src/main/java/com/gh/common/util/DialogUtils.java @@ -878,19 +878,18 @@ public class DialogUtils { // 区分此 dialog 是点击 dialog 外部取消的还是点击返回取消的 AtomicBoolean isCanceledByClickOutsideOfDialog = new AtomicBoolean(true); - final Dialog dialog = new Dialog(activityContext, android.R.style.Theme_Black_NoTitleBar_Fullscreen); + final Dialog dialog = new Dialog(activityContext, R.style.GhAlertDialog); View contentView = LayoutInflater.from(activityContext).inflate(R.layout.dialog_privacy_policy, null); dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); dialog.setContentView(contentView); Window window = dialog.getWindow(); if (window != null) { - window.getDecorView().setPadding(0, 0, 0, 0); window.setBackgroundDrawableResource(android.R.color.transparent); WindowManager.LayoutParams params = window.getAttributes(); params.horizontalMargin = 0; - params.width = context.getResources().getDisplayMetrics().widthPixels; - params.height = context.getResources().getDisplayMetrics().heightPixels; + params.width = context.getResources().getDisplayMetrics().widthPixels - DisplayUtils.dip2px(40); + params.height = context.getResources().getDisplayMetrics().heightPixels- DisplayUtils.dip2px(120); window.setAttributes(params); } diff --git a/app/src/main/res/drawable-xxxhdpi/dialog_privacy_head.png b/app/src/main/res/drawable-xxxhdpi/dialog_privacy_head.png index 3a69315703..c98902c1c9 100644 Binary files a/app/src/main/res/drawable-xxxhdpi/dialog_privacy_head.png and b/app/src/main/res/drawable-xxxhdpi/dialog_privacy_head.png differ diff --git a/app/src/main/res/drawable/dialog_privacy_background.xml b/app/src/main/res/drawable/dialog_privacy_background.xml new file mode 100644 index 0000000000..beae2f074e --- /dev/null +++ b/app/src/main/res/drawable/dialog_privacy_background.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_privacy_policy.xml b/app/src/main/res/layout/dialog_privacy_policy.xml index b25276ced6..77392204f1 100644 --- a/app/src/main/res/layout/dialog_privacy_policy.xml +++ b/app/src/main/res/layout/dialog_privacy_policy.xml @@ -3,13 +3,13 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/white"> + android:background="@drawable/dialog_privacy_background"> + app:layout_constraintLeft_toLeftOf="@id/head_background" + app:layout_constraintTop_toTopOf="@id/head_background" /> @@ -79,9 +79,9 @@ android:id="@+id/bottom_content" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="20dp" - android:layout_marginRight="20dp" - android:layout_marginBottom="48dp" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:layout_marginBottom="40dp" android:includeFontPadding="false" android:lineSpacingExtra="8dp" android:textColor="@color/text_333333" @@ -94,9 +94,9 @@ android:id="@+id/link_content" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="20dp" - android:layout_marginRight="20dp" - android:layout_marginBottom="32dp" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:layout_marginBottom="24dp" android:includeFontPadding="false" android:lineSpacingExtra="8dp" android:textColor="@color/text_333333" @@ -109,9 +109,9 @@ android:id="@+id/allow_button" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="16dp" - android:layout_marginRight="16dp" - android:layout_marginBottom="16dp" + android:layout_marginLeft="12dp" + android:layout_marginRight="12dp" + android:layout_marginBottom="8dp" android:background="@drawable/dialog_privacy_button" android:gravity="center" android:paddingBottom="16dp" diff --git a/app/src/main/res/layout/privacy_item.xml b/app/src/main/res/layout/privacy_item.xml index 8e6bea7f88..08f055e880 100644 --- a/app/src/main/res/layout/privacy_item.xml +++ b/app/src/main/res/layout/privacy_item.xml @@ -13,8 +13,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingTop="20dp" - android:paddingBottom="20dp"> + android:paddingTop="12dp" + android:paddingBottom="12dp">