From 9434f01b429b5e44fdb317ae7212982057ce4f51 Mon Sep 17 00:00:00 2001 From: Jeff Boek Date: Mon, 8 Apr 2019 13:48:37 -0700 Subject: [PATCH] Fixes #1204 - Fixes the home screen animation --- .../org/mozilla/fenix/home/HomeFragment.kt | 3 ++ .../main/res/drawable/home_header_shadow.xml | 7 ++++ app/src/main/res/layout/fragment_home.xml | 10 ++++++ app/src/main/res/values/colors.xml | 2 ++ app/src/main/res/xml/home_scene.xml | 33 +++++++++++++++++++ 5 files changed, 55 insertions(+) create mode 100644 app/src/main/res/drawable/home_header_shadow.xml 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 a527dd55a2..d050fe4552 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt @@ -153,6 +153,9 @@ class HomeFragment : Fragment(), CoroutineScope { BrowsingModeManager.Mode.Private -> BrowsingModeManager.Mode.Normal } } + + // We need the shadow to be above the components. + homeDividerShadow.bringToFront() } override fun onDestroyView() { diff --git a/app/src/main/res/drawable/home_header_shadow.xml b/app/src/main/res/drawable/home_header_shadow.xml new file mode 100644 index 0000000000..e3bf7a2977 --- /dev/null +++ b/app/src/main/res/drawable/home_header_shadow.xml @@ -0,0 +1,7 @@ + + + + diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index d9779c86f7..bf502474ee 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -89,5 +89,15 @@ android:layout_marginStart="40dp" android:layout_marginEnd="40dp"/> + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index a82eacad03..b1990043e0 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -140,4 +140,6 @@ @color/toolbar_dark_mode #232749 + + #1F1B215E diff --git a/app/src/main/res/xml/home_scene.xml b/app/src/main/res/xml/home_scene.xml index deca9d0fb9..431f92de69 100644 --- a/app/src/main/res/xml/home_scene.xml +++ b/app/src/main/res/xml/home_scene.xml @@ -50,6 +50,21 @@ motion:framePosition="90" android:alpha="0" /> + + + + + + + + + +