Refactor toolbar popup theme

This commit is contained in:
J-Jamet committed 2021-02-18 13:41:29 +01:00
1 parent e31574015b
commit 73224887b9
12 files changed
+58 -57

No files matched your search

@@ -67,7 +67,6 @@
android:layout_height="?attr/actionBarSize"
android:background="@color/transparent"
android:theme="?attr/toolbarAppearance"
app:popupTheme="?attr/toolbarPopupAppearance"
app:layout_collapseMode="pin"
tools:targetApi="lollipop">
</androidx.appcompat.widget.Toolbar>
@@ -38,7 +38,6 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:theme="?attr/toolbarSpecialAppearance"
app:popupTheme="?attr/toolbarPopupAppearance"
app:layout_constraintTop_toTopOf="parent" />
</com.google.android.material.appbar.AppBarLayout>
@@ -70,7 +69,6 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:theme="?attr/toolbarActionAppearance"
app:popupTheme="?attr/toolbarPopupAppearance"
android:layout_gravity="bottom" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -31,7 +31,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="?attr/toolbarSpecialAppearance"
app:popupTheme="?attr/toolbarPopupAppearance"
app:layout_constraintTop_toTopOf="parent" />
<androidx.coordinatorlayout.widget.CoordinatorLayout
@@ -128,8 +127,7 @@
app:navigationContentDescription="@string/about"
android:elevation="4dp"
app:layout_collapseMode="pin"
android:theme="?attr/toolbarHomeAppearance"
app:popupTheme="?attr/toolbarPopupAppearance" />
android:theme="?attr/toolbarHomeAppearance" />
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>
@@ -30,7 +30,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="?attr/toolbarSpecialAppearance"
app:popupTheme="?attr/toolbarPopupAppearance"
app:layout_constraintTop_toTopOf="parent" />
<androidx.coordinatorlayout.widget.CoordinatorLayout
@@ -63,7 +62,6 @@
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="?attr/toolbarAppearance"
app:popupTheme="?attr/toolbarPopupAppearance"
android:elevation="4dp"
tools:targetApi="lollipop">
<LinearLayout
@@ -156,7 +154,6 @@
android:layout_height="?attr/actionBarSize"
android:visibility="gone"
android:theme="?attr/toolbarActionAppearance"
app:popupTheme="?attr/toolbarPopupAppearance"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />
@@ -32,7 +32,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="?attr/toolbarSpecialAppearance"
app:popupTheme="?attr/toolbarPopupAppearance"
app:layout_constraintTop_toTopOf="parent" />
<androidx.coordinatorlayout.widget.CoordinatorLayout
@@ -79,7 +78,6 @@
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="?attr/toolbarAppearance"
app:popupTheme="?attr/toolbarPopupAppearance"
app:layout_collapseMode="pin"
tools:targetApi="lollipop">
<TextView
@@ -27,6 +27,5 @@
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="?attr/toolbarAppearance"
app:popupTheme="?attr/toolbarPopupAppearance"
android:elevation="4dp"
tools:targetApi="lollipop" />
-1
View File
@@ -19,7 +19,6 @@
-->
<resources>
<attr name="toolbarAppearance" format="reference" />
<attr name="toolbarPopupAppearance" format="reference" />
<attr name="toolbarHomeAppearance" format="reference" />
<attr name="toolbarSpecialAppearance" format="reference" />
<attr name="toolbarActionAppearance" format="reference" />
+1 -2
View File
@@ -30,7 +30,6 @@
<item name="android:textColorHintInverse">@color/green_light</item>
<item name="android:windowBackground">@color/background_dark</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Black</item>
<item name="toolbarPopupAppearance">@style/KeepassDXStyle.Toolbar.Popup.Black</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Black</item>
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Black</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Black.Dialog</item>
@@ -52,7 +51,7 @@
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<!-- Toolbar Popup menu -->
<style name="KeepassDXStyle.Toolbar.Popup.Black" parent="KeepassDXStyle.Toolbar.Popup.Night">
<style name="KeepassDXStyle.Toolbar.Popup.Black" parent="KeepassDXStyle.Toolbar.Black">
<item name="android:textColor">@color/colorTextInverse</item>
<item name="android:colorBackground">@color/grey_black</item>
</style>
+19 -9
View File
@@ -30,9 +30,10 @@
<item name="android:textColorHintInverse">@color/purple_lighter</item>
<item name="android:windowBackground">@color/background_purple</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Purple</item>
<item name="toolbarPopupAppearance">@style/KeepassDXStyle.Toolbar.Popup.Purple</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Purple</item>
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Purple</item>
<item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Purple</item>
<item name="popupTheme">@style/KeepassDXStyle.Toolbar.Popup.Purple</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Purple.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Purple.Dialog</item>
<item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Purple</item>
@@ -48,20 +49,29 @@
<item name="android:textColorHint">@color/purple_lighter</item>
<item name="android:tint">@color/colorTextInverse</item>
</style>
<!-- Toolbar Home Purple -->
<style name="KeepassDXStyle.Toolbar.Home.Purple" parent="KeepassDXStyle.Purple">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<!-- Toolbar Popup menu -->
<style name="KeepassDXStyle.Toolbar.Popup.Purple" parent="KeepassDXStyle.Toolbar.Popup.Light">
<item name="android:textColor">@color/colorText</item>
<style name="KeepassDXStyle.Toolbar.Popup.Purple" parent="KeepassDXStyle.Toolbar.Purple">
<item name="android:colorBackground">@color/background_purple</item>
</style>
<!-- Toolbar Home Purple -->
<style name="KeepassDXStyle.Toolbar.Home.Purple" parent="KeepassDXStyle.Toolbar.Purple">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<!-- Special Toolbar Purple -->
<style name="KeepassDXStyle.Toolbar.Special.Purple" parent="KeepassDXStyle.Toolbar.Purple">
<item name="android:background">@color/purple_dark</item>
<item name="background">@color/purple_dark</item>
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special.Purple</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Special.Purple" parent="KeepassDXStyle.Toolbar.Widget.Special">
<item name="android:background">@color/purple_dark</item>
</style>
<!-- Action Toolbar Purple -->
<style name="KeepassDXStyle.Toolbar.Action.Purple" parent="KeepassDXStyle.Toolbar.Purple">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Purple</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Action.Purple" parent="Widget.AppCompat.Toolbar">
<item name="android:background">@color/purple</item>
</style>
<!-- Dialog -->
<style name="KeepassDXStyle.Purple.Dialog" parent="KeepassDXStyle.Light.Dialog">
<item name="colorAccent">@color/red</item>
+18 -9
View File
@@ -30,9 +30,10 @@
<item name="android:textColorHintInverse">@color/purple_lighter</item>
<item name="android:windowBackground">@color/background_purple_dark</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Purple.Dark</item>
<item name="toolbarPopupAppearance">@style/KeepassDXStyle.Toolbar.Popup.Purple.Dark</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Purple.Dark</item>
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Purple.Dark</item>
<item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Purple.Dark</item>
<item name="popupTheme">@style/KeepassDXStyle.Toolbar.Popup.Purple.Dark</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Purple.Dark.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Purple.Dark.Dialog</item>
<item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Purple.Dark</item>
@@ -48,19 +49,27 @@
<item name="android:textColorHint">@color/purple_lighter</item>
<item name="android:tint">@color/colorTextInverse</item>
</style>
<!-- Toolbar Home Purple -->
<style name="KeepassDXStyle.Toolbar.Home.Purple.Dark" parent="KeepassDXStyle.Purple.Dark">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<!-- Toolbar Popup menu -->
<style name="KeepassDXStyle.Toolbar.Popup.Purple.Dark" parent="KeepassDXStyle.Toolbar.Popup.Night">
<item name="android:textColor">@color/colorTextInverse</item>
<style name="KeepassDXStyle.Toolbar.Popup.Purple.Dark" parent="KeepassDXStyle.Toolbar.Purple.Dark">
<item name="android:colorBackground">@color/purple_darkest</item>
</style>
<!-- Toolbar Home Purple -->
<style name="KeepassDXStyle.Toolbar.Home.Purple.Dark" parent="KeepassDXStyle.Toolbar.Purple.Dark">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<!-- Special Toolbar Purple -->
<style name="KeepassDXStyle.Toolbar.Special.Purple.Dark" parent="KeepassDXStyle.Toolbar.Purple.Dark">
<item name="android:background">@color/purple_dark</item>
<item name="background">@color/purple_dark</item>
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special.Purple.Dark</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Special.Purple.Dark" parent="KeepassDXStyle.Toolbar.Widget.Special">
<item name="android:background">@color/purple_darkest</item>
</style>
<!-- Action Toolbar Purple -->
<style name="KeepassDXStyle.Toolbar.Action.Purple.Dark" parent="KeepassDXStyle.Toolbar.Purple.Dark">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Purple.Dark</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Action.Purple.Dark" parent="Widget.AppCompat.Toolbar">
<item name="android:background">@color/purple_darker</item>
</style>
<!-- Dialog -->
<style name="KeepassDXStyle.Purple.Dark.Dialog" parent="KeepassDXStyle.Night.Dialog">
+1 -2
View File
@@ -31,7 +31,6 @@
<item name="android:textColorHintInverse">@color/green_light</item>
<item name="android:windowBackground">@color/background_light</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.White</item>
<item name="toolbarPopupAppearance">@style/KeepassDXStyle.Toolbar.Popup.White</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.White</item>
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.White</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.White.Dialog</item>
@@ -63,7 +62,7 @@
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<!-- Toolbar Popup menu -->
<style name="KeepassDXStyle.Toolbar.Popup.White" parent="KeepassDXStyle.Toolbar.Popup.Night">
<style name="KeepassDXStyle.Toolbar.Popup.White" parent="KeepassDXStyle.Toolbar.White">
<item name="android:textColor">@color/colorText</item>
<item name="android:colorBackground">@color/white</item>
</style>
+18 -22
View File
@@ -76,7 +76,6 @@
<!-- Toolbar -->
<item name="toolbarStyle">@style/Widget.AppCompat.Toolbar</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Light</item>
<item name="toolbarPopupAppearance">@style/KeepassDXStyle.Toolbar.Popup.Light</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Light</item>
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Light</item>
<item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Light</item>
@@ -133,7 +132,6 @@
<!-- Toolbar -->
<item name="toolbarStyle">@style/Widget.AppCompat.Toolbar</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Night</item>
<item name="toolbarPopupAppearance">@style/KeepassDXStyle.Toolbar.Popup.Night</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Night</item>
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Night</item>
<item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Night</item>
@@ -176,22 +174,31 @@
<item name="android:tint">@color/colorTextInverse</item>
</style>
<!-- Toolbar Popup -->
<style name="KeepassDXStyle.Toolbar.Popup.Light" parent="Theme.AppCompat.Light.DarkActionBar" />
<style name="KeepassDXStyle.Toolbar.Popup.Night" parent="Theme.AppCompat.DayNight" />
<!-- Toolbar Home -->
<style name="KeepassDXStyle.Toolbar.Navigation.Tinted" parent="Widget.AppCompat.Toolbar.Button.Navigation">
<item name="tint">?android:attr/textColorHintInverse</item>
</style>
<style name="KeepassDXStyle.Toolbar.Home.Light" parent="KeepassDXStyle.Toolbar.Light">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<style name="KeepassDXStyle.Toolbar.Home.Night" parent="KeepassDXStyle.Toolbar.Night">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<!-- Special Toolbar Style -->
<style name="KeepassDXStyle.Toolbar.Special.Light" parent="KeepassDXStyle.Toolbar.Light">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special</item>
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special.Green</item>
</style>
<style name="KeepassDXStyle.Toolbar.Special.Night" parent="KeepassDXStyle.Toolbar.Night">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special</item>
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special.Green</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Special" parent="Widget.AppCompat.Toolbar">
<item name="android:background">@color/green_dark</item>
<item name="titleTextAppearance">@style/KeepassDXStyle.TextAppearance.Toolbar.Special.Title</item>
<item name="subtitleTextAppearance">@style/KeepassDXStyle.TextAppearance.Toolbar.Special.SubTitle</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Special.Green" parent="KeepassDXStyle.Toolbar.Widget.Special">
<item name="android:background">@color/green_dark</item>
</style>
<style name="KeepassDXStyle.TextAppearance.Toolbar.Special.Title" parent="KeepassDXStyle.TextAppearance.Small">
<item name="android:textColor">?android:attr/textColorHintInverse</item>
</style>
@@ -201,26 +208,15 @@
<!-- Action Style -->
<style name="KeepassDXStyle.Toolbar.Action.Light" parent="KeepassDXStyle.Toolbar.Light">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action</item>
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Green</item>
</style>
<style name="KeepassDXStyle.Toolbar.Action.Night" parent="KeepassDXStyle.Toolbar.Night">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action</item>
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Green</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Action" parent="Widget.AppCompat.Toolbar">
<style name="KeepassDXStyle.Toolbar.Widget.Action.Green" parent="Widget.AppCompat.Toolbar">
<item name="android:background">@color/green</item>
</style>
<!-- Toolbar Home -->
<style name="KeepassDXStyle.Toolbar.Navigation.Tinted" parent="Widget.AppCompat.Toolbar.Button.Navigation">
<item name="tint">?android:attr/textColorHintInverse</item>
</style>
<style name="KeepassDXStyle.Toolbar.Home.Light" parent="KeepassDXStyle.Toolbar.Light">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<style name="KeepassDXStyle.Toolbar.Home.Night" parent="KeepassDXStyle.Toolbar.Night">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<style name="KeepassDXStyle.Toolbar.Overflow" parent="Widget.AppCompat.Light.ActionButton.Overflow">
<item name="android:tint">@color/colorTextInverse</item>
<item name="tint">@color/colorTextInverse</item>