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
2023-07-21 18:17:00 +02:00
parent 72b347bc85
commit 2a1a5d9bd4
14 changed files with 293 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/com/kunzisoft/keepass/adapters/FileDatabaseHistoryAdapter.kt
View File

@@ -23,12 +23,14 @@ import android.content.Context
import android.graphics.Color
import android.graphics.PorterDuff
import android.net.Uri
import android.util.TypedValue
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.*
import androidx.annotation.ColorInt
import android.widget.CompoundButton
import android.widget.EditText
import android.widget.ImageView
import android.widget.TextView
import android.widget.ViewSwitcher
import androidx.recyclerview.widget.RecyclerView
import androidx.recyclerview.widget.SortedList
import androidx.recyclerview.widget.SortedListAdapterCallback
@@ -84,20 +86,6 @@ class FileDatabaseHistoryAdapter(context: Context)
}
)
@ColorInt
private val defaultColor: Int
@ColorInt
private val warningColor: Int
init {
val typedValue = TypedValue()
val theme = context.theme
theme.resolveAttribute(R.attr.colorSecondary, typedValue, true)
warningColor = typedValue.data
theme.resolveAttribute(android.R.attr.textColorHintInverse, typedValue, true)
defaultColor = typedValue.data
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): FileDatabaseHistoryViewHolder {
val view = inflater.inflate(R.layout.item_file_info, parent, false)
return FileDatabaseHistoryViewHolder(view)

8
app/src/main/res/values-v21/styles_classic.xml
View File

@@ -19,16 +19,10 @@
-->
<resources>
<style name="KeepassDXStyle.Clear.v21" parent="KeepassDXStyle.Clear.Base" >
<item name="preferenceTheme">@style/KeepassDXStyle.Preference.v21</item>
<item name="android:statusBarColor">@color/grey_dark</item>
<item name="android:navigationBarColor">@color/grey_dark</item>
<item name="android:timePickerDialogTheme">@style/KeepassDXStyle.Clear.DateTime.Dialog</item>
<item name="android:datePickerDialogTheme">@style/KeepassDXStyle.Clear.DateTime.Dialog</item>
</style>
<style name="KeepassDXStyle.Dark" parent="KeepassDXStyle.Dark.v21" >
<item name="preferenceTheme">@style/KeepassDXStyle.Preference.v21</item>
<item name="android:statusBarColor">?attr/colorPrimaryDark</item>
<item name="android:navigationBarColor">?attr/colorPrimaryDark</item>
<style name="KeepassDXStyle.Dark.v21" parent="KeepassDXStyle.Dark.Base" >
<item name="android:timePickerDialogTheme">@style/KeepassDXStyle.Dark.DateTime.Dialog</item>
<item name="android:datePickerDialogTheme">@style/KeepassDXStyle.Dark.DateTime.Dialog</item>
</style>

6
app/src/main/res/values-v21/styles_kunzite.xml
View File

@@ -19,16 +19,10 @@
-->
<resources>
<style name="KeepassDXStyle.Purple" parent="KeepassDXStyle.Purple.v21" >
<item name="preferenceTheme">@style/KeepassDXStyle.Preference.v21</item>
<item name="android:statusBarColor">?attr/colorPrimaryDark</item>
<item name="android:navigationBarColor">?attr/colorPrimaryDark</item>
<item name="android:timePickerDialogTheme">@style/KeepassDXStyle.Purple.DateTime.Dialog</item>
<item name="android:datePickerDialogTheme">@style/KeepassDXStyle.Purple.DateTime.Dialog</item>
</style>
<style name="KeepassDXStyle.Purple.Dark" parent="KeepassDXStyle.Purple.Dark.v21" >
<item name="preferenceTheme">@style/KeepassDXStyle.Preference.v21</item>
<item name="android:statusBarColor">?attr/colorPrimaryDark</item>
<item name="android:navigationBarColor">?attr/colorPrimaryDark</item>
<item name="android:timePickerDialogTheme">@style/KeepassDXStyle.Purple.Dark.DateTime.Dialog</item>
<item name="android:datePickerDialogTheme">@style/KeepassDXStyle.Purple.Dark.DateTime.Dialog</item>
</style>

25
app/src/main/res/values-v23/styles_classic.xml
View File

@@ -1,25 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2021 Jeremy Jamet / Kunzisoft.
This file is part of KeePassDX.
KeePassDX is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
KeePassDX is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
-->
<resources>
<style name="KeepassDXStyle.Clear.v23" parent="KeepassDXStyle.Clear.v21" >
<item name="android:statusBarColor">?attr/colorPrimaryDark</item>
<item name="android:windowLightStatusBar">true</item>
</style>
</resources>

25
app/src/main/res/values-v27/styles_classic.xml
View File

@@ -1,25 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2021 Jeremy Jamet / Kunzisoft.
This file is part of KeePassDX.
KeePassDX is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
KeePassDX is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
-->
<resources>
<style name="KeepassDXStyle.Clear.v27" parent="KeepassDXStyle.Clear.v23" >
<item name="android:navigationBarColor">?attr/colorPrimary</item>
<item name="android:windowLightNavigationBar">true</item>
</style>
</resources>

139
app/src/main/res/values/colors.xml
View File

@@ -119,6 +119,7 @@
<color name="blue_deep">#1A73E8</color>
<!-- Themes colors -->
<!-- Forest -->
<color name="forest_theme_light_primary">@color/green</color>
<color name="forest_theme_light_primaryDark">@color/green_whitest</color>
@@ -186,6 +187,144 @@
<color name="forest_theme_night_inverseSurface">#E2E3DD</color>
<color name="forest_theme_night_inversePrimary">#006E1C</color>
<!-- Classic -->
<color name="classic_theme_light_primary">@color/cyan_lighter</color>
<color name="classic_theme_light_primaryDark">@color/white_darkest</color>
<color name="classic_theme_light_onPrimary">@color/white</color>
<color name="classic_theme_light_primaryContainer">@color/cyan_lighter</color>
<color name="classic_theme_light_onPrimaryContainer">@color/white_darkest</color>
<color name="classic_theme_light_secondary">@color/cyan</color>
<color name="classic_theme_light_onSecondary">@color/white_grey_light</color>
<color name="classic_theme_light_secondaryContainer">@color/cyan</color>
<color name="classic_theme_light_onSecondaryContainer">@color/white_grey_light</color>
<color name="classic_theme_light_tertiary">@color/cyan_dark</color>
<color name="classic_theme_light_onTertiary">@color/white</color>
<color name="classic_theme_light_tertiaryContainer">@color/cyan_dark</color>
<color name="classic_theme_light_onTertiaryContainer">@color/white</color>
<color name="classic_theme_light_error">#BA1A1A</color>
<color name="classic_theme_light_errorContainer">#FFDAD6</color>
<color name="classic_theme_light_onError">#FFFFFF</color>
<color name="classic_theme_light_onErrorContainer">#410002</color>
<color name="classic_theme_light_background">#E1E3E4</color>
<color name="classic_theme_light_onBackground">@color/cyan_dark</color>
<color name="classic_theme_light_surface">#D4D4D4</color>
<color name="classic_theme_light_onSurface">@color/cyan_dark</color>
<color name="classic_theme_light_surfaceContainerLowest">#E6E8EA</color>
<color name="classic_theme_light_surfaceContainerLow">#E6E8EA</color>
<color name="classic_theme_light_surfaceContainer">#DBDDDF</color>
<color name="classic_theme_light_surfaceContainerHigh">#D8DCDF</color>
<color name="classic_theme_light_surfaceContainerHighest">#D3D8DC</color>
<color name="classic_theme_light_surfaceVariant">#DEE5D8</color>
<color name="classic_theme_light_onSurfaceVariant">#404649</color>
<color name="classic_theme_light_outline">#72796F</color>
<color name="classic_theme_light_inverseOnSurface">#F0F1EB</color>
<color name="classic_theme_light_inverseSurface">#2D2F31</color>
<color name="classic_theme_light_inversePrimary">#4FC3F7</color>
<color name="classic_theme_night_primary">#209BC6</color>
<color name="classic_theme_night_primaryDark">@color/black_light</color>
<color name="classic_theme_night_onPrimary">@color/white</color>
<color name="classic_theme_night_primaryContainer">@color/cyan</color>
<color name="classic_theme_night_onPrimaryContainer">@color/white</color>
<color name="classic_theme_night_secondary">#268EB3</color>
<color name="classic_theme_night_onSecondary">@color/white</color>
<color name="classic_theme_night_secondaryContainer">#215B70</color>
<color name="classic_theme_night_onSecondaryContainer">@color/white_grey_light</color>
<color name="classic_theme_night_tertiary">@color/cyan_dark</color>
<color name="classic_theme_night_onTertiary">@color/white</color>
<color name="classic_theme_night_tertiaryContainer">@color/cyan_dark</color>
<color name="classic_theme_night_onTertiaryContainer">@color/white</color>
<color name="classic_theme_night_error">#FFB4AB</color>
<color name="classic_theme_night_errorContainer">#93000A</color>
<color name="classic_theme_night_onError">#690005</color>
<color name="classic_theme_night_onErrorContainer">#FFDAD6</color>
<color name="classic_theme_night_background">#0C0E0E</color>
<color name="classic_theme_night_onBackground">#DDE3E3</color>
<color name="classic_theme_night_surface">#1A2125</color>
<color name="classic_theme_night_onSurface">#F1F2F3</color>
<color name="classic_theme_night_surfaceContainerLowest">#222D30</color>
<color name="classic_theme_night_surfaceContainerLow">#212B2F</color>
<color name="classic_theme_night_surfaceContainer">#1D262C</color>
<color name="classic_theme_night_surfaceContainerHigh">#1B252B</color>
<color name="classic_theme_night_surfaceContainerHighest">#182025</color>
<color name="classic_theme_night_surfaceVariant">#404649</color>
<color name="classic_theme_night_onSurfaceVariant">#C2C9BD</color>
<color name="classic_theme_night_outline">#888F93</color>
<color name="classic_theme_night_inverseOnSurface">#191B1C</color>
<color name="classic_theme_night_inverseSurface">#DDE1E3</color>
<color name="classic_theme_night_inversePrimary">#00486E</color>
<!-- Divine -->
<color name="divine_theme_light_primary">@color/orange_dark</color>
<color name="divine_theme_light_primaryDark">@color/white</color>
<color name="divine_theme_light_onPrimary">@color/white</color>
<color name="divine_theme_light_primaryContainer">@color/green_dark</color>
<color name="divine_theme_light_onPrimaryContainer">@color/white</color>
<color name="divine_theme_light_secondary">@color/orange_dark</color>
<color name="divine_theme_light_onSecondary">#FBEFE5</color>
<color name="divine_theme_light_secondaryContainer">@color/orange_dark</color>
<color name="divine_theme_light_onSecondaryContainer">@color/white</color>
<color name="divine_theme_light_tertiary">@color/orange_lightest</color>
<color name="divine_theme_light_onTertiary">#3A1A04</color>
<color name="divine_theme_light_tertiaryContainer">@color/orange_lightest</color>
<color name="divine_theme_light_onTertiaryContainer">#3A1A04</color>
<color name="divine_theme_light_error">#BA1A1A</color>
<color name="divine_theme_light_errorContainer">#FFDAD6</color>
<color name="divine_theme_light_onError">#FFFFFF</color>
<color name="divine_theme_light_onErrorContainer">#410002</color>
<color name="divine_theme_light_background">@color/white</color>
<color name="divine_theme_light_onBackground">@color/orange_darkest</color>
<color name="divine_theme_light_surface">@color/white</color>
<color name="divine_theme_light_onSurface">#351904</color>
<color name="divine_theme_light_surfaceContainerLowest">#FFFCF9</color>
<color name="divine_theme_light_surfaceContainerLow">#FFFBF6</color>
<color name="divine_theme_light_surfaceContainer">#FEF9F2</color>
<color name="divine_theme_light_surfaceContainerHigh">#FBF5EC</color>
<color name="divine_theme_light_surfaceContainerHighest">#FAF2E7</color>
<color name="divine_theme_light_surfaceVariant">#E5DED8</color>
<color name="divine_theme_light_onSurfaceVariant">#494340</color>
<color name="divine_theme_light_outline">#79736F</color>
<color name="divine_theme_light_inverseOnSurface">#F1EEEB</color>
<color name="divine_theme_light_inverseSurface">#312F2D</color>
<color name="divine_theme_light_inversePrimary">#F7924F</color>
<color name="divine_theme_night_primary">@color/orange_darkest</color>
<color name="divine_theme_night_primaryDark">@color/black</color>
<color name="divine_theme_night_onPrimary">@color/white</color>
<color name="divine_theme_night_primaryContainer">@color/green_darkest</color>
<color name="divine_theme_night_onPrimaryContainer">@color/white</color>
<color name="divine_theme_night_secondary">@color/orange_dark</color>
<color name="divine_theme_night_onSecondary">@color/white</color>
<color name="divine_theme_night_secondaryContainer">@color/orange_darkest</color>
<color name="divine_theme_night_onSecondaryContainer">@color/white</color>
<color name="divine_theme_night_tertiary">@color/green_darkest</color>
<color name="divine_theme_night_onTertiary">@color/white</color>
<color name="divine_theme_night_tertiaryContainer">@color/green_darkest</color>
<color name="divine_theme_night_onTertiaryContainer">@color/white</color>
<color name="divine_theme_night_error">#FFB4AB</color>
<color name="divine_theme_night_errorContainer">#93000A</color>
<color name="divine_theme_night_onError">#690005</color>
<color name="divine_theme_night_onErrorContainer">#FFDAD6</color>
<color name="divine_theme_night_background">@color/black</color>
<color name="divine_theme_night_onBackground">#E3E0DD</color>
<color name="divine_theme_night_surface">@color/black</color>
<color name="divine_theme_night_onSurface">#F3F2F1</color>
<color name="divine_theme_night_surfaceContainerLowest">#2C221E</color>
<color name="divine_theme_night_surfaceContainerLow">#221A17</color>
<color name="divine_theme_night_surfaceContainer">#1C1613</color>
<color name="divine_theme_night_surfaceContainerHigh">#171210</color>
<color name="divine_theme_night_surfaceContainerHighest">#130F0E</color>
<color name="divine_theme_night_surfaceVariant">#494340</color>
<color name="divine_theme_night_onSurfaceVariant">#C9C2BD</color>
<color name="divine_theme_night_outline">#938B88</color>
<color name="divine_theme_night_inverseOnSurface">#1C1A19</color>
<color name="divine_theme_night_inverseSurface">#E3E0DD</color>
<color name="divine_theme_night_inversePrimary">#6E3000</color>
<!-- Reply -->
<color name="reply_orange_light">#FFBA52</color>
<color name="reply_orange">#F9AA33</color>
<color name="reply_blue_lightest">#F6F8FA</color>

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

@@ -52,6 +52,7 @@
<item name="colorErrorContainer">@color/forest_theme_light_errorContainer</item>
<item name="colorOnError">@color/forest_theme_light_onError</item>
<item name="colorOnErrorContainer">@color/forest_theme_light_onErrorContainer</item>
<item name="android:windowBackground">@color/green_white</item>
<item name="android:colorBackground">@color/forest_theme_light_background</item>
<item name="colorOnBackground">@color/forest_theme_light_onBackground</item>
<item name="colorSurface">@color/forest_theme_light_surface</item>
@@ -71,7 +72,6 @@
<item name="windowNoTitle">true</item>
<item name="windowActionBar">false</item>
<item name="android:fitsSystemWindows">false</item>
<item name="android:windowBackground">@color/green_white</item>
<item name="android:imageButtonStyle">@style/KeepassDXStyle.ImageButton</item>
<item name="imageButtonStyle">@style/KeepassDXStyle.ImageButton</item>
@@ -89,9 +89,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/green_lightest</item>
<item name="android:textColorHint">@color/grey_lighter</item>
<item name="android:textColorHintInverse">@color/green_lightest</item>
<item name="iconPreferenceColor">@color/text_color_secondary_light</item>
@@ -160,6 +158,7 @@
<item name="colorErrorContainer">@color/forest_theme_night_errorContainer</item>
<item name="colorOnError">@color/forest_theme_night_onError</item>
<item name="colorOnErrorContainer">@color/forest_theme_night_onErrorContainer</item>
<item name="android:windowBackground">?attr/colorSurfaceContainerHighest</item>
<item name="android:colorBackground">@color/forest_theme_night_background</item>
<item name="colorOnBackground">@color/forest_theme_night_onBackground</item>
<item name="colorSurface">@color/forest_theme_night_surface</item>
@@ -179,7 +178,6 @@
<item name="windowNoTitle">true</item>
<item name="windowActionBar">false</item>
<item name="android:fitsSystemWindows">false</item>
<item name="android:windowBackground">?attr/colorSurfaceContainerHighest</item>
<item name="android:imageButtonStyle">@style/KeepassDXStyle.ImageButton</item>
<item name="imageButtonStyle">@style/KeepassDXStyle.ImageButton</item>
@@ -197,9 +195,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/green_lightest</item>
<item name="android:textColorHint">@color/grey_lighter</item>
<item name="android:textColorHintInverse">@color/green_lightest</item>
<item name="iconPreferenceColor">@color/text_color_secondary_night</item>

122
app/src/main/res/values/styles_classic.xml
View File

@@ -19,40 +19,53 @@
-->
<resources>
<!-- Classic Clear Style -->
<style name="KeepassDXStyle.Clear" parent="KeepassDXStyle.Clear.v27" />
<style name="KeepassDXStyle.Clear.v27" parent="KeepassDXStyle.Clear.v23" />
<style name="KeepassDXStyle.Clear.v23" parent="KeepassDXStyle.Clear.v21" />
<style name="KeepassDXStyle.Clear" parent="KeepassDXStyle.Clear.v21" />
<style name="KeepassDXStyle.Clear.v21" parent="KeepassDXStyle.Clear.Base" />
<style name="KeepassDXStyle.Clear.Base" parent="KeepassDXStyle.Light" >
<item name="colorPrimary">@color/white_grey_lighter</item>
<item name="colorPrimaryDark">@color/white_grey_light</item>
<item name="colorOnPrimary">@color/grey_light</item>
<item name="colorSecondary">@color/cyan_lighter</item>
<item name="colorOnSecondary">@color/white_darkest</item>
<item name="colorTertiary">@color/white_grey_lighter</item>
<item name="colorOnTertiary">@color/white</item>
<item name="colorSurface">@color/white_darkest</item>
<item name="colorControlActivated">@color/cyan_lightest</item>
<item name="colorPrimary">@color/classic_theme_light_primary</item>
<item name="colorPrimaryDark">@color/classic_theme_light_primaryDark</item>
<item name="colorOnPrimary">@color/classic_theme_light_onPrimary</item>
<item name="colorPrimaryContainer">@color/classic_theme_light_primaryContainer</item>
<item name="colorOnPrimaryContainer">@color/classic_theme_light_onPrimaryContainer</item>
<item name="colorSecondary">@color/classic_theme_light_secondary</item>
<item name="colorOnSecondary">@color/classic_theme_light_onSecondary</item>
<item name="colorSecondaryContainer">@color/classic_theme_light_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/classic_theme_light_onSecondaryContainer</item>
<item name="colorTertiary">@color/classic_theme_light_tertiary</item>
<item name="colorOnTertiary">@color/classic_theme_light_onTertiary</item>
<item name="colorTertiaryContainer">@color/classic_theme_light_tertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/classic_theme_light_onTertiaryContainer</item>
<item name="colorError">@color/classic_theme_light_error</item>
<item name="colorErrorContainer">@color/classic_theme_light_errorContainer</item>
<item name="colorOnError">@color/classic_theme_light_onError</item>
<item name="colorOnErrorContainer">@color/classic_theme_light_onErrorContainer</item>
<item name="android:windowBackground">@color/classic_theme_light_background</item>
<item name="android:colorBackground">@color/classic_theme_light_background</item>
<item name="colorOnBackground">@color/classic_theme_light_onBackground</item>
<item name="colorSurface">@color/classic_theme_light_surface</item>
<item name="colorOnSurface">@color/classic_theme_light_onSurface</item>
<item name="colorSurfaceContainerLowest">@color/classic_theme_light_surfaceContainerLowest</item>
<item name="colorSurfaceContainerLow">@color/classic_theme_light_surfaceContainerLow</item>
<item name="colorSurfaceContainer">@color/classic_theme_light_surfaceContainer</item>
<item name="colorSurfaceContainerHigh">@color/classic_theme_light_surfaceContainerHigh</item>
<item name="colorSurfaceContainerHighest">@color/classic_theme_light_surfaceContainerHighest</item>
<item name="colorSurfaceVariant">@color/classic_theme_light_surfaceVariant</item>
<item name="colorOnSurfaceVariant">@color/classic_theme_light_onSurfaceVariant</item>
<item name="colorOutline">@color/classic_theme_light_outline</item>
<item name="colorOnSurfaceInverse">@color/classic_theme_light_inverseOnSurface</item>
<item name="colorSurfaceInverse">@color/classic_theme_light_inverseSurface</item>
<item name="colorPrimaryInverse">@color/classic_theme_light_inversePrimary</item>
<item name="android:textColorPrimary">@color/cyan_lightest</item>
<item name="android:textColorHintInverse">@color/cyan_lightest</item>
<item name="android:windowBackground">@color/white_darkest</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Clear.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Clear.Dialog</item>
<item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Clear</item>
<item name="cardBackgroundTransparentColor">@color/white_grey_lighter_transparent</item>
<item name="educationCircleColor">@color/cyan_lighter</item>
<item name="educationTextColor">@color/white</item>
<item name="android:textColor">@color/text_color_light</item>
<item name="android:textColorLink">@color/text_color_light</item>
<item name="android:editTextColor">@color/grey_light</item>
<item name="android:textColorPrimaryInverse">@color/grey_light</item>
<item name="android:textColorSecondary">@color/text_color_secondary_light</item>
<item name="android:textColorSecondaryInverse">@color/grey_lighter</item>
<item name="android:textColorHint">@color/grey_lighter</item>
<item name="chipFilterTextColor">@color/text_color_light</item>
<item name="chipFilterBackgroundColor">@color/white_darkest</item>
<item name="chipFilterBackgroundColorDisabled">@color/white_grey_lighter</item>
@@ -64,35 +77,56 @@
<item name="android:background">@color/white_grey_lighter</item>
<item name="background">@color/white_grey_lighter</item>
</style>
<style name="KeepassDXStyle.Clear.DateTime.Dialog" parent="Theme.AppCompat.Light.Dialog">
<style name="KeepassDXStyle.Clear.DateTime.Dialog" parent="KeepassDXStyle.Light.DateTime.Dialog">
<item name="colorSecondary">@color/cyan_lighter</item>
<item name="android:textColorPrimary">@color/cyan</item>
<item name="android:windowBackground">@color/white_grey_lighter</item>
</style>
<!-- CardView -->
<style name="KeepassDXStyle.Cardview.Clear" parent="KeepassDXStyle.Cardview">
<item name="cardBackgroundColor">@color/white_darkest</item>
</style>
<!-- Classic Dark Style -->
<style name="KeepassDXStyle.Dark" parent="KeepassDXStyle.Dark.v21" />
<style name="KeepassDXStyle.Dark.v21" parent="KeepassDXStyle.Night" >
<item name="colorPrimary">@color/grey_darker</item>
<item name="colorPrimaryDark">@color/black_light</item>
<item name="colorSecondary">@color/cyan</item>
<item name="colorOnSecondary">@color/white</item>
<item name="colorTertiary">@color/black_light</item>
<item name="colorOnTertiary">@color/black</item>
<item name="colorSurface">@color/black</item>
<style name="KeepassDXStyle.Dark.v21" parent="KeepassDXStyle.Dark.Base" />
<style name="KeepassDXStyle.Dark.Base" parent="KeepassDXStyle.Night" >
<item name="colorPrimary">@color/classic_theme_night_primary</item>
<item name="colorPrimaryDark">@color/classic_theme_night_primaryDark</item>
<item name="colorOnPrimary">@color/classic_theme_night_onPrimary</item>
<item name="colorPrimaryContainer">@color/classic_theme_night_primaryContainer</item>
<item name="colorOnPrimaryContainer">@color/classic_theme_night_onPrimaryContainer</item>
<item name="colorSecondary">@color/classic_theme_night_secondary</item>
<item name="colorOnSecondary">@color/classic_theme_night_onSecondary</item>
<item name="colorSecondaryContainer">@color/classic_theme_night_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/classic_theme_night_onSecondaryContainer</item>
<item name="colorTertiary">@color/classic_theme_night_tertiary</item>
<item name="colorOnTertiary">@color/classic_theme_night_onTertiary</item>
<item name="colorTertiaryContainer">@color/classic_theme_night_tertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/classic_theme_night_onTertiaryContainer</item>
<item name="colorError">@color/classic_theme_night_error</item>
<item name="colorErrorContainer">@color/classic_theme_night_errorContainer</item>
<item name="colorOnError">@color/classic_theme_night_onError</item>
<item name="colorOnErrorContainer">@color/classic_theme_night_onErrorContainer</item>
<item name="android:windowBackground">@color/classic_theme_night_background</item>
<item name="android:colorBackground">@color/classic_theme_night_background</item>
<item name="colorOnBackground">@color/classic_theme_night_onBackground</item>
<item name="colorSurface">@color/classic_theme_night_surface</item>
<item name="colorOnSurface">@color/classic_theme_night_onSurface</item>
<item name="colorSurfaceContainerLowest">@color/classic_theme_night_surfaceContainerLowest</item>
<item name="colorSurfaceContainerLow">@color/classic_theme_night_surfaceContainerLow</item>
<item name="colorSurfaceContainer">@color/classic_theme_night_surfaceContainer</item>
<item name="colorSurfaceContainerHigh">@color/classic_theme_night_surfaceContainerHigh</item>
<item name="colorSurfaceContainerHighest">@color/classic_theme_night_surfaceContainerHighest</item>
<item name="colorSurfaceVariant">@color/classic_theme_night_surfaceVariant</item>
<item name="colorOnSurfaceVariant">@color/classic_theme_night_onSurfaceVariant</item>
<item name="colorOutline">@color/classic_theme_night_outline</item>
<item name="colorOnSurfaceInverse">@color/classic_theme_night_inverseOnSurface</item>
<item name="colorSurfaceInverse">@color/classic_theme_night_inverseSurface</item>
<item name="colorPrimaryInverse">@color/classic_theme_night_inversePrimary</item>
<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="android:alertDialogTheme">@style/KeepassDXStyle.Dark.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Dark.Dialog</item>
<item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Dark</item>
<item name="cardBackgroundTransparentColor">@color/black_light_transparent</item>
<item name="educationCircleColor">@color/cyan</item>
<item name="educationTextColor">@color/white</item>
@@ -108,13 +142,9 @@
<item name="android:background">@color/black_lighter</item>
<item name="background">@color/black_lighter</item>
</style>
<style name="KeepassDXStyle.Dark.DateTime.Dialog" parent="Theme.AppCompat.DayNight.Dialog">
<style name="KeepassDXStyle.Dark.DateTime.Dialog" parent="KeepassDXStyle.Night.DateTime.Dialog">
<item name="colorSecondary">@color/cyan_lighter</item>
<item name="android:textColorPrimary">@color/cyan_lightest</item>
<item name="android:windowBackground">@color/black_lighter</item>
</style>
<!-- CardView -->
<style name="KeepassDXStyle.Cardview.Dark" parent="KeepassDXStyle.Cardview">
<item name="cardBackgroundColor">@color/black_light</item>
</style>
</resources>

104
app/src/main/res/values/styles_divine.xml
View File

@@ -23,35 +23,49 @@
<style name="KeepassDXStyle.White.v21" parent="KeepassDXStyle.White.Base" />
<style name="KeepassDXStyle.White.Base" parent="KeepassDXStyle.Light">
<item name="colorPrimary">@color/orange</item>
<item name="colorPrimaryDark">@color/white</item>
<item name="colorOnPrimary">@color/white</item>
<item name="colorSecondary">@color/orange</item>
<item name="colorOnSecondary">@color/white</item>
<item name="colorTertiary">@color/white_darkest</item>
<item name="colorOnTertiary">@color/white</item>
<item name="colorSurface">@color/white</item>
<item name="colorPrimary">@color/divine_theme_light_primary</item>
<item name="colorPrimaryDark">@color/divine_theme_light_primaryDark</item>
<item name="colorOnPrimary">@color/divine_theme_light_onPrimary</item>
<item name="colorPrimaryContainer">@color/divine_theme_light_primaryContainer</item>
<item name="colorOnPrimaryContainer">@color/divine_theme_light_onPrimaryContainer</item>
<item name="colorSecondary">@color/divine_theme_light_secondary</item>
<item name="colorOnSecondary">@color/divine_theme_light_onSecondary</item>
<item name="colorSecondaryContainer">@color/divine_theme_light_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/divine_theme_light_onSecondaryContainer</item>
<item name="colorTertiary">@color/divine_theme_light_tertiary</item>
<item name="colorOnTertiary">@color/divine_theme_light_onTertiary</item>
<item name="colorTertiaryContainer">@color/divine_theme_light_tertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/divine_theme_light_onTertiaryContainer</item>
<item name="colorError">@color/divine_theme_light_error</item>
<item name="colorErrorContainer">@color/divine_theme_light_errorContainer</item>
<item name="colorOnError">@color/divine_theme_light_onError</item>
<item name="colorOnErrorContainer">@color/divine_theme_light_onErrorContainer</item>
<item name="android:windowBackground">@color/divine_theme_light_background</item>
<item name="android:colorBackground">@color/divine_theme_light_background</item>
<item name="colorOnBackground">@color/divine_theme_light_onBackground</item>
<item name="colorSurface">@color/divine_theme_light_surface</item>
<item name="colorOnSurface">@color/divine_theme_light_onSurface</item>
<item name="colorSurfaceContainerLowest">@color/divine_theme_light_surfaceContainerLowest</item>
<item name="colorSurfaceContainerLow">@color/divine_theme_light_surfaceContainerLow</item>
<item name="colorSurfaceContainer">@color/divine_theme_light_surfaceContainer</item>
<item name="colorSurfaceContainerHigh">@color/divine_theme_light_surfaceContainerHigh</item>
<item name="colorSurfaceContainerHighest">@color/divine_theme_light_surfaceContainerHighest</item>
<item name="colorSurfaceVariant">@color/divine_theme_light_surfaceVariant</item>
<item name="colorOnSurfaceVariant">@color/divine_theme_light_onSurfaceVariant</item>
<item name="colorOutline">@color/divine_theme_light_outline</item>
<item name="colorOnSurfaceInverse">@color/divine_theme_light_inverseOnSurface</item>
<item name="colorSurfaceInverse">@color/divine_theme_light_inverseSurface</item>
<item name="colorPrimaryInverse">@color/divine_theme_light_inversePrimary</item>
<item name="colorOnContainer">@color/text_color_light</item>
<item name="colorControlActivated">@color/orange</item>
<item name="android:textColorPrimary">@color/orange_light</item>
<item name="android:textColorHintInverse">@color/orange_lighter</item>
<item name="android:windowBackground">@color/white</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.White.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.White.Dialog</item>
<item name="cardViewStyle">@style/KeepassDXStyle.Cardview.White</item>
<item name="cardBackgroundTransparentColor">@color/white_transparent</item>
<item name="educationCircleColor">@color/orange</item>
<item name="educationTextColor">@color/white</item>
<item name="android:textColor">@color/text_color_light</item>
<item name="android:textColorLink">@color/text_color_light</item>
<item name="android:editTextColor">@color/grey_light</item>
<item name="android:textColorSecondary">@color/text_color_secondary_light</item>
<item name="android:textColorSecondaryInverse">@color/grey_lighter</item>
<item name="android:textColorHint">@color/grey_lighter</item>
<item name="chipFilterTextColor">@color/grey_light</item>
<item name="chipFilterBackgroundColor">@color/white_darkest</item>
<item name="chipFilterBackgroundColorDisabled">@color/white</item>
@@ -78,23 +92,45 @@
<style name="KeepassDXStyle.Black.v21" parent="KeepassDXStyle.Black.Base" />
<style name="KeepassDXStyle.Black.Base" parent="KeepassDXStyle.Night" >
<item name="colorPrimary">@color/black_light</item>
<item name="colorPrimaryDark">@color/black</item>
<item name="colorSecondary">@color/orange_darker</item>
<item name="colorOnSecondary">@color/white</item>
<item name="colorTertiary">@color/black_light</item>
<item name="colorOnTertiary">@color/black</item>
<item name="colorSurface">@color/black</item>
<item name="colorPrimary">@color/divine_theme_night_primary</item>
<item name="colorPrimaryDark">@color/divine_theme_night_primaryDark</item>
<item name="colorOnPrimary">@color/divine_theme_night_onPrimary</item>
<item name="colorPrimaryContainer">@color/divine_theme_night_primaryContainer</item>
<item name="colorOnPrimaryContainer">@color/divine_theme_night_onPrimaryContainer</item>
<item name="colorSecondary">@color/divine_theme_night_secondary</item>
<item name="colorOnSecondary">@color/divine_theme_night_onSecondary</item>
<item name="colorSecondaryContainer">@color/divine_theme_night_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/divine_theme_night_onSecondaryContainer</item>
<item name="colorTertiary">@color/divine_theme_night_tertiary</item>
<item name="colorOnTertiary">@color/divine_theme_night_onTertiary</item>
<item name="colorTertiaryContainer">@color/divine_theme_night_tertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/divine_theme_night_onTertiaryContainer</item>
<item name="colorError">@color/divine_theme_night_error</item>
<item name="colorErrorContainer">@color/divine_theme_night_errorContainer</item>
<item name="colorOnError">@color/divine_theme_night_onError</item>
<item name="colorOnErrorContainer">@color/divine_theme_night_onErrorContainer</item>
<item name="android:windowBackground">@color/divine_theme_night_background</item>
<item name="android:colorBackground">@color/divine_theme_night_background</item>
<item name="colorOnBackground">@color/divine_theme_night_onBackground</item>
<item name="colorSurface">@color/divine_theme_night_surface</item>
<item name="colorOnSurface">@color/divine_theme_night_onSurface</item>
<item name="colorSurfaceContainerLowest">@color/divine_theme_night_surfaceContainerLowest</item>
<item name="colorSurfaceContainerLow">@color/divine_theme_night_surfaceContainerLow</item>
<item name="colorSurfaceContainer">@color/divine_theme_night_surfaceContainer</item>
<item name="colorSurfaceContainerHigh">@color/divine_theme_night_surfaceContainerHigh</item>
<item name="colorSurfaceContainerHighest">@color/divine_theme_night_surfaceContainerHighest</item>
<item name="colorSurfaceVariant">@color/divine_theme_night_surfaceVariant</item>
<item name="colorOnSurfaceVariant">@color/divine_theme_night_onSurfaceVariant</item>
<item name="colorOutline">@color/divine_theme_night_outline</item>
<item name="colorOnSurfaceInverse">@color/divine_theme_night_inverseOnSurface</item>
<item name="colorSurfaceInverse">@color/divine_theme_night_inverseSurface</item>
<item name="colorPrimaryInverse">@color/divine_theme_night_inversePrimary</item>
<item name="colorControlActivated">@color/orange</item>
<item name="android:textColorPrimary">@color/orange_lighter</item>
<item name="android:textColorHintInverse">@color/orange_lighter</item>
<item name="android:textColorSecondaryInverse">@color/white_dark</item>
<item name="android:windowBackground">@color/black</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Black.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Black.Dialog</item>
<item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Black</item>
<item name="cardBackgroundTransparentColor">@color/black_light_transparent</item>
<item name="educationCircleColor">@color/orange_darker</item>
<item name="educationTextColor">@color/white</item>
@@ -115,8 +151,4 @@
<item name="android:textColorPrimary">@color/orange</item>
<item name="android:windowBackground">@color/black_lighter</item>
</style>
<!-- CardView -->
<style name="KeepassDXStyle.Cardview.Black" parent="KeepassDXStyle.Cardview">
<item name="cardBackgroundColor">@color/black_light</item>
</style>
</resources>

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

@@ -30,11 +30,9 @@
<item name="colorOnTertiary">@color/white_purple_light</item>
<item name="colorSurface">@color/white_purple</item>
<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="android:alertDialogTheme">@style/KeepassDXStyle.Purple.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Purple.Dialog</item>
<item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Purple</item>
@@ -75,11 +73,9 @@
<item name="colorOnTertiary">@color/black_purple_dark</item>
<item name="colorSurface">@color/black_purple_dark</item>
<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="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>

6
app/src/main/res/values/styles_moon.xml
View File

@@ -30,10 +30,7 @@
<item name="colorOnTertiary">@color/blue_white</item>
<item name="colorSurface">@color/blue_white</item>
<item name="colorControlActivated">@color/blue_lighter</item>
<item name="android:textColorPrimary">@color/blue_light</item>
<item name="android:textColorHintInverse">@color/blue_white_dark</item>
<item name="android:textColorSecondaryInverse">@color/blue_white_dark</item>
<item name="android:windowBackground">@color/blue_white</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Blue.Dialog</item>
@@ -72,10 +69,7 @@
<item name="colorOnTertiary">@color/blue_black_dark</item>
<item name="colorSurface">@color/blue_black_dark</item>
<item name="colorControlActivated">@color/blue_lighter</item>
<item name="android:textColorPrimary">@color/blue_light</item>
<item name="android:textColorHintInverse">@color/blue_white_dark</item>
<item name="android:textColorSecondaryInverse">@color/blue_white_dark</item>
<item name="android:windowBackground">@color/blue_black_dark</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Blue.Night.Dialog</item>

6
app/src/main/res/values/styles_reply.xml
View File

@@ -30,10 +30,7 @@
<item name="colorOnTertiary">@color/reply_blue_lighter</item>
<item name="colorSurface">@color/reply_blue_lighter</item>
<item name="colorControlActivated">@color/reply_blue</item>
<item name="android:textColorPrimary">@color/reply_blue</item>
<item name="android:textColorHintInverse">@color/reply_orange</item>
<item name="android:textColorSecondaryInverse">@color/reply_orange</item>
<item name="android:windowBackground">@color/reply_blue_lighter</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Reply.Dialog</item>
@@ -76,10 +73,7 @@
<item name="colorOnTertiary">@color/reply_black</item>
<item name="colorSurface">@color/reply_black</item>
<item name="colorControlActivated">@color/reply_blue_light</item>
<item name="android:textColorPrimary">@color/reply_blue_lighter</item>
<item name="android:textColorHintInverse">@color/reply_blue_light</item>
<item name="android:textColorSecondaryInverse">@color/reply_blue_light</item>
<item name="android:windowBackground">@color/reply_black</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Reply.Night.Dialog</item>

13
app/src/main/res/values/styles_simple.xml
View File

@@ -33,9 +33,7 @@
<item name="colorOnTertiary">@color/white</item>
<item name="colorSurface">@color/white_slight</item>
<item name="colorControlActivated">@color/blue_deep</item>
<item name="android:textColorPrimary">@color/grey</item>
<item name="android:textColorHintInverse">@color/grey</item>
<item name="android:windowBackground">@color/white_slight</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Simple.Dialog</item>
@@ -45,14 +43,6 @@
<item name="educationCircleColor">@color/blue_dark</item>
<item name="educationTextColor">@color/white</item>
<item name="android:textColor">@color/text_color_light</item>
<item name="android:textColorLink">@color/text_color_light</item>
<item name="android:editTextColor">@color/grey_light</item>
<item name="android:textColorPrimaryInverse">@color/grey_light</item>
<item name="android:textColorSecondary">@color/text_color_secondary_light</item>
<item name="android:textColorSecondaryInverse">@color/grey_lighter</item>
<item name="android:textColorHint">@color/grey_lighter</item>
<item name="chipFilterTextColor">@color/text_color_light</item>
<item name="chipFilterBackgroundColor">@color/blue_white</item>
<item name="chipFilterBackgroundColorDisabled">@color/white_dark</item>
@@ -85,10 +75,7 @@
<item name="colorOnTertiary">@color/grey_slight</item>
<item name="colorSurface">@color/grey_slight_dark</item>
<item name="colorControlActivated">@color/blue_slight</item>
<item name="android:textColorPrimary">@color/white</item>
<item name="android:textColorHintInverse">@color/white</item>
<item name="android:textColorSecondaryInverse">@color/white_dark</item>
<item name="android:windowBackground">@color/grey_slight</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Simple.Night.Dialog</item>

6
app/src/main/res/values/styles_sun.xml
View File

@@ -30,10 +30,7 @@
<item name="colorOnTertiary">@color/red_white_light</item>
<item name="colorSurface">@color/red_white_light</item>
<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/red_white_light</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Red.Dialog</item>
@@ -71,10 +68,7 @@
<item name="colorOnTertiary">@color/red_black_dark</item>
<item name="colorSurface">@color/red_black_dark</item>
<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/red_black_dark</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Red.Night.Dialog</item>