From 540b0939d2b83c086940b830d6854b091b3d5e89 Mon Sep 17 00:00:00 2001
From: Jonathan Almeida <jalmeida@mozilla.com>
Date: Mon, 27 May 2019 00:10:50 -0400
Subject: [PATCH] Closes #2878: Cleanup with card-like styling

---
 .../org/mozilla/fenix/share/ShareFragment.kt     |  2 +-
 .../bottom_sheet_dialog_fragment_background.xml  |  9 +++++++++
 app/src/main/res/layout/component_share.xml      | 16 ++++++++--------
 app/src/main/res/values/dimens.xml               |  3 +++
 app/src/main/res/values/styles.xml               |  6 +++++-
 5 files changed, 26 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/res/drawable/bottom_sheet_dialog_fragment_background.xml

diff --git a/app/src/main/java/org/mozilla/fenix/share/ShareFragment.kt b/app/src/main/java/org/mozilla/fenix/share/ShareFragment.kt
index 4edeec7d1..590f0f5e5 100644
--- a/app/src/main/java/org/mozilla/fenix/share/ShareFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/share/ShareFragment.kt
@@ -40,7 +40,7 @@ class ShareFragment : AppCompatDialogFragment(), CoroutineScope {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setStyle(STYLE_NO_TITLE, R.style.CreateCollectionDialogStyle)
+        setStyle(STYLE_NO_TITLE, R.style.ShareDialogStyle)
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
diff --git a/app/src/main/res/drawable/bottom_sheet_dialog_fragment_background.xml b/app/src/main/res/drawable/bottom_sheet_dialog_fragment_background.xml
new file mode 100644
index 000000000..f22a270bf
--- /dev/null
+++ b/app/src/main/res/drawable/bottom_sheet_dialog_fragment_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <corners
+            android:topLeftRadius="@dimen/bottom_sheet_corner_radius"
+            android:topRightRadius="@dimen/bottom_sheet_corner_radius" />
+    <padding android:top="@dimen/bottom_sheet_top_padding" />
+    <solid android:color="?colorPrimary" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/component_share.xml b/app/src/main/res/layout/component_share.xml
index 1904a5554..7e5851c9f 100644
--- a/app/src/main/res/layout/component_share.xml
+++ b/app/src/main/res/layout/component_share.xml
@@ -25,19 +25,18 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <androidx.cardview.widget.CardView
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:cardBackgroundColor="?above"
-        app:cardCornerRadius="@dimen/tab_corner_radius"
-        app:cardElevation="5dp"
+        android:backgroundTint="?above"
+        android:background="@drawable/bottom_sheet_dialog_fragment_background"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
             <androidx.constraintlayout.widget.Group
                 android:id="@+id/send_tab_group"
@@ -53,11 +52,12 @@
                 android:textSize="12sp"
                 android:textStyle="bold"
                 android:layout_marginStart="16dp"
+                android:layout_marginTop="12dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/account_header"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" android:layout_marginTop="12dp"/>
+                app:layout_constraintTop_toTopOf="parent" />
 
             <org.mozilla.fenix.share.AccountDevicesShareRecyclerView
                 android:id="@+id/account_devices_recyclerview"
@@ -122,6 +122,6 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-    </androidx.cardview.widget.CardView>
+    </FrameLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 526072860..0307b7948 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -35,4 +35,7 @@
 
     <dimen name="onboarding_header_icon_height_width">32dp</dimen>
 
+    <!-- Bottom Sheet Fragment card -->
+    <dimen name="bottom_sheet_corner_radius">16dp</dimen>
+    <dimen name="bottom_sheet_top_padding">8dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 767cf1d9a..a5201d955 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -152,7 +152,7 @@
         <item name="android:paddingEnd">24dp</item>
     </style>
 
-    <style name="CreateCollectionDialogStyle" parent="NormalTheme">
+    <style name="DialogStyleBase" parent="NormalTheme">
         <item name="android:textAppearance">@style/TextAppearance.AppCompat</item>
         <item name="android:colorControlNormal">?accentHighContrast</item>
         <item name="android:colorControlActivated">?accentHighContrast</item>
@@ -262,4 +262,8 @@
     <style name="OnboardingCardDark" parent="OnboardingCardLight">
         <item name="android:background">@drawable/onboarding_card_background_dark</item>
     </style>
+
+    <style name="CreateCollectionDialogStyle" parent="DialogStyleBase"/>
+
+    <style name="ShareDialogStyle" parent="DialogStyleBase"/>
 </resources>