From 40a3246c325e3c5b7f1cbdff35eaa1e1b9810e6a Mon Sep 17 00:00:00 2001
From: Jeff Boek <jeff@jeffboek.com>
Date: Mon, 3 Jun 2019 16:04:03 -0700
Subject: [PATCH] Adds dialog style for Firefox Accounts

---
 .../settings/PairInstructionsFragment.kt      |  7 +++++++
 .../res/layout/fragment_pair_instructions.xml | 13 +++---------
 app/src/main/res/values/styles.xml            | 20 ++++++++++++++++++-
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/settings/PairInstructionsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/PairInstructionsFragment.kt
index 7cdc4e501..3ace9578b 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/PairInstructionsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/PairInstructionsFragment.kt
@@ -12,11 +12,18 @@ import android.widget.Button
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.text.HtmlCompat
+import androidx.fragment.app.DialogFragment
 import androidx.navigation.fragment.NavHostFragment.findNavController
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import org.mozilla.fenix.R
 
 class PairInstructionsFragment : BottomSheetDialogFragment() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setStyle(DialogFragment.STYLE_NO_TITLE, R.style.FirefoxAccountsDialogStyle)
+    }
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_pair_instructions, container, false)
     }
diff --git a/app/src/main/res/layout/fragment_pair_instructions.xml b/app/src/main/res/layout/fragment_pair_instructions.xml
index 046062a59..fb42eb5ef 100644
--- a/app/src/main/res/layout/fragment_pair_instructions.xml
+++ b/app/src/main/res/layout/fragment_pair_instructions.xml
@@ -8,7 +8,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?foundation"
-    android:orientation="vertical">
+    android:padding="8dp">
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline"
@@ -29,10 +29,7 @@
 
     <Button
         android:id="@+id/pair_cancel"
-        style="@style/SitePermissionButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="40dp"
+        style="@style/SitePermissionCancelButton"
         android:text="@string/pair_cancel"
         app:layout_constraintEnd_toStartOf="@+id/pair_open_camera"
         app:layout_constraintHorizontal_chainStyle="packed"
@@ -41,12 +38,8 @@
 
     <Button
         android:id="@+id/pair_open_camera"
-        style="@style/SitePermissionButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:backgroundTint="?accent"
+        style="@style/SitePermissionPrimaryButton"
         android:text="@string/pair_open_camera"
-        android:textColor="?contrastText"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toEndOf="@+id/pair_cancel"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ea3a35767..b781615e7 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -152,11 +152,26 @@
         <item name="android:background">@drawable/search_pill_drawable_button_background</item>
     </style>
 
-    <style name="SitePermissionButton" parent="Widget.AppCompat.Button">
+    <style name="SitePermissionButton" parent="Widget.AppCompat.Button.Borderless">
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:foreground">?android:attr/selectableItemBackground</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:textColor">?primaryText</item>
         <item name="android:paddingStart">24dp</item>
         <item name="android:paddingEnd">24dp</item>
+        <item name="android:elevation">0dp</item>
+    </style>
+
+    <style name="SitePermissionCancelButton" parent="SitePermissionButton">
+        <item name="android:textColor">?accent</item>
+        <item name="android:backgroundTint">?foundation</item>
+    </style>
+
+    <style name="SitePermissionPrimaryButton" parent="SitePermissionButton">
+        <item name="android:background">@drawable/button_background</item>
+        <item name="android:textColor">?contrastText</item>
+        <item name="android:backgroundTint">?accent</item>
     </style>
 
     <style name="DialogStyleBase" parent="NormalTheme">
@@ -271,6 +286,9 @@
     </style>
 
     <style name="CreateCollectionDialogStyle" parent="DialogStyleBase"/>
+    <style name="FirefoxAccountsDialogStyle" parent="DialogStyleBase">
+        <item name="android:windowBackground">@drawable/scrim_background</item>
+    </style>
 
     <style name="ShareDialogStyle" parent="DialogStyleBase"/>
 </resources>