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 styles

Browse Source
This commit is contained in:
J-Jamet
2022-02-05 16:48:30 +01:00
parent 1aeaf6855e
commit 631cb104cd
8 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/color/background_button_color_secondary.xml
View File

@@ -2,5 +2,5 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/white_grey" android:state_activated="true" />
<item android:color="@color/white_grey_darker" android:state_enabled="false" />
<item android:color="?android:attr/textColorHintInverse" android:state_enabled="true" />
<item android:color="?android:attr/textColorSecondaryInverse" android:state_enabled="true" />
</selector>

14
app/src/main/res/layout/item_file_info.xml
View File

@@ -71,8 +71,8 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/file_information_button"
android:button="@drawable/checkbox_star"
android:buttonTint="?android:attr/textColorHintInverse"
app:buttonTint="?android:attr/textColorHintInverse"
android:buttonTint="?android:attr/textColorSecondaryInverse"
app:buttonTint="?android:attr/textColorSecondaryInverse"
android:gravity="center"
android:contentDescription="@string/default_checkbox" />
<androidx.appcompat.widget.AppCompatImageButton
@@ -170,14 +170,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/entry_modified"
android:textColor="?android:attr/textColorHintInverse"
android:textColor="?android:attr/textColorSecondaryInverse"
android:textSize="12sp" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/file_modification"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?android:attr/textColorHintInverse"
android:textColor="?android:attr/textColorSecondaryInverse"
tools:text="Aug 21, 2020 3:40:14 PM" />
</LinearLayout>
@@ -189,7 +189,7 @@
android:paddingTop="8dp"
android:layout_marginRight="@dimen/default_margin"
android:layout_marginEnd="@dimen/default_margin"
android:textColor="?android:attr/textColorHintInverse"
android:textColor="?android:attr/textColorSecondaryInverse"
app:layout_constraintBottom_toBottomOf="@+id/file_modification_container"
app:layout_constraintEnd_toEndOf="parent"
tools:text="8 bytes" />
@@ -202,7 +202,7 @@
android:src="@drawable/ic_content_delete_white_24dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:tint="?android:attr/textColorHintInverse"
android:tint="?android:attr/textColorSecondaryInverse"
style="@style/KeepassDXStyle.ImageButton.Simple.Secondary"/>
<androidx.appcompat.widget.AppCompatTextView
@@ -219,7 +219,7 @@
app:layout_constraintStart_toEndOf="@+id/file_delete_button"
app:layout_constraintEnd_toEndOf="parent"
tools:text="/path/to/DatabaseName.kdbx"
android:textColor="?android:attr/textColorHintInverse"
android:textColor="?android:attr/textColorSecondaryInverse"
android:gravity="center_vertical|end"
android:textStyle="italic"/>
</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -113,6 +113,7 @@
<item name="colorControlActivated">@color/cyan_lightest</item>
<item name="android:textColorPrimary">@color/cyan_lightest</item>
<item name="android:textColorHintInverse">@color/cyan_lightest</item>
<item name="android:textColorSecondaryInverse">@color/white_dark</item>
<item name="android:windowBackground">@color/black</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Dark</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Dark</item>

11
app/src/main/res/values/style_divine.xml
View File

@@ -30,9 +30,9 @@
<item name="colorAccent">@color/orange</item>
<item name="colorAccentLight">@color/orange_lighter</item>
<item name="colorControlNormal">@color/grey_light</item>
<item name="colorControlActivated">@color/grey_light</item>
<item name="android:textColorPrimary">@color/green</item>
<item name="android:textColorHintInverse">@color/grey_light</item>
<item name="colorControlActivated">@color/green_light</item>
<item name="android:textColorPrimary">@color/green_light</item>
<item name="android:textColorHintInverse">@color/green_lighter</item>
<item name="android:windowBackground">@color/white</item>
<item name="toolbarColorControl">@color/grey_light</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.White</item>
@@ -116,9 +116,10 @@
<item name="colorAccent">@color/orange_darker</item>
<item name="colorAccentLight">@color/orange</item>
<item name="colorControlNormal">@color/grey_light</item>
<item name="colorControlActivated">@color/white_dark</item>
<item name="colorControlActivated">@color/green</item>
<item name="android:textColorPrimary">@color/green_lighter</item>
<item name="android:textColorHintInverse">@color/white</item>
<item name="android:textColorHintInverse">@color/green_lighter</item>
<item name="android:textColorSecondaryInverse">@color/white_dark</item>
<item name="android:windowBackground">@color/black</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Black</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Black</item>

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

@@ -28,6 +28,7 @@
<item name="colorControlActivated">@color/red_light</item>
<item name="android:textColorPrimary">@color/purple_light</item>
<item name="android:textColorHintInverse">@color/purple_lighter</item>
<item name="android:textColorSecondaryInverse">@color/purple_lighter</item>
<item name="android:windowBackground">@color/white_purple</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Purple</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Purple</item>
@@ -104,6 +105,7 @@
<item name="colorControlActivated">@color/red_light</item>
<item name="android:textColorPrimary">@color/purple_lighter</item>
<item name="android:textColorHintInverse">@color/purple_lighter</item>
<item name="android:textColorSecondaryInverse">@color/purple_lighter</item>
<item name="android:windowBackground">@color/black_purple_dark</item>
<item name="toolbarColorControl">@color/white</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Purple.Dark</item>

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

@@ -28,6 +28,7 @@
<item name="colorControlActivated">@color/blue_white</item>
<item name="android:textColorPrimary">@color/blue_light</item>
<item name="android:textColorHintInverse">@color/blue_lighter</item>
<item name="android:textColorSecondaryInverse">@color/blue_lighter</item>
<item name="android:windowBackground">@color/white_dark</item>
<item name="toolbarColorControl">@color/white</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Blue</item>
@@ -93,6 +94,7 @@
<item name="colorControlActivated">@color/blue_white</item>
<item name="android:textColorPrimary">@color/blue_light</item>
<item name="android:textColorHintInverse">@color/blue_lighter</item>
<item name="android:textColorSecondaryInverse">@color/blue_lighter</item>
<item name="android:windowBackground">@color/grey_dark</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Blue.Night</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Blue.Night</item>

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

@@ -28,6 +28,7 @@
<item name="colorControlActivated">@color/orange</item>
<item name="android:textColorPrimary">@color/red</item>
<item name="android:textColorHintInverse">@color/red_lightest</item>
<item name="android:textColorSecondaryInverse">@color/red_lightest</item>
<item name="android:windowBackground">@color/white_dark</item>
<item name="toolbarColorControl">@color/white</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Red</item>
@@ -92,6 +93,7 @@
<item name="colorControlActivated">@color/orange</item>
<item name="android:textColorPrimary">@color/red</item>
<item name="android:textColorHintInverse">@color/red_lightest</item>
<item name="android:textColorSecondaryInverse">@color/red_lightest</item>
<item name="android:windowBackground">@color/grey_dark</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Red.Night</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Red.Night</item>

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

@@ -62,7 +62,7 @@
<item name="android:textColorPrimary">@color/green_light</item>
<item name="android:textColorPrimaryInverse">@color/white_darkest</item>
<item name="android:textColorSecondary">@color/text_color_secondary_light</item>
<item name="android:textColorSecondaryInverse">@color/white_grey_darker</item>
<item name="android:textColorSecondaryInverse">@color/green_lightest</item>
<item name="android:textColorHint">@color/grey_lighter</item>
<item name="android:textColorHintInverse">@color/green_lightest</item>
@@ -132,7 +132,7 @@
<item name="android:textColorPrimary">@color/green_light</item>
<item name="android:textColorPrimaryInverse">@color/white_darkest</item>
<item name="android:textColorSecondary">@color/text_color_secondary_night</item>
<item name="android:textColorSecondaryInverse">@color/white_grey_darker</item>
<item name="android:textColorSecondaryInverse">@color/green_lightest</item>
<item name="android:textColorHint">@color/grey_lighter</item>
<item name="android:textColorHintInverse">@color/green_lightest</item>
@@ -197,7 +197,7 @@
<!-- Toolbar Home -->
<style name="KeepassDXStyle.Toolbar.Navigation.Tinted" parent="Widget.AppCompat.Toolbar.Button.Navigation">
<item name="tint">?android:attr/textColorHintInverse</item>
<item name="tint">?android:attr/textColorSecondaryInverse</item>
</style>
<style name="KeepassDXStyle.Toolbar.Home.Light" parent="KeepassDXStyle.Toolbar.Light">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
@@ -342,7 +342,7 @@
<item name="android:drawablePadding">8dp</item>
</style>
<style name="KeepassDXStyle.TextAppearance.Secondary.TextOnPrimary" parent="KeepassDXStyle.TextAppearance.Default.TextOnPrimary">
<item name="android:textColor">?android:attr/textColorHintInverse</item>
<item name="android:textColor">?android:attr/textColorSecondaryInverse</item>
<item name="android:textSize">14sp</item>
<item name="android:textStyle">italic</item>
</style>