From d39c15402e0c9ef88582a2104d518469a43f2365 Mon Sep 17 00:00:00 2001
From: Jeff Boek <jeff@jeffboek.com>
Date: Mon, 22 Apr 2019 21:00:01 -0700
Subject: [PATCH] For #1843 - Adds a better theme for the creation fragment

---
 .../fenix/collections/CreateCollectionFragment.kt  | 14 +++++++++++++-
 .../java/org/mozilla/fenix/home/HomeFragment.kt    |  5 +++--
 .../res/drawable/create_collection_background.xml  |  5 +++--
 .../main/res/layout/fragment_create_collection.xml |  1 -
 app/src/main/res/navigation/nav_graph.xml          |  9 ---------
 app/src/main/res/values/styles.xml                 | 12 ++++++++++++
 6 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/collections/CreateCollectionFragment.kt b/app/src/main/java/org/mozilla/fenix/collections/CreateCollectionFragment.kt
index a38abaf51..1e9b37994 100644
--- a/app/src/main/java/org/mozilla/fenix/collections/CreateCollectionFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/collections/CreateCollectionFragment.kt
@@ -4,21 +4,29 @@ package org.mozilla.fenix.collections
    License, v. 2.0. If a copy of the MPL was not distributed with this
    file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.ViewModelProviders
 import kotlinx.android.synthetic.main.fragment_create_collection.view.*
 import org.mozilla.fenix.R
 import org.mozilla.fenix.mvi.ActionBusFactory
 import org.mozilla.fenix.mvi.getManagedEmitter
 
-class CreateCollectionFragment : Fragment() {
+class CreateCollectionFragment : DialogFragment() {
 
     private lateinit var collectionCreationComponent: CollectionCreationComponent
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setStyle(DialogFragment.STYLE_NO_TITLE, R.style.CreateCollectionDialogStyle)
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
@@ -41,4 +49,8 @@ class CreateCollectionFragment : Fragment() {
 
         getManagedEmitter<CollectionCreationChange>().onNext(CollectionCreationChange.TabListChange(tabs))
     }
+
+    companion object {
+        const val createCollectionTag = "createCollection"
+    }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
index ab3885924..860eb97ba 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -33,6 +33,7 @@ import org.mozilla.fenix.BrowsingModeManager
 import org.mozilla.fenix.DefaultThemeManager
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
+import org.mozilla.fenix.collections.CreateCollectionFragment
 import org.mozilla.fenix.collections.CreateCollectionViewModel
 import org.mozilla.fenix.collections.Tab
 import org.mozilla.fenix.components.metrics.Event
@@ -187,8 +188,8 @@ class HomeFragment : Fragment(), CoroutineScope {
                     ViewModelProviders.of(this).get(CreateCollectionViewModel::class.java)
                 }!!.tabs = tabs
 
-                val direction = HomeFragmentDirections.actionHomeFragmentToCreateCollectionFragment()
-                Navigation.findNavController(view!!).navigate(direction)
+                CreateCollectionFragment()
+                    .show(requireActivity().supportFragmentManager, CreateCollectionFragment.createCollectionTag)
             }
             is TabAction.MenuTapped -> {
                 val isPrivate = (activity as HomeActivity).browsingModeManager.isPrivate
diff --git a/app/src/main/res/drawable/create_collection_background.xml b/app/src/main/res/drawable/create_collection_background.xml
index de5e8f42b..977845c7d 100644
--- a/app/src/main/res/drawable/create_collection_background.xml
+++ b/app/src/main/res/drawable/create_collection_background.xml
@@ -4,6 +4,7 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <gradient
-        android:startColor="?accentBright"
-        android:endColor="?accent" />
+        android:startColor="#F5393473"
+        android:endColor="#F520123A"
+        android:angle="45" />
 </shape>
diff --git a/app/src/main/res/layout/fragment_create_collection.xml b/app/src/main/res/layout/fragment_create_collection.xml
index c735fe9cc..863f74062 100644
--- a/app/src/main/res/layout/fragment_create_collection.xml
+++ b/app/src/main/res/layout/fragment_create_collection.xml
@@ -4,7 +4,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/create_collection_background"
-    android:fitsSystemWindows="true"
     tools:context="org.mozilla.fenix.collections.CreateCollectionFragment">
 
 </FrameLayout>
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 667e7a20a..2c867b8a3 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -32,9 +32,6 @@
         <action
             android:id="@+id/action_homeFragment_to_settingsFragment"
             app:destination="@id/settingsFragment" />
-        <action
-            android:id="@+id/action_homeFragment_to_createCollectionFragment"
-            app:destination="@id/createCollectionFragment" />
     </fragment>
 
     <fragment
@@ -287,10 +284,4 @@
         android:id="@+id/trackingProtectionFragment"
         android:name="org.mozilla.fenix.settings.TrackingProtectionFragment"
         android:label="TrackingProtectionFragment" />
-    <fragment
-        android:id="@+id/createCollectionFragment"
-        android:name="org.mozilla.fenix.collections.CreateCollectionFragment"
-        android:label="fragment_create_collection"
-        tools:layout="@layout/fragment_create_collection" >
-    </fragment>
 </navigation>
\ 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 22e659f4c..40bedf406 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -108,6 +108,18 @@
         <item name="android:paddingEnd">24dp</item>
     </style>
 
+
+    <style name="CreateCollectionDialogStyle" parent="Theme.AppCompat.DayNight.NoActionBar">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowAnimationStyle">@style/Animation.Design.BottomSheetDialog</item>
+        <item name="windowNoTitle">true</item>
+        <item name="windowActionBar">false</item>
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:windowTranslucentNavigation">true</item>
+    </style>
+
     <style name="CurrentSessionBottomSheetDialogTheme" parent="Theme.MaterialComponents.Light.BottomSheetDialog">
         <item name="bottomSheetStyle">@style/CurrentSessionBottomSheetStyle</item>
         <item name="android:textColor">@color/primary_text_normal_theme</item>