For #3806 - Adds corner radius to QAB and dialogs
parent
fe51bbcf7b
commit
1f108f3c88
|
@ -16,7 +16,6 @@ import io.reactivex.functions.Consumer
|
||||||
import kotlinx.android.synthetic.main.fragment_browser.*
|
import kotlinx.android.synthetic.main.fragment_browser.*
|
||||||
import kotlinx.android.synthetic.main.layout_quick_action_sheet.*
|
import kotlinx.android.synthetic.main.layout_quick_action_sheet.*
|
||||||
import kotlinx.android.synthetic.main.layout_quick_action_sheet.view.*
|
import kotlinx.android.synthetic.main.layout_quick_action_sheet.view.*
|
||||||
import kotlinx.android.synthetic.main.onboarding_privacy_notice.view.*
|
|
||||||
import org.mozilla.fenix.R
|
import org.mozilla.fenix.R
|
||||||
import org.mozilla.fenix.components.metrics.Event
|
import org.mozilla.fenix.components.metrics.Event
|
||||||
import org.mozilla.fenix.ext.components
|
import org.mozilla.fenix.ext.components
|
||||||
|
|
|
@ -1,7 +1,10 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<org.mozilla.fenix.quickactionsheet.QuickActionSheet
|
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
- 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/. -->
|
||||||
|
<org.mozilla.fenix.quickactionsheet.QuickActionSheet xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:id="@+id/quick_action_sheet"
|
android:id="@+id/quick_action_sheet"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="bottom"/>
|
android:layout_gravity="bottom"
|
||||||
|
android:background="@android:color/transparent" />
|
||||||
|
|
|
@ -15,7 +15,8 @@
|
||||||
android:id="@+id/swipeRefresh"
|
android:id="@+id/swipeRefresh"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_marginBottom="@dimen/toolbar_and_qab_height">
|
android:layout_marginBottom="@dimen/browser_toolbar_height">
|
||||||
|
|
||||||
<mozilla.components.concept.engine.EngineView
|
<mozilla.components.concept.engine.EngineView
|
||||||
android:id="@+id/engineView"
|
android:id="@+id/engineView"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
@ -26,8 +27,7 @@
|
||||||
android:id="@+id/nestedScrollQuickAction"
|
android:id="@+id/nestedScrollQuickAction"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:background="?foundation"
|
android:background="@android:color/transparent"
|
||||||
android:clipToPadding="true"
|
|
||||||
app:behavior_hideable="true"
|
app:behavior_hideable="true"
|
||||||
app:behavior_peekHeight="12dp"
|
app:behavior_peekHeight="12dp"
|
||||||
app:layout_behavior="org.mozilla.fenix.quickactionsheet.QuickActionSheetBehavior" />
|
app:layout_behavior="org.mozilla.fenix.quickactionsheet.QuickActionSheetBehavior" />
|
||||||
|
|
|
@ -6,7 +6,8 @@
|
||||||
android:id="@+id/quick_action_sheet"
|
android:id="@+id/quick_action_sheet"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:background="?foundation"
|
android:backgroundTint="?foundation"
|
||||||
|
android:background="@drawable/rounded_top_corners"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|
||||||
<View
|
<View
|
||||||
|
|
|
@ -54,6 +54,7 @@
|
||||||
<style name="NormalTheme" parent="NormalThemeBase" />
|
<style name="NormalTheme" parent="NormalThemeBase" />
|
||||||
|
|
||||||
<style name="DialogStyle" parent="Theme.MaterialComponents.Dialog.Alert">
|
<style name="DialogStyle" parent="Theme.MaterialComponents.Dialog.Alert">
|
||||||
|
<item name="dialogCornerRadius">@dimen/tab_corner_radius</item>
|
||||||
<item name="android:colorBackground">?above</item>
|
<item name="android:colorBackground">?above</item>
|
||||||
<item name="colorAccent">?accent</item>
|
<item name="colorAccent">?accent</item>
|
||||||
<item name="android:textColorPrimary">?primaryText</item>
|
<item name="android:textColorPrimary">?primaryText</item>
|
||||||
|
|
Loading…
Reference in New Issue