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: Add tertiary color, change color accent to color secondary

Browse Source
This commit is contained in:
J-Jamet
2023-07-09 11:40:58 +02:00
parent 3891bb1c8f
commit eb4e45cb69
51 changed files with 238 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt
View File

@@ -112,7 +112,7 @@ class EntryActivity : DatabaseLockActivity() {
} }
private var mIcon: IconImage? = null private var mIcon: IconImage? = null
private var mColorAccent: Int = 0 private var mColorSecondary: Int = 0
private var mControlColor: Int = 0 private var mControlColor: Int = 0
private var mColorPrimary: Int = 0 private var mColorPrimary: Int = 0
private var mColorBackground: Int = 0 private var mColorBackground: Int = 0
@@ -146,15 +146,15 @@ class EntryActivity : DatabaseLockActivity() {
toolbar?.title = " " toolbar?.title = " "
// Retrieve the textColor to tint the toolbar // Retrieve the textColor to tint the toolbar
val taColorAccent = theme.obtainStyledAttributes(intArrayOf(R.attr.colorAccent)) val taColorSecondary = theme.obtainStyledAttributes(intArrayOf(R.attr.colorSecondary))
val taControlColor = theme.obtainStyledAttributes(intArrayOf(R.attr.toolbarColorControl)) val taControlColor = theme.obtainStyledAttributes(intArrayOf(R.attr.toolbarColorControl))
val taColorPrimary = theme.obtainStyledAttributes(intArrayOf(R.attr.colorPrimary)) val taColorPrimary = theme.obtainStyledAttributes(intArrayOf(R.attr.colorPrimary))
val taColorBackground = theme.obtainStyledAttributes(intArrayOf(android.R.attr.windowBackground)) val taColorBackground = theme.obtainStyledAttributes(intArrayOf(android.R.attr.windowBackground))
mColorAccent = taColorAccent.getColor(0, Color.BLACK) mColorSecondary = taColorSecondary.getColor(0, Color.BLACK)
mControlColor = taControlColor.getColor(0, Color.BLACK) mControlColor = taControlColor.getColor(0, Color.BLACK)
mColorPrimary = taColorPrimary.getColor(0, Color.BLACK) mColorPrimary = taColorPrimary.getColor(0, Color.BLACK)
mColorBackground = taColorBackground.getColor(0, Color.BLACK) mColorBackground = taColorBackground.getColor(0, Color.BLACK)
taColorAccent.recycle() taColorSecondary.recycle()
taControlColor.recycle() taControlColor.recycle()
taColorPrimary.recycle() taColorPrimary.recycle()
taColorBackground.recycle() taColorBackground.recycle()
@@ -227,7 +227,7 @@ class EntryActivity : DatabaseLockActivity() {
historyView?.visibility = if (entryIsHistory) View.VISIBLE else View.GONE historyView?.visibility = if (entryIsHistory) View.VISIBLE else View.GONE
if (entryIsHistory) { if (entryIsHistory) {
collapsingToolbarLayout?.contentScrim = collapsingToolbarLayout?.contentScrim =
ColorDrawable(mColorAccent) ColorDrawable(mColorSecondary)
} }
val entryInfo = entryInfoHistory.entryInfo val entryInfo = entryInfoHistory.entryInfo
@@ -380,7 +380,7 @@ class EntryActivity : DatabaseLockActivity() {
mDatabase?.iconDrawableFactory?.assignDatabaseIcon( mDatabase?.iconDrawableFactory?.assignDatabaseIcon(
iconView, iconView,
icon, icon,
mForegroundColor ?: mColorAccent mForegroundColor ?: mColorSecondary
) )
} }
} }

2
app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupDialogFragment.kt
View File

@@ -108,7 +108,7 @@ class GroupDialogFragment : DatabaseDialogFragment() {
uuidReferenceView = root.findViewById(R.id.group_UUID_reference) uuidReferenceView = root.findViewById(R.id.group_UUID_reference)
// Retrieve the textColor to tint the icon // Retrieve the textColor to tint the icon
val ta = activity.theme.obtainStyledAttributes(intArrayOf(R.attr.colorAccent)) val ta = activity.theme.obtainStyledAttributes(intArrayOf(R.attr.colorSecondary))
mIconColor = ta.getColor(0, Color.WHITE) mIconColor = ta.getColor(0, Color.WHITE)
ta.recycle() ta.recycle()

2
app/src/main/java/com/kunzisoft/keepass/adapters/BreadcrumbAdapter.kt
View File

@@ -40,7 +40,7 @@ class BreadcrumbAdapter(val context: Context)
mShowUUID = PreferencesUtil.showUUID(context) mShowUUID = PreferencesUtil.showUUID(context)
// Retrieve the textColor to tint the icon // Retrieve the textColor to tint the icon
val taTextColor = context.theme.obtainStyledAttributes(intArrayOf(R.attr.textColorInverse)) val taTextColor = context.theme.obtainStyledAttributes(intArrayOf(R.attr.colorOnPrimary))
mIconColor = taTextColor.getColor(0, Color.WHITE) mIconColor = taTextColor.getColor(0, Color.WHITE)
taTextColor.recycle() taTextColor.recycle()
} }

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

@@ -92,7 +92,7 @@ class FileDatabaseHistoryAdapter(context: Context)
init { init {
val typedValue = TypedValue() val typedValue = TypedValue()
val theme = context.theme val theme = context.theme
theme.resolveAttribute(R.attr.colorAccent, typedValue, true) theme.resolveAttribute(R.attr.colorSecondary, typedValue, true)
warningColor = typedValue.data warningColor = typedValue.data
theme.resolveAttribute(android.R.attr.textColorHintInverse, typedValue, true) theme.resolveAttribute(android.R.attr.textColorHintInverse, typedValue, true)
defaultColor = typedValue.data defaultColor = typedValue.data

32
app/src/main/java/com/kunzisoft/keepass/adapters/NodesAdapter.kt
View File

@@ -95,9 +95,9 @@ class NodesAdapter (
@ColorInt @ColorInt
private val mTextColorSecondary: Int private val mTextColorSecondary: Int
@ColorInt @ColorInt
private val mColorAccentLight: Int private val mColorSecondary: Int
@ColorInt @ColorInt
private val mColorOnAccentColor: Int private val mColorOnSecondary: Int
/** /**
* Determine if the adapter contains or not any element * Determine if the adapter contains or not any element
@@ -127,13 +127,13 @@ class NodesAdapter (
this.mTextColorSecondary = taTextColorSecondary.getColor(0, Color.BLACK) this.mTextColorSecondary = taTextColorSecondary.getColor(0, Color.BLACK)
taTextColorSecondary.recycle() taTextColorSecondary.recycle()
// To get background color for selection // To get background color for selection
val taColorAccentLight = context.theme.obtainStyledAttributes(intArrayOf(R.attr.colorAccentLight)) val taColorSecondary = context.theme.obtainStyledAttributes(intArrayOf(R.attr.colorSecondary))
this.mColorAccentLight = taColorAccentLight.getColor(0, Color.GRAY) this.mColorSecondary = taColorSecondary.getColor(0, Color.GRAY)
taColorAccentLight.recycle() taColorSecondary.recycle()
// To get text color for selection // To get text color for selection
val taColorOnAccentColor = context.theme.obtainStyledAttributes(intArrayOf(R.attr.colorOnAccentColor)) val taColorOnSecondary = context.theme.obtainStyledAttributes(intArrayOf(R.attr.colorOnSecondary))
this.mColorOnAccentColor = taColorOnAccentColor.getColor(0, Color.WHITE) this.mColorOnSecondary = taColorOnSecondary.getColor(0, Color.WHITE)
taColorOnAccentColor.recycle() taColorOnSecondary.recycle()
} }
private fun assignPreferences() { private fun assignPreferences() {
@@ -380,7 +380,7 @@ class NodesAdapter (
// Assign icon colors // Assign icon colors
var iconColor = if (holder.container.isSelected) var iconColor = if (holder.container.isSelected)
mColorOnAccentColor mColorOnSecondary
else when (subNode.type) { else when (subNode.type) {
Type.GROUP -> mTextColorPrimary Type.GROUP -> mTextColorPrimary
Type.ENTRY -> mTextColor Type.ENTRY -> mTextColor
@@ -436,7 +436,7 @@ class NodesAdapter (
holder.container.setBackgroundColor(Color.TRANSPARENT) holder.container.setBackgroundColor(Color.TRANSPARENT)
} }
} else { } else {
holder.container.setBackgroundColor(mColorAccentLight) holder.container.setBackgroundColor(mColorSecondary)
} }
val foregroundColor = if (mShowEntryColors) entry.foregroundColor else null val foregroundColor = if (mShowEntryColors) entry.foregroundColor else null
if (!holder.container.isSelected) { if (!holder.container.isSelected) {
@@ -457,12 +457,12 @@ class NodesAdapter (
holder.meta.setTextColor(mTextColor) holder.meta.setTextColor(mTextColor)
} }
} else { } else {
holder.text.setTextColor(mColorOnAccentColor) holder.text.setTextColor(mColorOnSecondary)
holder.subText?.setTextColor(mColorOnAccentColor) holder.subText?.setTextColor(mColorOnSecondary)
holder.otpToken?.setTextColor(mColorOnAccentColor) holder.otpToken?.setTextColor(mColorOnSecondary)
holder.otpProgress?.setIndicatorColor(mColorOnAccentColor) holder.otpProgress?.setIndicatorColor(mColorOnSecondary)
holder.attachmentIcon?.setColorFilter(mColorOnAccentColor) holder.attachmentIcon?.setColorFilter(mColorOnSecondary)
holder.meta.setTextColor(mColorOnAccentColor) holder.meta.setTextColor(mColorOnSecondary)
} }
database.stopManageEntry(entry) database.stopManageEntry(entry)

39
app/src/main/res/animator-v23/scan.xml
View File

@@ -1,39 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<set
xmlns:android="http://schemas.android.com/apk/res/android"
android:ordering="sequentially">
<objectAnimator
android:propertyName="pathData"
android:valueFrom="@string/clip_path_scan_top"
android:valueTo="@string/clip_path_scan_bottom"
android:valueType="pathType"
android:duration="800"
android:interpolator="@android:interpolator/fast_out_slow_in" />
<objectAnimator
android:propertyName="pathData"
android:valueFrom="@string/clip_path_scan_bottom"
android:valueTo="@string/clip_path_scan_top"
android:valueType="pathType"
android:startOffset="50"
android:duration="500"
android:interpolator="@android:interpolator/fast_out_slow_in" />
</set>

2
app/src/main/res/color-v23/progress_color.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/colorAccent" /> <item android:color="?attr/colorSecondary" />
</selector> </selector>

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

@@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/colorAccentLight" android:state_pressed="true" />
<item android:color="@color/white_grey" android:state_activated="true" />
<item android:color="@color/white_grey_darker" android:state_enabled="false" />
<item android:color="?attr/colorAccent" android:state_enabled="true" />
</selector>

2
app/src/main/res/color/background_button_color_primary.xml → app/src/main/res/color/color_button_primary.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/colorPrimaryDark" android:state_pressed="true" /> <item android:color="?attr/colorPrimaryDark" android:state_pressed="true" />
<item android:color="@color/white_grey_darker" android:state_enabled="false" /> <item android:color="?attr/colorTertiary" android:state_enabled="false" />
<item android:color="?attr/colorPrimary" android:state_enabled="true" /> <item android:color="?attr/colorPrimary" android:state_enabled="true" />
</selector> </selector>

5
app/src/main/res/color/color_button_secondary.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/colorTertiary" android:state_enabled="false" />
<item android:color="?attr/colorSecondary" android:state_enabled="true" />
</selector>

5
app/src/main/res/color/color_on_button_primary.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" android:color="?attr/colorOnTertiary"/>
<item android:color="?attr/colorOnPrimary"/>
</selector>

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

@@ -18,7 +18,7 @@
along with KeePassDX. If not, see <http://www.gnu.org/licenses/>. along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
--> -->
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/colorAccent" android:state_focused="true"/> <item android:color="?attr/colorSecondary" android:state_focused="true"/>
<item android:alpha="0.46" android:color="?attr/colorOnSurface" android:state_hovered="true"/> <item android:alpha="0.46" android:color="?attr/colorOnSurface" android:state_hovered="true"/>
<item android:alpha="0.38" android:color="?attr/colorOnSurface" android:state_enabled="false"/> <item android:alpha="0.38" android:color="?attr/colorOnSurface" android:state_enabled="false"/>
<item android:alpha="0.42" android:color="?attr/colorOnSurface"/> <item android:alpha="0.42" android:color="?attr/colorOnSurface"/>

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

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" > <selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:state_selected="true" android:color="?attr/colorOnAccentColor"/> <item android:state_selected="true" android:color="?attr/colorOnSecondary"/>
<item android:color="?android:attr/textColorPrimary"/> <item android:color="?android:attr/textColorPrimary"/>
</selector> </selector>

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

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/white_grey" android:state_enabled="false" /> <item android:color="@color/white_grey" android:state_enabled="false" />
<item android:color="?attr/colorOnAccentColor" android:state_enabled="true" /> <item android:color="?attr/colorOnSecondary" android:state_enabled="true" />
</selector> </selector>

2
app/src/main/res/drawable-v21/background_button_small.xml
View File

@@ -14,7 +14,7 @@
android:right="14dp" android:right="14dp"
android:top="4dp" android:top="4dp"
android:bottom="8dp"/> android:bottom="8dp"/>
<solid android:color="?attr/colorAccent"/> <solid android:color="?attr/colorSecondary"/>
</shape> </shape>
</item> </item>
</layer-list> </layer-list>

2
app/src/main/res/drawable-v21/background_icon.xml
View File

@@ -11,7 +11,7 @@
android:right="12dp" android:right="12dp"
android:top="12dp" android:top="12dp"
android:bottom="12dp"/> android:bottom="12dp"/>
<solid android:color="?attr/colorAccent"/> <solid android:color="?attr/colorSecondary"/>
</shape> </shape>
</item> </item>
</ripple> </ripple>

2
app/src/main/res/drawable-v21/background_image_button.xml
View File

@@ -6,7 +6,7 @@
<item> <item>
<shape <shape
android:shape="oval"> android:shape="oval">
<stroke android:color="?attr/colorAccent" android:width="1dp"/> <stroke android:color="?attr/colorSecondary" android:width="1dp"/>
<padding <padding
android:left="12dp" android:left="12dp"
android:right="12dp" android:right="12dp"

2
app/src/main/res/drawable-v21/background_item_selection.xml
View File

@@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true"> <item android:state_selected="true">
<shape> <shape>
<solid android:color="?attr/colorAccentLight"/> <solid android:color="?attr/colorSecondary"/>
</shape> </shape>
</item> </item>
<item android:state_selected="false"> <item android:state_selected="false">

13
app/src/main/res/drawable-v23/bolt.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="@dimen/advanced_unlock_size"
android:height="@dimen/advanced_unlock_size"
android:viewportWidth="24"
android:viewportHeight="24">
<group>
<path
android:fillColor="#fffbfb"
android:strokeWidth="1"
android:pathData="M 13 4 L 8 13 L 11.777344 13 L 11 20 L 16 11 L 12.222656 11 L 13 4 z" />
</group>
</vector>

6
app/src/main/res/layout/activity_entry.xml
View File

@@ -82,7 +82,7 @@
android:id="@+id/entry_progress" android:id="@+id/entry_progress"
android:visibility="gone" android:visibility="gone"
android:indeterminate="false" android:indeterminate="false"
app:indicatorColor="?attr/colorAccent" app:indicatorColor="?attr/colorSecondary"
android:progress="10" android:progress="10"
android:max="30" android:max="30"
android:layout_gravity="bottom" android:layout_gravity="bottom"
@@ -109,9 +109,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
android:visibility="gone" android:visibility="gone"
android:background="?attr/colorAccent" android:background="?attr/colorSecondary"
android:padding="12dp" android:padding="12dp"
android:textColor="?attr/colorOnAccentColor" android:textColor="?attr/colorOnSecondary"
android:text="@string/entry_history"/> android:text="@string/entry_history"/>
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView

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

@@ -93,7 +93,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:contentDescription="@string/validate" android:contentDescription="@string/validate"
android:src="@drawable/ic_check_white_24dp" android:src="@drawable/ic_check_white_24dp"
app:tint="?attr/colorOnAccentColor" app:tint="?attr/colorOnSecondary"
app:fabSize="mini" app:fabSize="mini"
app:fabCustomSize="@dimen/button_small_size" app:fabCustomSize="@dimen/button_small_size"
app:layout_constraintTop_toTopOf="@+id/entry_edit_bottom_bar" app:layout_constraintTop_toTopOf="@+id/entry_edit_bottom_bar"

4
app/src/main/res/layout/activity_file_selection.xml
View File

@@ -75,7 +75,7 @@
android:shadowDy="2" android:shadowDy="2"
android:shadowRadius="4" android:shadowRadius="4"
android:paddingTop="?attr/actionBarSize" android:paddingTop="?attr/actionBarSize"
android:textColor="?attr/textColorInverse" android:textColor="?attr/colorOnPrimary"
android:gravity="center" android:gravity="center"
android:text="@string/app_name_part1"/> android:text="@string/app_name_part1"/>
<TextView <TextView
@@ -91,7 +91,7 @@
android:shadowDy="2" android:shadowDy="2"
android:shadowRadius="4" android:shadowRadius="4"
android:paddingTop="?attr/actionBarSize" android:paddingTop="?attr/actionBarSize"
android:textColor="?attr/colorAccent" android:textColor="?attr/colorSecondary"
android:gravity="center" android:gravity="center"
android:text="@string/app_name_part2"/> android:text="@string/app_name_part2"/>
<TextView <TextView

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

@@ -87,7 +87,7 @@
android:layout_gravity="center_vertical|start" android:layout_gravity="center_vertical|start"
android:visibility="gone" android:visibility="gone"
android:src="@drawable/ic_modified_white_12dp" android:src="@drawable/ic_modified_white_12dp"
app:tint="?attr/textColorInverse" app:tint="?attr/colorOnSecondary"
android:contentDescription="@string/save"/> android:contentDescription="@string/save"/>
</FrameLayout> </FrameLayout>
@@ -191,7 +191,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="start" android:layout_gravity="start"
app:itemTextColor="?android:attr/textColor" app:itemTextColor="?android:attr/textColor"
app:subheaderColor="?attr/colorAccent" app:subheaderColor="?attr/colorSecondary"
android:fitsSystemWindows="true" /> android:fitsSystemWindows="true" />
</androidx.drawerlayout.widget.DrawerLayout> </androidx.drawerlayout.widget.DrawerLayout>

2
app/src/main/res/layout/activity_icon_picker.xml
View File

@@ -52,7 +52,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:contentDescription="@string/validate" android:contentDescription="@string/validate"
android:src="@drawable/ic_file_upload_white_24dp" android:src="@drawable/ic_file_upload_white_24dp"
app:tint="?attr/colorOnAccentColor" app:tint="?attr/colorOnSecondary"
app:fabSize="mini" app:fabSize="mini"
app:fabCustomSize="@dimen/button_small_size" app:fabCustomSize="@dimen/button_small_size"
app:layout_constraintBottom_toTopOf="@+id/screenshot_mode_banner" app:layout_constraintBottom_toTopOf="@+id/screenshot_mode_banner"

2
app/src/main/res/layout/activity_key_generator.xml
View File

@@ -52,7 +52,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:contentDescription="@string/validate" android:contentDescription="@string/validate"
android:src="@drawable/ic_check_white_24dp" android:src="@drawable/ic_check_white_24dp"
app:tint="?attr/colorOnAccentColor" app:tint="?attr/colorOnSecondary"
app:fabSize="mini" app:fabSize="mini"
app:fabCustomSize="@dimen/button_small_size" app:fabCustomSize="@dimen/button_small_size"
app:layout_constraintTop_toTopOf="@+id/toolbar" app:layout_constraintTop_toTopOf="@+id/toolbar"

9
app/src/main/res/layout/activity_main_credential.xml
View File

@@ -161,15 +161,10 @@
android:paddingRight="24dp" android:paddingRight="24dp"
style="@style/KeepassDXStyle.TextAppearance.Tiny" style="@style/KeepassDXStyle.TextAppearance.Tiny"
android:text="@string/warning_database_link_revoked" android:text="@string/warning_database_link_revoked"
android:textColor="?attr/textColorInverse" android:textColor="?attr/colorOnSecondary"
android:background="?attr/colorAccent" android:background="?attr/colorSecondary"
app:layout_constraintBottom_toTopOf="@+id/activity_password_info_delimiter" app:layout_constraintBottom_toTopOf="@+id/activity_password_info_delimiter"
android:layout_gravity="bottom"/> android:layout_gravity="bottom"/>
<View
android:id="@+id/activity_password_info_delimiter"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?attr/colorAccentLight"/>
</LinearLayout> </LinearLayout>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout

2
app/src/main/res/layout/fragment_color_picker.xml
View File

@@ -43,7 +43,7 @@
android:layout_margin="20dp" android:layout_margin="20dp"
android:text="@string/enable" android:text="@string/enable"
android:background="@drawable/background_button_small" android:background="@drawable/background_button_small"
android:textColor="?attr/colorOnAccentColor" android:textColor="?attr/colorOnSecondary"
android:theme="?attr/switchAppearance" android:theme="?attr/switchAppearance"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

2
app/src/main/res/layout/fragment_progress.xml
View File

@@ -70,7 +70,7 @@
<com.google.android.material.progressindicator.LinearProgressIndicator <com.google.android.material.progressindicator.LinearProgressIndicator
android:id="@+id/progress_dialog_bar" android:id="@+id/progress_dialog_bar"
app:indicatorColor="?attr/colorAccent" app:indicatorColor="?attr/colorSecondary"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="18dp" android:layout_marginTop="18dp"

2
app/src/main/res/layout/fragment_set_main_credential.xml
View File

@@ -86,7 +86,7 @@
android:importantForAutofill="no" android:importantForAutofill="no"
android:contentDescription="@string/content_description_repeat_toggle_password_visibility" android:contentDescription="@string/content_description_repeat_toggle_password_visibility"
app:endIconMode="password_toggle" app:endIconMode="password_toggle"
app:endIconTint="?attr/colorAccent"> app:endIconTint="?attr/colorSecondary">
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputEditText
android:id="@+id/password_confirmation" android:id="@+id/password_confirmation"
android:layout_width="match_parent" android:layout_width="match_parent"

2
app/src/main/res/layout/fragment_set_otp.xml
View File

@@ -114,7 +114,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:endIconMode="password_toggle" app:endIconMode="password_toggle"
app:endIconTint="?attr/colorAccent"> app:endIconTint="?attr/colorSecondary">
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputEditText
android:id="@+id/setup_otp_secret" android:id="@+id/setup_otp_secret"
android:layout_width="match_parent" android:layout_width="match_parent"

2
app/src/main/res/layout/item_breadcrumb.xml
View File

@@ -56,7 +56,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/ic_arrow_right_white_24dp" android:src="@drawable/ic_arrow_right_white_24dp"
android:tint="?attr/textColorInverse" android:tint="?attr/colorOnPrimary"
android:importantForAccessibility="no" android:importantForAccessibility="no"
android:layout_marginEnd="6dp" android:layout_marginEnd="6dp"
android:layout_marginRight="6dp" android:layout_marginRight="6dp"

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

@@ -61,7 +61,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/default_file_button" app:layout_constraintEnd_toStartOf="@+id/default_file_button"
android:textColor="?attr/textColorInverse" android:textColor="?attr/colorOnPrimary"
tools:text="DatabaseAlias" /> tools:text="DatabaseAlias" />
<androidx.appcompat.widget.AppCompatCheckBox <androidx.appcompat.widget.AppCompatCheckBox
android:id="@+id/default_file_button" android:id="@+id/default_file_button"

4
app/src/main/res/layout/item_tag.xml
View File

@@ -35,10 +35,10 @@
android:layout_gravity="center" android:layout_gravity="center"
app:drawableLeftCompat="@drawable/ic_bookmark_white_12dp" app:drawableLeftCompat="@drawable/ic_bookmark_white_12dp"
app:drawableStartCompat="@drawable/ic_bookmark_white_12dp" app:drawableStartCompat="@drawable/ic_bookmark_white_12dp"
app:drawableTint="?attr/colorAccent" app:drawableTint="?attr/colorSecondary"
android:drawablePadding="2dp" android:drawablePadding="2dp"
tools:text="text" tools:text="text"
android:textColor="?attr/colorAccent" android:textColor="?attr/colorSecondary"
android:textSize="12sp" android:textSize="12sp"
android:paddingLeft="8dp" android:paddingLeft="8dp"
android:paddingStart="8dp" android:paddingStart="8dp"

4
app/src/main/res/layout/item_tag_edit.xml
View File

@@ -33,7 +33,7 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
app:drawableLeftCompat="@drawable/ic_bookmark_white_12dp" app:drawableLeftCompat="@drawable/ic_bookmark_white_12dp"
app:drawableStartCompat="@drawable/ic_bookmark_white_12dp" app:drawableStartCompat="@drawable/ic_bookmark_white_12dp"
app:drawableTint="?attr/colorAccent" app:drawableTint="?attr/colorSecondary"
android:drawablePadding="2dp" android:drawablePadding="2dp"
tools:text="text" tools:text="text"
android:textSize="12sp" android:textSize="12sp"
@@ -47,7 +47,7 @@
android:layout_height="24dp" android:layout_height="24dp"
android:padding="4dp" android:padding="4dp"
android:src="@drawable/ic_close_white_24dp" android:src="@drawable/ic_close_white_24dp"
app:tint="?attr/colorAccent" app:tint="?attr/colorSecondary"
android:gravity="center_vertical" android:gravity="center_vertical"
android:layout_gravity="center" android:layout_gravity="center"
android:contentDescription="@string/menu_delete" /> android:contentDescription="@string/menu_delete" />

4
app/src/main/res/layout/nav_header_database.xml
View File

@@ -44,7 +44,7 @@
android:layout_marginBottom="12dp" android:layout_marginBottom="12dp"
app:srcCompat="@drawable/ic_database_white_36dp" app:srcCompat="@drawable/ic_database_white_36dp"
style="@style/KeepassDXStyle.Icon" style="@style/KeepassDXStyle.Icon"
app:tint="?attr/colorAccent" /> app:tint="?attr/colorSecondary" />
<ImageView <ImageView
android:id="@+id/nav_database_modified" android:id="@+id/nav_database_modified"
@@ -52,7 +52,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:contentDescription="@string/save" android:contentDescription="@string/save"
android:src="@drawable/ic_modified_white_12dp" android:src="@drawable/ic_modified_white_12dp"
android:tint="?attr/textColorInverse" app:tint="?attr/colorOnPrimary"
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/nav_database_icon" app:layout_constraintBottom_toBottomOf="@+id/nav_database_icon"
app:layout_constraintStart_toEndOf="@+id/nav_database_icon" app:layout_constraintStart_toEndOf="@+id/nav_database_icon"

2
app/src/main/res/layout/pref_dialog_input_list.xml
View File

@@ -42,7 +42,7 @@
android:layout_margin="24dp" android:layout_margin="24dp"
android:text="@string/enable" android:text="@string/enable"
android:background="@drawable/background_button_small" android:background="@drawable/background_button_small"
android:textColor="?attr/textColorInverse" android:textColor="?attr/colorOnSecondary"
android:theme="?attr/switchAppearance" android:theme="?attr/switchAppearance"
android:minHeight="48dp"/> android:minHeight="48dp"/>

10
app/src/main/res/layout/view_button_add_node.xml
View File

@@ -52,8 +52,8 @@
android:layout_marginEnd="@dimen/image_button_margin" android:layout_marginEnd="@dimen/image_button_margin"
android:src="@drawable/ic_key_white_24dp" android:src="@drawable/ic_key_white_24dp"
android:contentDescription="@string/add_entry" android:contentDescription="@string/add_entry"
app:tint="?attr/colorOnAccentColor" app:tint="?attr/colorOnSecondary"
app:backgroundTint="?attr/colorAccent" app:backgroundTint="?attr/colorSecondary"
app:fabSize="mini" app:fabSize="mini"
app:fabCustomSize="@dimen/button_small_size" app:fabCustomSize="@dimen/button_small_size"
app:useCompatPadding="true" /> app:useCompatPadding="true" />
@@ -86,8 +86,8 @@
android:layout_marginEnd="@dimen/image_button_margin" android:layout_marginEnd="@dimen/image_button_margin"
android:src="@drawable/ic_folder_white_24dp" android:src="@drawable/ic_folder_white_24dp"
android:contentDescription="@string/add_group" android:contentDescription="@string/add_group"
app:tint="?attr/colorOnAccentColor" app:tint="?attr/colorOnSecondary"
app:backgroundTint="?attr/colorAccent" app:backgroundTint="?attr/colorSecondary"
app:fabSize="mini" app:fabSize="mini"
app:fabCustomSize="@dimen/button_small_size" app:fabCustomSize="@dimen/button_small_size"
app:useCompatPadding="true" /> app:useCompatPadding="true" />
@@ -103,7 +103,7 @@
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:contentDescription="@string/content_description_add_node" android:contentDescription="@string/content_description_add_node"
android:src="@drawable/ic_add_white_24dp" android:src="@drawable/ic_add_white_24dp"
app:tint="?attr/colorOnAccentColor" app:tint="?attr/colorOnSecondary"
app:fabSize="normal" app:fabSize="normal"
app:useCompatPadding="true" /> app:useCompatPadding="true" />

2
app/src/main/res/layout/view_main_credentials.xml
View File

@@ -28,7 +28,7 @@
android:layout_toStartOf="@+id/password_checkbox" android:layout_toStartOf="@+id/password_checkbox"
android:layout_toLeftOf="@+id/password_checkbox" android:layout_toLeftOf="@+id/password_checkbox"
app:endIconMode="password_toggle" app:endIconMode="password_toggle"
app:endIconTint="?attr/colorAccent"> app:endIconTint="?attr/colorSecondary">
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputEditText
android:id="@+id/password_text_view" android:id="@+id/password_text_view"

4
app/src/main/res/layout/view_passkey.xml
View File

@@ -14,7 +14,7 @@
android:importantForAccessibility="no" android:importantForAccessibility="no"
android:importantForAutofill="no" android:importantForAutofill="no"
app:endIconMode="password_toggle" app:endIconMode="password_toggle"
app:endIconTint="?attr/colorAccent" app:endIconTint="?attr/colorSecondary"
tools:ignore="UnusedAttribute"> tools:ignore="UnusedAttribute">
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputEditText
@@ -45,7 +45,7 @@
tools:text="Entropy: 72.50 bit" tools:text="Entropy: 72.50 bit"
android:textSize="11sp" android:textSize="11sp"
android:layout_margin="4dp" android:layout_margin="4dp"
android:textColor="?attr/colorAccent" android:textColor="?attr/colorSecondary"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/password_input_layout" app:layout_constraintBottom_toBottomOf="@+id/password_input_layout"
app:layout_constraintEnd_toEndOf="@+id/password_input_layout" /> app:layout_constraintEnd_toEndOf="@+id/password_input_layout" />

2
app/src/main/res/layout/view_search_filters.xml
View File

@@ -61,7 +61,7 @@
style="@style/KeepassDXStyle.ImageButton.Simple" style="@style/KeepassDXStyle.ImageButton.Simple"
android:contentDescription="@string/search_filters" android:contentDescription="@string/search_filters"
android:src="@drawable/ic_list_white_24dp" android:src="@drawable/ic_list_white_24dp"
app:tint="?attr/textColorInverse"/> app:tint="?attr/colorOnPrimary"/>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout <LinearLayout
android:id="@+id/search_advance_filters" android:id="@+id/search_advance_filters"

48
app/src/main/res/values-v23/fingerprint.xml
View File

@@ -1,48 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<integer name="fingerprint_viewport_width">160</integer>
<integer name="fingerprint_viewport_height">160</integer>
<integer name="fingerprint_viewport_center">80</integer>
<integer name="fingerprint_stroke_width">5</integer>
<integer name="tick_cross_stroke_width">7</integer>
<dimen name="advanced_unlock_size">80dp</dimen>
<!-- a pretty rough & ready re-draw of the fingerprint glyph from
https://github.com/googlesamples/android-FingerprintDialog -->
<string translatable="false" name="path_ridge_1">M56.2199243,45.3815903 C56.2199243,45.3815903 65.1913567,38.8543184 80.3604294,38.8543184 C95.5295022,38.8543184 103.720044,45.2851323 103.720044,45.2851323</string>
<string translatable="false" name="path_ridge_2">M45.5181172,67.9181841 C49.9761548,62.7019025 59.122049,49.7790452 80.2279027,49.7790452 C101.333756,49.7790452 110.740506,62.0384399 114.937688,67.9181841</string>
<string translatable="false" name="path_ridge_3">M51.7375623,107.718438 C51.7375623,107.718438 48.7129745,99.6302234 48.7129745,91.6334356 C48.7129745,81.3266864 55.9028711,60.2476586 80.4057228,60.2478671 C100.798248,60.2480407 112.457463,79.7942647 112.457463,88.386575 C112.457462,99.2963939 105.619846,103.039218 100.781849,102.18762 C95.9438519,101.336021 90.4490979,97.2187731 91.0639139,92.3178681 C91.67873,87.4169631 85.2177374,81.3265129 80.7504553,81.3266871 C73.0900115,81.3269859 69.8146331,85.3921834 69.8146329,92.2700585 C69.8146324,107.718437 83.7557525,121.02713 91.6787289,121.027128</string>
<string translatable="false" name="path_ridge_4">M70.7357889,121.024995 C70.7357889,121.024995 57.4650216,106.018711 58.8888756,91.5596242 C60.5513085,74.6777941 73.9858126,70.313752 80.3788823,70.3807995 C86.771952,70.4478469 101.550994,76.8218704 101.550997,92.2895418</string>
<string translatable="false" name="path_ridge_5">M80.1599645,91.1813411 C80.1599645,91.1813411 81.1144795,102.68333 86.7971146,107.529716 C93.2390527,113.023667 105.911091,112.342743 105.911091,112.342743</string>
<string translatable="false" name="path_tick">M52.2735573,79.0771904 C52.2735573,79.0771904 69.2403688,96.0440006 69.2403683,96.0440014 C69.2403679,96.0440021 109.820188,55.4641819 109.820188,55.4641819</string>
<string translatable="false" name="path_cross_1">M62,62 C62,62 80.5647617,80.5647617 80.564762,80.564762 C80.5647622,80.5647622 94.2921789,94.223714 98.5644262,98.5644262</string>
<string translatable="false" name="path_cross_2">M98.5644262,62 C98.5644251,62 81.1979242,79.366503 81.1979229,79.3665033 C81.1979216,79.3665035 62,98.5644262 62,98.5644262</string>
<!-- a 'window' which is ¼ of the height of the viewport that we use as a clip during the 'scan'
operation by animating it from the top to the bottom and back. -->
<string translatable="false" name="clip_path_scan_top">M0 0 L160 0 L160 40 L0 40 Z</string>
<string translatable="false" name="clip_path_scan_bottom">M0 120 L160 120 L160 160 L0 160 Z</string>
<color name="fingerprint_ridge">?attr/colorOnAccentColor</color>
<color name="fingerprint_ridge_scan">?attr/colorOnAccentColor</color>
</resources>

3
app/src/main/res/values/attrs.xml
View File

@@ -29,11 +29,8 @@
<attr name="chipFilterBackgroundColor" format="color" /> <attr name="chipFilterBackgroundColor" format="color" />
<attr name="chipFilterBackgroundColorDisabled" format="color" /> <attr name="chipFilterBackgroundColorDisabled" format="color" />
<attr name="colorAccentLight" format="reference|color" />
<attr name="cardBackgroundTransparentColor" format="reference|color" /> <attr name="cardBackgroundTransparentColor" format="reference|color" />
<attr name="iconPreferenceColor" format="reference|color" /> <attr name="iconPreferenceColor" format="reference|color" />
<attr name="textColorInverse" format="reference|color" />
<attr name="colorOnAccentColor" format="reference|color" />
<attr name="toolbarColorControl" format="reference|color" /> <attr name="toolbarColorControl" format="reference|color" />
<attr name="educationCircleColor" format="reference|color" /> <attr name="educationCircleColor" format="reference|color" />

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

@@ -70,6 +70,7 @@
<color name="green_black_light">#24352A</color> <color name="green_black_light">#24352A</color>
<color name="green_black">#202923</color> <color name="green_black">#202923</color>
<color name="red_white_lightest">#FBECEE</color>
<color name="red_white_light">#FCE6E8</color> <color name="red_white_light">#FCE6E8</color>
<color name="red_lightest">#ef9a9a</color> <color name="red_lightest">#ef9a9a</color>
<color name="red_lighter">#EF5350</color> <color name="red_lighter">#EF5350</color>
@@ -90,6 +91,7 @@
<color name="white_purple">#F2EDFA</color> <color name="white_purple">#F2EDFA</color>
<color name="white_purple_light">#F7F3FD</color> <color name="white_purple_light">#F7F3FD</color>
<color name="white_purple_light_transparent">#E0F7F3FD</color> <color name="white_purple_light_transparent">#E0F7F3FD</color>
<color name="purple_lightest">#F7D9FB</color>
<color name="purple_lighter">#ce93d8</color> <color name="purple_lighter">#ce93d8</color>
<color name="purple_light">#9048bc</color> <color name="purple_light">#9048bc</color>
<color name="purple">#743998</color> <color name="purple">#743998</color>
@@ -112,6 +114,7 @@
<color name="reply_orange_light">#FFBA52</color> <color name="reply_orange_light">#FFBA52</color>
<color name="reply_orange">#F9AA33</color> <color name="reply_orange">#F9AA33</color>
<color name="reply_blue_lightest">#F6F8FA</color>
<color name="reply_blue_lighter">#EDF0F2</color> <color name="reply_blue_lighter">#EDF0F2</color>
<color name="reply_blue_light">#D1DBE0</color> <color name="reply_blue_light">#D1DBE0</color>
<color name="reply_blue">#4A6572</color> <color name="reply_blue">#4A6572</color>

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

@@ -49,9 +49,11 @@
<item name="colorPrimary">@color/green</item> <item name="colorPrimary">@color/green</item>
<item name="colorPrimaryDark">@color/green_dark</item> <item name="colorPrimaryDark">@color/green_dark</item>
<item name="colorAccent">@color/orange</item> <item name="colorOnPrimary">@color/white</item>
<item name="colorAccentLight">@color/orange_lighter</item>
<item name="colorSecondary">@color/orange</item> <item name="colorSecondary">@color/orange</item>
<item name="colorOnSecondary">@color/white</item>
<item name="colorTertiary">@color/green_lightest</item>
<item name="colorOnTertiary">@color/green_white_dark</item>
<item name="colorControlNormal">@color/grey_lighter</item> <item name="colorControlNormal">@color/grey_lighter</item>
<item name="colorControlActivated">@color/orange</item> <item name="colorControlActivated">@color/orange</item>
@@ -65,7 +67,6 @@
<item name="android:textColor">@color/text_color_light</item> <item name="android:textColor">@color/text_color_light</item>
<item name="android:textColorLink">@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:editTextColor">@color/grey_light</item>
<item name="textColorInverse">@color/white</item>
<item name="android:textColorPrimary">@color/green_light</item> <item name="android:textColorPrimary">@color/green_light</item>
<item name="android:textColorPrimaryInverse">@color/white_darkest</item> <item name="android:textColorPrimaryInverse">@color/white_darkest</item>
<item name="android:textColorSecondary">@color/text_color_secondary_light</item> <item name="android:textColorSecondary">@color/text_color_secondary_light</item>
@@ -75,8 +76,6 @@
<item name="iconPreferenceColor">@color/text_color_secondary_light</item> <item name="iconPreferenceColor">@color/text_color_secondary_light</item>
<item name="colorOnAccentColor">@color/white</item>
<!-- Dialog --> <!-- Dialog -->
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Light.Dialog</item> <item name="android:alertDialogTheme">@style/KeepassDXStyle.Light.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Light.Dialog</item> <item name="alertDialogTheme">@style/KeepassDXStyle.Light.Dialog</item>
@@ -138,9 +137,11 @@
<item name="colorPrimary">@color/green</item> <item name="colorPrimary">@color/green</item>
<item name="colorPrimaryDark">@color/green_dark</item> <item name="colorPrimaryDark">@color/green_dark</item>
<item name="colorAccent">@color/orange</item> <item name="colorOnPrimary">@color/white</item>
<item name="colorAccentLight">@color/orange_lighter</item>
<item name="colorSecondary">@color/orange</item> <item name="colorSecondary">@color/orange</item>
<item name="colorOnSecondary">@color/white</item>
<item name="colorTertiary">@color/green_black_light</item>
<item name="colorOnTertiary">@color/green_black</item>
<item name="colorControlNormal">@color/grey_lighter</item> <item name="colorControlNormal">@color/grey_lighter</item>
<item name="colorControlActivated">@color/orange</item> <item name="colorControlActivated">@color/orange</item>
@@ -154,7 +155,6 @@
<item name="android:textColor">@color/text_color_night</item> <item name="android:textColor">@color/text_color_night</item>
<item name="android:textColorLink">@color/text_color_night</item> <item name="android:textColorLink">@color/text_color_night</item>
<item name="android:editTextColor">@color/white</item> <item name="android:editTextColor">@color/white</item>
<item name="textColorInverse">@color/white</item>
<item name="android:textColorPrimary">@color/green_light</item> <item name="android:textColorPrimary">@color/green_light</item>
<item name="android:textColorPrimaryInverse">@color/white_darkest</item> <item name="android:textColorPrimaryInverse">@color/white_darkest</item>
<item name="android:textColorSecondary">@color/text_color_secondary_night</item> <item name="android:textColorSecondary">@color/text_color_secondary_night</item>
@@ -164,8 +164,6 @@
<item name="iconPreferenceColor">@color/text_color_secondary_night</item> <item name="iconPreferenceColor">@color/text_color_secondary_night</item>
<item name="colorOnAccentColor">@color/white</item>
<!-- Dialog --> <!-- Dialog -->
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Night.Dialog</item> <item name="android:alertDialogTheme">@style/KeepassDXStyle.Night.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Night.Dialog</item> <item name="alertDialogTheme">@style/KeepassDXStyle.Night.Dialog</item>
@@ -283,23 +281,23 @@
<!-- Edit Text --> <!-- Edit Text -->
<style name="ThemeOverlay.KeepassDXTheme.TextInputEditText" parent="ThemeOverlay.Material3.TextInputEditText.OutlinedBox"> <style name="ThemeOverlay.KeepassDXTheme.TextInputEditText" parent="ThemeOverlay.Material3.TextInputEditText.OutlinedBox">
<item name="colorControlActivated">?attr/colorAccent</item> <item name="colorControlActivated">?attr/colorSecondary</item>
</style> </style>
<style name="ThemeOverlay.KeepassDXTheme.CompleteTextView" parent="ThemeOverlay.Material3.AutoCompleteTextView.OutlinedBox"> <style name="ThemeOverlay.KeepassDXTheme.CompleteTextView" parent="ThemeOverlay.Material3.AutoCompleteTextView.OutlinedBox">
<item name="colorControlActivated">?attr/colorAccent</item> <item name="colorControlActivated">?attr/colorSecondary</item>
</style> </style>
<style name="KeepassDXStyle.TextInputLayout" parent="Widget.Material3.TextInputLayout.OutlinedBox"> <style name="KeepassDXStyle.TextInputLayout" parent="Widget.Material3.TextInputLayout.OutlinedBox">
<item name="android:paddingTop">2dp</item> <item name="android:paddingTop">2dp</item>
<item name="android:paddingBottom">2dp</item> <item name="android:paddingBottom">2dp</item>
<item name="boxStrokeColor">@color/edit_text_stroke_color</item> <item name="boxStrokeColor">@color/edit_text_stroke_color</item>
<item name="hintTextColor">?attr/colorAccent</item> <item name="hintTextColor">?attr/colorSecondary</item>
<item name="materialThemeOverlay">@style/ThemeOverlay.KeepassDXTheme.TextInputEditText</item> <item name="materialThemeOverlay">@style/ThemeOverlay.KeepassDXTheme.TextInputEditText</item>
</style> </style>
<style name="KeepassDXStyle.TextInputLayout.ExposedMenu" parent="Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu"> <style name="KeepassDXStyle.TextInputLayout.ExposedMenu" parent="Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu">
<item name="android:paddingTop">2dp</item> <item name="android:paddingTop">2dp</item>
<item name="android:paddingBottom">2dp</item> <item name="android:paddingBottom">2dp</item>
<item name="boxStrokeColor">@color/edit_text_stroke_color</item> <item name="boxStrokeColor">@color/edit_text_stroke_color</item>
<item name="hintTextColor">?attr/colorAccent</item> <item name="hintTextColor">?attr/colorSecondary</item>
<item name="materialThemeOverlay">@style/ThemeOverlay.KeepassDXTheme.CompleteTextView</item> <item name="materialThemeOverlay">@style/ThemeOverlay.KeepassDXTheme.CompleteTextView</item>
</style> </style>
@@ -310,7 +308,7 @@
<style name="KeepassDXStyle.Switch.Light" parent="KeepassDXStyle.Light"> <style name="KeepassDXStyle.Switch.Light" parent="KeepassDXStyle.Light">
<item name="colorPrimary">@color/orange</item> <item name="colorPrimary">@color/orange</item>
<item name="colorOnPrimary">@color/green_white</item> <item name="colorOnPrimary">@color/green_white</item>
<item name="colorOnAccentColor">@color/white</item> <item name="colorOnSecondary">@color/white</item>
<item name="colorPrimaryContainer">?android:attr/windowBackground</item> <item name="colorPrimaryContainer">?android:attr/windowBackground</item>
<item name="colorOutline">@color/orange</item> <item name="colorOutline">@color/orange</item>
<item name="colorSurfaceVariant">@color/green_white</item> <item name="colorSurfaceVariant">@color/green_white</item>
@@ -318,7 +316,7 @@
<style name="KeepassDXStyle.Switch.Night" parent="KeepassDXStyle.Night"> <style name="KeepassDXStyle.Switch.Night" parent="KeepassDXStyle.Night">
<item name="colorPrimary">@color/orange</item> <item name="colorPrimary">@color/orange</item>
<item name="colorOnPrimary">@color/green_black_light</item> <item name="colorOnPrimary">@color/green_black_light</item>
<item name="colorOnAccentColor">@color/white</item> <item name="colorOnSecondary">@color/white</item>
<item name="colorPrimaryContainer">?android:attr/windowBackground</item> <item name="colorPrimaryContainer">?android:attr/windowBackground</item>
<item name="colorOutline">@color/orange</item> <item name="colorOutline">@color/orange</item>
<item name="colorSurfaceVariant">?android:attr/windowBackground</item> <item name="colorSurfaceVariant">?android:attr/windowBackground</item>
@@ -350,7 +348,7 @@
<!-- Dialog --> <!-- Dialog -->
<style name="KeepassDXStyle.Light.Dialog" parent="ThemeOverlay.Material3.Dialog.Alert"> <style name="KeepassDXStyle.Light.Dialog" parent="ThemeOverlay.Material3.Dialog.Alert">
<item name="colorAccent">@color/orange</item> <item name="colorSecondary">@color/orange</item>
<item name="android:textColorPrimary">@color/green</item> <item name="android:textColorPrimary">@color/green</item>
<item name="android:background">@color/green_white</item> <item name="android:background">@color/green_white</item>
<item name="background">@color/green_white</item> <item name="background">@color/green_white</item>
@@ -366,7 +364,7 @@
<item name="android:textColor">@color/text_color_light</item> <item name="android:textColor">@color/text_color_light</item>
</style> </style>
<style name="KeepassDXStyle.Light.DateTime.Dialog" parent="ThemeOverlay.MaterialComponents.Dialog"> <style name="KeepassDXStyle.Light.DateTime.Dialog" parent="ThemeOverlay.MaterialComponents.Dialog">
<item name="colorAccent">@color/orange</item> <item name="colorSecondary">@color/orange</item>
<item name="android:textColorPrimary">@color/green_dark</item> <item name="android:textColorPrimary">@color/green_dark</item>
<item name="android:windowBackground">@color/green_white</item> <item name="android:windowBackground">@color/green_white</item>
<item name="buttonBarNegativeButtonStyle">@style/KeepassDXStyle.Light.Dialog.NegativeButtonStyle</item> <item name="buttonBarNegativeButtonStyle">@style/KeepassDXStyle.Light.Dialog.NegativeButtonStyle</item>
@@ -374,7 +372,7 @@
</style> </style>
<style name="KeepassDXStyle.Night.Dialog" parent="ThemeOverlay.Material3.Dialog.Alert"> <style name="KeepassDXStyle.Night.Dialog" parent="ThemeOverlay.Material3.Dialog.Alert">
<item name="colorAccent">@color/orange</item> <item name="colorSecondary">@color/orange</item>
<item name="android:textColorPrimary">@color/green</item> <item name="android:textColorPrimary">@color/green</item>
<item name="android:background">@color/green_black_light</item> <item name="android:background">@color/green_black_light</item>
<item name="background">@color/green_black_light</item> <item name="background">@color/green_black_light</item>
@@ -390,7 +388,7 @@
<item name="android:textColor">@color/text_color_night</item> <item name="android:textColor">@color/text_color_night</item>
</style> </style>
<style name="KeepassDXStyle.Night.DateTime.Dialog" parent="ThemeOverlay.MaterialComponents.Dialog"> <style name="KeepassDXStyle.Night.DateTime.Dialog" parent="ThemeOverlay.MaterialComponents.Dialog">
<item name="colorAccent">@color/orange_darker</item> <item name="colorSecondary">@color/orange_darker</item>
<item name="android:textColorPrimary">@color/green_light</item> <item name="android:textColorPrimary">@color/green_light</item>
<item name="android:windowBackground">@color/grey_dark</item> <item name="android:windowBackground">@color/grey_dark</item>
<item name="buttonBarStyle">@style/KeepassDXStyle.Night.Dialog.NegativeButtonStyle</item> <item name="buttonBarStyle">@style/KeepassDXStyle.Night.Dialog.NegativeButtonStyle</item>
@@ -426,8 +424,8 @@
<item name="android:textColor">?android:attr/textColor</item> <item name="android:textColor">?android:attr/textColor</item>
</style> </style>
<style name="KeepassDXStyle.TextAppearance.Default.TextOnPrimary" parent="android:style/TextAppearance"> <style name="KeepassDXStyle.TextAppearance.Default.TextOnPrimary" parent="android:style/TextAppearance">
<item name="android:textColor">?attr/textColorInverse</item> <item name="android:textColor">?attr/colorOnPrimary</item>
<item name="drawableTint">?attr/textColorInverse</item> <item name="drawableTint">?attr/colorOnPrimary</item>
<item name="android:drawablePadding">8dp</item> <item name="android:drawablePadding">8dp</item>
</style> </style>
<style name="KeepassDXStyle.TextAppearance.Secondary.TextOnPrimary" parent="KeepassDXStyle.TextAppearance.Default.TextOnPrimary"> <style name="KeepassDXStyle.TextAppearance.Secondary.TextOnPrimary" parent="KeepassDXStyle.TextAppearance.Default.TextOnPrimary">
@@ -436,7 +434,7 @@
<item name="android:textStyle">italic</item> <item name="android:textStyle">italic</item>
</style> </style>
<style name="KeepassDXStyle.TextAppearance.Warning.TextOnPrimary" parent="KeepassDXStyle.TextAppearance.Default.TextOnPrimary"> <style name="KeepassDXStyle.TextAppearance.Warning.TextOnPrimary" parent="KeepassDXStyle.TextAppearance.Default.TextOnPrimary">
<item name="android:textColor">?attr/textColorInverse</item> <item name="android:textColor">?attr/colorOnPrimary</item>
<item name="android:textSize">14sp</item> <item name="android:textSize">14sp</item>
<item name="android:textStyle">italic</item> <item name="android:textStyle">italic</item>
</style> </style>
@@ -481,18 +479,18 @@
</style> </style>
<style name="KeepassDXStyle.TextAppearance.Tiny.Secondary" parent="KeepassDXStyle.TextAppearance"> <style name="KeepassDXStyle.TextAppearance.Tiny.Secondary" parent="KeepassDXStyle.TextAppearance">
<item name="android:textSize">12sp</item> <item name="android:textSize">12sp</item>
<item name="android:textColor">?attr/colorAccent</item> <item name="android:textColor">?attr/colorSecondary</item>
</style> </style>
<style name="KeepassDXStyle.TextAppearance.Warning" parent="KeepassDXStyle.TextAppearance"> <style name="KeepassDXStyle.TextAppearance.Warning" parent="KeepassDXStyle.TextAppearance">
<item name="android:textColor">?attr/colorAccent</item> <item name="android:textColor">?attr/colorSecondary</item>
</style> </style>
<style name="KeepassDXStyle.TextAppearance.Info" parent="KeepassDXStyle.TextAppearance"> <style name="KeepassDXStyle.TextAppearance.Info" parent="KeepassDXStyle.TextAppearance">
<item name="android:textSize">12sp</item> <item name="android:textSize">12sp</item>
<item name="android:textColor">?attr/colorOnAccentColor</item> <item name="android:textColor">?attr/colorOnSecondary</item>
<item name="android:background">@drawable/background_rounded_square</item> <item name="android:background">@drawable/background_rounded_square</item>
<item name="backgroundTint">?attr/colorAccent</item> <item name="backgroundTint">?attr/colorSecondary</item>
</style> </style>
<!-- Nodes Text Style --> <!-- Nodes Text Style -->
@@ -536,16 +534,16 @@
</style> </style>
<!-- Button Style --> <!-- Button Style -->
<style name="KeepassDXStyle.Button.Primary" parent="Widget.Material3.Button"> <style name="KeepassDXStyle.Button.Primary" parent="Widget.Material3.Button.ElevatedButton">
<item name="android:textColor">?attr/textColorInverse</item> <item name="backgroundTint">@color/color_button_primary</item>
<item name="backgroundTint">@color/background_button_color_primary</item> <item name="android:textColor">@color/color_on_button_primary</item>
<item name="iconTint">?attr/textColorInverse</item> <item name="iconTint">@color/color_on_button_primary</item>
<item name="android:layout_margin">8dp</item> <item name="android:layout_margin">8dp</item>
</style> </style>
<style name="KeepassDXStyle.Button.Secondary" parent="Widget.Material3.Button.OutlinedButton"> <style name="KeepassDXStyle.Button.Secondary" parent="Widget.Material3.Button.OutlinedButton">
<item name="strokeColor">@color/background_button_color_secondary</item> <item name="strokeColor">@color/color_button_secondary</item>
<item name="android:textColor">@color/background_button_color_secondary</item> <item name="android:textColor">@color/color_button_secondary</item>
<item name="iconTint">@color/background_button_color_secondary</item> <item name="iconTint">@color/color_button_secondary</item>
<item name="android:layout_margin">8dp</item> <item name="android:layout_margin">8dp</item>
</style> </style>
<style name="KeepassDXStyle.Base.ImageButton" parent="Widget.AppCompat.ImageButton" /> <style name="KeepassDXStyle.Base.ImageButton" parent="Widget.AppCompat.ImageButton" />
@@ -553,13 +551,13 @@
<item name="android:gravity">center</item> <item name="android:gravity">center</item>
</style> </style>
<style name="KeepassDXStyle.ImageButton" parent="KeepassDXStyle.v21.ImageButton"> <style name="KeepassDXStyle.ImageButton" parent="KeepassDXStyle.v21.ImageButton">
<item name="android:colorForeground">?attr/textColorInverse</item> <item name="android:colorForeground">?attr/colorOnSecondary</item>
<item name="android:background">@drawable/background_image_button</item> <item name="android:background">@drawable/background_image_button</item>
<item name="backgroundTint">@color/background_button_color_secondary</item> <item name="backgroundTint">@color/color_button_secondary</item>
</style> </style>
<style name="KeepassDXStyle.ImageButton.Simple" parent="KeepassDXStyle.v21.ImageButton"> <style name="KeepassDXStyle.ImageButton.Simple" parent="KeepassDXStyle.v21.ImageButton">
<item name="android:colorForeground">@color/background_button_color_secondary</item> <item name="android:colorForeground">@color/color_button_secondary</item>
<item name="tint">@color/background_button_color_secondary</item> <item name="tint">@color/color_button_secondary</item>
<item name="android:background">?android:attr/actionBarItemBackground</item> <item name="android:background">?android:attr/actionBarItemBackground</item>
<item name="backgroundTint">@null</item> <item name="backgroundTint">@null</item>
<item name="android:padding">12dp</item> <item name="android:padding">12dp</item>
@@ -596,7 +594,7 @@
</style> </style>
<style name="KeepassDXStyle.Fab.Special" parent="KeepassDXStyle.v21.Fab"> <style name="KeepassDXStyle.Fab.Special" parent="KeepassDXStyle.v21.Fab">
<item name="backgroundTint">?attr/colorPrimary</item> <item name="backgroundTint">?attr/colorPrimary</item>
<item name="tint">?attr/textColorInverse</item> <item name="tint">?attr/colorOnPrimary</item>
</style> </style>
<!-- Menu FAB --> <!-- Menu FAB -->
@@ -604,14 +602,14 @@
</style> </style>
<style name="KeepassDXStyle.FabMenu" parent="KeepassDXStyle.v21.FabMenu"> <style name="KeepassDXStyle.FabMenu" parent="KeepassDXStyle.v21.FabMenu">
<item name="android:textSize">15sp</item> <item name="android:textSize">15sp</item>
<item name="android:textColor">?attr/colorOnAccentColor</item> <item name="android:textColor">?attr/colorOnSecondary</item>
<item name="android:background">@drawable/background_button_small</item> <item name="android:background">@drawable/background_button_small</item>
<item name="backgroundTint">@color/background_button_color_secondary</item> <item name="backgroundTint">@color/color_button_secondary</item>
</style> </style>
<!-- Form --> <!-- Form -->
<style name="KeepassDXStyle.TextAppearance.LabelTextStyle" parent="KeepassDXStyle.TextAppearance"> <style name="KeepassDXStyle.TextAppearance.LabelTextStyle" parent="KeepassDXStyle.TextAppearance">
<item name="android:textColor">?attr/colorAccent</item> <item name="android:textColor">?attr/colorSecondary</item>
<item name="android:textSize">12sp</item> <item name="android:textSize">12sp</item>
<item name="android:paddingLeft">4dp</item> <item name="android:paddingLeft">4dp</item>
<item name="android:paddingStart">4dp</item> <item name="android:paddingStart">4dp</item>

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

@@ -26,8 +26,11 @@
<style name="KeepassDXStyle.Clear.Base" parent="KeepassDXStyle.Light" > <style name="KeepassDXStyle.Clear.Base" parent="KeepassDXStyle.Light" >
<item name="colorPrimary">@color/white_grey_lighter</item> <item name="colorPrimary">@color/white_grey_lighter</item>
<item name="colorPrimaryDark">@color/white_grey_light</item> <item name="colorPrimaryDark">@color/white_grey_light</item>
<item name="colorAccent">@color/cyan_lighter</item> <item name="colorOnPrimary">@color/grey_light</item>
<item name="colorAccentLight">@color/cyan_lightest</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="colorControlActivated">@color/cyan_lightest</item> <item name="colorControlActivated">@color/cyan_lightest</item>
<item name="android:textColorPrimary">@color/cyan_lightest</item> <item name="android:textColorPrimary">@color/cyan_lightest</item>
<item name="android:textColorHintInverse">@color/cyan_lightest</item> <item name="android:textColorHintInverse">@color/cyan_lightest</item>
@@ -48,7 +51,6 @@
<item name="android:textColor">@color/text_color_light</item> <item name="android:textColor">@color/text_color_light</item>
<item name="android:textColorLink">@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:editTextColor">@color/grey_light</item>
<item name="textColorInverse">@color/grey_light</item>
<item name="android:textColorPrimaryInverse">@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:textColorSecondary">@color/text_color_secondary_light</item>
<item name="android:textColorSecondaryInverse">@color/grey_lighter</item> <item name="android:textColorSecondaryInverse">@color/grey_lighter</item>
@@ -91,13 +93,13 @@
</style> </style>
<!-- Dialog --> <!-- Dialog -->
<style name="KeepassDXStyle.Clear.Dialog" parent="KeepassDXStyle.Light.Dialog"> <style name="KeepassDXStyle.Clear.Dialog" parent="KeepassDXStyle.Light.Dialog">
<item name="colorAccent">@color/cyan_lighter</item> <item name="colorSecondary">@color/cyan_lighter</item>
<item name="android:textColorPrimary">@color/cyan</item> <item name="android:textColorPrimary">@color/cyan</item>
<item name="android:background">@color/white_grey_lighter</item> <item name="android:background">@color/white_grey_lighter</item>
<item name="background">@color/white_grey_lighter</item> <item name="background">@color/white_grey_lighter</item>
</style> </style>
<style name="KeepassDXStyle.Clear.DateTime.Dialog" parent="Theme.AppCompat.Light.Dialog"> <style name="KeepassDXStyle.Clear.DateTime.Dialog" parent="Theme.AppCompat.Light.Dialog">
<item name="colorAccent">@color/cyan_lighter</item> <item name="colorSecondary">@color/cyan_lighter</item>
<item name="android:textColorPrimary">@color/cyan</item> <item name="android:textColorPrimary">@color/cyan</item>
<item name="android:windowBackground">@color/white_grey_lighter</item> <item name="android:windowBackground">@color/white_grey_lighter</item>
</style> </style>
@@ -111,8 +113,10 @@
<style name="KeepassDXStyle.Dark.v21" parent="KeepassDXStyle.Night" > <style name="KeepassDXStyle.Dark.v21" parent="KeepassDXStyle.Night" >
<item name="colorPrimary">@color/grey_darker</item> <item name="colorPrimary">@color/grey_darker</item>
<item name="colorPrimaryDark">@color/black_light</item> <item name="colorPrimaryDark">@color/black_light</item>
<item name="colorAccent">@color/cyan</item> <item name="colorSecondary">@color/cyan</item>
<item name="colorAccentLight">@color/cyan_lightest</item> <item name="colorOnSecondary">@color/white</item>
<item name="colorTertiary">@color/black_light</item>
<item name="colorOnTertiary">@color/black</item>
<item name="colorControlActivated">@color/cyan_lightest</item> <item name="colorControlActivated">@color/cyan_lightest</item>
<item name="android:textColorPrimary">@color/cyan_lightest</item> <item name="android:textColorPrimary">@color/cyan_lightest</item>
<item name="android:textColorHintInverse">@color/cyan_lightest</item> <item name="android:textColorHintInverse">@color/cyan_lightest</item>
@@ -162,13 +166,13 @@
</style> </style>
<!-- Dialog --> <!-- Dialog -->
<style name="KeepassDXStyle.Dark.Dialog" parent="KeepassDXStyle.Night.Dialog"> <style name="KeepassDXStyle.Dark.Dialog" parent="KeepassDXStyle.Night.Dialog">
<item name="colorAccent">@color/cyan_lighter</item> <item name="colorSecondary">@color/cyan_lighter</item>
<item name="android:textColorPrimary">@color/cyan_lightest</item> <item name="android:textColorPrimary">@color/cyan_lightest</item>
<item name="android:background">@color/black_lighter</item> <item name="android:background">@color/black_lighter</item>
<item name="background">@color/black_lighter</item> <item name="background">@color/black_lighter</item>
</style> </style>
<style name="KeepassDXStyle.Dark.DateTime.Dialog" parent="Theme.AppCompat.DayNight.Dialog"> <style name="KeepassDXStyle.Dark.DateTime.Dialog" parent="Theme.AppCompat.DayNight.Dialog">
<item name="colorAccent">@color/cyan_lighter</item> <item name="colorSecondary">@color/cyan_lighter</item>
<item name="android:textColorPrimary">@color/cyan_lightest</item> <item name="android:textColorPrimary">@color/cyan_lightest</item>
<item name="android:windowBackground">@color/black_lighter</item> <item name="android:windowBackground">@color/black_lighter</item>
</style> </style>
@@ -180,7 +184,7 @@
<style name="KeepassDXStyle.Switch.Clear" parent="KeepassDXStyle.Clear"> <style name="KeepassDXStyle.Switch.Clear" parent="KeepassDXStyle.Clear">
<item name="colorPrimary">@color/cyan_lighter</item> <item name="colorPrimary">@color/cyan_lighter</item>
<item name="colorOnPrimary">?android:attr/windowBackground</item> <item name="colorOnPrimary">?android:attr/windowBackground</item>
<item name="colorOnAccentColor">@color/white</item> <item name="colorOnSecondary">@color/white</item>
<item name="colorPrimaryContainer">?android:attr/windowBackground</item> <item name="colorPrimaryContainer">?android:attr/windowBackground</item>
<item name="colorOutline">?attr/colorPrimary</item> <item name="colorOutline">?attr/colorPrimary</item>
<item name="colorSurfaceVariant">?android:attr/windowBackground</item> <item name="colorSurfaceVariant">?android:attr/windowBackground</item>
@@ -188,7 +192,7 @@
<style name="KeepassDXStyle.Switch.Dark" parent="KeepassDXStyle.Dark"> <style name="KeepassDXStyle.Switch.Dark" parent="KeepassDXStyle.Dark">
<item name="colorPrimary">@color/cyan_lighter</item> <item name="colorPrimary">@color/cyan_lighter</item>
<item name="colorOnPrimary">?android:attr/windowBackground</item> <item name="colorOnPrimary">?android:attr/windowBackground</item>
<item name="colorOnAccentColor">@color/white</item> <item name="colorOnSecondary">@color/white</item>
<item name="colorPrimaryContainer">?android:attr/windowBackground</item> <item name="colorPrimaryContainer">?android:attr/windowBackground</item>
<item name="colorOutline">?attr/colorPrimary</item> <item name="colorOutline">?attr/colorPrimary</item>
<item name="colorSurfaceVariant">?android:attr/windowBackground</item> <item name="colorSurfaceVariant">?android:attr/windowBackground</item>

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

@@ -26,9 +26,11 @@
<style name="KeepassDXStyle.White.Base" parent="KeepassDXStyle.Light" > <style name="KeepassDXStyle.White.Base" parent="KeepassDXStyle.Light" >
<item name="colorPrimary">@color/white</item> <item name="colorPrimary">@color/white</item>
<item name="colorPrimaryDark">@color/white</item> <item name="colorPrimaryDark">@color/white</item>
<item name="colorOnPrimary">@color/grey_light</item>
<item name="colorSecondary">@color/orange</item> <item name="colorSecondary">@color/orange</item>
<item name="colorAccent">@color/orange</item> <item name="colorOnSecondary">@color/white</item>
<item name="colorAccentLight">@color/orange_lighter</item> <item name="colorTertiary">@color/white_darkest</item>
<item name="colorOnTertiary">@color/white</item>
<item name="colorControlNormal">@color/grey_light</item> <item name="colorControlNormal">@color/grey_light</item>
<item name="colorControlActivated">@color/orange</item> <item name="colorControlActivated">@color/orange</item>
<item name="android:textColorPrimary">@color/orange_light</item> <item name="android:textColorPrimary">@color/orange_light</item>
@@ -50,7 +52,6 @@
<item name="android:textColor">@color/text_color_light</item> <item name="android:textColor">@color/text_color_light</item>
<item name="android:textColorLink">@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:editTextColor">@color/grey_light</item>
<item name="textColorInverse">@color/grey_light</item>
<item name="android:textColorPrimaryInverse">@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:textColorSecondary">@color/text_color_secondary_light</item>
<item name="android:textColorSecondaryInverse">@color/grey_lighter</item> <item name="android:textColorSecondaryInverse">@color/grey_lighter</item>
@@ -96,13 +97,13 @@
</style> </style>
<!-- Dialog --> <!-- Dialog -->
<style name="KeepassDXStyle.White.Dialog" parent="KeepassDXStyle.Light.Dialog"> <style name="KeepassDXStyle.White.Dialog" parent="KeepassDXStyle.Light.Dialog">
<item name="colorAccent">@color/orange</item> <item name="colorSecondary">@color/orange</item>
<item name="android:textColorPrimary">@color/grey_light</item> <item name="android:textColorPrimary">@color/grey_light</item>
<item name="android:background">@color/white</item> <item name="android:background">@color/white</item>
<item name="background">@color/white</item> <item name="background">@color/white</item>
</style> </style>
<style name="KeepassDXStyle.White.DateTime.Dialog" parent="Theme.AppCompat.Light.Dialog"> <style name="KeepassDXStyle.White.DateTime.Dialog" parent="Theme.AppCompat.Light.Dialog">
<item name="colorAccent">@color/orange</item> <item name="colorSecondary">@color/orange</item>
<item name="android:textColorPrimary">@color/orange_darker</item> <item name="android:textColorPrimary">@color/orange_darker</item>
<item name="android:windowBackground">@color/white</item> <item name="android:windowBackground">@color/white</item>
</style> </style>
@@ -116,8 +117,10 @@
<style name="KeepassDXStyle.Black.v21" parent="KeepassDXStyle.Night.v21" > <style name="KeepassDXStyle.Black.v21" parent="KeepassDXStyle.Night.v21" >
<item name="colorPrimary">@color/black_light</item> <item name="colorPrimary">@color/black_light</item>
<item name="colorPrimaryDark">@color/black</item> <item name="colorPrimaryDark">@color/black</item>
<item name="colorAccent">@color/orange_darker</item> <item name="colorSecondary">@color/orange_darker</item>
<item name="colorAccentLight">@color/orange</item> <item name="colorOnSecondary">@color/white</item>
<item name="colorTertiary">@color/black_light</item>
<item name="colorOnTertiary">@color/black</item>
<item name="colorControlNormal">@color/grey_light</item> <item name="colorControlNormal">@color/grey_light</item>
<item name="colorControlActivated">@color/orange</item> <item name="colorControlActivated">@color/orange</item>
<item name="android:textColorPrimary">@color/orange_lighter</item> <item name="android:textColorPrimary">@color/orange_lighter</item>
@@ -175,13 +178,13 @@
</style> </style>
<!-- Dialog --> <!-- Dialog -->
<style name="KeepassDXStyle.Black.Dialog" parent="KeepassDXStyle.Night.Dialog"> <style name="KeepassDXStyle.Black.Dialog" parent="KeepassDXStyle.Night.Dialog">
<item name="colorAccent">@color/orange_darker</item> <item name="colorSecondary">@color/orange_darker</item>
<item name="android:textColorPrimary">@color/white</item> <item name="android:textColorPrimary">@color/white</item>
<item name="android:background">@color/black_lighter</item> <item name="android:background">@color/black_lighter</item>
<item name="background">@color/black_lighter</item> <item name="background">@color/black_lighter</item>
</style> </style>
<style name="KeepassDXStyle.Black.DateTime.Dialog" parent="Theme.AppCompat.DayNight.Dialog"> <style name="KeepassDXStyle.Black.DateTime.Dialog" parent="Theme.AppCompat.DayNight.Dialog">
<item name="colorAccent">@color/orange_darker</item> <item name="colorSecondary">@color/orange_darker</item>
<item name="android:textColorPrimary">@color/orange</item> <item name="android:textColorPrimary">@color/orange</item>
<item name="android:windowBackground">@color/black_lighter</item> <item name="android:windowBackground">@color/black_lighter</item>
</style> </style>
@@ -193,7 +196,7 @@
<style name="KeepassDXStyle.Switch.White" parent="KeepassDXStyle.White"> <style name="KeepassDXStyle.Switch.White" parent="KeepassDXStyle.White">
<item name="colorPrimary">@color/orange</item> <item name="colorPrimary">@color/orange</item>
<item name="colorOnPrimary">?android:attr/windowBackground</item> <item name="colorOnPrimary">?android:attr/windowBackground</item>
<item name="colorOnAccentColor">@color/white</item> <item name="colorOnSecondary">@color/white</item>
<item name="colorPrimaryContainer">?android:attr/windowBackground</item> <item name="colorPrimaryContainer">?android:attr/windowBackground</item>
<item name="colorOutline">?attr/colorPrimary</item> <item name="colorOutline">?attr/colorPrimary</item>
<item name="colorSurfaceVariant">?android:attr/windowBackground</item> <item name="colorSurfaceVariant">?android:attr/windowBackground</item>
@@ -201,7 +204,7 @@
<style name="KeepassDXStyle.Switch.Black" parent="KeepassDXStyle.Black"> <style name="KeepassDXStyle.Switch.Black" parent="KeepassDXStyle.Black">
<item name="colorPrimary">@color/orange_darker</item> <item name="colorPrimary">@color/orange_darker</item>
<item name="colorOnPrimary">?android:attr/windowBackground</item> <item name="colorOnPrimary">?android:attr/windowBackground</item>
<item name="colorOnAccentColor">@color/white</item> <item name="colorOnSecondary">@color/white</item>
<item name="colorPrimaryContainer">?android:attr/windowBackground</item> <item name="colorPrimaryContainer">?android:attr/windowBackground</item>
<item name="colorOutline">?attr/colorPrimary</item> <item name="colorOutline">?attr/colorPrimary</item>
<item name="colorSurfaceVariant">?android:attr/windowBackground</item> <item name="colorSurfaceVariant">?android:attr/windowBackground</item>

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

@@ -23,8 +23,11 @@
<style name="KeepassDXStyle.Purple.v21" parent="KeepassDXStyle.Light.v21" > <style name="KeepassDXStyle.Purple.v21" parent="KeepassDXStyle.Light.v21" >
<item name="colorPrimary">@color/purple</item> <item name="colorPrimary">@color/purple</item>
<item name="colorPrimaryDark">@color/purple_dark</item> <item name="colorPrimaryDark">@color/purple_dark</item>
<item name="colorAccent">@color/red</item> <item name="colorOnPrimary">@color/white_purple</item>
<item name="colorAccentLight">@color/red_light</item> <item name="colorSecondary">@color/red</item>
<item name="colorOnSecondary">@color/purple_lighter</item>
<item name="colorTertiary">@color/purple_lightest</item>
<item name="colorOnTertiary">@color/white_purple_light</item>
<item name="colorControlActivated">@color/red_light</item> <item name="colorControlActivated">@color/red_light</item>
<item name="android:textColorPrimary">@color/purple_light</item> <item name="android:textColorPrimary">@color/purple_light</item>
<item name="android:textColorHintInverse">@color/purple_lighter</item> <item name="android:textColorHintInverse">@color/purple_lighter</item>
@@ -82,13 +85,13 @@
</style> </style>
<!-- Dialog --> <!-- Dialog -->
<style name="KeepassDXStyle.Purple.Dialog" parent="KeepassDXStyle.Light.Dialog"> <style name="KeepassDXStyle.Purple.Dialog" parent="KeepassDXStyle.Light.Dialog">
<item name="colorAccent">@color/red</item> <item name="colorSecondary">@color/red</item>
<item name="android:textColorPrimary">@color/purple_light</item> <item name="android:textColorPrimary">@color/purple_light</item>
<item name="android:background">@color/white_purple</item> <item name="android:background">@color/white_purple</item>
<item name="background">@color/white_purple</item> <item name="background">@color/white_purple</item>
</style> </style>
<style name="KeepassDXStyle.Purple.DateTime.Dialog" parent="Theme.AppCompat.Light.Dialog"> <style name="KeepassDXStyle.Purple.DateTime.Dialog" parent="Theme.AppCompat.Light.Dialog">
<item name="colorAccent">@color/red</item> <item name="colorSecondary">@color/red</item>
<item name="android:textColorPrimary">@color/purple_light</item> <item name="android:textColorPrimary">@color/purple_light</item>
<item name="android:windowBackground">@color/white_purple</item> <item name="android:windowBackground">@color/white_purple</item>
</style> </style>
@@ -102,8 +105,11 @@
<style name="KeepassDXStyle.Purple.Dark.v21" parent="KeepassDXStyle.Night.v21" > <style name="KeepassDXStyle.Purple.Dark.v21" parent="KeepassDXStyle.Night.v21" >
<item name="colorPrimary">@color/purple_darker</item> <item name="colorPrimary">@color/purple_darker</item>
<item name="colorPrimaryDark">@color/black_purple</item> <item name="colorPrimaryDark">@color/black_purple</item>
<item name="colorAccent">@color/red</item> <item name="colorOnPrimary">@color/white_purple_light</item>
<item name="colorAccentLight">@color/red_light</item> <item name="colorSecondary">@color/red</item>
<item name="colorOnSecondary">@color/white_purple_light</item>
<item name="colorTertiary">@color/black_purple</item>
<item name="colorOnTertiary">@color/black_purple_dark</item>
<item name="colorControlActivated">@color/red_light</item> <item name="colorControlActivated">@color/red_light</item>
<item name="android:textColorPrimary">@color/purple_lighter</item> <item name="android:textColorPrimary">@color/purple_lighter</item>
<item name="android:textColorHintInverse">@color/purple_lighter</item> <item name="android:textColorHintInverse">@color/purple_lighter</item>
@@ -162,13 +168,13 @@
</style> </style>
<!-- Dialog --> <!-- Dialog -->
<style name="KeepassDXStyle.Purple.Dark.Dialog" parent="KeepassDXStyle.Night.Dialog"> <style name="KeepassDXStyle.Purple.Dark.Dialog" parent="KeepassDXStyle.Night.Dialog">
<item name="colorAccent">@color/red</item> <item name="colorSecondary">@color/red</item>
<item name="android:textColorPrimary">@color/purple_lighter</item> <item name="android:textColorPrimary">@color/purple_lighter</item>
<item name="android:background">@color/black_purple_dark</item> <item name="android:background">@color/black_purple_dark</item>
<item name="background">@color/black_purple_dark</item> <item name="background">@color/black_purple_dark</item>
</style> </style>
<style name="KeepassDXStyle.Purple.Dark.DateTime.Dialog" parent="Theme.AppCompat.DayNight.Dialog"> <style name="KeepassDXStyle.Purple.Dark.DateTime.Dialog" parent="Theme.AppCompat.DayNight.Dialog">
<item name="colorAccent">@color/red</item> <item name="colorSecondary">@color/red</item>
<item name="android:textColorPrimary">@color/purple_lighter</item> <item name="android:textColorPrimary">@color/purple_lighter</item>
<item name="android:windowBackground">@color/black_purple_dark</item> <item name="android:windowBackground">@color/black_purple_dark</item>
</style> </style>
@@ -180,7 +186,7 @@
<style name="KeepassDXStyle.Switch.Purple" parent="KeepassDXStyle.Purple"> <style name="KeepassDXStyle.Switch.Purple" parent="KeepassDXStyle.Purple">
<item name="colorPrimary">@color/purple</item> <item name="colorPrimary">@color/purple</item>
<item name="colorOnPrimary">@color/white_purple_light</item> <item name="colorOnPrimary">@color/white_purple_light</item>
<item name="colorOnAccentColor">@color/white</item> <item name="colorOnSecondary">@color/white</item>
<item name="colorPrimaryContainer">?android:attr/windowBackground</item> <item name="colorPrimaryContainer">?android:attr/windowBackground</item>
<item name="colorOutline">@color/purple_light</item> <item name="colorOutline">@color/purple_light</item>
<item name="colorSurfaceVariant">?android:attr/windowBackground</item> <item name="colorSurfaceVariant">?android:attr/windowBackground</item>
@@ -188,7 +194,7 @@
<style name="KeepassDXStyle.Switch.Purple.Dark" parent="KeepassDXStyle.Purple.Dark"> <style name="KeepassDXStyle.Switch.Purple.Dark" parent="KeepassDXStyle.Purple.Dark">
<item name="colorPrimary">@color/purple</item> <item name="colorPrimary">@color/purple</item>
<item name="colorOnPrimary">@color/purple_darker</item> <item name="colorOnPrimary">@color/purple_darker</item>
<item name="colorOnAccentColor">@color/white</item> <item name="colorOnSecondary">@color/white</item>
<item name="colorPrimaryContainer">?android:attr/windowBackground</item> <item name="colorPrimaryContainer">?android:attr/windowBackground</item>
<item name="colorOutline">@color/purple_dark</item> <item name="colorOutline">@color/purple_dark</item>
<item name="colorSurfaceVariant">?android:attr/windowBackground</item> <item name="colorSurfaceVariant">?android:attr/windowBackground</item>

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

@@ -23,8 +23,11 @@
<style name="KeepassDXStyle.Blue.v21" parent="KeepassDXStyle.Light" > <style name="KeepassDXStyle.Blue.v21" parent="KeepassDXStyle.Light" >
<item name="colorPrimary">@color/blue</item> <item name="colorPrimary">@color/blue</item>
<item name="colorPrimaryDark">@color/blue_dark</item> <item name="colorPrimaryDark">@color/blue_dark</item>
<item name="colorAccent">@color/blue_lighter</item> <item name="colorOnPrimary">@color/white</item>
<item name="colorAccentLight">@color/blue_white_dark</item> <item name="colorSecondary">@color/blue_lighter</item>
<item name="colorOnSecondary">@color/white</item>
<item name="colorTertiary">@color/blue_white_dark</item>
<item name="colorOnTertiary">@color/blue_white</item>
<item name="colorControlActivated">@color/blue_lighter</item> <item name="colorControlActivated">@color/blue_lighter</item>
<item name="android:textColorPrimary">@color/blue_light</item> <item name="android:textColorPrimary">@color/blue_light</item>
<item name="android:textColorHintInverse">@color/blue_white_dark</item> <item name="android:textColorHintInverse">@color/blue_white_dark</item>
@@ -77,13 +80,13 @@
</style> </style>
<!-- Dialog --> <!-- Dialog -->
<style name="KeepassDXStyle.Blue.Dialog" parent="KeepassDXStyle.Light.Dialog"> <style name="KeepassDXStyle.Blue.Dialog" parent="KeepassDXStyle.Light.Dialog">
<item name="colorAccent">@color/blue_white_dark</item> <item name="colorSecondary">@color/blue_white_dark</item>
<item name="android:textColorPrimary">@color/blue</item> <item name="android:textColorPrimary">@color/blue</item>
<item name="android:background">@color/blue_white_light</item> <item name="android:background">@color/blue_white_light</item>
<item name="background">@color/blue_white_light</item> <item name="background">@color/blue_white_light</item>
</style> </style>
<style name="KeepassDXStyle.Blue.DateTime.Dialog" parent="Theme.AppCompat.Light.Dialog"> <style name="KeepassDXStyle.Blue.DateTime.Dialog" parent="Theme.AppCompat.Light.Dialog">
<item name="colorAccent">@color/blue</item> <item name="colorSecondary">@color/blue</item>
<item name="android:textColorPrimary">@color/blue</item> <item name="android:textColorPrimary">@color/blue</item>
<item name="android:windowBackground">@color/white_dark</item> <item name="android:windowBackground">@color/white_dark</item>
</style> </style>
@@ -94,8 +97,11 @@
<style name="KeepassDXStyle.Blue.Night.v21" parent="KeepassDXStyle.Night" > <style name="KeepassDXStyle.Blue.Night.v21" parent="KeepassDXStyle.Night" >
<item name="colorPrimary">@color/blue</item> <item name="colorPrimary">@color/blue</item>
<item name="colorPrimaryDark">@color/blue_dark</item> <item name="colorPrimaryDark">@color/blue_dark</item>
<item name="colorAccent">@color/blue_lighter</item> <item name="colorOnPrimary">@color/white</item>
<item name="colorAccentLight">@color/blue_white_dark</item> <item name="colorSecondary">@color/blue_lighter</item>
<item name="colorOnSecondary">@color/white</item>
<item name="colorTertiary">@color/blue_black</item>
<item name="colorOnTertiary">@color/blue_black_dark</item>
<item name="colorControlActivated">@color/blue_lighter</item> <item name="colorControlActivated">@color/blue_lighter</item>
<item name="android:textColorPrimary">@color/blue_light</item> <item name="android:textColorPrimary">@color/blue_light</item>
<item name="android:textColorHintInverse">@color/blue_white_dark</item> <item name="android:textColorHintInverse">@color/blue_white_dark</item>
@@ -147,13 +153,13 @@
</style> </style>
<!-- Dialog --> <!-- Dialog -->
<style name="KeepassDXStyle.Blue.Night.Dialog" parent="KeepassDXStyle.Night.Dialog"> <style name="KeepassDXStyle.Blue.Night.Dialog" parent="KeepassDXStyle.Night.Dialog">
<item name="colorAccent">@color/blue_white_dark</item> <item name="colorSecondary">@color/blue_white_dark</item>
<item name="android:textColorPrimary">@color/blue</item> <item name="android:textColorPrimary">@color/blue</item>
<item name="android:background">@color/blue_black_dark</item> <item name="android:background">@color/blue_black_dark</item>
<item name="background">@color/blue_black_dark</item> <item name="background">@color/blue_black_dark</item>
</style> </style>
<style name="KeepassDXStyle.Blue.Night.DateTime.Dialog" parent="Theme.AppCompat.DayNight.Dialog"> <style name="KeepassDXStyle.Blue.Night.DateTime.Dialog" parent="Theme.AppCompat.DayNight.Dialog">
<item name="colorAccent">@color/blue</item> <item name="colorSecondary">@color/blue</item>
<item name="android:textColorPrimary">@color/blue</item> <item name="android:textColorPrimary">@color/blue</item>
<item name="android:windowBackground">@color/grey_dark</item> <item name="android:windowBackground">@color/grey_dark</item>
</style> </style>
@@ -167,14 +173,14 @@
<!-- Switch --> <!-- Switch -->
<style name="KeepassDXStyle.Switch.Blue" parent="KeepassDXStyle.Blue"> <style name="KeepassDXStyle.Switch.Blue" parent="KeepassDXStyle.Blue">
<item name="colorOnPrimary">@color/blue_white_light</item> <item name="colorOnPrimary">@color/blue_white_light</item>
<item name="colorOnAccentColor">@color/white</item> <item name="colorOnSecondary">@color/white</item>
<item name="colorPrimaryContainer">?android:attr/windowBackground</item> <item name="colorPrimaryContainer">?android:attr/windowBackground</item>
<item name="colorOutline">@color/blue_lighter</item> <item name="colorOutline">@color/blue_lighter</item>
<item name="colorSurfaceVariant">?android:attr/windowBackground</item> <item name="colorSurfaceVariant">?android:attr/windowBackground</item>
</style> </style>
<style name="KeepassDXStyle.Switch.Blue.Night" parent="KeepassDXStyle.Blue.Night"> <style name="KeepassDXStyle.Switch.Blue.Night" parent="KeepassDXStyle.Blue.Night">
<item name="colorOnPrimary">@color/blue_black_dark</item> <item name="colorOnPrimary">@color/blue_black_dark</item>
<item name="colorOnAccentColor">@color/white</item> <item name="colorOnSecondary">@color/white</item>
<item name="colorPrimaryContainer">?android:attr/windowBackground</item> <item name="colorPrimaryContainer">?android:attr/windowBackground</item>
<item name="colorOutline">@color/blue_lighter</item> <item name="colorOutline">@color/blue_lighter</item>
<item name="colorSurfaceVariant">?android:attr/windowBackground</item> <item name="colorSurfaceVariant">?android:attr/windowBackground</item>

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

@@ -23,9 +23,12 @@
<style name="KeepassDXStyle.Reply.v21" parent="KeepassDXStyle.Light.v21" > <style name="KeepassDXStyle.Reply.v21" parent="KeepassDXStyle.Light.v21" >
<item name="colorPrimary">@color/reply_blue_dark</item> <item name="colorPrimary">@color/reply_blue_dark</item>
<item name="colorPrimaryDark">@color/reply_blue</item> <item name="colorPrimaryDark">@color/reply_blue</item>
<item name="colorAccent">@color/reply_orange</item> <item name="colorOnPrimary">@color/reply_blue_light</item>
<item name="colorAccentLight">@color/reply_orange_light</item> <item name="colorSecondary">@color/reply_orange</item>
<item name="colorControlActivated">@color/reply_blue_light</item> <item name="colorOnSecondary">@color/reply_black</item>
<item name="colorTertiary">@color/reply_blue_light</item>
<item name="colorOnTertiary">@color/reply_blue_lighter</item>
<item name="colorControlActivated">@color/reply_blue</item>
<item name="android:textColorPrimary">@color/reply_blue</item> <item name="android:textColorPrimary">@color/reply_blue</item>
<item name="android:textColorHintInverse">@color/reply_orange</item> <item name="android:textColorHintInverse">@color/reply_orange</item>
<item name="android:textColorSecondaryInverse">@color/reply_orange</item> <item name="android:textColorSecondaryInverse">@color/reply_orange</item>
@@ -38,9 +41,9 @@
<item name="popupTheme">@style/KeepassDXStyle.Toolbar.Popup.Reply</item> <item name="popupTheme">@style/KeepassDXStyle.Toolbar.Popup.Reply</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Reply.Dialog</item> <item name="android:alertDialogTheme">@style/KeepassDXStyle.Reply.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Reply.Dialog</item> <item name="alertDialogTheme">@style/KeepassDXStyle.Reply.Dialog</item>
<item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Reply.Light</item>
<item name="educationCircleColor">@color/reply_orange</item> <item name="educationCircleColor">@color/reply_orange</item>
<item name="educationTextColor">@color/reply_black</item> <item name="educationTextColor">@color/reply_black</item>
<item name="colorOnAccentColor">@color/reply_black</item>
<item name="chipFilterTextColor">@color/reply_black</item> <item name="chipFilterTextColor">@color/reply_black</item>
<item name="chipFilterBackgroundColor">@color/reply_orange</item> <item name="chipFilterBackgroundColor">@color/reply_orange</item>
@@ -82,16 +85,20 @@
</style> </style>
<!-- Dialog --> <!-- Dialog -->
<style name="KeepassDXStyle.Reply.Dialog" parent="KeepassDXStyle.Light.Dialog"> <style name="KeepassDXStyle.Reply.Dialog" parent="KeepassDXStyle.Light.Dialog">
<item name="colorAccent">@color/reply_orange</item> <item name="colorSecondary">@color/reply_orange</item>
<item name="android:textColorPrimary">@color/reply_blue_dark</item> <item name="android:textColorPrimary">@color/reply_blue_dark</item>
<item name="android:background">@color/reply_blue_lighter</item> <item name="android:background">@color/reply_blue_lighter</item>
<item name="background">@color/reply_blue_lighter</item> <item name="background">@color/reply_blue_lighter</item>
</style> </style>
<style name="KeepassDXStyle.Reply.DateTime.Dialog" parent="Theme.AppCompat.Light.Dialog"> <style name="KeepassDXStyle.Reply.DateTime.Dialog" parent="Theme.AppCompat.Light.Dialog">
<item name="colorAccent">@color/reply_blue_dark</item> <item name="colorSecondary">@color/reply_blue_dark</item>
<item name="android:textColorPrimary">@color/reply_blue_dark</item> <item name="android:textColorPrimary">@color/reply_blue_dark</item>
<item name="android:windowBackground">@color/reply_blue_lighter</item> <item name="android:windowBackground">@color/reply_blue_lighter</item>
</style> </style>
<!-- CardView -->
<style name="KeepassDXStyle.Cardview.Reply.Light" parent="KeepassDXStyle.Cardview">
<item name="cardBackgroundColor">@color/reply_blue_lightest</item>
</style>
<!-- Dark Reply Style --> <!-- Dark Reply Style -->
@@ -99,8 +106,11 @@
<style name="KeepassDXStyle.Reply.Night.v21" parent="KeepassDXStyle.Night.v21" > <style name="KeepassDXStyle.Reply.Night.v21" parent="KeepassDXStyle.Night.v21" >
<item name="colorPrimary">@color/reply_blue_dark</item> <item name="colorPrimary">@color/reply_blue_dark</item>
<item name="colorPrimaryDark">@color/reply_black</item> <item name="colorPrimaryDark">@color/reply_black</item>
<item name="colorAccent">@color/reply_orange</item> <item name="colorOnPrimary">@color/reply_blue_light</item>
<item name="colorAccentLight">@color/reply_orange_light</item> <item name="colorSecondary">@color/reply_orange</item>
<item name="colorOnSecondary">@color/reply_black</item>
<item name="colorTertiary">@color/reply_black_dark</item>
<item name="colorOnTertiary">@color/reply_black</item>
<item name="colorControlActivated">@color/reply_blue_light</item> <item name="colorControlActivated">@color/reply_blue_light</item>
<item name="android:textColorPrimary">@color/reply_blue_lighter</item> <item name="android:textColorPrimary">@color/reply_blue_lighter</item>
<item name="android:textColorHintInverse">@color/reply_blue_light</item> <item name="android:textColorHintInverse">@color/reply_blue_light</item>
@@ -117,7 +127,6 @@
<item name="cardBackgroundTransparentColor">@color/reply_black_transparent</item> <item name="cardBackgroundTransparentColor">@color/reply_black_transparent</item>
<item name="educationCircleColor">@color/reply_orange</item> <item name="educationCircleColor">@color/reply_orange</item>
<item name="educationTextColor">@color/reply_black</item> <item name="educationTextColor">@color/reply_black</item>
<item name="colorOnAccentColor">@color/reply_black</item>
<item name="chipFilterTextColor">@color/reply_black</item> <item name="chipFilterTextColor">@color/reply_black</item>
<item name="chipFilterBackgroundColor">@color/reply_orange</item> <item name="chipFilterBackgroundColor">@color/reply_orange</item>
@@ -159,13 +168,13 @@
</style> </style>
<!-- Dialog --> <!-- Dialog -->
<style name="KeepassDXStyle.Reply.Night.Dialog" parent="KeepassDXStyle.Night.Dialog"> <style name="KeepassDXStyle.Reply.Night.Dialog" parent="KeepassDXStyle.Night.Dialog">
<item name="colorAccent">@color/reply_blue_lighter</item> <item name="colorSecondary">@color/reply_blue_lighter</item>
<item name="android:textColorPrimary">@color/reply_orange</item> <item name="android:textColorPrimary">@color/reply_orange</item>
<item name="android:background">@color/reply_black</item> <item name="android:background">@color/reply_black</item>
<item name="background">@color/reply_black</item> <item name="background">@color/reply_black</item>
</style> </style>
<style name="KeepassDXStyle.Reply.Night.DateTime.Dialog" parent="Theme.AppCompat.DayNight.Dialog"> <style name="KeepassDXStyle.Reply.Night.DateTime.Dialog" parent="Theme.AppCompat.DayNight.Dialog">
<item name="colorAccent">@color/reply_blue_dark</item> <item name="colorSecondary">@color/reply_blue_dark</item>
<item name="android:textColorPrimary">@color/reply_orange</item> <item name="android:textColorPrimary">@color/reply_orange</item>
<item name="android:windowBackground">@color/reply_black</item> <item name="android:windowBackground">@color/reply_black</item>
</style> </style>
@@ -176,8 +185,8 @@
<!-- Switch --> <!-- Switch -->
<style name="KeepassDXStyle.Switch.Reply" parent="KeepassDXStyle.Reply"> <style name="KeepassDXStyle.Switch.Reply" parent="KeepassDXStyle.Reply">
<item name="colorPrimary">@color/reply_orange</item> <item name="colorPrimary">@color/reply_orange</item>
<item name="colorOnPrimary">@color/reply_blue_light</item> <item name="colorOnPrimary">@color/reply_blue_lightest</item>
<item name="colorOnAccentColor">@color/white</item> <item name="colorOnSecondary">@color/white</item>
<item name="colorPrimaryContainer">?android:attr/windowBackground</item> <item name="colorPrimaryContainer">?android:attr/windowBackground</item>
<item name="colorOutline">@color/reply_orange</item> <item name="colorOutline">@color/reply_orange</item>
<item name="colorSurfaceVariant">?android:attr/windowBackground</item> <item name="colorSurfaceVariant">?android:attr/windowBackground</item>
@@ -185,7 +194,7 @@
<style name="KeepassDXStyle.Switch.Reply.Night" parent="KeepassDXStyle.Reply.Night"> <style name="KeepassDXStyle.Switch.Reply.Night" parent="KeepassDXStyle.Reply.Night">
<item name="colorPrimary">@color/reply_orange</item> <item name="colorPrimary">@color/reply_orange</item>
<item name="colorOnPrimary">@color/reply_black</item> <item name="colorOnPrimary">@color/reply_black</item>
<item name="colorOnAccentColor">@color/white</item> <item name="colorOnSecondary">@color/white</item>
<item name="colorPrimaryContainer">?android:attr/windowBackground</item> <item name="colorPrimaryContainer">?android:attr/windowBackground</item>
<item name="colorOutline">@color/reply_orange</item> <item name="colorOutline">@color/reply_orange</item>
<item name="colorSurfaceVariant">?android:attr/windowBackground</item> <item name="colorSurfaceVariant">?android:attr/windowBackground</item>

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

@@ -26,8 +26,11 @@
<style name="KeepassDXStyle.Simple.Base" parent="KeepassDXStyle.Light" > <style name="KeepassDXStyle.Simple.Base" parent="KeepassDXStyle.Light" >
<item name="colorPrimary">@color/white_slight</item> <item name="colorPrimary">@color/white_slight</item>
<item name="colorPrimaryDark">@color/white_slight</item> <item name="colorPrimaryDark">@color/white_slight</item>
<item name="colorAccent">@color/blue_deep</item> <item name="colorOnPrimary">@color/grey_light</item>
<item name="colorAccentLight">@color/blue_deep</item> <item name="colorSecondary">@color/blue_deep</item>
<item name="colorOnSecondary">@color/white</item>
<item name="colorTertiary">@color/white_darkest</item>
<item name="colorOnTertiary">@color/white</item>
<item name="colorControlActivated">@color/blue_deep</item> <item name="colorControlActivated">@color/blue_deep</item>
<item name="android:textColorPrimary">@color/grey</item> <item name="android:textColorPrimary">@color/grey</item>
<item name="android:textColorHintInverse">@color/grey</item> <item name="android:textColorHintInverse">@color/grey</item>
@@ -48,7 +51,6 @@
<item name="android:textColor">@color/text_color_light</item> <item name="android:textColor">@color/text_color_light</item>
<item name="android:textColorLink">@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:editTextColor">@color/grey_light</item>
<item name="textColorInverse">@color/grey_light</item>
<item name="android:textColorPrimaryInverse">@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:textColorSecondary">@color/text_color_secondary_light</item>
<item name="android:textColorSecondaryInverse">@color/grey_lighter</item> <item name="android:textColorSecondaryInverse">@color/grey_lighter</item>
@@ -91,13 +93,13 @@
</style> </style>
<!-- Dialog --> <!-- Dialog -->
<style name="KeepassDXStyle.Simple.Dialog" parent="KeepassDXStyle.Light.Dialog"> <style name="KeepassDXStyle.Simple.Dialog" parent="KeepassDXStyle.Light.Dialog">
<item name="colorAccent">@color/blue_deep</item> <item name="colorSecondary">@color/blue_deep</item>
<item name="android:textColorPrimary">@color/grey</item> <item name="android:textColorPrimary">@color/grey</item>
<item name="android:background">@color/white_slight</item> <item name="android:background">@color/white_slight</item>
<item name="background">@color/white_slight</item> <item name="background">@color/white_slight</item>
</style> </style>
<style name="KeepassDXStyle.Simple.DateTime.Dialog" parent="Theme.AppCompat.Light.Dialog"> <style name="KeepassDXStyle.Simple.DateTime.Dialog" parent="Theme.AppCompat.Light.Dialog">
<item name="colorAccent">@color/blue_deep</item> <item name="colorSecondary">@color/blue_deep</item>
<item name="android:textColorPrimary">@color/grey</item> <item name="android:textColorPrimary">@color/grey</item>
<item name="android:windowBackground">@color/white_slight</item> <item name="android:windowBackground">@color/white_slight</item>
</style> </style>
@@ -111,8 +113,10 @@
<style name="KeepassDXStyle.Simple.Night.v21" parent="KeepassDXStyle.Night" > <style name="KeepassDXStyle.Simple.Night.v21" parent="KeepassDXStyle.Night" >
<item name="colorPrimary">@color/grey_slight</item> <item name="colorPrimary">@color/grey_slight</item>
<item name="colorPrimaryDark">@color/grey_slight</item> <item name="colorPrimaryDark">@color/grey_slight</item>
<item name="colorAccent">@color/blue_slight</item> <item name="colorSecondary">@color/blue_slight</item>
<item name="colorAccentLight">@color/blue_slight</item> <item name="colorOnSecondary">@color/white</item>
<item name="colorTertiary">@color/black_light</item>
<item name="colorOnTertiary">@color/black</item>
<item name="colorControlActivated">@color/blue_slight</item> <item name="colorControlActivated">@color/blue_slight</item>
<item name="android:textColorPrimary">@color/white</item> <item name="android:textColorPrimary">@color/white</item>
<item name="android:textColorHintInverse">@color/white</item> <item name="android:textColorHintInverse">@color/white</item>
@@ -162,13 +166,13 @@
</style> </style>
<!-- Dialog --> <!-- Dialog -->
<style name="KeepassDXStyle.Simple.Night.Dialog" parent="KeepassDXStyle.Night.Dialog"> <style name="KeepassDXStyle.Simple.Night.Dialog" parent="KeepassDXStyle.Night.Dialog">
<item name="colorAccent">@color/blue_slight</item> <item name="colorSecondary">@color/blue_slight</item>
<item name="android:textColorPrimary">@color/white</item> <item name="android:textColorPrimary">@color/white</item>
<item name="android:background">@color/grey_slight</item> <item name="android:background">@color/grey_slight</item>
<item name="background">@color/grey_slight</item> <item name="background">@color/grey_slight</item>
</style> </style>
<style name="KeepassDXStyle.Simple.Night.DateTime.Dialog" parent="Theme.AppCompat.DayNight.Dialog"> <style name="KeepassDXStyle.Simple.Night.DateTime.Dialog" parent="Theme.AppCompat.DayNight.Dialog">
<item name="colorAccent">@color/blue_slight</item> <item name="colorSecondary">@color/blue_slight</item>
<item name="android:textColorPrimary">@color/white</item> <item name="android:textColorPrimary">@color/white</item>
<item name="android:windowBackground">@color/grey_slight</item> <item name="android:windowBackground">@color/grey_slight</item>
</style> </style>
@@ -180,7 +184,7 @@
<style name="KeepassDXStyle.Switch.Simple" parent="KeepassDXStyle.Simple"> <style name="KeepassDXStyle.Switch.Simple" parent="KeepassDXStyle.Simple">
<item name="colorPrimary">@color/blue_slight</item> <item name="colorPrimary">@color/blue_slight</item>
<item name="colorOnPrimary">?android:attr/windowBackground</item> <item name="colorOnPrimary">?android:attr/windowBackground</item>
<item name="colorOnAccentColor">@color/white</item> <item name="colorOnSecondary">@color/white</item>
<item name="colorPrimaryContainer">?android:attr/windowBackground</item> <item name="colorPrimaryContainer">?android:attr/windowBackground</item>
<item name="colorOutline">?attr/colorPrimary</item> <item name="colorOutline">?attr/colorPrimary</item>
<item name="colorSurfaceVariant">?android:attr/windowBackground</item> <item name="colorSurfaceVariant">?android:attr/windowBackground</item>
@@ -188,7 +192,7 @@
<style name="KeepassDXStyle.Switch.Simple.Night" parent="KeepassDXStyle.Simple.Night"> <style name="KeepassDXStyle.Switch.Simple.Night" parent="KeepassDXStyle.Simple.Night">
<item name="colorPrimary">@color/blue_slight</item> <item name="colorPrimary">@color/blue_slight</item>
<item name="colorOnPrimary">?android:attr/windowBackground</item> <item name="colorOnPrimary">?android:attr/windowBackground</item>
<item name="colorOnAccentColor">@color/white</item> <item name="colorOnSecondary">@color/white</item>
<item name="colorPrimaryContainer">?android:attr/windowBackground</item> <item name="colorPrimaryContainer">?android:attr/windowBackground</item>
<item name="colorOutline">?attr/colorPrimary</item> <item name="colorOutline">?attr/colorPrimary</item>
<item name="colorSurfaceVariant">?android:attr/windowBackground</item> <item name="colorSurfaceVariant">?android:attr/windowBackground</item>

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

@@ -23,8 +23,11 @@
<style name="KeepassDXStyle.Red.v21" parent="KeepassDXStyle.Light" > <style name="KeepassDXStyle.Red.v21" parent="KeepassDXStyle.Light" >
<item name="colorPrimary">@color/red</item> <item name="colorPrimary">@color/red</item>
<item name="colorPrimaryDark">@color/red_dark</item> <item name="colorPrimaryDark">@color/red_dark</item>
<item name="colorAccent">@color/orange</item> <item name="colorOnPrimary">@color/red_white_light</item>
<item name="colorAccentLight">@color/orange_lighter</item> <item name="colorSecondary">@color/orange</item>
<item name="colorOnSecondary">@color/white</item>
<item name="colorTertiary">@color/red_lightest</item>
<item name="colorOnTertiary">@color/red_white_light</item>
<item name="colorControlActivated">@color/orange</item> <item name="colorControlActivated">@color/orange</item>
<item name="android:textColorPrimary">@color/red</item> <item name="android:textColorPrimary">@color/red</item>
<item name="android:textColorHintInverse">@color/red_lightest</item> <item name="android:textColorHintInverse">@color/red_lightest</item>
@@ -77,13 +80,13 @@
</style> </style>
<!-- Dialog --> <!-- Dialog -->
<style name="KeepassDXStyle.Red.Dialog" parent="KeepassDXStyle.Light.Dialog"> <style name="KeepassDXStyle.Red.Dialog" parent="KeepassDXStyle.Light.Dialog">
<item name="colorAccent">@color/red</item> <item name="colorSecondary">@color/red</item>
<item name="android:textColorPrimary">@color/orange</item> <item name="android:textColorPrimary">@color/orange</item>
<item name="android:background">@color/red_white_light</item> <item name="android:background">@color/red_white_light</item>
<item name="background">@color/red_white_light</item> <item name="background">@color/red_white_light</item>
</style> </style>
<style name="KeepassDXStyle.Red.DateTime.Dialog" parent="Theme.AppCompat.Light.Dialog"> <style name="KeepassDXStyle.Red.DateTime.Dialog" parent="Theme.AppCompat.Light.Dialog">
<item name="colorAccent">@color/red</item> <item name="colorSecondary">@color/red</item>
<item name="android:textColorPrimary">@color/orange</item> <item name="android:textColorPrimary">@color/orange</item>
<item name="android:windowBackground">@color/white_dark</item> <item name="android:windowBackground">@color/white_dark</item>
</style> </style>
@@ -93,8 +96,11 @@
<style name="KeepassDXStyle.Red.Night.v21" parent="KeepassDXStyle.Night" > <style name="KeepassDXStyle.Red.Night.v21" parent="KeepassDXStyle.Night" >
<item name="colorPrimary">@color/red</item> <item name="colorPrimary">@color/red</item>
<item name="colorPrimaryDark">@color/red_dark</item> <item name="colorPrimaryDark">@color/red_dark</item>
<item name="colorAccent">@color/orange</item> <item name="colorOnPrimary">@color/red_white_light</item>
<item name="colorAccentLight">@color/orange_lighter</item> <item name="colorSecondary">@color/orange</item>
<item name="colorOnSecondary">@color/white</item>
<item name="colorTertiary">@color/red_black</item>
<item name="colorOnTertiary">@color/red_black_dark</item>
<item name="colorControlActivated">@color/orange</item> <item name="colorControlActivated">@color/orange</item>
<item name="android:textColorPrimary">@color/red</item> <item name="android:textColorPrimary">@color/red</item>
<item name="android:textColorHintInverse">@color/red_lightest</item> <item name="android:textColorHintInverse">@color/red_lightest</item>
@@ -146,19 +152,19 @@
</style> </style>
<!-- Dialog --> <!-- Dialog -->
<style name="KeepassDXStyle.Red.Night.Dialog" parent="KeepassDXStyle.Night.Dialog"> <style name="KeepassDXStyle.Red.Night.Dialog" parent="KeepassDXStyle.Night.Dialog">
<item name="colorAccent">@color/red</item> <item name="colorSecondary">@color/red</item>
<item name="android:textColorPrimary">@color/orange</item> <item name="android:textColorPrimary">@color/orange</item>
<item name="android:background">@color/red_black_dark</item> <item name="android:background">@color/red_black_dark</item>
<item name="background">@color/red_black_dark</item> <item name="background">@color/red_black_dark</item>
</style> </style>
<style name="KeepassDXStyle.Red.Night.DateTime.Dialog" parent="Theme.AppCompat.DayNight.Dialog"> <style name="KeepassDXStyle.Red.Night.DateTime.Dialog" parent="Theme.AppCompat.DayNight.Dialog">
<item name="colorAccent">@color/red</item> <item name="colorSecondary">@color/red</item>
<item name="android:textColorPrimary">@color/orange</item> <item name="android:textColorPrimary">@color/orange</item>
<item name="android:windowBackground">@color/grey_dark</item> <item name="android:windowBackground">@color/grey_dark</item>
</style> </style>
<!-- CardView --> <!-- CardView -->
<style name="KeepassDXStyle.Cardview.Red" parent="KeepassDXStyle.Cardview"> <style name="KeepassDXStyle.Cardview.Red" parent="KeepassDXStyle.Cardview">
<item name="cardBackgroundColor">@color/red_white_light</item> <item name="cardBackgroundColor">@color/red_white_lightest</item>
</style> </style>
<style name="KeepassDXStyle.Cardview.Red.Night" parent="KeepassDXStyle.Cardview"> <style name="KeepassDXStyle.Cardview.Red.Night" parent="KeepassDXStyle.Cardview">
<item name="cardBackgroundColor">@color/red_black</item> <item name="cardBackgroundColor">@color/red_black</item>
@@ -166,8 +172,8 @@
<!-- Switch --> <!-- Switch -->
<style name="KeepassDXStyle.Switch.Red" parent="KeepassDXStyle.Red"> <style name="KeepassDXStyle.Switch.Red" parent="KeepassDXStyle.Red">
<item name="colorPrimary">@color/orange</item> <item name="colorPrimary">@color/orange</item>
<item name="colorOnPrimary">@color/red_white_light</item> <item name="colorOnPrimary">@color/red_white_lightest</item>
<item name="colorOnAccentColor">@color/white</item> <item name="colorOnSecondary">@color/white</item>
<item name="colorPrimaryContainer">?android:attr/windowBackground</item> <item name="colorPrimaryContainer">?android:attr/windowBackground</item>
<item name="colorOutline">@color/orange</item> <item name="colorOutline">@color/orange</item>
<item name="colorSurfaceVariant">?android:attr/windowBackground</item> <item name="colorSurfaceVariant">?android:attr/windowBackground</item>
@@ -175,7 +181,7 @@
<style name="KeepassDXStyle.Switch.Red.Night" parent="KeepassDXStyle.Red.Night"> <style name="KeepassDXStyle.Switch.Red.Night" parent="KeepassDXStyle.Red.Night">
<item name="colorPrimary">@color/orange_dark</item> <item name="colorPrimary">@color/orange_dark</item>
<item name="colorOnPrimary">@color/red_black_dark</item> <item name="colorOnPrimary">@color/red_black_dark</item>
<item name="colorOnAccentColor">@color/white</item> <item name="colorOnSecondary">@color/white</item>
<item name="colorPrimaryContainer">?android:attr/windowBackground</item> <item name="colorPrimaryContainer">?android:attr/windowBackground</item>
<item name="colorOutline">@color/orange_dark</item> <item name="colorOutline">@color/orange_dark</item>
<item name="colorSurfaceVariant">?android:attr/windowBackground</item> <item name="colorSurfaceVariant">?android:attr/windowBackground</item>