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 toolbar appearance #669

Browse Source
This commit is contained in:
J-Jamet
2020-08-27 20:39:03 +02:00
parent 949bc58a80
commit ecc198e8a0
8 changed files with 39 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/res/layout/activity_entry_edit.xml
View File

@@ -69,9 +69,6 @@
android:id="@+id/entry_edit_bottom_bar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:theme="@style/Widget.MaterialComponents.BottomAppBar"
android:backgroundTint="?attr/colorAccent"
app:backgroundTint="?attr/colorAccent"
app:fabAlignmentMode="center"
app:hideOnScroll="false"
app:layout_scrollFlags="scroll|enterAlways"

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

@@ -156,8 +156,7 @@
android:layout_height="?attr/actionBarSize"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:theme="?attr/actionToolbarAppearance"
android:background="?attr/colorAccent" />
style="?attr/actionToolbarAppearance" />
<include
layout="@layout/view_button_lock"

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

@@ -31,7 +31,6 @@
<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.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.Black</item>

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

@@ -30,7 +30,6 @@
<item name="android:windowBackground">@color/background_light</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Blue</item>
<item name="specialToolbarAppearance">@style/KeepassDXStyle.Toolbar.Special.Blue</item>
<item name="actionToolbarAppearance">@style/KeepassDXStyle.Toolbar.Action.Blue</item>
<item name="actionModeStyle">@style/KeepassDXStyle.ActionMode.Blue</item>
</style>
<!-- Toolbar Style Blue -->

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

@@ -30,7 +30,6 @@
<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.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>

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

@@ -31,7 +31,6 @@
<item name="android:windowBackground">@color/background_purple</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Purple</item>
<item name="specialToolbarAppearance">@style/KeepassDXStyle.Toolbar.Special.Purple</item>
<item name="actionToolbarAppearance">@style/KeepassDXStyle.Toolbar.Action.Purple</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Purple.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Purple.Dialog</item>
<item name="actionModeStyle">@style/KeepassDXStyle.ActionMode.Purple</item>

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

@@ -30,7 +30,6 @@
<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.Red</item>
<item name="actionModeStyle">@style/KeepassDXStyle.ActionMode.Red</item>
</style>
<!-- Toolbar Style Red -->

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

@@ -76,8 +76,11 @@
<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.Light</item>
<item name="actionToolbarAppearance">@style/KeepassDXStyle.Toolbar.Action</item>
<item name="bottomAppBarStyle">@style/KeepassDXStyle.Toolbar.Bottom</item>
<item name="actionModeStyle">@style/KeepassDXStyle.ActionMode</item>
<item name="android:actionOverflowButtonStyle">@style/KeepassDXStyle.Toolbar.Overflow</item>
<item name="actionOverflowButtonStyle">@style/KeepassDXStyle.Toolbar.Overflow</item>
<!-- CollapsingToolbarLayout -->
<item name="expandedTitleTextAppearance">@style/KeepassDXStyle.Expanded.Title</item>
<item name="collapsedTitleTextAppearance">@style/KeepassDXStyle.Collapsed.Title</item>
@@ -129,8 +132,11 @@
<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.Night</item>
<item name="actionToolbarAppearance">@style/KeepassDXStyle.Toolbar.Action</item>
<item name="bottomAppBarStyle">@style/KeepassDXStyle.Toolbar.Bottom</item>
<item name="actionModeStyle">@style/KeepassDXStyle.ActionMode</item>
<item name="android:actionOverflowButtonStyle">@style/KeepassDXStyle.Toolbar.Overflow</item>
<item name="actionOverflowButtonStyle">@style/KeepassDXStyle.Toolbar.Overflow</item>
<!-- CollapsingToolbarLayout -->
<item name="expandedTitleTextAppearance">@style/KeepassDXStyle.Expanded.Title</item>
<item name="collapsedTitleTextAppearance">@style/KeepassDXStyle.Collapsed.Title</item>
@@ -158,7 +164,7 @@
<item name="android:activityCloseExitAnimation">@anim/slide_out_right</item>
</style>
<!-- Toolbar Style Light Green -->
<!-- Toolbar Style Light -->
<style name="KeepassDXStyle.Toolbar.Light" parent="KeepassDXStyle.Light.v21">
<item name="colorControlNormal">@color/colorTextInverse</item>
<item name="android:textColorPrimary">@color/colorTextInverse</item>
@@ -168,7 +174,7 @@
<item name="android:tint">@color/colorTextInverse</item>
</style>
<!-- Toolbar Style Night Green -->
<!-- Toolbar Style Night -->
<style name="KeepassDXStyle.Toolbar.Night" parent="KeepassDXStyle.Night.v21">
<item name="colorControlNormal">@color/colorTextInverse</item>
<item name="android:textColorPrimary">@color/colorTextInverse</item>
@@ -178,6 +184,34 @@
<item name="android:tint">@color/colorTextInverse</item>
</style>
<style name="KeepassDXStyle.Toolbar.Title" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
<item name="android:textColor">@color/colorTextInverse</item>
</style>
<style name="KeepassDXStyle.Toolbar.Subtitle" parent="TextAppearance.Widget.AppCompat.Toolbar.Subtitle">
<item name="android:textColor">@color/colorTextInverse</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>
</style>
<!-- Action Style -->
<style name="KeepassDXStyle.Toolbar.Action" parent="Widget.AppCompat.Toolbar">
<item name="titleTextAppearance">@style/KeepassDXStyle.Toolbar.Title</item>
<item name="subtitleTextAppearance">@style/KeepassDXStyle.Toolbar.Subtitle</item>
<item name="android:background">?attr/colorAccent</item>
</style>
<!-- Bottom Toolbar Style -->
<style name="KeepassDXStyle.Toolbar.Bottom" parent="Widget.MaterialComponents.BottomAppBar">
<item name="titleTextAppearance">@style/KeepassDXStyle.Toolbar.Title</item>
<item name="subtitleTextAppearance">@style/KeepassDXStyle.Toolbar.Subtitle</item>
<item name="android:textColorSecondary">@color/colorTextInverse</item>
<item name="backgroundTint">?attr/colorAccent</item>
<item name="android:background">?attr/colorAccent</item>
<item name="background">?attr/colorAccent</item>
</style>
<!-- Special Toolbar Light Style -->
<style name="KeepassDXStyle.Toolbar.Special.Light" parent="KeepassDXStyle.Toolbar.Light">
<item name="android:background">@color/green_dark</item>