blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #8949 - Removes old motionlayout code, fixes how shadow is drawn

master
Jeff Boek 2020-03-11 14:08:58 -07:00 committed by Emily Kager
parent fc67747409
commit 74ce62b5c3
12 changed files with 26 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/proguard-rules.pro vendored
View File

@ -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.** { *; }

2
app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
View File

@ -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)
}

47
app/src/main/java/org/mozilla/fenix/home/SearchView.kt
View File

@ -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
}
}

6
app/src/main/res/drawable/home_bottom_bar_background.xml
View File

@ -9,9 +9,9 @@
<solid android:color="@color/foundation_normal_theme" />
</shape>
</item>
<item android:height="1dp">
<shape android:shape="rectangle">
<solid android:color="#1AFFFFFF" />
<item android:bottom="-2dp" android:left="-2dp" android:right="-2dp">
<shape>
<stroke android:width="1dp" android:color="#1AFFFFFF" />
</shape>
</item>
</layer-list>

6
app/src/main/res/drawable/home_bottom_bar_background_top.xml
View File

@ -9,9 +9,9 @@
<solid android:color="@color/foundation_normal_theme" />
</shape>
</item>
<item android:height="1dp" android:gravity="bottom">
<shape android:shape="rectangle">
<solid android:color="#1AFFFFFF" />
<item android:top="-2dp" android:left="-2dp" android:right="-2dp">
<shape>
<stroke android:width="1dp" android:color="#1AFFFFFF" />
</shape>
</item>
</layer-list>

10
app/src/main/res/drawable/home_header_shadow.xml
View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- 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/. -->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:startColor="?shadow"
android:endColor="@android:color/transparent"
android:angle="270" />
</shape>

1
app/src/main/res/drawable/home_search_background_normal.xml → app/src/main/res/drawable/home_search_background.xml
View File

@ -4,6 +4,5 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="?inset"/>
<corners android:radius="8dp"/>
</shape>

15
app/src/main/res/drawable/home_search_background_dark.xml
View File

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- 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/. -->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="?inset"/>
<stroke android:width="1dp"
android:color="?inset"/>
<corners android:bottomRightRadius="8dp"
android:bottomLeftRadius="8dp"
android:topLeftRadius="8dp"
android:topRightRadius="8dp"/>
</shape>

12
app/src/main/res/drawable/home_search_background_dark_no_border.xml
View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- 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/. -->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="?inset"/>
<corners android:bottomRightRadius="8dp"
android:bottomLeftRadius="8dp"
android:topLeftRadius="8dp"
android:topRightRadius="8dp"/>
</shape>

6
app/src/main/res/drawable/private_home_bottom_bar_background_gradient.xml
View File

@ -14,9 +14,9 @@
android:type="linear" />
</shape>
</item>
<item android:height="1dp">
<shape android:shape="rectangle">
<solid android:color="#1AFFFFFF" />
<item android:bottom="-2dp" android:left="-2dp" android:right="-2dp">
<shape>
<stroke android:width="1dp" android:color="#1AFFFFFF" />
</shape>
</item>
</layer-list>

6
app/src/main/res/drawable/private_home_bottom_bar_background_gradient_top.xml
View File

@ -14,9 +14,9 @@
android:type="linear" />
</shape>
</item>
<item android:height="1dp" android:gravity="bottom">
<shape android:shape="rectangle">
<solid android:color="#1AFFFFFF" />
<item android:top="-2dp" android:left="-2dp" android:right="-2dp">
<shape>
<stroke android:width="1dp" android:color="#1AFFFFFF" />
</shape>
</item>
</layer-list>

33
app/src/main/res/layout/fragment_home.xml
View File

@ -82,24 +82,6 @@
android:layout_gravity="bottom"
tools:context=".home.HomeFragment">
<View
android:id="@+id/bottomBarShadow"
android:layout_width="0dp"
android:layout_height="1dp"
android:background="@color/bottom_bar_shadow"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toTopOf="@id/bottom_bar" />
<View
android:id="@+id/bottomBarHighlight"
android:layout_width="0dp"
android:layout_height="1dp"
android:background="@color/bottom_bar_shadow"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toTopOf="@id/bottom_bar" />
<View
android:id="@+id/bottom_bar"
android:layout_width="0dp"
@ -110,13 +92,13 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<org.mozilla.fenix.home.SearchView
<FrameLayout
android:id="@+id/toolbar_wrapper"
android:layout_width="0dp"
android:layout_height="40dp"
android:layout_marginStart="8dp"
android:layout_marginEnd="0dp"
android:background="@drawable/home_search_background_normal"
android:background="@drawable/home_search_background"
android:clickable="true"
android:contentDescription="@string/search_hint"
android:focusable="true"
@ -149,7 +131,7 @@
android:text="@string/search_hint"
android:textColor="?primaryText"
android:textSize="15sp" />
</org.mozilla.fenix.home.SearchView>
</FrameLayout>
<ImageButton
android:id="@+id/add_tab_button"
@ -171,6 +153,15 @@
app:layout_constraintTop_toTopOf="@id/bottom_bar"
app:layout_constraintBottom_toBottomOf="@id/bottom_bar"/>
<View
android:id="@+id/bottomBarShadow"
android:layout_width="0dp"
android:layout_height="1dp"
android:background="@color/bottom_bar_shadow"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toTopOf="@id/bottom_bar" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>