diff --git a/CHANGELOG b/CHANGELOG index 3b3099a2e..f0a490630 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,5 @@ KeePassDX(2.9.14) + * Dark Themes (WARNING: You must reselect your theme if upgrading from an old installation) KeePassDX(2.9.13) * Binary image viewer #473 #749 diff --git a/app/build.gradle b/app/build.gradle index d03513295..ad38178f0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -51,7 +51,11 @@ android { buildConfigField "String", "BUILD_VERSION", "\"libre\"" buildConfigField "boolean", "FULL_VERSION", "true" buildConfigField "boolean", "CLOSED_STORE", "false" - buildConfigField "String[]", "STYLES_DISABLED", "{\"KeepassDXStyle_Red\",\"KeepassDXStyle_Purple\",\"KeepassDXStyle_Purple_Dark\"}" + buildConfigField "String[]", "STYLES_DISABLED", + "{\"KeepassDXStyle_Red\"," + + "\"KeepassDXStyle_Red_Night\"," + + "\"KeepassDXStyle_Purple\"," + + "\"KeepassDXStyle_Purple_Dark\"}" buildConfigField "String[]", "ICON_PACKS_DISABLED", "{}" } pro { @@ -70,7 +74,13 @@ android { buildConfigField "String", "BUILD_VERSION", "\"free\"" buildConfigField "boolean", "FULL_VERSION", "false" buildConfigField "boolean", "CLOSED_STORE", "true" - buildConfigField "String[]", "STYLES_DISABLED", "{\"KeepassDXStyle_Blue\",\"KeepassDXStyle_Red\",\"KeepassDXStyle_Purple\",\"KeepassDXStyle_Purple_Dark\"}" + buildConfigField "String[]", "STYLES_DISABLED", + "{\"KeepassDXStyle_Blue\"," + + "\"KeepassDXStyle_Blue_Night\"," + + "\"KeepassDXStyle_Red\"," + + "\"KeepassDXStyle_Red_Night\"," + + "\"KeepassDXStyle_Purple\"," + + "\"KeepassDXStyle_Purple_Dark\"}" buildConfigField "String[]", "ICON_PACKS_DISABLED", "{}" manifestPlaceholders = [ googleAndroidBackupAPIKey:"AEdPqrEAAAAIbRfbV8fHLItXo8OcHwrO0sSNblqhPwkc0DPTqg" ] } diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/stylish/Stylish.kt b/app/src/main/java/com/kunzisoft/keepass/activities/stylish/Stylish.kt index 174904509..aeb971842 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/stylish/Stylish.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/stylish/Stylish.kt @@ -20,11 +20,12 @@ package com.kunzisoft.keepass.activities.stylish import android.content.Context +import android.content.res.Configuration +import android.util.Log import androidx.annotation.StyleRes import androidx.preference.PreferenceManager -import android.util.Log - import com.kunzisoft.keepass.R +import com.kunzisoft.keepass.settings.PreferencesUtil /** * Class that provides functions to retrieve and assign a theme to a module @@ -43,12 +44,51 @@ object Stylish { themeString = PreferenceManager.getDefaultSharedPreferences(context).getString(stylishPrefKey, context.getString(R.string.list_style_name_light)) } + private fun retrieveEquivalentSystemStyle(styleString: String, context: Context): String { + val systemNightMode = when (PreferencesUtil.getStyleBrightness(context)) { + context.getString(R.string.list_style_brightness_light) -> { + false + } + context.getString(R.string.list_style_brightness_night) -> { + true + } + else -> { + when (context.resources.configuration.uiMode.and(Configuration.UI_MODE_NIGHT_MASK)) { + Configuration.UI_MODE_NIGHT_YES -> true + else -> false + } + } + } + + return if (systemNightMode) { + when (styleString) { + context.getString(R.string.list_style_name_light) -> context.getString(R.string.list_style_name_night) + context.getString(R.string.list_style_name_white) -> context.getString(R.string.list_style_name_black) + context.getString(R.string.list_style_name_clear) -> context.getString(R.string.list_style_name_dark) + context.getString(R.string.list_style_name_blue) -> context.getString(R.string.list_style_name_blue_night) + context.getString(R.string.list_style_name_red) -> context.getString(R.string.list_style_name_red_night) + context.getString(R.string.list_style_name_purple) -> context.getString(R.string.list_style_name_purple_dark) + else -> styleString + } + } else { + when (styleString) { + context.getString(R.string.list_style_name_night) -> context.getString(R.string.list_style_name_light) + context.getString(R.string.list_style_name_black) -> context.getString(R.string.list_style_name_white) + context.getString(R.string.list_style_name_dark) -> context.getString(R.string.list_style_name_clear) + context.getString(R.string.list_style_name_blue_night) -> context.getString(R.string.list_style_name_blue) + context.getString(R.string.list_style_name_red_night) -> context.getString(R.string.list_style_name_red) + context.getString(R.string.list_style_name_purple_dark) -> context.getString(R.string.list_style_name_purple) + else -> styleString + } + } + } + /** * Assign the style to the class attribute * @param styleString Style id String */ - fun assignStyle(styleString: String) { - themeString = styleString + fun assignStyle(styleString: String, context: Context) { + themeString = retrieveEquivalentSystemStyle(styleString, context) } /** @@ -59,12 +99,16 @@ object Stylish { @StyleRes fun getThemeId(context: Context): Int { - return when (themeString) { + return when (retrieveEquivalentSystemStyle(themeString ?: context.getString(R.string.list_style_name_light), context)) { context.getString(R.string.list_style_name_night) -> R.style.KeepassDXStyle_Night + context.getString(R.string.list_style_name_white) -> R.style.KeepassDXStyle_White context.getString(R.string.list_style_name_black) -> R.style.KeepassDXStyle_Black + context.getString(R.string.list_style_name_clear) -> R.style.KeepassDXStyle_Clear context.getString(R.string.list_style_name_dark) -> R.style.KeepassDXStyle_Dark context.getString(R.string.list_style_name_blue) -> R.style.KeepassDXStyle_Blue + context.getString(R.string.list_style_name_blue_night) -> R.style.KeepassDXStyle_Blue_Night context.getString(R.string.list_style_name_red) -> R.style.KeepassDXStyle_Red + context.getString(R.string.list_style_name_red_night) -> R.style.KeepassDXStyle_Red_Night context.getString(R.string.list_style_name_purple) -> R.style.KeepassDXStyle_Purple context.getString(R.string.list_style_name_purple_dark) -> R.style.KeepassDXStyle_Purple_Dark else -> R.style.KeepassDXStyle_Light diff --git a/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt b/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt index f68ba9ea7..d38f8e421 100644 --- a/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt +++ b/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt @@ -28,6 +28,7 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView import androidx.annotation.ColorInt +import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.SortedList import androidx.recyclerview.widget.SortedListAdapterCallback @@ -100,9 +101,7 @@ class NodeAdapter (private val context: Context) this.mDatabase = Database.getInstance() // Color of content selection - val taContentSelectionColor = context.theme.obtainStyledAttributes(intArrayOf(R.attr.textColorInverse)) - this.mContentSelectionColor = taContentSelectionColor.getColor(0, Color.WHITE) - taContentSelectionColor.recycle() + this.mContentSelectionColor = ContextCompat.getColor(context, R.color.colorTextInverse) // Retrieve the color to tint the icon val taTextColorPrimary = context.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColorPrimary)) this.mIconGroupColor = taTextColorPrimary.getColor(0, Color.BLACK) diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/NestedAppSettingsFragment.kt b/app/src/main/java/com/kunzisoft/keepass/settings/NestedAppSettingsFragment.kt index b9ebbab67..1d656aa33 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/NestedAppSettingsFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/NestedAppSettingsFragment.kt @@ -385,7 +385,7 @@ class NestedAppSettingsFragment : NestedSettingsFragment() { } } if (styleEnabled) { - Stylish.assignStyle(styleIdString) + Stylish.assignStyle(styleIdString, activity) // Relaunch the current activity to redraw theme (activity as? SettingsActivity?)?.apply { keepCurrentScreen() @@ -397,6 +397,16 @@ class NestedAppSettingsFragment : NestedSettingsFragment() { styleEnabled } + findPreference(getString(R.string.setting_style_brightness_key))?.setOnPreferenceChangeListener { _, _ -> + (activity as? SettingsActivity?)?.apply { + keepCurrentScreen() + startActivity(intent) + finish() + activity.overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out) + } + true + } + findPreference(getString(R.string.setting_icon_pack_choose_key))?.setOnPreferenceChangeListener { _, newValue -> var iconPackEnabled = true val iconPackId = newValue as String diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/PreferencesUtil.kt b/app/src/main/java/com/kunzisoft/keepass/settings/PreferencesUtil.kt index f2c166d9e..013b085d0 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/PreferencesUtil.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/PreferencesUtil.kt @@ -132,6 +132,12 @@ object PreferencesUtil { context.resources.getBoolean(R.bool.show_uuid_default)) } + fun getStyleBrightness(context: Context): String? { + val prefs = PreferenceManager.getDefaultSharedPreferences(context) + return prefs.getString(context.getString(R.string.setting_style_brightness_key), + context.resources.getString(R.string.list_style_brightness_follow_system)) + } + /** * Retrieve the text size in % (1 for 100%) */ diff --git a/app/src/main/java/com/kunzisoft/keepass/view/SpecialModeView.kt b/app/src/main/java/com/kunzisoft/keepass/view/SpecialModeView.kt index 030d330b2..77ab72795 100644 --- a/app/src/main/java/com/kunzisoft/keepass/view/SpecialModeView.kt +++ b/app/src/main/java/com/kunzisoft/keepass/view/SpecialModeView.kt @@ -20,9 +20,14 @@ package com.kunzisoft.keepass.view import android.content.Context +import android.graphics.PorterDuff +import android.graphics.PorterDuffColorFilter import android.util.AttributeSet +import android.util.TypedValue import android.view.View +import androidx.annotation.ColorInt import androidx.appcompat.widget.Toolbar +import androidx.core.content.ContextCompat import com.kunzisoft.keepass.R class SpecialModeView @JvmOverloads constructor(context: Context, @@ -31,7 +36,13 @@ class SpecialModeView @JvmOverloads constructor(context: Context, : Toolbar(context, attrs, defStyle) { init { - setNavigationIcon(R.drawable.ic_arrow_back_white_24dp) + ContextCompat.getDrawable(context, R.drawable.ic_arrow_back_white_24dp)?.let { closeDrawable -> + val typedValue = TypedValue() + context.theme.resolveAttribute(R.attr.colorControlNormal, typedValue, true) + @ColorInt val colorControl = typedValue.data + closeDrawable.colorFilter = PorterDuffColorFilter(colorControl, PorterDuff.Mode.SRC_ATOP) + navigationIcon = closeDrawable + } title = resources.getString(R.string.selection_mode) } diff --git a/app/src/main/java/com/kunzisoft/keepass/view/ToolbarAction.kt b/app/src/main/java/com/kunzisoft/keepass/view/ToolbarAction.kt index cc86a0296..7c103a828 100644 --- a/app/src/main/java/com/kunzisoft/keepass/view/ToolbarAction.kt +++ b/app/src/main/java/com/kunzisoft/keepass/view/ToolbarAction.kt @@ -19,19 +19,25 @@ */ package com.kunzisoft.keepass.view +import android.annotation.SuppressLint import android.content.Context +import android.graphics.PorterDuff +import android.graphics.PorterDuffColorFilter import android.util.AttributeSet +import android.util.TypedValue import android.view.Menu import android.view.MenuInflater import android.view.View +import androidx.annotation.ColorInt import androidx.appcompat.view.ActionMode import androidx.appcompat.view.SupportMenuInflater import androidx.appcompat.widget.Toolbar +import androidx.core.content.ContextCompat import com.kunzisoft.keepass.R class ToolbarAction @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, - defStyle: Int = R.attr.actionToolbarAppearance) + defStyle: Int = androidx.appcompat.R.attr.toolbarStyle) : Toolbar(context, attrs, defStyle) { private var mActionModeCallback: ActionMode.Callback? = null @@ -39,7 +45,13 @@ class ToolbarAction @JvmOverloads constructor(context: Context, private var isOpen = false init { - setNavigationIcon(R.drawable.ic_close_white_24dp) + ContextCompat.getDrawable(context, R.drawable.ic_close_white_24dp)?.let { closeDrawable -> + val typedValue = TypedValue() + context.theme.resolveAttribute(R.attr.colorControlNormal, typedValue, true) + @ColorInt val colorControl = typedValue.data + closeDrawable.colorFilter = PorterDuffColorFilter(colorControl, PorterDuff.Mode.SRC_ATOP) + navigationIcon = closeDrawable + } } fun startSupportActionMode(actionModeCallback: ActionMode.Callback): ActionMode { @@ -106,6 +118,7 @@ class ToolbarAction @JvmOverloads constructor(context: Context, override fun setCustomView(view: View?) {} + @SuppressLint("RestrictedApi") override fun getMenuInflater(): MenuInflater { return SupportMenuInflater(toolbarAction.context) } diff --git a/app/src/main/res/layout/activity_entry.xml b/app/src/main/res/layout/activity_entry.xml index 93f4eda35..e96c41ab3 100644 --- a/app/src/main/res/layout/activity_entry.xml +++ b/app/src/main/res/layout/activity_entry.xml @@ -67,7 +67,6 @@ android:layout_height="?attr/actionBarSize" android:background="@color/transparent" android:theme="?attr/toolbarAppearance" - app:popupTheme="?attr/toolbarPopupAppearance" app:layout_collapseMode="pin" tools:targetApi="lollipop"> diff --git a/app/src/main/res/layout/activity_entry_edit.xml b/app/src/main/res/layout/activity_entry_edit.xml index c24debc93..61dc71f3f 100644 --- a/app/src/main/res/layout/activity_entry_edit.xml +++ b/app/src/main/res/layout/activity_entry_edit.xml @@ -37,9 +37,7 @@ android:id="@+id/special_mode_view" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" - android:theme="?attr/specialToolbarAppearance" - app:titleTextAppearance="@style/KeepassDXStyle.TextAppearance.Toolbar.Special.Title" - app:subtitleTextAppearance="@style/KeepassDXStyle.TextAppearance.Toolbar.Special.SubTitle" + android:theme="?attr/toolbarSpecialAppearance" app:layout_constraintTop_toTopOf="parent" /> @@ -70,7 +68,7 @@ android:id="@+id/entry_edit_bottom_bar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" - app:popupTheme="?attr/toolbarPopupAppearance" + android:theme="?attr/toolbarActionAppearance" android:layout_gravity="bottom" /> + android:theme="?attr/toolbarHomeAppearance" /> diff --git a/app/src/main/res/layout/activity_group.xml b/app/src/main/res/layout/activity_group.xml index 8073ea918..e7bd96282 100644 --- a/app/src/main/res/layout/activity_group.xml +++ b/app/src/main/res/layout/activity_group.xml @@ -29,9 +29,7 @@ android:id="@+id/special_mode_view" android:layout_width="match_parent" android:layout_height="wrap_content" - android:theme="?attr/specialToolbarAppearance" - app:titleTextAppearance="@style/KeepassDXStyle.TextAppearance.Toolbar.Special.Title" - app:subtitleTextAppearance="@style/KeepassDXStyle.TextAppearance.Toolbar.Special.SubTitle" + android:theme="?attr/toolbarSpecialAppearance" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/activity_password.xml b/app/src/main/res/layout/activity_password.xml index 9a01d55ac..88cde8f97 100644 --- a/app/src/main/res/layout/activity_password.xml +++ b/app/src/main/res/layout/activity_password.xml @@ -31,9 +31,7 @@ android:id="@+id/special_mode_view" android:layout_width="match_parent" android:layout_height="wrap_content" - android:theme="?attr/specialToolbarAppearance" - app:titleTextAppearance="@style/KeepassDXStyle.TextAppearance.Toolbar.Special.Title" - app:subtitleTextAppearance="@style/KeepassDXStyle.TextAppearance.Toolbar.Special.SubTitle" + android:theme="?attr/toolbarSpecialAppearance" app:layout_constraintTop_toTopOf="parent" /> + android:background="?android:attr/listDivider"/> \ No newline at end of file diff --git a/app/src/main/res/layout/view_button_lock.xml b/app/src/main/res/layout/view_button_lock.xml index 5a0b92975..963c483b3 100644 --- a/app/src/main/res/layout/view_button_lock.xml +++ b/app/src/main/res/layout/view_button_lock.xml @@ -42,7 +42,7 @@ tools:targetApi="lollipop" android:elevation="4dp" android:src="@drawable/ic_lock_white_24dp" - android:tint="?attr/textColorInverse" + android:tint="@color/colorTextInverse" android:layout_gravity="bottom|start" android:contentDescription="@string/menu_lock" /> \ No newline at end of file diff --git a/app/src/main/res/menu/advanced_unlock.xml b/app/src/main/res/menu/advanced_unlock.xml index ed65272b0..db56f466d 100644 --- a/app/src/main/res/menu/advanced_unlock.xml +++ b/app/src/main/res/menu/advanced_unlock.xml @@ -23,5 +23,6 @@ android:icon="@drawable/ic_keystore_remove_white_24dp" android:title="@string/menu_keystore_remove_key" android:orderInCategory="85" + app:iconTint="?attr/colorControlNormal" app:showAsAction="ifRoom" /> \ No newline at end of file diff --git a/app/src/main/res/menu/autofill.xml b/app/src/main/res/menu/autofill.xml index b70d493c6..165097587 100644 --- a/app/src/main/res/menu/autofill.xml +++ b/app/src/main/res/menu/autofill.xml @@ -23,5 +23,6 @@ android:icon="@drawable/ic_block_white_24dp" android:title="@string/autofill_block" android:orderInCategory="1" + app:iconTint="?attr/colorControlNormal" app:showAsAction="ifRoom" /> \ No newline at end of file diff --git a/app/src/main/res/menu/contribution.xml b/app/src/main/res/menu/contribution.xml index 5c1671456..535de0089 100644 --- a/app/src/main/res/menu/contribution.xml +++ b/app/src/main/res/menu/contribution.xml @@ -23,5 +23,6 @@ android:icon="@drawable/ic_heart_white_24dp" android:title="@string/contribute" android:orderInCategory="99" + app:iconTint="?attr/colorControlNormal" app:showAsAction="ifRoom" /> \ No newline at end of file diff --git a/app/src/main/res/menu/database.xml b/app/src/main/res/menu/database.xml index a7a182b8a..04d881a39 100644 --- a/app/src/main/res/menu/database.xml +++ b/app/src/main/res/menu/database.xml @@ -23,10 +23,12 @@ android:icon="@drawable/ic_save_white_24dp" android:title="@string/menu_save_database" android:orderInCategory="95" + app:iconTint="?attr/colorControlNormal" app:showAsAction="ifRoom" /> \ No newline at end of file diff --git a/app/src/main/res/menu/default_menu.xml b/app/src/main/res/menu/default_menu.xml index 07f675ed7..6e2628794 100644 --- a/app/src/main/res/menu/default_menu.xml +++ b/app/src/main/res/menu/default_menu.xml @@ -23,10 +23,12 @@ android:icon="@drawable/ic_settings_white_24dp" android:title="@string/settings" android:orderInCategory="91" + app:iconTint="?attr/colorControlNormal" app:showAsAction="ifRoom" /> diff --git a/app/src/main/res/menu/entry.xml b/app/src/main/res/menu/entry.xml index ee0eb7a0c..e8b3be2d8 100644 --- a/app/src/main/res/menu/entry.xml +++ b/app/src/main/res/menu/entry.xml @@ -23,10 +23,12 @@ android:icon="@drawable/ic_mode_edit_white_24dp" android:title="@string/menu_edit" android:orderInCategory="22" + app:iconTint="?attr/colorControlNormal" app:showAsAction="ifRoom" /> diff --git a/app/src/main/res/menu/entry_edit.xml b/app/src/main/res/menu/entry_edit.xml index 4b542c6a5..76e63cfef 100644 --- a/app/src/main/res/menu/entry_edit.xml +++ b/app/src/main/res/menu/entry_edit.xml @@ -25,15 +25,18 @@ android:icon="@drawable/ic_new_field_white_24dp" android:title="@string/entry_add_field" android:orderInCategory="92" + app:iconTint="?attr/colorControlNormal" app:showAsAction="always" /> diff --git a/app/src/main/res/menu/entry_history.xml b/app/src/main/res/menu/entry_history.xml index c4fc8b419..84516a354 100644 --- a/app/src/main/res/menu/entry_history.xml +++ b/app/src/main/res/menu/entry_history.xml @@ -23,10 +23,12 @@ android:icon="@drawable/ic_autorenew_white_24dp" android:title="@string/menu_restore_entry_history" android:orderInCategory="92" + app:iconTint="?attr/colorControlNormal" app:showAsAction="ifRoom" /> diff --git a/app/src/main/res/menu/node_menu.xml b/app/src/main/res/menu/node_menu.xml index c5ff3000e..7b4ab114f 100644 --- a/app/src/main/res/menu/node_menu.xml +++ b/app/src/main/res/menu/node_menu.xml @@ -24,25 +24,30 @@ android:icon="@drawable/ic_content_copy_white_24dp" android:title="@string/menu_copy" android:orderInCategory="1040" + app:iconTint="?attr/colorControlNormal" app:showAsAction="ifRoom" /> diff --git a/app/src/main/res/menu/node_paste_menu.xml b/app/src/main/res/menu/node_paste_menu.xml index 7d462805c..66fea87d2 100644 --- a/app/src/main/res/menu/node_paste_menu.xml +++ b/app/src/main/res/menu/node_paste_menu.xml @@ -23,5 +23,6 @@ android:icon="@drawable/ic_content_paste_white_24dp" android:title="@string/menu_paste" android:orderInCategory="1090" + app:iconTint="?attr/colorControlNormal" app:showAsAction="ifRoom|withText" /> diff --git a/app/src/main/res/menu/open_file.xml b/app/src/main/res/menu/open_file.xml index d3c7a4369..11f3ee674 100644 --- a/app/src/main/res/menu/open_file.xml +++ b/app/src/main/res/menu/open_file.xml @@ -23,5 +23,6 @@ android:icon="@drawable/ic_read_write_white_24dp" android:title="@string/menu_open_file_read_and_write" android:orderInCategory="85" + app:iconTint="?attr/colorControlNormal" app:showAsAction="ifRoom" /> \ No newline at end of file diff --git a/app/src/main/res/menu/recycle_bin.xml b/app/src/main/res/menu/recycle_bin.xml index deb567244..fd983c863 100644 --- a/app/src/main/res/menu/recycle_bin.xml +++ b/app/src/main/res/menu/recycle_bin.xml @@ -24,5 +24,6 @@ android:icon="@drawable/ic_delete_forever_white_24dp" android:title="@string/menu_empty_recycle_bin" android:orderInCategory="35" + app:iconTint="?attr/colorControlNormal" app:showAsAction="ifRoom" /> \ No newline at end of file diff --git a/app/src/main/res/menu/search.xml b/app/src/main/res/menu/search.xml index 705250069..b742492f6 100644 --- a/app/src/main/res/menu/search.xml +++ b/app/src/main/res/menu/search.xml @@ -25,5 +25,6 @@ app:showAsAction="always|collapseActionView" android:orderInCategory="31" android:iconifiedByDefault="true" + app:iconTint="?attr/colorControlNormal" app:actionViewClass="androidx.appcompat.widget.SearchView" /> \ No newline at end of file diff --git a/app/src/main/res/menu/tree.xml b/app/src/main/res/menu/tree.xml index 1cc88ebeb..d08354bd2 100644 --- a/app/src/main/res/menu/tree.xml +++ b/app/src/main/res/menu/tree.xml @@ -23,5 +23,6 @@ android:icon="@drawable/ic_sort_white_24dp" android:title="@string/sort_menu" android:orderInCategory="41" + app:iconTint="?attr/colorControlNormal" app:showAsAction="ifRoom" /> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 3c010d470..dc80384c1 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -444,14 +444,12 @@ App-Design Design, das in der App genutzt wird - Hell - Dunkel - Schwarz - Klassisch Dunkel - Himmel und Meer - Roter Vulkan - Purple Light - Purple Dark + Wald + Göttlich + Klassisch + Mond + Sonne + Kunzite Datei Schreibrechte gewähren, um Datenbankänderungen zu speichern Einrichten einer Einmal-Passwortverwaltung (HOTP / TOTP), um ein Token zu generieren, das für die Zwei-Faktor-Authentifizierung (2FA) angefordert wird. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 788f82b7b..6c2fd3137 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -281,14 +281,12 @@ Thème de l’application Thème utilisé dans l’application - Jour - Nuit - Noir - Foncé Classique - Ciel et Océan - Rouge Volcan - Pourpre Lumineux - Pourpre Obscur + Forêt + Divin + Classique + Lune + Soleil + Kunzite Collection d’icônes Collection d’icônes utilisées dans l’application diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 61bb0db6b..9fb2faf6e 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -493,14 +493,12 @@ アプリのテーマ アプリで使用するテーマ - Light - Night - Black - Classic Dark - Sky and Ocean - Red Volcano - Purple Light - Purple Dark + Forest + Divine + Classic + Moon + Sun + Kunzite アイコンパック アプリで使用するアイコンパック diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml index 9aa0121dd..b04ba8024 100644 --- a/app/src/main/res/values-v21/styles.xml +++ b/app/src/main/res/values-v21/styles.xml @@ -29,6 +29,9 @@ @style/KeepassDXStyle.Light.DateTime.Dialog @style/KeepassDXStyle.Light.DateTime.Dialog + - diff --git a/app/src/main/res/values-v23/styles.xml b/app/src/main/res/values-v23/styles.xml new file mode 100644 index 000000000..a45d29099 --- /dev/null +++ b/app/src/main/res/values-v23/styles.xml @@ -0,0 +1,24 @@ + + + + + diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 73f6b73cf..2c22042c0 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -19,10 +19,9 @@ --> - - - + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index f313fa6ef..e975599ad 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -25,7 +25,12 @@ #0A0A0A #101010 #0e0e0e + #212121 #E00E0E0E + #ececec + #dddddd + #E0DDDDDD + #D4D4D4 #bdbdbd #9e9e9e #E0424242 @@ -41,13 +46,15 @@ #2e7d32 #90CAF9 - #42a5f5 + #5DB2F6 #2196F3 #1E88E5 #1976D2 #1565C0 - #33b5e5 + #33b5e5 + #2B9AC3 + #2486AB #2c7a96 #ef9a9a diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index 7ec0683c2..c67398dcd 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -171,6 +171,7 @@ settings_appearance_key setting_style_key + setting_style_brightness_key setting_icon_pack_choose_key list_entries_show_username_key true @@ -327,22 +328,40 @@ KeepassDXStyle_Light KeepassDXStyle_Night + KeepassDXStyle_White KeepassDXStyle_Black + KeepassDXStyle_Clear KeepassDXStyle_Dark KeepassDXStyle_Blue + KeepassDXStyle_Blue_Night KeepassDXStyle_Red + KeepassDXStyle_Red_Night KeepassDXStyle_Purple KeepassDXStyle_Purple_Dark - + @string/list_style_name_light - @string/list_style_name_night - @string/list_style_name_black - @string/list_style_name_dark + @string/list_style_name_white + @string/list_style_name_clear @string/list_style_name_blue @string/list_style_name_red @string/list_style_name_purple + + + @string/list_style_name_night + @string/list_style_name_black + @string/list_style_name_dark + @string/list_style_name_blue_night + @string/list_style_name_red_night @string/list_style_name_purple_dark + KeepassDXStyle_Brightness_Light + KeepassDXStyle_Brightness_Night + KeepassDXStyle_Brightness_Follow_System + + @string/list_style_brightness_light + @string/list_style_brightness_night + @string/list_style_brightness_follow_system + @string/material_resource_id diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d1d3f2944..08d9c179a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -558,14 +558,19 @@ App theme Theme used in the app + Forest + Divine + Classic + Moon + Sun + Kunzite + + Theme brightness + Select light or dark themes + Light - Night - Black - Classic Dark - Sky and Ocean - Red Volcano - Purple Light - Purple Dark + Dark + Follow the system Icon pack Icon pack used in the app diff --git a/app/src/main/res/values/style_black.xml b/app/src/main/res/values/style_black.xml index 7a9b5d474..1e3ce7636 100644 --- a/app/src/main/res/values/style_black.xml +++ b/app/src/main/res/values/style_black.xml @@ -18,7 +18,7 @@ along with KeePassDX. If not, see . --> - + - - - + + + + + + @@ -45,14 +46,22 @@ @color/colorTextInverse - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/style_clear.xml b/app/src/main/res/values/style_clear.xml new file mode 100644 index 000000000..2afed7510 --- /dev/null +++ b/app/src/main/res/values/style_clear.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/style_dark.xml b/app/src/main/res/values/style_dark.xml index b4746ec83..ab65a3bf7 100644 --- a/app/src/main/res/values/style_dark.xml +++ b/app/src/main/res/values/style_dark.xml @@ -20,17 +20,18 @@ - + + + + diff --git a/app/src/main/res/values/style_purple.xml b/app/src/main/res/values/style_purple.xml index 5138a8755..89bbaebc9 100644 --- a/app/src/main/res/values/style_purple.xml +++ b/app/src/main/res/values/style_purple.xml @@ -30,9 +30,10 @@ @color/purple_lighter @color/background_purple @style/KeepassDXStyle.Toolbar.Purple - @style/KeepassDXStyle.Toolbar.Popup.Purple @style/KeepassDXStyle.Toolbar.Home.Purple - @style/KeepassDXStyle.Toolbar.Special.Purple + @style/KeepassDXStyle.Toolbar.Special.Purple + @style/KeepassDXStyle.Toolbar.Action.Purple + @style/KeepassDXStyle.Toolbar.Popup.Purple @style/KeepassDXStyle.Purple.Dialog @style/KeepassDXStyle.Purple.Dialog @style/KeepassDXStyle.Cardview.Purple @@ -48,20 +49,29 @@ @color/purple_lighter @color/colorTextInverse - - - + + + + + + + - - - + + + + + + @@ -45,16 +46,25 @@ @color/colorTextInverse - + + + + - diff --git a/app/src/main/res/values/style_red_night.xml b/app/src/main/res/values/style_red_night.xml new file mode 100644 index 000000000..5a993e5eb --- /dev/null +++ b/app/src/main/res/values/style_red_night.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/style_white.xml b/app/src/main/res/values/style_white.xml new file mode 100644 index 000000000..b08b9d8a6 --- /dev/null +++ b/app/src/main/res/values/style_white.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index dd3446545..efa39cf4b 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -74,13 +74,11 @@ @style/KeepassDXStyle.Light.Dialog + @style/Widget.AppCompat.Toolbar @style/KeepassDXStyle.Toolbar.Light - @style/KeepassDXStyle.Toolbar.Popup.Light @style/KeepassDXStyle.Toolbar.Home.Light - @style/KeepassDXStyle.Toolbar.Special.Light - @style/KeepassDXStyle.Toolbar.Action - @style/KeepassDXStyle.Toolbar.Overflow - @style/KeepassDXStyle.Toolbar.Overflow + @style/KeepassDXStyle.Toolbar.Special.Light + @style/KeepassDXStyle.Toolbar.Action.Light @style/KeepassDXStyle.Expanded.Title @style/KeepassDXStyle.Collapsed.Title @@ -130,25 +128,22 @@ @style/KeepassDXStyle.Night.Dialog + @style/Widget.AppCompat.Toolbar @style/KeepassDXStyle.Toolbar.Night - @style/KeepassDXStyle.Toolbar.Popup.Night @style/KeepassDXStyle.Toolbar.Home.Night - @style/KeepassDXStyle.Toolbar.Special.Night - @style/KeepassDXStyle.Toolbar.Action - @style/KeepassDXStyle.Toolbar.Overflow - @style/KeepassDXStyle.Toolbar.Overflow + @style/KeepassDXStyle.Toolbar.Special.Night + @style/KeepassDXStyle.Toolbar.Action.Night @style/KeepassDXStyle.Expanded.Title @style/KeepassDXStyle.Collapsed.Title + - + - - - - - - - - + + + - - - - - - - - - - - @@ -344,14 +327,6 @@ @color/group_subtitle_color - - - - @@ -418,6 +393,7 @@ diff --git a/app/src/main/res/xml/preferences_appearance.xml b/app/src/main/res/xml/preferences_appearance.xml index bee5612c7..f7d15e4a7 100644 --- a/app/src/main/res/xml/preferences_appearance.xml +++ b/app/src/main/res/xml/preferences_appearance.xml @@ -28,7 +28,14 @@ android:summary="@string/style_choose_summary" android:defaultValue="@string/list_style_name_light" android:entries="@array/list_style_names" - android:entryValues="@array/list_style_values" /> + android:entryValues="@array/list_style_values_light" /> +