more dialogs and buttons

duckduckgo · Jan 12, 2023 · 188c548 · 188c548
1 parent bb0ef67
commit 188c548
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 11 deletions.
diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/activity_vpn_onboarding.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/activity_vpn_onboarding.xml
@@ -53,7 +53,7 @@
         app:buttonSize="large"
         android:layout_marginStart="@dimen/keyline_5"
         android:layout_marginEnd="@dimen/keyline_5"
-        android:layout_marginBottom="@dimen/keyline_4"
+        android:layout_marginBottom="@dimen/keyline_5"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"/>

diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/content_vpn_always_on_alert.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/content_vpn_always_on_alert.xml
@@ -88,7 +88,7 @@
             app:buttonSize="large"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/keyline_1"
+            android:layout_marginTop="@dimen/daxButtonDefaultMargin"
             android:text="@string/atp_PromoteAlwaysOnDialogNotNow"
         />
     </LinearLayout>

diff --git a/...otection/vpn-impl/src/main/res/layout/dialog_tracking_protection_manually_disable_app.xml b/...otection/vpn-impl/src/main/res/layout/dialog_tracking_protection_manually_disable_app.xml
@@ -85,7 +85,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/keyline_4"
-                android:layout_marginEnd="@dimen/keyline_2"
+                android:layout_marginEnd="@dimen/daxButtonDefaultMargin"
                 android:gravity="center|center_horizontal"
                 android:text="@string/atp_ExcludeAppsManuallyCTANotNow"
                 app:layout_constraintBottom_toBottomOf="parent"

diff --git a/...rotection/vpn-impl/src/main/res/layout/dialog_tracking_protection_manually_enable_app.xml b/...rotection/vpn-impl/src/main/res/layout/dialog_tracking_protection_manually_enable_app.xml
@@ -63,7 +63,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/keyline_4"
-        android:layout_marginEnd="@dimen/keyline_2"
+        android:layout_marginEnd="@dimen/daxButtonDefaultMargin"
         android:gravity="center|center_horizontal"
         android:text="@string/atp_ExcludeAppsManuallyCTACancel"
         app:layout_constraintEnd_toStartOf="@id/trackingProtectionExcludeAppDialogEnable"

diff --git a/...g-protection/vpn-impl/src/main/res/layout/dialog_tracking_protection_restore_defaults.xml b/...g-protection/vpn-impl/src/main/res/layout/dialog_tracking_protection_restore_defaults.xml
@@ -84,7 +84,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/keyline_4"
-                    android:layout_marginEnd="@dimen/keyline_2"
+                    android:layout_marginEnd="@dimen/daxButtonDefaultMargin"
                     android:gravity="center|center_horizontal"
                     android:text="@string/atp_ExcludeAppsManuallyCTACancel"
                     app:layout_constraintEnd_toStartOf="@id/trackingProtectionRestoreDefaultsRestore"

diff --git a/app/src/main/res/layout/content_onboarding_default_browser.xml b/app/src/main/res/layout/content_onboarding_default_browser.xml
@@ -84,7 +84,7 @@
         app:buttonSize="large"
         android:layout_marginStart="@dimen/keyline_5"
         android:layout_marginEnd="@dimen/keyline_5"
-        android:layout_marginBottom="@dimen/keyline_1"
+        android:layout_marginBottom="@dimen/daxButtonDefaultMargin"
         android:layout_height="wrap_content"
         android:text="@string/defaultBrowserLetsDoIt"
         app:layout_constraintBottom_toTopOf="@+id/continueButton"

diff --git a/app/src/main/res/layout/include_dax_dialog_cta.xml b/app/src/main/res/layout/include_dax_dialog_cta.xml
@@ -75,7 +75,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             app:buttonSize="large"
-            android:layout_marginTop="@dimen/daxDialogButtonSpacing"
+            android:layout_marginTop="@dimen/keyline_4"
             android:text="@string/onboardingLetsDoItButton"
             app:layout_constraintEnd_toEndOf="@id/cardView"
             app:layout_constraintStart_toStartOf="@id/cardView"

diff --git a/common-ui/src/main/res/layout/view_dax_dialog.xml b/common-ui/src/main/res/layout/view_dax_dialog.xml
@@ -108,7 +108,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:buttonSize="large"
-                    android:layout_marginTop="@dimen/daxDialogButtonSpacing"/>
+                    android:layout_marginTop="@dimen/keyline_4"/>
 
                 <com.duckduckgo.mobile.android.ui.view.button.DaxButtonGhost
                     android:id="@+id/secondaryCta"

diff --git a/common-ui/src/main/res/layout/view_dax_dialog_animated.xml b/common-ui/src/main/res/layout/view_dax_dialog_animated.xml
@@ -94,14 +94,14 @@
                     android:id="@+id/descriptionText"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_marginTop="@dimen/daxDialogButtonSpacing"/>
+                    android:layout_marginTop="14dp"/>
 
                 <com.duckduckgo.mobile.android.ui.view.button.DaxButtonPrimary
                     android:id="@+id/primaryCta"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:buttonSize="large"
-                    android:layout_marginTop="@dimen/daxDialogButtonSpacing" />
+                    android:layout_marginTop="@dimen/daxButtonDefaultMargin" />
 
                 <com.duckduckgo.mobile.android.ui.view.button.DaxButtonGhost
                     android:id="@+id/secondaryCta"

diff --git a/common-ui/src/main/res/values/design-system-dimensions.xml b/common-ui/src/main/res/values/design-system-dimensions.xml
@@ -99,7 +99,6 @@
 
     <!-- Dax Dialog  -->
     <dimen name="daxDialogContentPaddingTop">20dp</dimen>
-    <dimen name="daxDialogButtonSpacing">14dp</dimen>
 
     <!-- Card -->
     <dimen name="daxBubbleDialogDistanceFromEdge">22dp</dimen>