From 74ce62b5c3cf17add202126b20cd66e6fc46f4c5 Mon Sep 17 00:00:00 2001 From: Jeff Boek Date: Wed, 11 Mar 2020 14:08:58 -0700 Subject: [PATCH] For #8949 - Removes old motionlayout code, fixes how shadow is drawn --- app/proguard-rules.pro | 3 -- .../org/mozilla/fenix/home/HomeFragment.kt | 2 + .../java/org/mozilla/fenix/home/SearchView.kt | 47 ------------------- .../drawable/home_bottom_bar_background.xml | 6 +-- .../home_bottom_bar_background_top.xml | 6 +-- .../main/res/drawable/home_header_shadow.xml | 10 ---- ..._normal.xml => home_search_background.xml} | 1 - .../drawable/home_search_background_dark.xml | 15 ------ .../home_search_background_dark_no_border.xml | 12 ----- ...te_home_bottom_bar_background_gradient.xml | 6 +-- ...ome_bottom_bar_background_gradient_top.xml | 6 +-- app/src/main/res/layout/fragment_home.xml | 33 +++++-------- 12 files changed, 26 insertions(+), 121 deletions(-) delete mode 100644 app/src/main/java/org/mozilla/fenix/home/SearchView.kt delete mode 100644 app/src/main/res/drawable/home_header_shadow.xml rename app/src/main/res/drawable/{home_search_background_normal.xml => home_search_background.xml} (97%) delete mode 100644 app/src/main/res/drawable/home_search_background_dark.xml delete mode 100644 app/src/main/res/drawable/home_search_background_dark_no_border.xml diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 77510c5ba..6ca59c4d9 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -91,9 +91,6 @@ # Keep code generated from Glean Metrics -keep class org.mozilla.fenix.GleanMetrics.** { *; } -# Keep methods that are called by MotionLayout --keep class org.mozilla.fenix.home.SearchView { *; } - # Keep motionlayout internal methods # https://github.com/mozilla-mobile/fenix/issues/2094 -keep class androidx.constraintlayout.** { *; } 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 c4e069545..60daba445 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt @@ -21,6 +21,7 @@ import androidx.appcompat.app.AlertDialog import androidx.constraintlayout.widget.ConstraintLayout import androidx.constraintlayout.widget.ConstraintSet import androidx.constraintlayout.widget.ConstraintSet.BOTTOM +import androidx.constraintlayout.widget.ConstraintSet.PARENT_ID import androidx.constraintlayout.widget.ConstraintSet.TOP import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.core.content.ContextCompat @@ -228,6 +229,7 @@ class HomeFragment : Fragment() { clone(view.toolbarLayout) clear(view.bottomBarShadow.id, BOTTOM) connect(view.bottomBarShadow.id, TOP, view.bottom_bar.id, BOTTOM) + connect(view.bottomBarShadow.id, BOTTOM, PARENT_ID, BOTTOM) applyTo(view.toolbarLayout) } diff --git a/app/src/main/java/org/mozilla/fenix/home/SearchView.kt b/app/src/main/java/org/mozilla/fenix/home/SearchView.kt deleted file mode 100644 index aa85f814c..000000000 --- a/app/src/main/java/org/mozilla/fenix/home/SearchView.kt +++ /dev/null @@ -1,47 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * 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/. */ - -package org.mozilla.fenix.home - -import android.content.Context -import android.graphics.drawable.TransitionDrawable -import android.util.AttributeSet -import android.widget.FrameLayout -import org.mozilla.fenix.R - -class SearchView(context: Context, attrs: AttributeSet) : FrameLayout(context, attrs) { - private val lightDrawable = - resources.getDrawable(R.drawable.home_search_background_normal, context.theme) - private val darkDrawable = - resources.getDrawable(R.drawable.home_search_background_dark, context.theme) - private val darkNoBorderDrawable = - resources.getDrawable(R.drawable.home_search_background_dark_no_border, context.theme) - - private val lightToDark = TransitionDrawable(arrayOf(lightDrawable, darkDrawable)) - private val darkToNoBorder = TransitionDrawable(arrayOf(darkDrawable, darkNoBorderDrawable)) - - fun transitionToLight() { - background = lightToDark - lightToDark.reverseTransition(transitionDurationMs) - } - - fun transitionToDark() { - background = lightToDark - lightToDark.startTransition(transitionDurationMs) - } - - fun transitionToDarkFromNoBorder() { - background = darkToNoBorder - darkToNoBorder.reverseTransition(transitionDurationMs) - } - - fun transitionToDarkNoBorder() { - background = darkToNoBorder - darkToNoBorder.startTransition(transitionDurationMs) - } - - companion object { - const val transitionDurationMs = 200 - } -} diff --git a/app/src/main/res/drawable/home_bottom_bar_background.xml b/app/src/main/res/drawable/home_bottom_bar_background.xml index 080355691..04f3ff1fa 100644 --- a/app/src/main/res/drawable/home_bottom_bar_background.xml +++ b/app/src/main/res/drawable/home_bottom_bar_background.xml @@ -9,9 +9,9 @@ - - - + + + diff --git a/app/src/main/res/drawable/home_bottom_bar_background_top.xml b/app/src/main/res/drawable/home_bottom_bar_background_top.xml index 4f55f346c..46494b539 100644 --- a/app/src/main/res/drawable/home_bottom_bar_background_top.xml +++ b/app/src/main/res/drawable/home_bottom_bar_background_top.xml @@ -9,9 +9,9 @@ - - - + + + diff --git a/app/src/main/res/drawable/home_header_shadow.xml b/app/src/main/res/drawable/home_header_shadow.xml deleted file mode 100644 index 7619a9873..000000000 --- a/app/src/main/res/drawable/home_header_shadow.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/home_search_background_normal.xml b/app/src/main/res/drawable/home_search_background.xml similarity index 97% rename from app/src/main/res/drawable/home_search_background_normal.xml rename to app/src/main/res/drawable/home_search_background.xml index fcc500614..19e41a79f 100644 --- a/app/src/main/res/drawable/home_search_background_normal.xml +++ b/app/src/main/res/drawable/home_search_background.xml @@ -4,6 +4,5 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - \ No newline at end of file diff --git a/app/src/main/res/drawable/home_search_background_dark.xml b/app/src/main/res/drawable/home_search_background_dark.xml deleted file mode 100644 index 5796f98ab..000000000 --- a/app/src/main/res/drawable/home_search_background_dark.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/home_search_background_dark_no_border.xml b/app/src/main/res/drawable/home_search_background_dark_no_border.xml deleted file mode 100644 index 955ed4696..000000000 --- a/app/src/main/res/drawable/home_search_background_dark_no_border.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/private_home_bottom_bar_background_gradient.xml b/app/src/main/res/drawable/private_home_bottom_bar_background_gradient.xml index b96094a6e..ec00f3ea3 100644 --- a/app/src/main/res/drawable/private_home_bottom_bar_background_gradient.xml +++ b/app/src/main/res/drawable/private_home_bottom_bar_background_gradient.xml @@ -14,9 +14,9 @@ android:type="linear" /> - - - + + + diff --git a/app/src/main/res/drawable/private_home_bottom_bar_background_gradient_top.xml b/app/src/main/res/drawable/private_home_bottom_bar_background_gradient_top.xml index 3516dfeba..b68155d68 100644 --- a/app/src/main/res/drawable/private_home_bottom_bar_background_gradient_top.xml +++ b/app/src/main/res/drawable/private_home_bottom_bar_background_gradient_top.xml @@ -14,9 +14,9 @@ android:type="linear" /> - - - + + + diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 58a8a3a89..ef96187af 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -82,24 +82,6 @@ android:layout_gravity="bottom" tools:context=".home.HomeFragment"> - - - - - - + + + \ No newline at end of file