Browse Source

修改权限弹窗样式

Pq 1 year ago
parent
commit
2e9bd4128d

BIN
BaseLibrary/src/main/res/drawable-xhdpi/icon_allow_bt.png


BIN
BaseLibrary/src/main/res/drawable-xhdpi/icon_not_allow_bt.png


BIN
BaseLibrary/src/main/res/drawable-xhdpi/icon_permission_tip_top.png


BIN
BaseLibrary/src/main/res/drawable-xxhdpi/icon_allow_bt.png


BIN
BaseLibrary/src/main/res/drawable-xxhdpi/icon_not_allow_bt.png


BIN
BaseLibrary/src/main/res/drawable-xxhdpi/icon_permission_tip_top.png


+ 6 - 0
BaseLibrary/src/main/res/drawable/shape_bottom_20dp_white.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/white" />
+    <corners android:bottomLeftRadius="20dp"
+        android:bottomRightRadius="20dp"/>
+</shape>

+ 87 - 57
BaseLibrary/src/main/res/layout/accompany_permissions_popu.xml

@@ -11,34 +11,45 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content">
-
+        <ImageView
+            android:id="@+id/iv_top"
+            android:adjustViewBounds="true"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:src="@drawable/icon_permission_tip_top"
+            android:layout_width="264dp"
+            android:layout_height="wrap_content"/>
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="@dimen/dp_264"
+            android:layout_width="264dp"
+            android:paddingBottom="17dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_5"
-            android:background="@drawable/bg_white_18dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/tv_title">
+            android:background="@drawable/shape_bottom_20dp_white"
+            app:layout_constraintEnd_toEndOf="@+id/iv_top"
+            app:layout_constraintStart_toStartOf="@+id/iv_top"
+            app:layout_constraintTop_toBottomOf="@id/iv_top">
 
 
-            <ImageView
-                android:id="@+id/iv_centre"
-                android:layout_width="@dimen/dp_156"
-                android:layout_height="@dimen/dp_94"
-                android:layout_marginTop="@dimen/dp_41"
-                android:background="@drawable/ic_accompany_permissions_centre"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
+            <TextView
+                android:id="@+id/tv_title_tip"
+                android:includeFontPadding="false"
+                android:layout_marginTop="12dp"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                android:text="开启权限"
+                android:textStyle="bold"
+                android:textSize="@dimen/sp_18"
+                android:textColor="@color/color_1a1a1a"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
             <TextView
                 android:id="@+id/tv_content"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/dp_15"
-                android:layout_marginTop="@dimen/dp_21"
+                android:layout_marginTop="@dimen/dp_7"
                 android:layout_marginEnd="@dimen/dp_15"
                 android:gravity="center"
                 android:lineSpacingExtra="@dimen/dp_5"
@@ -46,53 +57,74 @@
                 android:textSize="@dimen/dp_14"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/iv_centre" />
+                app:layout_constraintTop_toBottomOf="@id/tv_title_tip" />
 
-            <TextView
+            <ImageView
+                android:layout_marginStart="12dp"
+                app:layout_constraintLeft_toLeftOf="parent"
+                android:layout_marginTop="17dp"
+                app:layout_constraintTop_toBottomOf="@+id/tv_content"
+                android:src="@drawable/icon_not_allow_bt"
                 android:id="@+id/btn_cancel"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_20"
-                android:layout_marginTop="@dimen/dp_24"
-                android:layout_marginEnd="@dimen/dp_30"
-                android:layout_marginBottom="@dimen/dp_15"
-                android:background="@drawable/bg_grayf2_45dp_shape"
-                android:paddingStart="@dimen/dp_30"
-                android:paddingTop="@dimen/dp_7"
-                android:paddingEnd="@dimen/dp_30"
-                android:paddingBottom="@dimen/dp_7"
-                android:text="不允许"
-                android:textColor="@color/colorPrimary"
-                android:textSize="@dimen/dp_14"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/btn_commit"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/tv_content" />
+                android:layout_height="wrap_content"/>
 
-            <TextView
+            <ImageView
+                android:layout_marginEnd="12dp"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/btn_cancel"
+                android:src="@drawable/icon_allow_bt"
                 android:id="@+id/btn_commit"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_10"
-                android:layout_marginTop="@dimen/dp_24"
-                android:layout_marginEnd="@dimen/dp_20"
-                android:layout_marginBottom="@dimen/dp_15"
-                android:background="@drawable/btn_primary_default_shape"
-                android:paddingStart="@dimen/dp_30"
-                android:paddingTop="@dimen/dp_7"
-                android:paddingEnd="@dimen/dp_30"
-                android:paddingBottom="@dimen/dp_7"
-                android:text="去开启"
-                android:textColor="@color/white"
-                android:textSize="@dimen/dp_14"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/btn_cancel"
-                app:layout_constraintTop_toBottomOf="@id/tv_content" />
+                android:layout_height="wrap_content"/>
+
+            <!--            <TextView-->
+            <!--                android:id="@+id/btn_cancel"-->
+            <!--                android:layout_width="wrap_content"-->
+            <!--                android:layout_height="wrap_content"-->
+            <!--                android:layout_marginStart="@dimen/dp_20"-->
+            <!--                android:layout_marginTop="@dimen/dp_24"-->
+            <!--                android:layout_marginEnd="@dimen/dp_30"-->
+            <!--                android:layout_marginBottom="@dimen/dp_15"-->
+            <!--                android:background="@drawable/bg_grayf2_45dp_shape"-->
+            <!--                android:paddingStart="@dimen/dp_30"-->
+            <!--                android:paddingTop="@dimen/dp_7"-->
+            <!--                android:paddingEnd="@dimen/dp_30"-->
+            <!--                android:paddingBottom="@dimen/dp_7"-->
+            <!--                android:text="不允许"-->
+            <!--                android:textColor="@color/colorPrimary"-->
+            <!--                android:textSize="@dimen/dp_14"-->
+            <!--                app:layout_constraintBottom_toBottomOf="parent"-->
+            <!--                app:layout_constraintEnd_toStartOf="@id/btn_commit"-->
+            <!--                app:layout_constraintStart_toStartOf="parent"-->
+            <!--                app:layout_constraintTop_toBottomOf="@id/tv_content" />-->
+
+            <!--            <TextView-->
+            <!--                android:id="@+id/btn_commit"-->
+            <!--                android:layout_width="wrap_content"-->
+            <!--                android:layout_height="wrap_content"-->
+            <!--                android:layout_marginStart="@dimen/dp_10"-->
+            <!--                android:layout_marginTop="@dimen/dp_24"-->
+            <!--                android:layout_marginEnd="@dimen/dp_20"-->
+            <!--                android:layout_marginBottom="@dimen/dp_15"-->
+            <!--                android:background="@drawable/btn_primary_default_shape"-->
+            <!--                android:paddingStart="@dimen/dp_30"-->
+            <!--                android:paddingTop="@dimen/dp_7"-->
+            <!--                android:paddingEnd="@dimen/dp_30"-->
+            <!--                android:paddingBottom="@dimen/dp_7"-->
+            <!--                android:text="去开启"-->
+            <!--                android:textColor="@color/white"-->
+            <!--                android:textSize="@dimen/dp_14"-->
+            <!--                app:layout_constraintBottom_toBottomOf="parent"-->
+            <!--                app:layout_constraintEnd_toEndOf="parent"-->
+            <!--                app:layout_constraintStart_toEndOf="@id/btn_cancel"-->
+            <!--                app:layout_constraintTop_toBottomOf="@id/tv_content" />-->
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
+
         <TextView
+            android:visibility="gone"
             android:id="@+id/tv_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -106,8 +138,6 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
-
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </LinearLayout>