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

Merge branch 'feature/Dark_Mode' into develop #714

Browse Source
This commit is contained in:
J-Jamet
2021-02-20 11:16:57 +01:00
parent a43b580d67 279f4a347a
commit fcd7fd2889
53 changed files with 713 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@@ -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

14
app/build.gradle
View File

@@ -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" ]
}

54
app/src/main/java/com/kunzisoft/keepass/activities/stylish/Stylish.kt
View File

@@ -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

5
app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt
View File

@@ -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)

12
app/src/main/java/com/kunzisoft/keepass/settings/NestedAppSettingsFragment.kt
View File

@@ -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<ListPreference>(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<IconPackListPreference>(getString(R.string.setting_icon_pack_choose_key))?.setOnPreferenceChangeListener { _, newValue ->
var iconPackEnabled = true
val iconPackId = newValue as String

6
app/src/main/java/com/kunzisoft/keepass/settings/PreferencesUtil.kt
View File

@@ -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%)
*/

13
app/src/main/java/com/kunzisoft/keepass/view/SpecialModeView.kt
View File

@@ -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)
}

17
app/src/main/java/com/kunzisoft/keepass/view/ToolbarAction.kt
View File

@@ -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)
}

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

@@ -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">
</androidx.appcompat.widget.Toolbar>

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

@@ -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" />
</com.google.android.material.appbar.AppBarLayout>
@@ -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" />
<com.google.android.material.floatingactionbutton.FloatingActionButton

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

@@ -30,9 +30,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" />
<androidx.coordinatorlayout.widget.CoordinatorLayout
@@ -73,7 +71,7 @@
android:layout_height="wrap_content"
android:textSize="32sp"
android:textStyle="bold"
android:shadowColor="#393939"
android:shadowColor="#80000000"
android:shadowDx="2"
android:shadowDy="2"
android:shadowRadius="4"
@@ -89,7 +87,7 @@
android:layout_marginLeft="2dp"
android:textSize="32sp"
android:textStyle="bold"
android:shadowColor="#393939"
android:shadowColor="#80000000"
android:shadowDx="2"
android:shadowDy="2"
android:shadowRadius="4"
@@ -105,7 +103,7 @@
android:layout_marginLeft="12dp"
android:textSize="32sp"
android:textStyle="bold"
android:shadowColor="#393939"
android:shadowColor="#80000000"
android:shadowDx="2"
android:shadowDy="2"
android:shadowRadius="4"
@@ -129,8 +127,7 @@
app:navigationContentDescription="@string/about"
android:elevation="4dp"
app:layout_collapseMode="pin"
android:theme="?attr/toolbarHomeAppearance"
app:popupTheme="?attr/toolbarPopupAppearance" />
android:theme="?attr/toolbarHomeAppearance" />
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>

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

@@ -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" />
<androidx.coordinatorlayout.widget.CoordinatorLayout
@@ -64,7 +62,6 @@
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="?attr/toolbarAppearance"
app:popupTheme="?attr/toolbarPopupAppearance"
android:elevation="4dp"
tools:targetApi="lollipop">
<LinearLayout
@@ -156,7 +153,7 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:visibility="gone"
app:popupTheme="?attr/toolbarPopupAppearance"
android:theme="?attr/toolbarActionAppearance"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />

5
app/src/main/res/layout/activity_password.xml
View File

@@ -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" />
<androidx.coordinatorlayout.widget.CoordinatorLayout
@@ -80,7 +78,6 @@
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="?attr/toolbarAppearance"
app:popupTheme="?attr/toolbarPopupAppearance"
app:layout_collapseMode="pin"
tools:targetApi="lollipop">
<TextView

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

@@ -26,12 +26,13 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="?attr/colorPrimary"
android:elevation="4dp"
tools:targetApi="lollipop">
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?attr/colorPrimaryDark"/>
android:background="?android:attr/listDivider"/>
<ViewSwitcher
android:id="@+id/file_main_switcher"

1
app/src/main/res/layout/toolbar_default.xml
View File

@@ -27,6 +27,5 @@
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="?attr/toolbarAppearance"
app:popupTheme="?attr/toolbarPopupAppearance"
android:elevation="4dp"
tools:targetApi="lollipop" />

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

@@ -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" />
</FrameLayout>

1
app/src/main/res/menu/advanced_unlock.xml
View File

@@ -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" />
</menu>

1
app/src/main/res/menu/autofill.xml
View File

@@ -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" />
</menu>

1
app/src/main/res/menu/contribution.xml
View File

@@ -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" />
</menu>

2
app/src/main/res/menu/database.xml
View File

@@ -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" />
<item android:id="@+id/menu_reload_database"
android:icon="@drawable/ic_reload_white_24dp"
android:title="@string/menu_reload_database"
android:orderInCategory="96"
app:iconTint="?attr/colorControlNormal"
app:showAsAction="ifRoom" />
</menu>

2
app/src/main/res/menu/default_menu.xml
View File

@@ -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" />
<item android:id="@+id/menu_about"
android:icon="@drawable/ic_help_white_24dp"
android:title="@string/about"
android:orderInCategory="101"
app:iconTint="?attr/colorControlNormal"
app:showAsAction="ifRoom" />
</menu>

2
app/src/main/res/menu/entry.xml
View File

@@ -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" />
<item android:id="@+id/menu_goto_url"
android:icon="@drawable/ic_launch_white_24dp"
android:title="@string/menu_url"
android:orderInCategory="23"
app:iconTint="?attr/colorControlNormal"
app:showAsAction="ifRoom" />
</menu>

3
app/src/main/res/menu/entry_edit.xml
View File

@@ -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" />
<item android:id="@+id/menu_add_attachment"
android:icon="@drawable/ic_attach_file_white_24dp"
android:title="@string/entry_add_attachment"
android:orderInCategory="93"
app:iconTint="?attr/colorControlNormal"
app:showAsAction="always" />
<item android:id="@+id/menu_add_otp"
android:icon="@drawable/ic_otp_white_24dp"
android:title="@string/entry_setup_otp"
android:orderInCategory="94"
app:iconTint="?attr/colorControlNormal"
app:showAsAction="always" />
</menu>

2
app/src/main/res/menu/entry_history.xml
View File

@@ -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" />
<item android:id="@+id/menu_delete_entry_history"
android:icon="@drawable/ic_content_delete_white_24dp"
android:title="@string/menu_delete_entry_history"
android:orderInCategory="93"
app:iconTint="?attr/colorControlNormal"
app:showAsAction="ifRoom" />
</menu>

5
app/src/main/res/menu/node_menu.xml
View File

@@ -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" />
<item android:id="@+id/menu_move"
android:icon="@drawable/ic_content_cut_white_24dp"
android:title="@string/menu_move"
android:orderInCategory="1030"
app:iconTint="?attr/colorControlNormal"
app:showAsAction="ifRoom" />
<item android:id="@+id/menu_delete"
android:icon="@drawable/ic_content_delete_white_24dp"
android:title="@string/menu_delete"
android:orderInCategory="1050"
app:iconTint="?attr/colorControlNormal"
app:showAsAction="ifRoom" />
<item android:id="@+id/menu_open"
android:icon="@drawable/ic_launch_white_24dp"
android:title="@string/menu_open"
android:orderInCategory="1060"
app:iconTint="?attr/colorControlNormal"
app:showAsAction="ifRoom" />
<item android:id="@+id/menu_edit"
android:icon="@drawable/ic_mode_edit_white_24dp"
android:title="@string/menu_edit"
android:orderInCategory="1070"
app:iconTint="?attr/colorControlNormal"
app:showAsAction="ifRoom" />
</menu>

1
app/src/main/res/menu/node_paste_menu.xml
View File

@@ -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" />
</menu>

1
app/src/main/res/menu/open_file.xml
View File

@@ -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" />
</menu>

1
app/src/main/res/menu/recycle_bin.xml
View File

@@ -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" />
</menu>

1
app/src/main/res/menu/search.xml
View File

@@ -25,5 +25,6 @@
app:showAsAction="always|collapseActionView"
android:orderInCategory="31"
android:iconifiedByDefault="true"
app:iconTint="?attr/colorControlNormal"
app:actionViewClass="androidx.appcompat.widget.SearchView" />
</menu>

1
app/src/main/res/menu/tree.xml
View File

@@ -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" />
</menu>

14
app/src/main/res/values-de/strings.xml
View File

@@ -444,14 +444,12 @@
<string name="style_choose_title">App-Design</string>
<string name="style_choose_summary">Design, das in der App genutzt wird</string>
<string-array name="list_style_names">
<item>Hell</item>
<item>Dunkel</item>
<item>Schwarz</item>
<item>Klassisch Dunkel</item>
<item>Himmel und Meer</item>
<item>Roter Vulkan</item>
<item>Purple Light</item>
<item>Purple Dark</item>
<item>Wald</item>
<item>Göttlich</item>
<item>Klassisch</item>
<item>Mond</item>
<item>Sonne</item>
<item>Kunzite</item>
</string-array>
<string name="warning_database_read_only">Datei Schreibrechte gewähren, um Datenbankänderungen zu speichern</string>
<string name="education_setup_OTP_summary">Einrichten einer Einmal-Passwortverwaltung (HOTP / TOTP), um ein Token zu generieren, das für die Zwei-Faktor-Authentifizierung (2FA) angefordert wird.</string>

14
app/src/main/res/values-fr/strings.xml
View File

@@ -281,14 +281,12 @@
<string name="style_choose_title">Thème de l’application</string>
<string name="style_choose_summary">Thème utilisé dans l’application</string>
<string-array name="list_style_names">
<item>Jour</item>
<item>Nuit</item>
<item>Noir</item>
<item>Foncé Classique</item>
<item>Ciel et Océan</item>
<item>Rouge Volcan</item>
<item>Pourpre Lumineux</item>
<item>Pourpre Obscur</item>
<item>Forêt</item>
<item>Divin</item>
<item>Classique</item>
<item>Lune</item>
<item>Soleil</item>
<item>Kunzite</item>
</string-array>
<string name="icon_pack_choose_title">Collection d’icônes</string>
<string name="icon_pack_choose_summary">Collection d’icônes utilisées dans l’application</string>

14
app/src/main/res/values-ja/strings.xml
View File

@@ -493,14 +493,12 @@
<string name="style_choose_title">アプリのテーマ</string>
<string name="style_choose_summary">アプリで使用するテーマ</string>
<string-array name="list_style_names">
<item>Light</item>
<item>Night</item>
<item>Black</item>
<item>Classic Dark</item>
<item>Sky and Ocean</item>
<item>Red Volcano</item>
<item>Purple Light</item>
<item>Purple Dark</item>
<item>Forest</item>
<item>Divine</item>
<item>Classic</item>
<item>Moon</item>
<item>Sun</item>
<item>Kunzite</item>
</string-array>
<string name="icon_pack_choose_title">アイコンパック</string>
<string name="icon_pack_choose_summary">アプリで使用するアイコンパック</string>

5
app/src/main/res/values-v21/styles.xml
View File

@@ -29,6 +29,9 @@
<item name="android:timePickerDialogTheme">@style/KeepassDXStyle.Light.DateTime.Dialog</item>
<item name="android:datePickerDialogTheme">@style/KeepassDXStyle.Light.DateTime.Dialog</item>
</style>
<style name="KeepassDXStyle.Light.WhiteBar.v23" parent="KeepassDXStyle.Light" >
<item name="android:statusBarColor">@color/dark_light</item>
</style>
<style name="KeepassDXStyle.Night" parent="KeepassDXStyle.Night.v21" >
<item name="preferenceTheme">@style/KeepassDXStyle.Preference.v21</item>
<item name="android:statusBarColor">?attr/colorPrimaryDark</item>
@@ -56,7 +59,7 @@
</style>
<!-- FAB -->
<style name="KeepassDXStyle.v21.Fab" parent="Theme.AppCompat">
<style name="KeepassDXStyle.v21.Fab" parent="Theme.AppCompat.DayNight">
<item name="android:elevation">4dp</item>
</style>

24
app/src/main/res/values-v23/styles.xml Normal file
View File

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

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

@@ -19,10 +19,9 @@
-->
<resources>
<attr name="toolbarAppearance" format="reference" />
<attr name="toolbarPopupAppearance" format="reference" />
<attr name="toolbarHomeAppearance" format="reference" />
<attr name="specialToolbarAppearance" format="reference" />
<attr name="actionToolbarAppearance" format="reference" />
<attr name="toolbarSpecialAppearance" format="reference" />
<attr name="toolbarActionAppearance" format="reference" />
<attr name="colorAccentLight" format="reference|color" />
<attr name="cardBackgroundTransparentColor" format="reference|color" />

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

@@ -25,7 +25,12 @@
<color name="darker">#0A0A0A</color>
<color name="grey_black">#101010</color>
<color name="dark">#0e0e0e</color>
<color name="dark_light">#212121</color>
<color name="dark_transparent">#E00E0E0E</color>
<color name="grey_lightest">#ececec</color>
<color name="grey_lighter">#dddddd</color>
<color name="grey_lighter_transparent">#E0DDDDDD</color>
<color name="grey_light">#D4D4D4</color>
<color name="grey">#bdbdbd</color>
<color name="grey_dark">#9e9e9e</color>
<color name="grey_dark_transparent">#E0424242</color>
@@ -41,13 +46,15 @@
<color name="green_darker">#2e7d32</color>
<color name="blue_lighter">#90CAF9</color>
<color name="blue_white">#42a5f5</color>
<color name="blue_white">#5DB2F6</color>
<color name="blue_light">#2196F3</color>
<color name="blue">#1E88E5</color>
<color name="blue_dark">#1976D2</color>
<color name="blue_darker">#1565C0</color>
<color name="cyan_lighter">#33b5e5</color>
<color name="cyan_lightest">#33b5e5</color>
<color name="cyan_lighter">#2B9AC3</color>
<color name="cyan_light">#2486AB</color>
<color name="cyan">#2c7a96</color>
<color name="red_lighter">#ef9a9a</color>

27
app/src/main/res/values/donottranslate.xml
View File

@@ -171,6 +171,7 @@
<string name="settings_appearance_key" translatable="false">settings_appearance_key</string>
<string name="setting_style_key" translatable="false">setting_style_key</string>
<string name="setting_style_brightness_key" translatable="false">setting_style_brightness_key</string>
<string name="setting_icon_pack_choose_key" translatable="false">setting_icon_pack_choose_key</string>
<string name="list_entries_show_username_key" translatable="false">list_entries_show_username_key</string>
<bool name="list_entries_show_username_default" translatable="false">true</bool>
@@ -327,22 +328,40 @@
<!-- Style -->
<string name="list_style_name_light" translatable="false">KeepassDXStyle_Light</string>
<string name="list_style_name_night" translatable="false">KeepassDXStyle_Night</string>
<string name="list_style_name_white" translatable="false">KeepassDXStyle_White</string>
<string name="list_style_name_black" translatable="false">KeepassDXStyle_Black</string>
<string name="list_style_name_clear" translatable="false">KeepassDXStyle_Clear</string>
<string name="list_style_name_dark" translatable="false">KeepassDXStyle_Dark</string>
<string name="list_style_name_blue" translatable="false">KeepassDXStyle_Blue</string>
<string name="list_style_name_blue_night" translatable="false">KeepassDXStyle_Blue_Night</string>
<string name="list_style_name_red" translatable="false">KeepassDXStyle_Red</string>
<string name="list_style_name_red_night" translatable="false">KeepassDXStyle_Red_Night</string>
<string name="list_style_name_purple" translatable="false">KeepassDXStyle_Purple</string>
<string name="list_style_name_purple_dark" translatable="false">KeepassDXStyle_Purple_Dark</string>
<string-array name="list_style_values">
<string-array name="list_style_values_light">
<item translatable="false">@string/list_style_name_light</item>
<item translatable="false">@string/list_style_name_night</item>
<item translatable="false">@string/list_style_name_black</item>
<item translatable="false">@string/list_style_name_dark</item>
<item translatable="false">@string/list_style_name_white</item>
<item translatable="false">@string/list_style_name_clear</item>
<item translatable="false">@string/list_style_name_blue</item>
<item translatable="false">@string/list_style_name_red</item>
<item translatable="false">@string/list_style_name_purple</item>
</string-array>
<string-array name="list_style_values_night">
<item translatable="false">@string/list_style_name_night</item>
<item translatable="false">@string/list_style_name_black</item>
<item translatable="false">@string/list_style_name_dark</item>
<item translatable="false">@string/list_style_name_blue_night</item>
<item translatable="false">@string/list_style_name_red_night</item>
<item translatable="false">@string/list_style_name_purple_dark</item>
</string-array>
<string name="list_style_brightness_light" translatable="false">KeepassDXStyle_Brightness_Light</string>
<string name="list_style_brightness_night" translatable="false">KeepassDXStyle_Brightness_Night</string>
<string name="list_style_brightness_follow_system" translatable="false">KeepassDXStyle_Brightness_Follow_System</string>
<string-array name="list_style_brightness_values">
<item translatable="false">@string/list_style_brightness_light</item>
<item translatable="false">@string/list_style_brightness_night</item>
<item translatable="false">@string/list_style_brightness_follow_system</item>
</string-array>
<!-- WARNING ! module icon-pack-material must be import in gradle -->
<string name="setting_icon_pack_choose_default" translatable="false">@string/material_resource_id</string>

19
app/src/main/res/values/strings.xml
View File

@@ -558,14 +558,19 @@
<string name="style_choose_title">App theme</string>
<string name="style_choose_summary">Theme used in the app</string>
<string-array name="list_style_names">
<item>Forest</item>
<item>Divine</item>
<item>Classic</item>
<item>Moon</item>
<item>Sun</item>
<item>Kunzite</item>
</string-array>
<string name="style_brightness_title">Theme brightness</string>
<string name="style_brightness_summary">Select light or dark themes</string>
<string-array name="list_style_brightness_names">
<item>Light</item>
<item>Night</item>
<item>Black</item>
<item>Classic Dark</item>
<item>Sky and Ocean</item>
<item>Red Volcano</item>
<item>Purple Light</item>
<item>Purple Dark</item>
<item>Dark</item>
<item>Follow the system</item>
</string-array>
<string name="icon_pack_choose_title">Icon pack</string>
<string name="icon_pack_choose_summary">Icon pack used in the app</string>

29
app/src/main/res/values/style_black.xml
View File

@@ -18,7 +18,7 @@
along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
-->
<resources>
<!-- Dark Style -->
<!-- Black Style -->
<style name="KeepassDXStyle.Black" parent="KeepassDXStyle.Night" >
<item name="colorPrimary">@color/dark</item>
<item name="colorPrimaryDark">@color/black</item>
@@ -30,9 +30,10 @@
<item name="android:textColorHintInverse">@color/green_light</item>
<item name="android:windowBackground">@color/background_dark</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Black</item>
<item name="toolbarPopupAppearance">@style/KeepassDXStyle.Toolbar.Popup.Black</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Black</item>
<item name="specialToolbarAppearance">@style/KeepassDXStyle.Toolbar.Special.Black</item>
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Black</item>
<item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Black</item>
<item name="popupTheme">@style/KeepassDXStyle.Toolbar.Popup.Black</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Black.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Black.Dialog</item>
<item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Black</item>
@@ -47,19 +48,27 @@
<item name="android:textColorHint">@color/green_lighter</item>
<item name="android:tint">@color/colorTextInverse</item>
</style>
<!-- Toolbar Home Black -->
<style name="KeepassDXStyle.Toolbar.Home.Black" parent="KeepassDXStyle.Black">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<!-- Toolbar Popup menu -->
<style name="KeepassDXStyle.Toolbar.Popup.Black" parent="KeepassDXStyle.Toolbar.Popup.Night">
<item name="android:textColor">@color/colorTextInverse</item>
<style name="KeepassDXStyle.Toolbar.Popup.Black" parent="KeepassDXStyle.Toolbar.Black">
<item name="android:colorBackground">@color/grey_black</item>
</style>
<!-- Toolbar Home Black -->
<style name="KeepassDXStyle.Toolbar.Home.Black" parent="KeepassDXStyle.Toolbar.Black">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<!-- Special Toolbar Black -->
<style name="KeepassDXStyle.Toolbar.Special.Black" parent="KeepassDXStyle.Toolbar.Black">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special.Black</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Special.Black" parent="KeepassDXStyle.Toolbar.Widget.Special">
<item name="android:background">@color/black</item>
<item name="background">@color/black</item>
</style>
<!-- Action Toolbar Black -->
<style name="KeepassDXStyle.Toolbar.Action.Black" parent="KeepassDXStyle.Toolbar.Black">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Black</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Action.Black" parent="Widget.AppCompat.Toolbar">
<item name="android:background">@color/dark</item>
</style>
<!-- Dialog -->
<style name="KeepassDXStyle.Black.Dialog" parent="KeepassDXStyle.Night.Dialog">

17
app/src/main/res/values/style_blue.xml
View File

@@ -30,7 +30,8 @@
<item name="android:windowBackground">@color/background_light</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Blue</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Blue</item>
<item name="specialToolbarAppearance">@style/KeepassDXStyle.Toolbar.Special.Blue</item>
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Blue</item>
<item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Blue</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Blue.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Blue.Dialog</item>
</style>
@@ -45,14 +46,22 @@
<item name="android:tint">@color/colorTextInverse</item>
</style>
<!-- Toolbar Home Blue -->
<style name="KeepassDXStyle.Toolbar.Home.Blue" parent="KeepassDXStyle.Blue">
<style name="KeepassDXStyle.Toolbar.Home.Blue" parent="KeepassDXStyle.Toolbar.Blue">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<!-- Special Toolbar Blue -->
<style name="KeepassDXStyle.Toolbar.Special.Blue" parent="KeepassDXStyle.Toolbar.Blue">
<item name="actionMenuTextColor">@color/colorTextInverse</item>
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special.Blue</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Special.Blue" parent="KeepassDXStyle.Toolbar.Widget.Special">
<item name="android:background">@color/blue_dark</item>
<item name="background">@color/blue_dark</item>
</style>
<!-- Action Toolbar Blue -->
<style name="KeepassDXStyle.Toolbar.Action.Blue" parent="KeepassDXStyle.Toolbar.Blue">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Blue</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Action.Blue" parent="Widget.AppCompat.Toolbar">
<item name="android:background">@color/blue</item>
</style>
<!-- Dialog -->
<style name="KeepassDXStyle.Blue.Dialog" parent="KeepassDXStyle.Light.Dialog">

71
app/src/main/res/values/style_blue_night.xml Normal file
View File

@@ -0,0 +1,71 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2018 Jeremy Jamet / Kunzisoft.
This file is part of KeePassDX.
KeePassDX is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
KeePassDX is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
-->
<resources>
<!-- Blue Style -->
<style name="KeepassDXStyle.Blue.Night" parent="KeepassDXStyle.Night" >
<item name="colorPrimary">@color/blue</item>
<item name="colorPrimaryDark">@color/blue_dark</item>
<item name="colorAccent">@color/blue_white</item>
<item name="colorAccentLight">@color/blue_lighter</item>
<item name="colorControlActivated">@color/blue_white</item>
<item name="android:textColorPrimary">@color/blue_light</item>
<item name="android:textColorHintInverse">@color/blue_lighter</item>
<item name="android:windowBackground">@color/background_night</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Blue.Night</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Blue.Night</item>
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Blue.Night</item>
<item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Blue.Night</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Blue.Night.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Blue.Night.Dialog</item>
</style>
<!-- Toolbar Style Blue -->
<style name="KeepassDXStyle.Toolbar.Blue.Night" parent="KeepassDXStyle.Blue.Night">
<item name="colorControlActivated">@color/blue_lighter</item>
<item name="colorControlNormal">@color/colorTextInverse</item>
<item name="android:textColorPrimary">@color/colorTextInverse</item>
<item name="android:textColorSecondary">@color/colorTextInverse</item>
<item name="android:editTextColor">@color/colorTextInverse</item>
<item name="android:textColorHint">@color/blue_lighter</item>
<item name="android:tint">@color/colorTextInverse</item>
</style>
<!-- Toolbar Home Blue -->
<style name="KeepassDXStyle.Toolbar.Home.Blue.Night" parent="KeepassDXStyle.Toolbar.Blue.Night">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<!-- Special Toolbar Blue -->
<style name="KeepassDXStyle.Toolbar.Special.Blue.Night" parent="KeepassDXStyle.Toolbar.Blue.Night">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special.Blue.Night</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Special.Blue.Night" parent="KeepassDXStyle.Toolbar.Widget.Special">
<item name="android:background">@color/blue_dark</item>
</style>
<!-- Action Toolbar Blue -->
<style name="KeepassDXStyle.Toolbar.Action.Blue.Night" parent="KeepassDXStyle.Toolbar.Blue.Night">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Blue.Night</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Action.Blue.Night" parent="Widget.AppCompat.Toolbar">
<item name="android:background">@color/blue</item>
</style>
<!-- Dialog -->
<style name="KeepassDXStyle.Blue.Night.Dialog" parent="KeepassDXStyle.Night.Dialog">
<item name="colorAccent">@color/blue_lighter</item>
<item name="android:textColorPrimary">@color/blue</item>
</style>
</resources>

89
app/src/main/res/values/style_clear.xml Normal file
View File

@@ -0,0 +1,89 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2018 Jeremy Jamet / Kunzisoft.
This file is part of KeePassDX.
KeePassDX is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
KeePassDX is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
-->
<resources>
<!-- Clear Style -->
<style name="KeepassDXStyle.Clear" parent="KeepassDXStyle.Light.WhiteBar.v23" >
<item name="colorPrimary">@color/grey_lighter</item>
<item name="colorPrimaryDark">@color/grey_light</item>
<item name="colorAccent">@color/cyan_lighter</item>
<item name="colorAccentLight">@color/cyan_lightest</item>
<item name="colorControlActivated">@color/cyan_lightest</item>
<item name="android:textColorPrimary">@color/cyan_lightest</item>
<item name="android:textColorHintInverse">@color/cyan_lightest</item>
<item name="android:windowBackground">@color/grey_lightest</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Clear</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Clear</item>
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Clear</item>
<item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Clear</item>
<item name="popupTheme">@style/KeepassDXStyle.Toolbar.Popup.Clear</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Clear.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Clear.Dialog</item>
<item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Clear</item>
<item name="cardBackgroundTransparentColor">@color/grey_lighter_transparent</item>
<item name="android:textColor">@color/text_color_light</item>
<item name="android:editTextColor">@color/colorText</item>
<item name="textColorInverse">@color/colorText</item>
<item name="android:textColorPrimaryInverse">@color/colorText</item>
<item name="android:textColorSecondary">@color/text_color_secondary_light</item>
<item name="android:textColorSecondaryInverse">@color/colorTextSecondary</item>
<item name="android:textColorHint">@color/colorTextSecondary</item>
</style>
<!-- Toolbar Style Clear -->
<style name="KeepassDXStyle.Toolbar.Clear" parent="KeepassDXStyle.Clear">
<item name="colorControlNormal">@color/colorText</item>
<item name="android:textColorPrimary">@color/colorText</item>
<item name="android:textColorSecondary">@color/colorTextSecondary</item>
<item name="android:tint">@color/colorText</item>
</style>
<!-- Toolbar Popup menu -->
<style name="KeepassDXStyle.Toolbar.Popup.Clear" parent="KeepassDXStyle.Toolbar.Clear">
<item name="android:colorBackground">@color/grey_lighter</item>
</style>
<!-- Toolbar Home Clear -->
<style name="KeepassDXStyle.Toolbar.Home.Clear" parent="KeepassDXStyle.Toolbar.Clear">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<!-- Special Toolbar Clear -->
<style name="KeepassDXStyle.Toolbar.Special.Clear" parent="KeepassDXStyle.Toolbar.Clear">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special.Clear</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Special.Clear" parent="KeepassDXStyle.Toolbar.Widget.Special">
<item name="android:background">@color/grey_lighter</item>
</style>
<!-- Action Toolbar Clear -->
<style name="KeepassDXStyle.Toolbar.Action.Clear" parent="KeepassDXStyle.Toolbar.Clear">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Clear</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Action.Clear" parent="Widget.AppCompat.Toolbar">
<item name="android:background">@color/grey_lighter</item>
</style>
<!-- Dialog -->
<style name="KeepassDXStyle.Clear.Dialog" parent="KeepassDXStyle.Light.Dialog">
<item name="colorAccent">@color/cyan_lighter</item>
<item name="android:textColorPrimary">@color/cyan</item>
<item name="android:background">@color/grey_lighter</item>
<item name="background">@color/grey_lighter</item>
</style>
<!-- CardView -->
<style name="KeepassDXStyle.Cardview.Clear" parent="CardView">
<item name="cardBackgroundColor">@color/grey_lighter</item>
</style>
</resources>

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

@@ -20,17 +20,18 @@
<resources>
<!-- Dark Style -->
<style name="KeepassDXStyle.Dark" parent="KeepassDXStyle.Night" >
<item name="colorPrimary">#212121</item>
<item name="colorPrimary">@color/dark_light</item>
<item name="colorPrimaryDark">@color/dark</item>
<item name="colorAccent">@color/cyan</item>
<item name="colorAccentLight">@color/cyan_lighter</item>
<item name="colorControlActivated">@color/cyan_lighter</item>
<item name="android:textColorPrimary">@color/cyan_lighter</item>
<item name="android:textColorHintInverse">@color/cyan_lighter</item>
<item name="colorAccentLight">@color/cyan_lightest</item>
<item name="colorControlActivated">@color/cyan_lightest</item>
<item name="android:textColorPrimary">@color/cyan_lightest</item>
<item name="android:textColorHintInverse">@color/cyan_lightest</item>
<item name="android:windowBackground">@color/background_dark</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Dark</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Dark</item>
<item name="specialToolbarAppearance">@style/KeepassDXStyle.Toolbar.Special.Dark</item>
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Dark</item>
<item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Dark</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Dark.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Dark.Dialog</item>
<item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Dark</item>
@@ -44,18 +45,27 @@
<item name="android:tint">@color/colorTextInverse</item>
</style>
<!-- Toolbar Home Dark -->
<style name="KeepassDXStyle.Toolbar.Home.Dark" parent="KeepassDXStyle.Dark">
<style name="KeepassDXStyle.Toolbar.Home.Dark" parent="KeepassDXStyle.Toolbar.Dark">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<!-- Special Toolbar Dark -->
<style name="KeepassDXStyle.Toolbar.Special.Dark" parent="KeepassDXStyle.Toolbar.Dark">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special.Dark</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Special.Dark" parent="KeepassDXStyle.Toolbar.Widget.Special">
<item name="android:background">@color/dark</item>
<item name="background">@color/dark</item>
</style>
<!-- Action Toolbar Dark -->
<style name="KeepassDXStyle.Toolbar.Action.Dark" parent="KeepassDXStyle.Toolbar.Dark">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Dark</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Action.Dark" parent="Widget.AppCompat.Toolbar">
<item name="android:background">@color/dark_light</item>
</style>
<!-- Dialog -->
<style name="KeepassDXStyle.Dark.Dialog" parent="KeepassDXStyle.Night.Dialog">
<item name="colorAccent">#fefefe</item>
<item name="android:textColorPrimary">@color/cyan_lighter</item>
<item name="colorAccent">@color/cyan_lighter</item>
<item name="android:textColorPrimary">@color/cyan_lightest</item>
<item name="android:background">@color/grey_black</item>
<item name="background">@color/grey_black</item>
</style>

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

@@ -30,9 +30,10 @@
<item name="android:textColorHintInverse">@color/purple_lighter</item>
<item name="android:windowBackground">@color/background_purple</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Purple</item>
<item name="toolbarPopupAppearance">@style/KeepassDXStyle.Toolbar.Popup.Purple</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Purple</item>
<item name="specialToolbarAppearance">@style/KeepassDXStyle.Toolbar.Special.Purple</item>
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Purple</item>
<item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Purple</item>
<item name="popupTheme">@style/KeepassDXStyle.Toolbar.Popup.Purple</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Purple.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Purple.Dialog</item>
<item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Purple</item>
@@ -48,20 +49,29 @@
<item name="android:textColorHint">@color/purple_lighter</item>
<item name="android:tint">@color/colorTextInverse</item>
</style>
<!-- Toolbar Home Purple -->
<style name="KeepassDXStyle.Toolbar.Home.Purple" parent="KeepassDXStyle.Purple">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<!-- Toolbar Popup menu -->
<style name="KeepassDXStyle.Toolbar.Popup.Purple" parent="KeepassDXStyle.Toolbar.Popup.Light">
<item name="android:textColor">@color/colorText</item>
<style name="KeepassDXStyle.Toolbar.Popup.Purple" parent="KeepassDXStyle.Toolbar.Purple">
<item name="android:colorBackground">@color/background_purple</item>
</style>
<!-- Toolbar Home Purple -->
<style name="KeepassDXStyle.Toolbar.Home.Purple" parent="KeepassDXStyle.Toolbar.Purple">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<!-- Special Toolbar Purple -->
<style name="KeepassDXStyle.Toolbar.Special.Purple" parent="KeepassDXStyle.Toolbar.Purple">
<item name="android:background">@color/purple_dark</item>
<item name="background">@color/purple_dark</item>
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special.Purple</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Special.Purple" parent="KeepassDXStyle.Toolbar.Widget.Special">
<item name="android:background">@color/purple_dark</item>
</style>
<!-- Action Toolbar Purple -->
<style name="KeepassDXStyle.Toolbar.Action.Purple" parent="KeepassDXStyle.Toolbar.Purple">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Purple</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Action.Purple" parent="Widget.AppCompat.Toolbar">
<item name="android:background">@color/purple</item>
</style>
<!-- Dialog -->
<style name="KeepassDXStyle.Purple.Dialog" parent="KeepassDXStyle.Light.Dialog">
<item name="colorAccent">@color/red</item>

29
app/src/main/res/values/style_purple_dark.xml
View File

@@ -30,9 +30,10 @@
<item name="android:textColorHintInverse">@color/purple_lighter</item>
<item name="android:windowBackground">@color/background_purple_dark</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Purple.Dark</item>
<item name="toolbarPopupAppearance">@style/KeepassDXStyle.Toolbar.Popup.Purple.Dark</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Purple.Dark</item>
<item name="specialToolbarAppearance">@style/KeepassDXStyle.Toolbar.Special.Purple.Dark</item>
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Purple.Dark</item>
<item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Purple.Dark</item>
<item name="popupTheme">@style/KeepassDXStyle.Toolbar.Popup.Purple.Dark</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Purple.Dark.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Purple.Dark.Dialog</item>
<item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Purple.Dark</item>
@@ -48,19 +49,27 @@
<item name="android:textColorHint">@color/purple_lighter</item>
<item name="android:tint">@color/colorTextInverse</item>
</style>
<!-- Toolbar Home Purple -->
<style name="KeepassDXStyle.Toolbar.Home.Purple.Dark" parent="KeepassDXStyle.Purple.Dark">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<!-- Toolbar Popup menu -->
<style name="KeepassDXStyle.Toolbar.Popup.Purple.Dark" parent="KeepassDXStyle.Toolbar.Popup.Night">
<item name="android:textColor">@color/colorTextInverse</item>
<style name="KeepassDXStyle.Toolbar.Popup.Purple.Dark" parent="KeepassDXStyle.Toolbar.Purple.Dark">
<item name="android:colorBackground">@color/purple_darkest</item>
</style>
<!-- Toolbar Home Purple -->
<style name="KeepassDXStyle.Toolbar.Home.Purple.Dark" parent="KeepassDXStyle.Toolbar.Purple.Dark">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<!-- Special Toolbar Purple -->
<style name="KeepassDXStyle.Toolbar.Special.Purple.Dark" parent="KeepassDXStyle.Toolbar.Purple.Dark">
<item name="android:background">@color/purple_dark</item>
<item name="background">@color/purple_dark</item>
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special.Purple.Dark</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Special.Purple.Dark" parent="KeepassDXStyle.Toolbar.Widget.Special">
<item name="android:background">@color/purple_darkest</item>
</style>
<!-- Action Toolbar Purple -->
<style name="KeepassDXStyle.Toolbar.Action.Purple.Dark" parent="KeepassDXStyle.Toolbar.Purple.Dark">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Purple.Dark</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Action.Purple.Dark" parent="Widget.AppCompat.Toolbar">
<item name="android:background">@color/purple_darker</item>
</style>
<!-- Dialog -->
<style name="KeepassDXStyle.Purple.Dark.Dialog" parent="KeepassDXStyle.Night.Dialog">

22
app/src/main/res/values/style_red.xml
View File

@@ -19,7 +19,7 @@
-->
<resources>
<!-- Red Style -->
<style name="KeepassDXStyle.Red" parent="KeepassDXStyle.Night" >
<style name="KeepassDXStyle.Red" parent="KeepassDXStyle.Light" >
<item name="colorPrimary">@color/red</item>
<item name="colorPrimaryDark">@color/red_dark</item>
<item name="colorAccent">@color/orange</item>
@@ -27,10 +27,11 @@
<item name="colorControlActivated">@color/orange</item>
<item name="android:textColorPrimary">@color/red</item>
<item name="android:textColorHintInverse">@color/red_lighter</item>
<item name="android:windowBackground">@color/background_night</item>
<item name="android:windowBackground">@color/background_light</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Red</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Red</item>
<item name="specialToolbarAppearance">@style/KeepassDXStyle.Toolbar.Special.Red</item>
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Red</item>
<item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Red</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Red.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Red.Dialog</item>
</style>
@@ -45,16 +46,25 @@
<item name="android:tint">@color/colorTextInverse</item>
</style>
<!-- Toolbar Home Red -->
<style name="KeepassDXStyle.Toolbar.Home.Red" parent="KeepassDXStyle.Red">
<style name="KeepassDXStyle.Toolbar.Home.Red" parent="KeepassDXStyle.Toolbar.Red">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<!-- Special Toolbar Red -->
<style name="KeepassDXStyle.Toolbar.Special.Red" parent="KeepassDXStyle.Toolbar.Red">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special.Red</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Special.Red" parent="KeepassDXStyle.Toolbar.Widget.Special">
<item name="android:background">@color/red_dark</item>
<item name="background">@color/red_dark</item>
</style>
<!-- Action Toolbar Red -->
<style name="KeepassDXStyle.Toolbar.Action.Red" parent="KeepassDXStyle.Toolbar.Red">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Red</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Action.Red" parent="Widget.AppCompat.Toolbar">
<item name="android:background">@color/red</item>
</style>
<!-- Dialog -->
<style name="KeepassDXStyle.Red.Dialog" parent="KeepassDXStyle.Night.Dialog">
<style name="KeepassDXStyle.Red.Dialog" parent="KeepassDXStyle.Light.Dialog">
<item name="colorAccent">@color/red</item>
<item name="android:textColorPrimary">@color/orange</item>
</style>

71
app/src/main/res/values/style_red_night.xml Normal file
View File

@@ -0,0 +1,71 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2018 Jeremy Jamet / Kunzisoft.
This file is part of KeePassDX.
KeePassDX is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
KeePassDX is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
-->
<resources>
<!-- Red Style -->
<style name="KeepassDXStyle.Red.Night" parent="KeepassDXStyle.Night" >
<item name="colorPrimary">@color/red</item>
<item name="colorPrimaryDark">@color/red_dark</item>
<item name="colorAccent">@color/orange</item>
<item name="colorAccentLight">@color/orange_light</item>
<item name="colorControlActivated">@color/orange</item>
<item name="android:textColorPrimary">@color/red</item>
<item name="android:textColorHintInverse">@color/red_lighter</item>
<item name="android:windowBackground">@color/background_night</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Red.Night</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Red.Night</item>
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Red.Night</item>
<item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Red.Night</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Red.Night.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Red.Night.Dialog</item>
</style>
<!-- Toolbar Style Red -->
<style name="KeepassDXStyle.Toolbar.Red.Night" parent="KeepassDXStyle.Red.Night">
<item name="colorControlActivated">@color/red_lighter</item>
<item name="colorControlNormal">@color/colorTextInverse</item>
<item name="android:textColorPrimary">@color/colorTextInverse</item>
<item name="android:textColorSecondary">@color/colorTextInverse</item>
<item name="android:editTextColor">@color/colorTextInverse</item>
<item name="android:textColorHint">@color/red_lighter</item>
<item name="android:tint">@color/colorTextInverse</item>
</style>
<!-- Toolbar Home Red -->
<style name="KeepassDXStyle.Toolbar.Home.Red.Night" parent="KeepassDXStyle.Toolbar.Red.Night">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<!-- Special Toolbar Red -->
<style name="KeepassDXStyle.Toolbar.Special.Red.Night" parent="KeepassDXStyle.Toolbar.Red.Night">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special.Red.Night</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Special.Red.Night" parent="KeepassDXStyle.Toolbar.Widget.Special">
<item name="android:background">@color/red_dark</item>
</style>
<!-- Action Toolbar Red -->
<style name="KeepassDXStyle.Toolbar.Action.Red.Night" parent="KeepassDXStyle.Toolbar.Red.Night">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Red.Night</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Action.Red.Night" parent="Widget.AppCompat.Toolbar">
<item name="android:background">@color/red</item>
</style>
<!-- Dialog -->
<style name="KeepassDXStyle.Red.Night.Dialog" parent="KeepassDXStyle.Night.Dialog">
<item name="colorAccent">@color/red</item>
<item name="android:textColorPrimary">@color/orange</item>
</style>
</resources>

93
app/src/main/res/values/style_white.xml Normal file
View File

@@ -0,0 +1,93 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2020 Jeremy Jamet / Kunzisoft.
This file is part of KeePassDX.
KeePassDX is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
KeePassDX is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
-->
<resources>
<!-- White Style -->
<style name="KeepassDXStyle.White" parent="KeepassDXStyle.Light.WhiteBar.v23" >
<item name="colorPrimary">@color/white</item>
<item name="colorPrimaryDark">@color/white</item>
<item name="colorAccent">@color/orange</item>
<item name="colorAccentLight">@color/orange_light</item>
<item name="colorControlNormal">@color/colorText</item>
<item name="colorControlActivated">@color/green</item>
<item name="android:textColorPrimary">@color/green_light</item>
<item name="android:textColorHintInverse">@color/green_light</item>
<item name="android:windowBackground">@color/white</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.White</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.White</item>
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.White</item>
<item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.White</item>
<item name="popupTheme">@style/KeepassDXStyle.Toolbar.Popup.White</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.White.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.White.Dialog</item>
<item name="cardViewStyle">@style/KeepassDXStyle.Cardview.White</item>
<item name="cardBackgroundTransparentColor">@color/white_transparent</item>
<item name="android:textColor">@color/text_color_light</item>
<item name="android:editTextColor">@color/colorText</item>
<item name="textColorInverse">@color/colorText</item>
<item name="android:textColorPrimaryInverse">@color/colorText</item>
<item name="android:textColorSecondary">@color/text_color_secondary_light</item>
<item name="android:textColorSecondaryInverse">@color/colorTextSecondary</item>
<item name="android:textColorHint">@color/colorTextSecondary</item>
</style>
<!-- Toolbar Style White -->
<style name="KeepassDXStyle.Toolbar.White" parent="KeepassDXStyle.White">
<item name="colorControlNormal">@color/colorText</item>
<item name="android:textColorPrimary">@color/colorText</item>
<item name="android:textColorSecondary">@color/colorTextSecondary</item>
<item name="android:editTextColor">@color/colorText</item>
<item name="android:textColorHint">@color/green_light</item>
<item name="android:tint">@color/colorText</item>
<item name="tint">@color/colorText</item>
</style>
<!-- Toolbar Popup menu -->
<style name="KeepassDXStyle.Toolbar.Popup.White" parent="KeepassDXStyle.Toolbar.White">
<item name="android:colorBackground">@color/white</item>
</style>
<!-- Toolbar Home White -->
<style name="KeepassDXStyle.Toolbar.Home.White" parent="KeepassDXStyle.Toolbar.White">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<!-- Special Toolbar White -->
<style name="KeepassDXStyle.Toolbar.Special.White" parent="KeepassDXStyle.Toolbar.White">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special.White</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Special.White" parent="KeepassDXStyle.Toolbar.Widget.Special">
<item name="android:background">@color/white</item>
</style>
<!-- Action Toolbar White -->
<style name="KeepassDXStyle.Toolbar.Action.White" parent="KeepassDXStyle.Toolbar.White">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.White</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Action.White" parent="Widget.AppCompat.Toolbar">
<item name="android:background">@color/white</item>
</style>
<!-- Dialog -->
<style name="KeepassDXStyle.White.Dialog" parent="KeepassDXStyle.Light.Dialog">
<item name="colorAccent">@color/orange</item>
<item name="android:textColorPrimary">@color/green</item>
<item name="android:background">@color/white</item>
<item name="background">@color/white</item>
</style>
<!-- CardView -->
<style name="KeepassDXStyle.Cardview.White" parent="CardView">
<item name="cardBackgroundColor">@color/white</item>
</style>
</resources>

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

@@ -74,13 +74,11 @@
<item name="alertDialogTheme">@style/KeepassDXStyle.Light.Dialog</item>
<!-- Toolbar -->
<item name="toolbarStyle">@style/Widget.AppCompat.Toolbar</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Light</item>
<item name="toolbarPopupAppearance">@style/KeepassDXStyle.Toolbar.Popup.Light</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Light</item>
<item name="specialToolbarAppearance">@style/KeepassDXStyle.Toolbar.Special.Light</item>
<item name="actionToolbarAppearance">@style/KeepassDXStyle.Toolbar.Action</item>
<item name="android:actionOverflowButtonStyle">@style/KeepassDXStyle.Toolbar.Overflow</item>
<item name="actionOverflowButtonStyle">@style/KeepassDXStyle.Toolbar.Overflow</item>
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Light</item>
<item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Light</item>
<!-- CollapsingToolbarLayout -->
<item name="expandedTitleTextAppearance">@style/KeepassDXStyle.Expanded.Title</item>
<item name="collapsedTitleTextAppearance">@style/KeepassDXStyle.Collapsed.Title</item>
@@ -130,25 +128,22 @@
<item name="alertDialogTheme">@style/KeepassDXStyle.Night.Dialog</item>
<!-- Toolbar -->
<item name="toolbarStyle">@style/Widget.AppCompat.Toolbar</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Night</item>
<item name="toolbarPopupAppearance">@style/KeepassDXStyle.Toolbar.Popup.Night</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Night</item>
<item name="specialToolbarAppearance">@style/KeepassDXStyle.Toolbar.Special.Night</item>
<item name="actionToolbarAppearance">@style/KeepassDXStyle.Toolbar.Action</item>
<item name="android:actionOverflowButtonStyle">@style/KeepassDXStyle.Toolbar.Overflow</item>
<item name="actionOverflowButtonStyle">@style/KeepassDXStyle.Toolbar.Overflow</item>
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Night</item>
<item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Night</item>
<!-- CollapsingToolbarLayout -->
<item name="expandedTitleTextAppearance">@style/KeepassDXStyle.Expanded.Title</item>
<item name="collapsedTitleTextAppearance">@style/KeepassDXStyle.Collapsed.Title</item>
</style>
<!-- Light Style -->
<style name="KeepassDXStyle.Light.WhiteBar.v23" parent="KeepassDXStyle.Light" />
<style name="KeepassDXStyle.Light" parent="KeepassDXStyle.Light.v21" />
<style name="KeepassDXStyle.Toolbar.Popup.Light" parent="Theme.AppCompat.Light.DarkActionBar" />
<!-- Night Style -->
<style name="KeepassDXStyle.Night" parent="KeepassDXStyle.Night.v21" />
<style name="KeepassDXStyle.Toolbar.Popup.Night" parent="Theme.AppCompat" />
<!-- Activity Animation -->
<style name="KeepassDXStyle.ActivityAnimation" parent="@android:style/Animation.Activity">
@@ -158,7 +153,7 @@
<item name="android:activityCloseExitAnimation">@anim/slide_out_right</item>
</style>
<!-- Toolbar Style Light -->
<!-- Toolbar Style -->
<style name="KeepassDXStyle.Toolbar.Light" parent="KeepassDXStyle.Light.v21">
<item name="colorControlNormal">@color/colorTextInverse</item>
<item name="android:textColorPrimary">@color/colorTextInverse</item>
@@ -167,8 +162,6 @@
<item name="android:textColorHint">@color/green_lighter</item>
<item name="android:tint">@color/colorTextInverse</item>
</style>
<!-- Toolbar Style Night -->
<style name="KeepassDXStyle.Toolbar.Night" parent="KeepassDXStyle.Night.v21">
<item name="colorControlNormal">@color/colorTextInverse</item>
<item name="android:textColorPrimary">@color/colorTextInverse</item>
@@ -182,59 +175,49 @@
<style name="KeepassDXStyle.Toolbar.Navigation.Tinted" parent="Widget.AppCompat.Toolbar.Button.Navigation">
<item name="tint">?android:attr/textColorHintInverse</item>
</style>
<style name="KeepassDXStyle.Toolbar.Home.Light" parent="KeepassDXStyle.Light.v21">
<style name="KeepassDXStyle.Toolbar.Home.Light" parent="KeepassDXStyle.Toolbar.Light">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<style name="KeepassDXStyle.Toolbar.Home.Night" parent="KeepassDXStyle.Night.v21">
<style name="KeepassDXStyle.Toolbar.Home.Night" parent="KeepassDXStyle.Toolbar.Night">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<style name="KeepassDXStyle.Toolbar.Title" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
<item name="android:textColor">@color/colorTextInverse</item>
<!-- Special Toolbar Style -->
<style name="KeepassDXStyle.Toolbar.Special.Light" parent="KeepassDXStyle.Toolbar.Light">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special.Green</item>
</style>
<style name="KeepassDXStyle.Toolbar.Subtitle" parent="TextAppearance.Widget.AppCompat.Toolbar.Subtitle">
<item name="android:textColor">@color/colorTextInverse</item>
<style name="KeepassDXStyle.Toolbar.Special.Night" parent="KeepassDXStyle.Toolbar.Night">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special.Green</item>
</style>
<style name="KeepassDXStyle.Toolbar.Overflow" parent="Widget.AppCompat.Light.ActionButton.Overflow">
<item name="android:tint">@color/colorTextInverse</item>
<item name="tint">@color/colorTextInverse</item>
<style name="KeepassDXStyle.Toolbar.Widget.Special" parent="Widget.AppCompat.Toolbar">
<item name="titleTextAppearance">@style/KeepassDXStyle.TextAppearance.Toolbar.Special.Title</item>
<item name="subtitleTextAppearance">@style/KeepassDXStyle.TextAppearance.Toolbar.Special.SubTitle</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Special.Green" parent="KeepassDXStyle.Toolbar.Widget.Special">
<item name="android:background">@color/green_dark</item>
</style>
<style name="KeepassDXStyle.TextAppearance.Toolbar.Special.Title" parent="KeepassDXStyle.TextAppearance.Small">
<item name="android:textColor">?android:attr/textColorHintInverse</item>
</style>
<style name="KeepassDXStyle.TextAppearance.Toolbar.Special.SubTitle" parent="KeepassDXStyle.TextAppearance.Tiny">
<item name="android:textColor">@color/colorTextInverse</item>
</style>
<!-- Action Style -->
<style name="KeepassDXStyle.Toolbar.Action" parent="Widget.AppCompat.Toolbar">
<item name="titleTextAppearance">@style/KeepassDXStyle.Toolbar.Title</item>
<item name="subtitleTextAppearance">@style/KeepassDXStyle.Toolbar.Subtitle</item>
<item name="android:background">?attr/colorPrimary</item>
<style name="KeepassDXStyle.Toolbar.Action.Light" parent="KeepassDXStyle.Toolbar.Light">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Green</item>
</style>
<!-- Bottom Toolbar Style -->
<style name="KeepassDXStyle.Toolbar.Bottom" parent="Widget.MaterialComponents.BottomAppBar">
<item name="titleTextAppearance">@style/KeepassDXStyle.Toolbar.Title</item>
<item name="subtitleTextAppearance">@style/KeepassDXStyle.Toolbar.Subtitle</item>
<item name="android:textColorSecondary">@color/colorTextInverse</item>
<item name="backgroundTint">?attr/colorPrimary</item>
<item name="android:background">?attr/colorPrimary</item>
<item name="background">?attr/colorPrimary</item>
<style name="KeepassDXStyle.Toolbar.Action.Night" parent="KeepassDXStyle.Toolbar.Night">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Green</item>
</style>
<!-- Special Toolbar Light Style -->
<style name="KeepassDXStyle.Toolbar.Special.Light" parent="KeepassDXStyle.Toolbar.Light">
<item name="android:background">@color/green_dark</item>
<item name="background">@color/green_dark</item>
</style>
<!-- Special Toolbar Night Style -->
<style name="KeepassDXStyle.Toolbar.Special.Night" parent="KeepassDXStyle.Toolbar.Night">
<item name="android:background">@color/green_dark</item>
<item name="background">@color/green_dark</item>
<style name="KeepassDXStyle.Toolbar.Widget.Action.Green" parent="Widget.AppCompat.Toolbar">
<item name="android:background">@color/green</item>
</style>
<!-- CollapsingToolbarLayout -->
<style name="KeepassDXStyle.Expanded.Title" parent="KeepassDXStyle.TextAppearance.Title.TextOnPrimary">
<item name="android:textSize">28sp</item>
</style>
<style name="KeepassDXStyle.Collapsed.Title" parent="KeepassDXStyle.TextAppearance.Title.TextOnPrimary">
<item name="android:textSize">18sp</item>
</style>
@@ -344,14 +327,6 @@
<item name="android:tint">@color/group_subtitle_color</item>
</style>
<!-- Special Toolbar text titlé -->
<style name="KeepassDXStyle.TextAppearance.Toolbar.Special.Title" parent="KeepassDXStyle.TextAppearance.Small">
<item name="android:textColor">?android:attr/textColorHintInverse</item>
</style>
<style name="KeepassDXStyle.TextAppearance.Toolbar.Special.SubTitle" parent="KeepassDXStyle.TextAppearance.Tiny">
<item name="android:textColor">@color/colorTextInverse</item>
</style>
<!-- Button Style -->
<style name="KeepassDXStyle.v21.Button" parent="Base.TextAppearance.AppCompat.Button">
<item name="android:gravity">center</item>
@@ -404,7 +379,7 @@
</style>
<style name="KeepassDXStyle.Special.Button.Stroke" parent="KeepassDXStyle.v21.Button">
<item name="android:background">@drawable/btn_special_start_bottom_stroke</item>
<item name="backgroundTint">?attr/textColorInverse</item>
<item name="backgroundTint">@color/colorTextInverse</item>
<item name="backgroundTintMode">src_atop</item>
</style>
@@ -418,6 +393,7 @@
</style>
<style name="KeepassDXStyle.FabMenu" parent="KeepassDXStyle.v21.FabMenu">
<item name="android:textSize">15sp</item>
<item name="android:textColor">@color/white</item>
<item name="android:background">@drawable/background_button_small</item>
<item name="backgroundTint">@color/background_button_color_accent</item>
</style>

9
app/src/main/res/xml/preferences_appearance.xml
View File

@@ -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" />
<ListPreference
android:key="@string/setting_style_brightness_key"
android:title="@string/style_brightness_title"
android:summary="@string/style_brightness_summary"
android:defaultValue="@string/list_style_brightness_follow_system"
android:entries="@array/list_style_brightness_names"
android:entryValues="@array/list_style_brightness_values" />
<com.kunzisoft.keepass.settings.preference.IconPackListPreference
android:key="@string/setting_icon_pack_choose_key"
android:title="@string/icon_pack_choose_title"

1
fastlane/metadata/android/en-US/changelogs/58.txt
View File

@@ -0,0 +1 @@
* Dark Themes (WARNING: You must reselect your theme if upgrading from an old installation)

1
fastlane/metadata/android/fr-FR/changelogs/58.txt
View File

@@ -0,0 +1 @@
* Thèmes sombres (ATTENTION: Vous devez reselectionner votre theme si mise à niveau d'une ancienne installation)