rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix action bar style

Browse Source
This commit is contained in:
J-Jamet
2020-06-17 23:23:57 +02:00
parent b1b92b2995
commit f61ce10716
7 changed files with 6 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/res/layout/activity_group.xml
View File

@@ -163,6 +163,7 @@
app:layout_constraintBottom_toBottomOf="parent"
android:elevation="4dp"
android:theme="?attr/actionToolbarAppearance"
android:background="?attr/colorAccent"
tools:targetApi="lollipop" />
</androidx.constraintlayout.widget.ConstraintLayout>

7
app/src/main/res/values/style_black.xml
View File

@@ -31,7 +31,7 @@
<item name="android:windowBackground">@color/background_dark</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Black</item>
<item name="specialToolbarAppearance">@style/KeepassDXStyle.Toolbar.Special.Black</item>
<item name="actionToolbarAppearance">@style/KeepassDXStyle.Toolbar.Action.Black</item>
<item name="actionToolbarAppearance">@style/KeepassDXStyle.Toolbar.Black</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Black.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Black.Dialog</item>
<item name="actionModeStyle">@style/KeepassDXStyle.ActionMode.Dark</item>
@@ -50,11 +50,6 @@
<item name="android:background">@color/black</item>
<item name="background">@color/black</item>
</style>
<!-- Action Toolbar Black -->
<style name="KeepassDXStyle.Toolbar.Action.Black" parent="KeepassDXStyle.Toolbar.Black">
<item name="android:background">@color/orange_dark</item>
<item name="background">@color/orange_dark</item>
</style>
<!-- Contextual Action Bar Dark -->
<style name="KeepassDXStyle.ActionMode.Black" parent="@style/Widget.AppCompat.ActionMode">
<item name="background">@color/dark</item>

2
app/src/main/res/values/style_blue.xml
View File

@@ -52,8 +52,6 @@
<!-- Action Toolbar Blue -->
<style name="KeepassDXStyle.Toolbar.Action.Blue" parent="KeepassDXStyle.Toolbar.Blue">
<item name="actionMenuTextColor">@color/colorTextInverse</item>
<item name="android:background">@color/blue_white</item>
<item name="background">@color/blue_white</item>
</style>
<!-- Contextual Action Bar Blue -->
<style name="KeepassDXStyle.ActionMode.Blue" parent="@style/Widget.AppCompat.ActionMode">

7
app/src/main/res/values/style_dark.xml
View File

@@ -30,7 +30,7 @@
<item name="android:windowBackground">@color/background_dark</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Dark</item>
<item name="specialToolbarAppearance">@style/KeepassDXStyle.Toolbar.Special.Dark</item>
<item name="actionToolbarAppearance">@style/KeepassDXStyle.Toolbar.Action.Dark</item>
<item name="actionToolbarAppearance">@style/KeepassDXStyle.Toolbar.Dark</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Dark.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Dark.Dialog</item>
<item name="actionModeStyle">@style/KeepassDXStyle.ActionMode.Dark</item>
@@ -47,11 +47,6 @@
<item name="android:background">@color/dark</item>
<item name="background">@color/dark</item>
</style>
<!-- Action Toolbar Dark -->
<style name="KeepassDXStyle.Toolbar.Action.Dark" parent="KeepassDXStyle.Toolbar.Dark">
<item name="android:background">@color/cyan</item>
<item name="background">@color/cyan</item>
</style>
<!-- Contextual Action Bar Dark -->
<style name="KeepassDXStyle.ActionMode.Dark" parent="@style/Widget.AppCompat.ActionMode">
<item name="background">@color/dark</item>

2
app/src/main/res/values/style_purple.xml
View File

@@ -51,8 +51,6 @@
<!-- Action Toolbar Purple -->
<style name="KeepassDXStyle.Toolbar.Action.Purple" parent="KeepassDXStyle.Toolbar.Purple">
<item name="actionMenuTextColor">@color/colorTextInverse</item>
<item name="android:background">@color/red</item>
<item name="background">@color/red</item>
</style>
<!-- Contextual Action Bar Purple -->
<style name="KeepassDXStyle.ActionMode.Purple" parent="@style/Widget.AppCompat.ActionMode">

7
app/src/main/res/values/style_red.xml
View File

@@ -30,7 +30,7 @@
<item name="android:windowBackground">@color/background_night</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Red</item>
<item name="specialToolbarAppearance">@style/KeepassDXStyle.Toolbar.Special.Red</item>
<item name="actionToolbarAppearance">@style/KeepassDXStyle.Toolbar.Action.Red</item>
<item name="actionToolbarAppearance">@style/KeepassDXStyle.Toolbar.Red</item>
<item name="actionModeStyle">@style/KeepassDXStyle.ActionMode.Red</item>
</style>
<!-- Toolbar Style Red -->
@@ -48,11 +48,6 @@
<item name="android:background">@color/red_dark</item>
<item name="background">@color/red_dark</item>
</style>
<!-- Action Toolbar Red -->
<style name="KeepassDXStyle.Toolbar.Action.Red" parent="KeepassDXStyle.Toolbar.Red">
<item name="android:background">@color/orange</item>
<item name="background">@color/orange</item>
</style>
<!-- Contextual Action Bar Red -->
<style name="KeepassDXStyle.ActionMode.Red" parent="@style/Widget.AppCompat.ActionMode">
<item name="background">@color/orange</item>

16
app/src/main/res/values/styles.xml
View File

@@ -75,7 +75,7 @@
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Light</item>
<item name="toolbarPopupAppearance">@style/KeepassDXStyle.Light.Toolbar.Popup</item>
<item name="specialToolbarAppearance">@style/KeepassDXStyle.Toolbar.Special.Light</item>
<item name="actionToolbarAppearance">@style/KeepassDXStyle.Toolbar.Action.Light</item>
<item name="actionToolbarAppearance">@style/KeepassDXStyle.Toolbar.Light</item>
<item name="actionModeStyle">@style/KeepassDXStyle.ActionMode</item>
<!-- CollapsingToolbarLayout -->
<item name="expandedTitleTextAppearance">@style/KeepassDXStyle.Expanded.Title</item>
@@ -128,7 +128,7 @@
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Night</item>
<item name="toolbarPopupAppearance">@style/KeepassDXStyle.Night.Toolbar.Popup</item>
<item name="specialToolbarAppearance">@style/KeepassDXStyle.Toolbar.Special.Night</item>
<item name="actionToolbarAppearance">@style/KeepassDXStyle.Toolbar.Action.Night</item>
<item name="actionToolbarAppearance">@style/KeepassDXStyle.Toolbar.Night</item>
<item name="actionModeStyle">@style/KeepassDXStyle.ActionMode</item>
<!-- CollapsingToolbarLayout -->
<item name="expandedTitleTextAppearance">@style/KeepassDXStyle.Expanded.Title</item>
@@ -189,18 +189,6 @@
<item name="background">@color/green_dark</item>
</style>
<!-- Action Toolbar Light Style -->
<style name="KeepassDXStyle.Toolbar.Action.Light" parent="KeepassDXStyle.Toolbar.Light">
<item name="android:background">@color/orange_dark</item>
<item name="background">@color/orange_dark</item>
</style>
<!-- Action Toolbar Night Style -->
<style name="KeepassDXStyle.Toolbar.Action.Night" parent="KeepassDXStyle.Toolbar.Night">
<item name="android:background">@color/orange_dark</item>
<item name="background">@color/orange_dark</item>
</style>
<!-- Contextual Action Bar -->
<style name="KeepassDXStyle.ActionMode" parent="@style/Widget.AppCompat.ActionMode">
<item name="android:background">@color/orange</item>