dialog padding

duckduckgo · Dec 14, 2022 · 31ba8b7 · 31ba8b7
1 parent 040738d
commit 31ba8b7
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 40 deletions.
diff --git a/app/src/main/res/layout/content_site_location_permission_dialog.xml b/app/src/main/res/layout/content_site_location_permission_dialog.xml
@@ -16,18 +16,20 @@
   ~ limitations under the License.
   -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:padding="@dimen/keyline_5"
+    style="@style/Widget.DuckDuckGo.Dialog.Content"
     android:gravity="center"
     android:orientation="vertical">
 
     <FrameLayout
         android:id="@+id/sitePermissionDialogFaviconContainer"
         android:layout_width="@dimen/dialogImageSize"
         android:layout_height="@dimen/dialogImageSize"
+        android:layout_marginBottom="@dimen/keyline_4"
         android:background="@drawable/list_item_image_circular_background"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -39,24 +41,23 @@
             android:layout_height="22dp"
             android:layout_gravity="center"
             android:importantForAccessibility="no"
-            android:src="@drawable/ic_globe_gray_16dp" />
+            android:src="@drawable/ic_globe_gray_16dp"/>
     </FrameLayout>
 
     <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
         android:id="@+id/sitePermissionDialogTitle"
         app:typography="h2"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/keyline_4"
-        android:text="@string/preciseLocationSiteDialogTitle" />
+        android:text="@string/preciseLocationSiteDialogTitle"/>
 
     <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
         android:id="@+id/sitePermissionDialogSubtitle"
         app:typography="body1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/keyline_2"
-        android:text="@string/preciseLocationSiteDialogSubtitle" />
+        android:text="@string/preciseLocationSiteDialogSubtitle"/>
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -65,29 +66,29 @@
         android:gravity="end"
         android:orientation="vertical">
 
-    <com.duckduckgo.mobile.android.ui.view.button.DaxButtonGhost
-        android:id="@+id/siteAllowAlwaysLocationPermission"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/preciseLocationSiteDialogAllowAlways" />
+        <com.duckduckgo.mobile.android.ui.view.button.DaxButtonGhost
+            android:id="@+id/siteAllowAlwaysLocationPermission"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/preciseLocationSiteDialogAllowAlways"/>
 
-    <com.duckduckgo.mobile.android.ui.view.button.DaxButtonGhost
-        android:id="@+id/siteAllowOnceLocationPermission"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/preciseLocationSiteDialogAllowOnce" />
+        <com.duckduckgo.mobile.android.ui.view.button.DaxButtonGhost
+            android:id="@+id/siteAllowOnceLocationPermission"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/preciseLocationSiteDialogAllowOnce"/>
 
-    <com.duckduckgo.mobile.android.ui.view.button.DaxButtonGhost
-        android:id="@+id/siteDenyOnceLocationPermission"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/preciseLocationSiteDialogDenyOnce" />
+        <com.duckduckgo.mobile.android.ui.view.button.DaxButtonGhost
+            android:id="@+id/siteDenyOnceLocationPermission"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/preciseLocationSiteDialogDenyOnce"/>
 
-    <com.duckduckgo.mobile.android.ui.view.button.DaxButtonGhost
-        android:id="@+id/siteDenyAlwaysLocationPermission"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/preciseLocationSiteDialogDenyAlways" />
+        <com.duckduckgo.mobile.android.ui.view.button.DaxButtonGhost
+            android:id="@+id/siteDenyAlwaysLocationPermission"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/preciseLocationSiteDialogDenyAlways"/>
 
     </LinearLayout>
 

diff --git a/app/src/main/res/layout/content_system_location_permission_dialog.xml b/app/src/main/res/layout/content_system_location_permission_dialog.xml
@@ -16,41 +16,41 @@
   ~ limitations under the License.
   -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:padding="@dimen/keyline_5"
+    style="@style/Widget.DuckDuckGo.Dialog.Content"
     android:gravity="center"
     android:orientation="vertical">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/faviconImage"
         android:layout_width="@dimen/dialogImageSize"
         android:layout_height="@dimen/dialogImageSize"
-        android:layout_marginBottom="@dimen/keyline_4"
         android:layout_gravity="center"
         android:importantForAccessibility="no"
+        android:layout_marginBottom="@dimen/keyline_4"
         app:srcCompat="@drawable/ic_dax_icon"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"/>
 
     <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
         android:id="@+id/systemPermissionDialogTitle"
         app:typography="h2"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/keyline_4"
-        android:text="@string/preciseLocationSystemDialogTitle" />
+        android:text="@string/preciseLocationSystemDialogTitle"/>
 
     <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
         android:id="@+id/systemPermissionDialogSubtitle"
         app:typography="body1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/keyline_2"
-        android:text="@string/preciseLocationSystemDialogSubtitle" />
+        android:text="@string/preciseLocationSystemDialogSubtitle"/>
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -63,19 +63,19 @@
             android:id="@+id/allowLocationPermission"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/preciseLocationSystemDialogAllow" />
+            android:text="@string/preciseLocationSystemDialogAllow"/>
 
         <com.duckduckgo.mobile.android.ui.view.button.DaxButtonGhost
             android:id="@+id/denyLocationPermission"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/preciseLocationSystemDialogDeny" />
+            android:text="@string/preciseLocationSystemDialogDeny"/>
 
         <com.duckduckgo.mobile.android.ui.view.button.DaxButtonGhost
             android:id="@+id/neverAllowLocationPermission"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/preciseLocationSystemDialogNeverAllow" />
+            android:text="@string/preciseLocationSystemDialogNeverAllow"/>
 
     </LinearLayout>
 

diff --git a/common-ui/src/main/res/layout/dialog_text_alert.xml b/common-ui/src/main/res/layout/dialog_text_alert.xml
@@ -32,8 +32,7 @@
         android:importantForAccessibility="no"
         android:src="@drawable/ic_globe_gray_16dp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
+        app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"/>
 
     <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
         android:id="@+id/textAlertDialogTitle"
@@ -42,8 +41,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textAlertDialogImage"
-        app:textType="primary"
-        app:typography="h2"/>
+        app:textType="primary" app:typography="h2"/>
 
     <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
         android:id="@+id/textAlertDialogMessage"