From eb4e45cb69bbd6af27ea257ca978382d0d037a1e Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Sun, 9 Jul 2023 11:40:58 +0200 Subject: [PATCH] fix: Add tertiary color, change color accent to color secondary --- .../keepass/activities/EntryActivity.kt | 12 +-- .../activities/dialogs/GroupDialogFragment.kt | 2 +- .../keepass/adapters/BreadcrumbAdapter.kt | 2 +- .../adapters/FileDatabaseHistoryAdapter.kt | 2 +- .../keepass/adapters/NodesAdapter.kt | 32 ++++---- app/src/main/res/animator-v23/scan.xml | 39 --------- app/src/main/res/color-v23/progress_color.xml | 2 +- .../background_button_color_secondary.xml | 7 -- ...r_primary.xml => color_button_primary.xml} | 2 +- .../main/res/color/color_button_secondary.xml | 5 ++ .../res/color/color_on_button_primary.xml | 5 ++ .../main/res/color/edit_text_stroke_color.xml | 2 +- app/src/main/res/color/list_primary_color.xml | 2 +- app/src/main/res/color/text_color_button.xml | 2 +- .../drawable-v21/background_button_small.xml | 2 +- .../main/res/drawable-v21/background_icon.xml | 2 +- .../drawable-v21/background_image_button.xml | 2 +- .../background_item_selection.xml | 2 +- app/src/main/res/drawable-v23/bolt.xml | 13 --- app/src/main/res/layout/activity_entry.xml | 6 +- .../main/res/layout/activity_entry_edit.xml | 2 +- .../res/layout/activity_file_selection.xml | 4 +- app/src/main/res/layout/activity_group.xml | 4 +- .../main/res/layout/activity_icon_picker.xml | 2 +- .../res/layout/activity_key_generator.xml | 2 +- .../res/layout/activity_main_credential.xml | 9 +- .../main/res/layout/fragment_color_picker.xml | 2 +- app/src/main/res/layout/fragment_progress.xml | 2 +- .../layout/fragment_set_main_credential.xml | 2 +- app/src/main/res/layout/fragment_set_otp.xml | 2 +- app/src/main/res/layout/item_breadcrumb.xml | 2 +- app/src/main/res/layout/item_file_info.xml | 2 +- app/src/main/res/layout/item_tag.xml | 4 +- app/src/main/res/layout/item_tag_edit.xml | 4 +- .../main/res/layout/nav_header_database.xml | 4 +- .../res/layout/pref_dialog_input_list.xml | 2 +- .../main/res/layout/view_button_add_node.xml | 10 +-- .../main/res/layout/view_main_credentials.xml | 2 +- app/src/main/res/layout/view_passkey.xml | 4 +- .../main/res/layout/view_search_filters.xml | 2 +- app/src/main/res/values-v23/fingerprint.xml | 48 ----------- app/src/main/res/values/attrs.xml | 3 - app/src/main/res/values/colors.xml | 3 + app/src/main/res/values/styles.xml | 82 +++++++++---------- app/src/main/res/values/styles_classic.xml | 26 +++--- app/src/main/res/values/styles_divine.xml | 25 +++--- app/src/main/res/values/styles_kunzite.xml | 26 +++--- app/src/main/res/values/styles_moon.xml | 26 +++--- app/src/main/res/values/styles_reply.xml | 37 +++++---- app/src/main/res/values/styles_simple.xml | 26 +++--- app/src/main/res/values/styles_sun.xml | 30 ++++--- 51 files changed, 238 insertions(+), 304 deletions(-) delete mode 100644 app/src/main/res/animator-v23/scan.xml delete mode 100644 app/src/main/res/color/background_button_color_secondary.xml rename app/src/main/res/color/{background_button_color_primary.xml => color_button_primary.xml} (76%) create mode 100644 app/src/main/res/color/color_button_secondary.xml create mode 100644 app/src/main/res/color/color_on_button_primary.xml delete mode 100644 app/src/main/res/drawable-v23/bolt.xml delete mode 100644 app/src/main/res/values-v23/fingerprint.xml diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt index df2177a9d..6cf47f501 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt @@ -112,7 +112,7 @@ class EntryActivity : DatabaseLockActivity() { } private var mIcon: IconImage? = null - private var mColorAccent: Int = 0 + private var mColorSecondary: Int = 0 private var mControlColor: Int = 0 private var mColorPrimary: Int = 0 private var mColorBackground: Int = 0 @@ -146,15 +146,15 @@ class EntryActivity : DatabaseLockActivity() { toolbar?.title = " " // 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 taColorPrimary = theme.obtainStyledAttributes(intArrayOf(R.attr.colorPrimary)) 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) mColorPrimary = taColorPrimary.getColor(0, Color.BLACK) mColorBackground = taColorBackground.getColor(0, Color.BLACK) - taColorAccent.recycle() + taColorSecondary.recycle() taControlColor.recycle() taColorPrimary.recycle() taColorBackground.recycle() @@ -227,7 +227,7 @@ class EntryActivity : DatabaseLockActivity() { historyView?.visibility = if (entryIsHistory) View.VISIBLE else View.GONE if (entryIsHistory) { collapsingToolbarLayout?.contentScrim = - ColorDrawable(mColorAccent) + ColorDrawable(mColorSecondary) } val entryInfo = entryInfoHistory.entryInfo @@ -380,7 +380,7 @@ class EntryActivity : DatabaseLockActivity() { mDatabase?.iconDrawableFactory?.assignDatabaseIcon( iconView, icon, - mForegroundColor ?: mColorAccent + mForegroundColor ?: mColorSecondary ) } } diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupDialogFragment.kt index 2403eebbf..885159b0d 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupDialogFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupDialogFragment.kt @@ -108,7 +108,7 @@ class GroupDialogFragment : DatabaseDialogFragment() { uuidReferenceView = root.findViewById(R.id.group_UUID_reference) // 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) ta.recycle() diff --git a/app/src/main/java/com/kunzisoft/keepass/adapters/BreadcrumbAdapter.kt b/app/src/main/java/com/kunzisoft/keepass/adapters/BreadcrumbAdapter.kt index f87576716..e9fa81caf 100644 --- a/app/src/main/java/com/kunzisoft/keepass/adapters/BreadcrumbAdapter.kt +++ b/app/src/main/java/com/kunzisoft/keepass/adapters/BreadcrumbAdapter.kt @@ -40,7 +40,7 @@ class BreadcrumbAdapter(val context: Context) mShowUUID = PreferencesUtil.showUUID(context) // 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) taTextColor.recycle() } diff --git a/app/src/main/java/com/kunzisoft/keepass/adapters/FileDatabaseHistoryAdapter.kt b/app/src/main/java/com/kunzisoft/keepass/adapters/FileDatabaseHistoryAdapter.kt index 0d16635a7..2e97a3893 100644 --- a/app/src/main/java/com/kunzisoft/keepass/adapters/FileDatabaseHistoryAdapter.kt +++ b/app/src/main/java/com/kunzisoft/keepass/adapters/FileDatabaseHistoryAdapter.kt @@ -92,7 +92,7 @@ class FileDatabaseHistoryAdapter(context: Context) init { val typedValue = TypedValue() val theme = context.theme - theme.resolveAttribute(R.attr.colorAccent, typedValue, true) + theme.resolveAttribute(R.attr.colorSecondary, typedValue, true) warningColor = typedValue.data theme.resolveAttribute(android.R.attr.textColorHintInverse, typedValue, true) defaultColor = typedValue.data diff --git a/app/src/main/java/com/kunzisoft/keepass/adapters/NodesAdapter.kt b/app/src/main/java/com/kunzisoft/keepass/adapters/NodesAdapter.kt index 61a1eaaab..840496b44 100644 --- a/app/src/main/java/com/kunzisoft/keepass/adapters/NodesAdapter.kt +++ b/app/src/main/java/com/kunzisoft/keepass/adapters/NodesAdapter.kt @@ -95,9 +95,9 @@ class NodesAdapter ( @ColorInt private val mTextColorSecondary: Int @ColorInt - private val mColorAccentLight: Int + private val mColorSecondary: Int @ColorInt - private val mColorOnAccentColor: Int + private val mColorOnSecondary: Int /** * Determine if the adapter contains or not any element @@ -127,13 +127,13 @@ class NodesAdapter ( this.mTextColorSecondary = taTextColorSecondary.getColor(0, Color.BLACK) taTextColorSecondary.recycle() // To get background color for selection - val taColorAccentLight = context.theme.obtainStyledAttributes(intArrayOf(R.attr.colorAccentLight)) - this.mColorAccentLight = taColorAccentLight.getColor(0, Color.GRAY) - taColorAccentLight.recycle() + val taColorSecondary = context.theme.obtainStyledAttributes(intArrayOf(R.attr.colorSecondary)) + this.mColorSecondary = taColorSecondary.getColor(0, Color.GRAY) + taColorSecondary.recycle() // To get text color for selection - val taColorOnAccentColor = context.theme.obtainStyledAttributes(intArrayOf(R.attr.colorOnAccentColor)) - this.mColorOnAccentColor = taColorOnAccentColor.getColor(0, Color.WHITE) - taColorOnAccentColor.recycle() + val taColorOnSecondary = context.theme.obtainStyledAttributes(intArrayOf(R.attr.colorOnSecondary)) + this.mColorOnSecondary = taColorOnSecondary.getColor(0, Color.WHITE) + taColorOnSecondary.recycle() } private fun assignPreferences() { @@ -380,7 +380,7 @@ class NodesAdapter ( // Assign icon colors var iconColor = if (holder.container.isSelected) - mColorOnAccentColor + mColorOnSecondary else when (subNode.type) { Type.GROUP -> mTextColorPrimary Type.ENTRY -> mTextColor @@ -436,7 +436,7 @@ class NodesAdapter ( holder.container.setBackgroundColor(Color.TRANSPARENT) } } else { - holder.container.setBackgroundColor(mColorAccentLight) + holder.container.setBackgroundColor(mColorSecondary) } val foregroundColor = if (mShowEntryColors) entry.foregroundColor else null if (!holder.container.isSelected) { @@ -457,12 +457,12 @@ class NodesAdapter ( holder.meta.setTextColor(mTextColor) } } else { - holder.text.setTextColor(mColorOnAccentColor) - holder.subText?.setTextColor(mColorOnAccentColor) - holder.otpToken?.setTextColor(mColorOnAccentColor) - holder.otpProgress?.setIndicatorColor(mColorOnAccentColor) - holder.attachmentIcon?.setColorFilter(mColorOnAccentColor) - holder.meta.setTextColor(mColorOnAccentColor) + holder.text.setTextColor(mColorOnSecondary) + holder.subText?.setTextColor(mColorOnSecondary) + holder.otpToken?.setTextColor(mColorOnSecondary) + holder.otpProgress?.setIndicatorColor(mColorOnSecondary) + holder.attachmentIcon?.setColorFilter(mColorOnSecondary) + holder.meta.setTextColor(mColorOnSecondary) } database.stopManageEntry(entry) diff --git a/app/src/main/res/animator-v23/scan.xml b/app/src/main/res/animator-v23/scan.xml deleted file mode 100644 index d4965f389..000000000 --- a/app/src/main/res/animator-v23/scan.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/color-v23/progress_color.xml b/app/src/main/res/color-v23/progress_color.xml index cc68be3d4..4106a655a 100644 --- a/app/src/main/res/color-v23/progress_color.xml +++ b/app/src/main/res/color-v23/progress_color.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/app/src/main/res/color/background_button_color_secondary.xml b/app/src/main/res/color/background_button_color_secondary.xml deleted file mode 100644 index 9af1c0e0d..000000000 --- a/app/src/main/res/color/background_button_color_secondary.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/color/background_button_color_primary.xml b/app/src/main/res/color/color_button_primary.xml similarity index 76% rename from app/src/main/res/color/background_button_color_primary.xml rename to app/src/main/res/color/color_button_primary.xml index 31a28d56a..404c70c74 100644 --- a/app/src/main/res/color/background_button_color_primary.xml +++ b/app/src/main/res/color/color_button_primary.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/color/color_button_secondary.xml b/app/src/main/res/color/color_button_secondary.xml new file mode 100644 index 000000000..a7d084f41 --- /dev/null +++ b/app/src/main/res/color/color_button_secondary.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/color/color_on_button_primary.xml b/app/src/main/res/color/color_on_button_primary.xml new file mode 100644 index 000000000..f4e93d5d5 --- /dev/null +++ b/app/src/main/res/color/color_on_button_primary.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/color/edit_text_stroke_color.xml b/app/src/main/res/color/edit_text_stroke_color.xml index 1e73b070e..10e2723ac 100644 --- a/app/src/main/res/color/edit_text_stroke_color.xml +++ b/app/src/main/res/color/edit_text_stroke_color.xml @@ -18,7 +18,7 @@ along with KeePassDX. If not, see . --> - + diff --git a/app/src/main/res/color/list_primary_color.xml b/app/src/main/res/color/list_primary_color.xml index 06694e43a..5f4d3121e 100644 --- a/app/src/main/res/color/list_primary_color.xml +++ b/app/src/main/res/color/list_primary_color.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/color/text_color_button.xml b/app/src/main/res/color/text_color_button.xml index 13c44bba4..41fb69212 100644 --- a/app/src/main/res/color/text_color_button.xml +++ b/app/src/main/res/color/text_color_button.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable-v21/background_button_small.xml b/app/src/main/res/drawable-v21/background_button_small.xml index db088c7a2..c203f0917 100644 --- a/app/src/main/res/drawable-v21/background_button_small.xml +++ b/app/src/main/res/drawable-v21/background_button_small.xml @@ -14,7 +14,7 @@ android:right="14dp" android:top="4dp" android:bottom="8dp"/> - + diff --git a/app/src/main/res/drawable-v21/background_icon.xml b/app/src/main/res/drawable-v21/background_icon.xml index 4bf4cf1ca..eeed6744d 100644 --- a/app/src/main/res/drawable-v21/background_icon.xml +++ b/app/src/main/res/drawable-v21/background_icon.xml @@ -11,7 +11,7 @@ android:right="12dp" android:top="12dp" android:bottom="12dp"/> - + \ No newline at end of file diff --git a/app/src/main/res/drawable-v21/background_image_button.xml b/app/src/main/res/drawable-v21/background_image_button.xml index ae42055a0..416ee142b 100644 --- a/app/src/main/res/drawable-v21/background_image_button.xml +++ b/app/src/main/res/drawable-v21/background_image_button.xml @@ -6,7 +6,7 @@ - + - + diff --git a/app/src/main/res/drawable-v23/bolt.xml b/app/src/main/res/drawable-v23/bolt.xml deleted file mode 100644 index 8684f8cf3..000000000 --- a/app/src/main/res/drawable-v23/bolt.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/app/src/main/res/layout/activity_entry.xml b/app/src/main/res/layout/activity_entry.xml index f7e355eeb..dcd8a7989 100644 --- a/app/src/main/res/layout/activity_entry.xml +++ b/app/src/main/res/layout/activity_entry.xml @@ -82,7 +82,7 @@ android:id="@+id/entry_progress" android:visibility="gone" android:indeterminate="false" - app:indicatorColor="?attr/colorAccent" + app:indicatorColor="?attr/colorSecondary" android:progress="10" android:max="30" android:layout_gravity="bottom" @@ -109,9 +109,9 @@ android:layout_height="wrap_content" app:layout_constraintTop_toTopOf="parent" android:visibility="gone" - android:background="?attr/colorAccent" + android:background="?attr/colorSecondary" android:padding="12dp" - android:textColor="?attr/colorOnAccentColor" + android:textColor="?attr/colorOnSecondary" android:text="@string/entry_history"/> @@ -191,7 +191,7 @@ android:layout_height="match_parent" android:layout_gravity="start" app:itemTextColor="?android:attr/textColor" - app:subheaderColor="?attr/colorAccent" + app:subheaderColor="?attr/colorSecondary" android:fitsSystemWindows="true" /> diff --git a/app/src/main/res/layout/activity_icon_picker.xml b/app/src/main/res/layout/activity_icon_picker.xml index 0cdc49ef8..ae77f2592 100644 --- a/app/src/main/res/layout/activity_icon_picker.xml +++ b/app/src/main/res/layout/activity_icon_picker.xml @@ -52,7 +52,7 @@ android:layout_height="wrap_content" android:contentDescription="@string/validate" android:src="@drawable/ic_file_upload_white_24dp" - app:tint="?attr/colorOnAccentColor" + app:tint="?attr/colorOnSecondary" app:fabSize="mini" app:fabCustomSize="@dimen/button_small_size" app:layout_constraintBottom_toTopOf="@+id/screenshot_mode_banner" diff --git a/app/src/main/res/layout/activity_key_generator.xml b/app/src/main/res/layout/activity_key_generator.xml index 9cd8cff9d..5ec89a120 100644 --- a/app/src/main/res/layout/activity_key_generator.xml +++ b/app/src/main/res/layout/activity_key_generator.xml @@ -52,7 +52,7 @@ android:layout_height="wrap_content" android:contentDescription="@string/validate" android:src="@drawable/ic_check_white_24dp" - app:tint="?attr/colorOnAccentColor" + app:tint="?attr/colorOnSecondary" app:fabSize="mini" app:fabCustomSize="@dimen/button_small_size" app:layout_constraintTop_toTopOf="@+id/toolbar" diff --git a/app/src/main/res/layout/activity_main_credential.xml b/app/src/main/res/layout/activity_main_credential.xml index a072e9d9f..ca799e47e 100644 --- a/app/src/main/res/layout/activity_main_credential.xml +++ b/app/src/main/res/layout/activity_main_credential.xml @@ -161,15 +161,10 @@ android:paddingRight="24dp" style="@style/KeepassDXStyle.TextAppearance.Tiny" android:text="@string/warning_database_link_revoked" - android:textColor="?attr/textColorInverse" - android:background="?attr/colorAccent" + android:textColor="?attr/colorOnSecondary" + android:background="?attr/colorSecondary" app:layout_constraintBottom_toTopOf="@+id/activity_password_info_delimiter" android:layout_gravity="bottom"/> - + app:endIconTint="?attr/colorSecondary"> + app:endIconTint="?attr/colorSecondary"> diff --git a/app/src/main/res/layout/nav_header_database.xml b/app/src/main/res/layout/nav_header_database.xml index cfaa045a4..9ec685888 100644 --- a/app/src/main/res/layout/nav_header_database.xml +++ b/app/src/main/res/layout/nav_header_database.xml @@ -44,7 +44,7 @@ android:layout_marginBottom="12dp" app:srcCompat="@drawable/ic_database_white_36dp" style="@style/KeepassDXStyle.Icon" - app:tint="?attr/colorAccent" /> + app:tint="?attr/colorSecondary" /> diff --git a/app/src/main/res/layout/view_button_add_node.xml b/app/src/main/res/layout/view_button_add_node.xml index f2da52108..303b38a5f 100644 --- a/app/src/main/res/layout/view_button_add_node.xml +++ b/app/src/main/res/layout/view_button_add_node.xml @@ -52,8 +52,8 @@ android:layout_marginEnd="@dimen/image_button_margin" android:src="@drawable/ic_key_white_24dp" android:contentDescription="@string/add_entry" - app:tint="?attr/colorOnAccentColor" - app:backgroundTint="?attr/colorAccent" + app:tint="?attr/colorOnSecondary" + app:backgroundTint="?attr/colorSecondary" app:fabSize="mini" app:fabCustomSize="@dimen/button_small_size" app:useCompatPadding="true" /> @@ -86,8 +86,8 @@ android:layout_marginEnd="@dimen/image_button_margin" android:src="@drawable/ic_folder_white_24dp" android:contentDescription="@string/add_group" - app:tint="?attr/colorOnAccentColor" - app:backgroundTint="?attr/colorAccent" + app:tint="?attr/colorOnSecondary" + app:backgroundTint="?attr/colorSecondary" app:fabSize="mini" app:fabCustomSize="@dimen/button_small_size" app:useCompatPadding="true" /> @@ -103,7 +103,7 @@ android:layout_alignParentBottom="true" android:contentDescription="@string/content_description_add_node" android:src="@drawable/ic_add_white_24dp" - app:tint="?attr/colorOnAccentColor" + app:tint="?attr/colorOnSecondary" app:fabSize="normal" app:useCompatPadding="true" /> diff --git a/app/src/main/res/layout/view_main_credentials.xml b/app/src/main/res/layout/view_main_credentials.xml index 700d3030d..49af082a7 100644 --- a/app/src/main/res/layout/view_main_credentials.xml +++ b/app/src/main/res/layout/view_main_credentials.xml @@ -28,7 +28,7 @@ android:layout_toStartOf="@+id/password_checkbox" android:layout_toLeftOf="@+id/password_checkbox" app:endIconMode="password_toggle" - app:endIconTint="?attr/colorAccent"> + app:endIconTint="?attr/colorSecondary"> diff --git a/app/src/main/res/layout/view_search_filters.xml b/app/src/main/res/layout/view_search_filters.xml index f48c67270..3565d8fc3 100644 --- a/app/src/main/res/layout/view_search_filters.xml +++ b/app/src/main/res/layout/view_search_filters.xml @@ -61,7 +61,7 @@ style="@style/KeepassDXStyle.ImageButton.Simple" android:contentDescription="@string/search_filters" android:src="@drawable/ic_list_white_24dp" - app:tint="?attr/textColorInverse"/> + app:tint="?attr/colorOnPrimary"/> - - - - - 160 - 160 - 80 - 5 - 7 - 80dp - - - 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 - 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 - 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 - 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 - 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 - - 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 - - M62,62 C62,62 80.5647617,80.5647617 80.564762,80.564762 C80.5647622,80.5647622 94.2921789,94.223714 98.5644262,98.5644262 - M98.5644262,62 C98.5644251,62 81.1979242,79.366503 81.1979229,79.3665033 C81.1979216,79.3665035 62,98.5644262 62,98.5644262 - - - M0 0 L160 0 L160 40 L0 40 Z - M0 120 L160 120 L160 160 L0 160 Z - - ?attr/colorOnAccentColor - ?attr/colorOnAccentColor - - diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index cfb40ccd0..7b7f09221 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -29,11 +29,8 @@ - - - diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 8391598ff..793328008 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -70,6 +70,7 @@ #24352A #202923 + #FBECEE #FCE6E8 #ef9a9a #EF5350 @@ -90,6 +91,7 @@ #F2EDFA #F7F3FD #E0F7F3FD + #F7D9FB #ce93d8 #9048bc #743998 @@ -112,6 +114,7 @@ #FFBA52 #F9AA33 + #F6F8FA #EDF0F2 #D1DBE0 #4A6572 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index bcb7b8047..f475b3b1b 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -49,9 +49,11 @@ @color/green @color/green_dark - @color/orange - @color/orange_lighter + @color/white @color/orange + @color/white + @color/green_lightest + @color/green_white_dark @color/grey_lighter @color/orange @@ -65,7 +67,6 @@ @color/text_color_light @color/text_color_light @color/grey_light - @color/white @color/green_light @color/white_darkest @color/text_color_secondary_light @@ -75,8 +76,6 @@ @color/text_color_secondary_light - @color/white - @style/KeepassDXStyle.Light.Dialog @style/KeepassDXStyle.Light.Dialog @@ -138,9 +137,11 @@ @color/green @color/green_dark - @color/orange - @color/orange_lighter + @color/white @color/orange + @color/white + @color/green_black_light + @color/green_black @color/grey_lighter @color/orange @@ -154,7 +155,6 @@ @color/text_color_night @color/text_color_night @color/white - @color/white @color/green_light @color/white_darkest @color/text_color_secondary_night @@ -164,8 +164,6 @@ @color/text_color_secondary_night - @color/white - @style/KeepassDXStyle.Night.Dialog @style/KeepassDXStyle.Night.Dialog @@ -283,23 +281,23 @@ @@ -310,7 +308,7 @@ @@ -481,18 +479,18 @@ @@ -536,16 +534,16 @@ - @@ -604,14 +602,14 @@ @@ -111,8 +113,10 @@ @@ -180,7 +184,7 @@ @@ -116,8 +117,10 @@ @@ -193,7 +196,7 @@ @@ -102,8 +105,11 @@ @@ -180,7 +186,7 @@ @@ -94,8 +97,11 @@ @@ -167,14 +173,14 @@ + + @@ -99,8 +106,11 @@ @@ -176,8 +185,8 @@ @@ -111,8 +113,10 @@ @@ -180,7 +184,7 @@ @@ -93,8 +96,11 @@