rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: Large pass to add Material 3

Browse Source
This commit is contained in:
J-Jamet
2023-07-10 20:11:39 +02:00
parent 71fd17c0ac
commit 8570f47372
57 changed files with 750 additions and 1176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,6 @@ package com.kunzisoft.keepass.activities
import android.app.Activity
import android.content.Intent
import android.graphics.Color
import android.graphics.drawable.ColorDrawable
import android.net.Uri
import android.os.Bundle
import android.os.Handler
@@ -70,8 +69,6 @@ import com.kunzisoft.keepass.timeout.TimeoutHelper
import com.kunzisoft.keepass.utils.UriUtil.openUrl
import com.kunzisoft.keepass.utils.UuidUtil
import com.kunzisoft.keepass.utils.getParcelableExtraCompat
import com.kunzisoft.keepass.view.changeControlColor
import com.kunzisoft.keepass.view.changeTitleColor
import com.kunzisoft.keepass.view.hideByFading
import com.kunzisoft.keepass.view.showActionErrorIfNeeded
import com.kunzisoft.keepass.viewmodels.EntryViewModel
@@ -113,8 +110,6 @@ class EntryActivity : DatabaseLockActivity() {
private var mIcon: IconImage? = null
private var mColorSecondary: Int = 0
private var mControlColor: Int = 0
private var mColorPrimary: Int = 0
private var mColorBackground: Int = 0
private var mBackgroundColor: Int? = null
private var mForegroundColor: Int? = null
@@ -147,16 +142,10 @@ class EntryActivity : DatabaseLockActivity() {
// Retrieve the textColor to tint the toolbar
val taColorSecondary = theme.obtainStyledAttributes(intArrayOf(R.attr.colorSecondary))
val taControlColor = theme.obtainStyledAttributes(intArrayOf(R.attr.toolbarColorControl))
val taColorPrimary = theme.obtainStyledAttributes(intArrayOf(R.attr.colorPrimary))
val taColorBackground = theme.obtainStyledAttributes(intArrayOf(android.R.attr.windowBackground))
mColorSecondary = taColorSecondary.getColor(0, Color.BLACK)
mControlColor = taControlColor.getColor(0, Color.BLACK)
mColorPrimary = taColorPrimary.getColor(0, Color.BLACK)
mColorBackground = taColorBackground.getColor(0, Color.BLACK)
taColorSecondary.recycle()
taControlColor.recycle()
taColorPrimary.recycle()
taColorBackground.recycle()
// Init Tags adapter
@@ -225,10 +214,10 @@ class EntryActivity : DatabaseLockActivity() {
this.mEntryIsHistory = entryIsHistory
// Assign history dedicated view
historyView?.visibility = if (entryIsHistory) View.VISIBLE else View.GONE
// TODO History badge
/*
if (entryIsHistory) {
collapsingToolbarLayout?.contentScrim =
ColorDrawable(mColorSecondary)
}
}*/
val entryInfo = entryInfoHistory.entryInfo
// Manage entry copy to start notification if allowed (at the first start)
@@ -366,8 +355,6 @@ class EntryActivity : DatabaseLockActivity() {
}
private fun applyToolbarColors() {
appBarLayout?.setBackgroundColor(mBackgroundColor ?: mColorPrimary)
collapsingToolbarLayout?.contentScrim = ColorDrawable(mBackgroundColor ?: mColorPrimary)
val backgroundDarker = if (mBackgroundColor != null) {
ColorUtils.blendARGB(mBackgroundColor!!, Color.WHITE, 0.1f)
} else {
@@ -384,8 +371,6 @@ class EntryActivity : DatabaseLockActivity() {
)
}
}
toolbar?.changeControlColor(mForegroundColor ?: mControlColor)
collapsingToolbarLayout?.changeTitleColor(mForegroundColor ?: mControlColor)
}
override fun onCreateOptionsMenu(menu: Menu): Boolean {

8
app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseModeActivity.kt
View File

@@ -9,7 +9,7 @@ import com.kunzisoft.keepass.activities.helpers.SpecialMode
import com.kunzisoft.keepass.activities.helpers.TypeMode
import com.kunzisoft.keepass.model.SearchInfo
import com.kunzisoft.keepass.settings.PreferencesUtil
import com.kunzisoft.keepass.view.SpecialModeView
import com.kunzisoft.keepass.view.ToolbarSpecial
/**
@@ -20,7 +20,7 @@ abstract class DatabaseModeActivity : DatabaseActivity() {
protected var mSpecialMode: SpecialMode = SpecialMode.DEFAULT
private var mTypeMode: TypeMode = TypeMode.DEFAULT
private var mSpecialModeView: SpecialModeView? = null
private var mToolbarSpecial: ToolbarSpecial? = null
override fun onBackPressed() {
if (mSpecialMode != SpecialMode.DEFAULT)
@@ -113,8 +113,8 @@ abstract class DatabaseModeActivity : DatabaseActivity() {
?: EntrySelectionHelper.retrieveSearchInfoFromIntent(intent)
// To show the selection mode
mSpecialModeView = findViewById(R.id.special_mode_view)
mSpecialModeView?.apply {
mToolbarSpecial = findViewById(R.id.special_mode_view)
mToolbarSpecial?.apply {
// Populate title
val selectionModeStringId = when (mSpecialMode) {
SpecialMode.DEFAULT, // Not important because hidden

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

@@ -39,10 +39,10 @@ class BreadcrumbAdapter(val context: Context)
mShowNumberEntries = PreferencesUtil.showNumberEntries(context)
mShowUUID = PreferencesUtil.showUUID(context)
// Retrieve the textColor to tint the icon
val taTextColor = context.theme.obtainStyledAttributes(intArrayOf(R.attr.colorOnPrimary))
mIconColor = taTextColor.getColor(0, Color.WHITE)
taTextColor.recycle()
// Retrieve the color to tint the icon
val taIconColor = context.theme.obtainStyledAttributes(intArrayOf(R.attr.colorOnSurface))
mIconColor = taIconColor.getColor(0, Color.WHITE)
taIconColor.recycle()
}
@SuppressLint("NotifyDataSetChanged")
@@ -71,7 +71,7 @@ class BreadcrumbAdapter(val context: Context)
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BreadcrumbGroupViewHolder {
return BreadcrumbGroupViewHolder(inflater.inflate(
when (viewType) {
0 -> R.layout.item_group
0 -> R.layout.item_breadcrumb_important
else -> R.layout.item_breadcrumb
}, parent, false)
)

6
app/src/main/java/com/kunzisoft/keepass/view/AddNodeButtonView.kt
View File

@@ -43,10 +43,8 @@ class AddNodeButtonView @JvmOverloads constructor(context: Context,
var addButtonView: FloatingActionButton? = null
private lateinit var addEntryView: View
private lateinit var textAddEntryView: View
private lateinit var fabAddEntryView: View
private lateinit var addGroupView: View
private lateinit var textAddGroupView: View
private lateinit var fabAddGroupView: View
private var addEntryEnable: Boolean = false
@@ -81,10 +79,8 @@ class AddNodeButtonView @JvmOverloads constructor(context: Context,
addButtonView = findViewById(R.id.add_button)
addEntryView = findViewById(R.id.container_add_entry)
textAddEntryView = findViewById(R.id.text_add_entry)
fabAddEntryView = findViewById(R.id.fab_add_entry)
addGroupView = findViewById(R.id.container_add_group)
textAddGroupView = findViewById(R.id.text_add_group)
fabAddGroupView = findViewById(R.id.fab_add_group)
animationDuration = 300L
@@ -205,14 +201,12 @@ class AddNodeButtonView @JvmOverloads constructor(context: Context,
fun setAddGroupClickListener(onClickListener: OnClickListener) {
if (addGroupEnable) {
textAddGroupView.setOnClickListener(onButtonClickListener(onClickListener))
fabAddGroupView.setOnClickListener(onButtonClickListener(onClickListener))
}
}
fun setAddEntryClickListener(onClickListener: OnClickListener) {
if (addEntryEnable) {
textAddEntryView.setOnClickListener(onButtonClickListener(onClickListener))
fabAddEntryView.setOnClickListener(onButtonClickListener(onClickListener))
}
}

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

@@ -31,14 +31,14 @@ 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.google.android.material.appbar.MaterialToolbar
import com.kunzisoft.keepass.R
class ToolbarAction @JvmOverloads constructor(context: Context,
attrs: AttributeSet? = null,
defStyle: Int = androidx.appcompat.R.attr.toolbarStyle)
: Toolbar(context, attrs, defStyle) {
defStyle: Int = R.attr.toolbarActionStyle)
: MaterialToolbar(context, attrs, defStyle) {
private var mActionModeCallback: ActionMode.Callback? = null
private val actionMode = NodeActionMode(this)
@@ -47,7 +47,7 @@ class ToolbarAction @JvmOverloads constructor(context: Context,
init {
ContextCompat.getDrawable(context, R.drawable.ic_close_white_24dp)?.let { closeDrawable ->
val typedValue = TypedValue()
context.theme.resolveAttribute(R.attr.colorControlNormal, typedValue, true)
context.theme.resolveAttribute(R.attr.colorOnSurface, typedValue, true)
@ColorInt val colorControl = typedValue.data
closeDrawable.colorFilter = PorterDuffColorFilter(colorControl, PorterDuff.Mode.SRC_ATOP)
navigationIcon = closeDrawable

10
app/src/main/java/com/kunzisoft/keepass/view/SpecialModeView.kt → app/src/main/java/com/kunzisoft/keepass/view/ToolbarSpecial.kt
View File

@@ -26,14 +26,14 @@ 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.google.android.material.appbar.MaterialToolbar
import com.kunzisoft.keepass.R
class SpecialModeView @JvmOverloads constructor(context: Context,
attrs: AttributeSet? = null,
defStyle: Int = androidx.appcompat.R.attr.toolbarStyle)
: Toolbar(context, attrs, defStyle) {
class ToolbarSpecial @JvmOverloads constructor(context: Context,
attrs: AttributeSet? = null,
defStyle: Int = R.attr.toolbarSpecialStyle)
: MaterialToolbar(context, attrs, defStyle) {
init {
ContextCompat.getDrawable(context, R.drawable.ic_arrow_back_white_24dp)?.let { closeDrawable ->

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

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

2
app/src/main/res/color/background_button_color_on_primary.xml → app/src/main/res/color/color_on_primary.xml
View File

@@ -2,5 +2,5 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/white_grey" android:state_activated="true" />
<item android:color="@color/white_grey_darker" android:state_enabled="false" />
<item android:color="?android:attr/textColorSecondaryInverse" android:state_enabled="true" />
<item android:color="?attr/colorOnPrimary" android:state_enabled="true" />
</selector>

6
app/src/main/res/color/color_primary.xml Normal file
View File

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

6
app/src/main/res/color/color_secondary.xml Normal file
View File

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

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

@@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:color="@color/white"
tools:targetApi="lollipop">
<item>
<layer-list>
<item android:bottom="2dp" android:left="2dp">
<shape>
<corners
android:radius="@dimen/dialog_radius" />
<padding
android:left="14dp"
android:right="14dp"
android:top="4dp"
android:bottom="8dp"/>
<solid android:color="?attr/colorSecondary"/>
</shape>
</item>
</layer-list>
</item>
</ripple>

0
app/src/main/res/drawable/background_button_small.xml → app/src/main/res/drawable/background_switch.xml
View File

2
app/src/main/res/drawable/ic_info_hint_color_24dp.xml
View File

@@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/background_button_color_on_primary"
android:fillColor="@color/color_on_primary"
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
</vector>

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

@@ -36,14 +36,12 @@
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar"
android:layout_width="match_parent"
android:layout_height="@dimen/toolbar_parallax_height"
android:background="?attr/colorPrimary">
android:layout_height="wrap_content">
<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/toolbar_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:contentScrim="?attr/colorPrimary"
app:expandedTitleGravity="center_horizontal|bottom"
app:expandedTitleMarginStart="@dimen/default_margin"
app:expandedTitleMarginEnd="@dimen/default_margin"
@@ -54,12 +52,12 @@
android:id="@+id/title_block"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:minHeight="160dp"
app:layout_collapseMode="parallax"
android:orientation="vertical"
android:background="@drawable/background_repeat"
android:gravity="center"
android:paddingBottom="12dp"
style="@style/KeepassDXStyle.TextAppearance.Default">
android:paddingBottom="12dp">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/entry_icon"
android:layout_width="wrap_content"
@@ -69,14 +67,12 @@
style="@style/KeepassDXStyle.Icon"
android:layout_gravity="center"/>
</FrameLayout>
<androidx.appcompat.widget.Toolbar
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:theme="?attr/toolbarAppearance"
app:layout_collapseMode="pin"
tools:targetApi="lollipop">
</androidx.appcompat.widget.Toolbar>
android:layout_height="wrap_content"
style="@style/KeepassDXStyle.Toolbar.Transparent"
app:layout_collapseMode="pin" />
<com.google.android.material.progressindicator.LinearProgressIndicator
android:id="@+id/entry_progress"

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

@@ -39,11 +39,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fitsSystemWindows="true">
<com.kunzisoft.keepass.view.SpecialModeView
<com.kunzisoft.keepass.view.ToolbarSpecial
android:id="@+id/special_mode_view"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:theme="?attr/toolbarSpecialAppearance"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent" />
</com.google.android.material.appbar.AppBarLayout>
@@ -81,8 +80,7 @@
<com.kunzisoft.keepass.view.ToolbarAction
android:id="@+id/entry_edit_bottom_bar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:theme="?attr/toolbarActionAppearance"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
app:layout_constraintBottom_toTopOf="@+id/screenshot_mode_banner" />
@@ -93,8 +91,6 @@
android:layout_height="wrap_content"
android:contentDescription="@string/validate"
android:src="@drawable/ic_check_white_24dp"
app:tint="?attr/colorOnSecondary"
app:fabSize="mini"
app:fabCustomSize="@dimen/button_small_size"
app:layout_constraintTop_toTopOf="@+id/entry_edit_bottom_bar"
app:layout_constraintBottom_toTopOf="@+id/screenshot_mode_banner"

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

@@ -27,11 +27,10 @@
android:importantForAutofill="noExcludeDescendants"
tools:targetApi="o">
<com.kunzisoft.keepass.view.SpecialModeView
<com.kunzisoft.keepass.view.ToolbarSpecial
android:id="@+id/special_mode_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="?attr/toolbarSpecialAppearance"
app:layout_constraintTop_toTopOf="parent" />
<androidx.coordinatorlayout.widget.CoordinatorLayout
@@ -46,8 +45,7 @@
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar"
android:layout_width="match_parent"
android:layout_height="@dimen/toolbar_parallax_height"
android:background="?attr/colorPrimary">
android:layout_height="wrap_content">
<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/toolbar_layout"
@@ -75,7 +73,7 @@
android:shadowDy="2"
android:shadowRadius="4"
android:paddingTop="?attr/actionBarSize"
android:textColor="?attr/colorOnPrimary"
android:textColor="@color/green_light"
android:gravity="center"
android:text="@string/app_name_part1"/>
<TextView
@@ -91,15 +89,16 @@
android:shadowDy="2"
android:shadowRadius="4"
android:paddingTop="?attr/actionBarSize"
android:textColor="?attr/colorSecondary"
android:textColor="@color/orange"
android:gravity="center"
android:text="@string/app_name_part2"/>
<TextView
android:id="@+id/file_selection_title_part_3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginLeft="12dp"
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:paddingHorizontal="4dp"
android:textSize="32sp"
android:textStyle="bold"
android:visibility="gone"
@@ -108,21 +107,19 @@
android:shadowDy="2"
android:shadowRadius="4"
android:paddingTop="?attr/actionBarSize"
android:textColor="?android:attr/textColorHintInverse"
android:textColor="@color/green_lightest"
android:gravity="center"
android:text="@string/app_name_part3"/>
</LinearLayout>
<androidx.appcompat.widget.Toolbar
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:navigationIcon="@drawable/ic_info_white_24dp"
app:navigationContentDescription="@string/about"
android:background="?attr/colorPrimary"
app:layout_collapseMode="pin"
android:theme="?attr/toolbarHomeAppearance" />
app:layout_collapseMode="pin"/>
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>
@@ -140,6 +137,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintBottom_toTopOf="@+id/screenshot_mode_banner"
android:background="?attr/colorSurface"
android:orientation="horizontal"
android:weightSum="2">

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

@@ -24,27 +24,23 @@
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:filterTouchesWhenObscured="true"
android:fitsSystemWindows="true">
android:filterTouchesWhenObscured="true">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/activity_group_container_view"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.kunzisoft.keepass.view.SpecialModeView
<com.kunzisoft.keepass.view.ToolbarSpecial
android:id="@+id/special_mode_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="?attr/toolbarSpecialAppearance"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.Toolbar
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="?attr/toolbarAppearance"
android:layout_height="wrap_content"
android:title="@string/app_name"
app:layout_constraintTop_toBottomOf="@+id/special_mode_view">
<FrameLayout
@@ -58,37 +54,37 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
tools:text="Database"
style="@style/KeepassDXStyle.TextAppearance.Title.TextOnPrimary" />
style="@style/KeepassDXStyle.Title.OnSurface" />
</FrameLayout>
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.MaterialToolbar>
<FrameLayout
android:layout_width="48dp"
android:layout_height="?attr/actionBarSize"
android:layout_marginStart="50dp"
android:layout_marginLeft="50dp"
android:layout_height="wrap_content"
android:layout_marginStart="41dp"
android:layout_marginLeft="41dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/special_mode_view">
<ImageView
android:id="@+id/database_color"
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_gravity="center_vertical|start"
android:visibility="gone"
android:src="@drawable/background_rounded_square"
android:contentDescription="@string/content_description_database_color"/>
app:layout_constraintTop_toBottomOf="@+id/special_mode_view"
app:layout_constraintBottom_toTopOf="@+id/group_coordinator">
<ImageView
android:id="@+id/database_modified"
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_marginStart="12dp"
android:layout_marginLeft="12dp"
android:layout_gravity="center_vertical|start"
android:visibility="gone"
android:src="@drawable/ic_modified_white_12dp"
app:tint="?attr/colorOnSecondary"
android:contentDescription="@string/save"/>
android:id="@+id/database_color"
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_gravity="center_vertical|start"
android:visibility="gone"
android:src="@drawable/background_rounded_square"
android:contentDescription="@string/content_description_database_color"/>
<ImageView
android:id="@+id/database_modified"
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_marginStart="12dp"
android:layout_marginLeft="12dp"
android:layout_gravity="center_vertical|start"
android:visibility="gone"
android:src="@drawable/ic_modified_white_12dp"
app:tint="?attr/colorOnSurface"
android:contentDescription="@string/save"/>
</FrameLayout>
<androidx.coordinatorlayout.widget.CoordinatorLayout
@@ -102,7 +98,6 @@
android:id="@+id/app_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:targetApi="lollipop"
android:fitsSystemWindows="true">
<FrameLayout
@@ -110,20 +105,17 @@
android:layout_height="wrap_content"
app:layout_scrollFlags="scroll|snap|enterAlways">
<androidx.appcompat.widget.Toolbar
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar_breadcrumb"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="?attr/toolbarAppearance"
tools:targetApi="lollipop">
android:layout_height="wrap_content">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/breadcrumb_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
android:orientation="horizontal" />
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.MaterialToolbar>
<com.kunzisoft.keepass.view.SearchFiltersView
android:id="@+id/search_filters"
@@ -159,9 +151,8 @@
<com.kunzisoft.keepass.view.ToolbarAction
android:id="@+id/toolbar_action"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_height="64dp"
android:visibility="gone"
android:theme="?attr/toolbarActionAppearance"
app:layout_constraintBottom_toTopOf="@+id/screenshot_mode_banner" />
<FrameLayout
@@ -190,8 +181,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="start"
app:itemTextColor="?android:attr/textColor"
app:subheaderColor="?attr/colorSecondary"
style="@style/Widget.Material3.NavigationView"
android:fitsSystemWindows="true" />
</androidx.drawerlayout.widget.DrawerLayout>

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

@@ -40,9 +40,8 @@
<com.kunzisoft.keepass.view.ToolbarAction
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:theme="?attr/toolbarActionAppearance"
app:layout_constraintBottom_toTopOf="@+id/screenshot_mode_banner" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -52,8 +51,6 @@
android:layout_height="wrap_content"
android:contentDescription="@string/validate"
android:src="@drawable/ic_file_upload_white_24dp"
app:tint="?attr/colorOnSecondary"
app:fabSize="mini"
app:fabCustomSize="@dimen/button_small_size"
app:layout_constraintBottom_toTopOf="@+id/screenshot_mode_banner"
app:layout_constraintEnd_toEndOf="parent"

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

@@ -40,9 +40,8 @@
<com.kunzisoft.keepass.view.ToolbarAction
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:theme="?attr/toolbarActionAppearance"
app:layout_constraintBottom_toTopOf="@+id/screenshot_mode_banner" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -52,8 +51,6 @@
android:layout_height="wrap_content"
android:contentDescription="@string/validate"
android:src="@drawable/ic_check_white_24dp"
app:tint="?attr/colorOnSecondary"
app:fabSize="mini"
app:fabCustomSize="@dimen/button_small_size"
app:layout_constraintTop_toTopOf="@+id/toolbar"
app:layout_constraintBottom_toTopOf="@+id/screenshot_mode_banner"

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

@@ -26,12 +26,11 @@
android:filterTouchesWhenObscured="true"
tools:targetApi="o">
<com.kunzisoft.keepass.view.SpecialModeView
<com.kunzisoft.keepass.view.ToolbarSpecial
app:layout_constraintTop_toTopOf="parent"
android:id="@+id/special_mode_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="?attr/toolbarSpecialAppearance" />
android:layout_height="wrap_content" />
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/activity_password_coordinator_layout"
@@ -45,8 +44,7 @@
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary">
android:layout_height="wrap_content">
<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/toolbar_layout"
@@ -74,17 +72,16 @@
android:backgroundTint="@color/green"/>
</FrameLayout>
<androidx.appcompat.widget.Toolbar
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:theme="?attr/toolbarAppearance"
android:background="?attr/colorPrimary"
app:layout_collapseMode="pin"
tools:targetApi="lollipop">
android:layout_height="wrap_content"
android:elevation="0dp"
app:elevation="0dp"
app:layout_collapseMode="pin">
<TextView
android:id="@+id/filename"
style="@style/KeepassDXStyle.TextAppearance.Title.TextOnPrimary"
style="@style/KeepassDXStyle.Title.OnSurface"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
@@ -93,7 +90,7 @@
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:singleLine="true"/>
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.MaterialToolbar>
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>
@@ -112,7 +109,6 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:elevation="4dp"
app:layout_constraintWidth_percent="@dimen/content_percent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -120,16 +116,17 @@
<View
android:layout_width="match_parent"
android:layout_height="116dp"
android:background="?attr/colorPrimary" />
<androidx.cardview.widget.CardView
android:background="?attr/colorSurface" />
<com.google.android.material.card.MaterialCardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="12dp">
style="@style/KeepassDXStyle.Cardview.SurfaceContainer.High"
android:layout_margin="16dp">
<com.kunzisoft.keepass.view.MainCredentialView
android:id="@+id/activity_password_credentials"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</androidx.cardview.widget.CardView>
</com.google.android.material.card.MaterialCardView>
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -169,7 +166,8 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:background="?attr/colorSurface">
<androidx.fragment.app.FragmentContainerView
android:id="@+id/fragment_advanced_unlock_container_view"
android:layout_width="0dp"

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

@@ -42,9 +42,9 @@
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:text="@string/enable"
android:background="@drawable/background_button_small"
android:background="@drawable/background_switch"
android:backgroundTint="?attr/colorSecondary"
android:textColor="?attr/colorOnSecondary"
android:theme="?attr/switchAppearance"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:minHeight="48dp"/>

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

@@ -71,7 +71,6 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:theme="?attr/switchAppearance"
android:text="@string/protection" />
</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -69,7 +69,6 @@
android:id="@+id/password_checkbox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="?attr/switchAppearance"
android:text="@string/password"/>
<!-- Password Input -->
@@ -120,7 +119,6 @@
android:id="@+id/keyfile_checkbox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="?attr/switchAppearance"
android:text="@string/entry_keyfile"/>
<com.kunzisoft.keepass.view.KeyFileSelectionView
@@ -151,7 +149,6 @@
android:id="@+id/hardware_key_checkbox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="?attr/switchAppearance"
android:text="@string/hardware_key"/>
<com.kunzisoft.keepass.view.HardwareKeySelectionView

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

@@ -17,50 +17,58 @@
You should have received a copy of the GNU General Public License
along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/breadcrumb_group"
android:layout_margin="4dp"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="horizontal"
android:gravity="center_vertical"
android:baselineAligned="false"
android:background="?android:attr/selectableItemBackground">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/group_icon"
android:layout_width="26dp"
android:layout_height="26dp"
android:layout_marginStart="6dp"
android:layout_marginLeft="6dp"
android:layout_marginEnd="6dp"
android:layout_marginRight="6dp"
android:layout_gravity="center_vertical"
android:contentDescription="@string/hint_icon_name"
android:scaleType="fitXY" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/group_name"
android:layout_height="wrap_content"
android:minHeight="@dimen/min_height_breadcrumb"
android:background="?android:attr/selectableItemBackground"
style="@style/KeepassDXStyle.Cardview.Surface.Small">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start|center_vertical"
android:text="@string/root"
android:maxLines="2"
android:ellipsize="end"
style="@style/KeepassDXStyle.TextAppearance.SubTitle.TextOnPrimary"
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/group_separator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_arrow_right_white_24dp"
android:tint="?attr/colorOnPrimary"
android:importantForAccessibility="no"
android:layout_marginEnd="6dp"
android:layout_marginRight="6dp"
style="@style/KeepassDXStyle.TextAppearance.SubTitle.TextOnPrimary"
android:textStyle="bold"
tools:targetApi="jelly_bean" />
</LinearLayout>
android:orientation="horizontal"
android:gravity="center"
android:layout_gravity="center"
android:layout_marginHorizontal="5dp"
android:baselineAligned="false">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/group_icon"
android:layout_width="26dp"
android:layout_height="26dp"
android:layout_marginStart="6dp"
android:layout_marginLeft="6dp"
android:layout_marginEnd="6dp"
android:layout_marginRight="6dp"
android:layout_gravity="center_vertical"
android:contentDescription="@string/hint_icon_name"
app:tint="?attr/colorOnSurface"
android:scaleType="fitXY" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/group_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start|center_vertical"
android:text="@string/root"
android:maxLines="2"
android:ellipsize="end"
style="@style/KeepassDXStyle.SubTitle.OnSurface"
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/group_separator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_arrow_right_white_24dp"
app:tint="?attr/colorOnSurface"
android:importantForAccessibility="no"
android:layout_marginEnd="6dp"
android:layout_marginRight="6dp"
tools:targetApi="jelly_bean" />
</LinearLayout>
</com.google.android.material.card.MaterialCardView>

86
app/src/main/res/layout/item_breadcrumb_important.xml Normal file
View File

@@ -0,0 +1,86 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2021 Jeremy Jamet / Kunzisoft.
This file is part of KeePassDX.
KeePassDX is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
KeePassDX is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
-->
<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/breadcrumb_group"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:minHeight="@dimen/min_height_breadcrumb"
android:background="?android:attr/selectableItemBackground"
style="@style/KeepassDXStyle.Cardview.Surface.Small">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginHorizontal="5dp"
android:gravity="center"
android:layout_gravity="center"
android:baselineAligned="false">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="6dp"
android:layout_marginRight="6dp"
android:gravity="center_vertical">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/group_icon"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_gravity="end|center_vertical"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
app:tint="?attr/colorOnSurface"
android:scaleType="fitXY" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/group_numbers"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="3"
style="@style/KeepassDXStyle.TextAppearance.Info" />
</RelativeLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_gravity="start|center_vertical"
android:layout_marginEnd="6dp"
android:layout_marginRight="6dp"
android:layout_weight="1">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/group_name"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/root"
android:maxLines="2"
android:ellipsize="end"
style="@style/KeepassDXStyle.SubTitle.Important.OnSurface" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/group_meta"
android:layout_height="match_parent"
android:layout_width="match_parent"
tools:text="7543A7EAB2EA7CFD1394F1615EBEB08C"
android:lines="1"
android:singleLine="true"
style="@style/KeepassDXStyle.Text.Meta.OnSurface" />
</LinearLayout>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>

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

@@ -25,203 +25,216 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="?attr/colorPrimary"
android:elevation="4dp"
android:background="?attr/colorSurface"
android:paddingBottom="8dp"
tools:targetApi="lollipop">
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?android:attr/listDivider"/>
<ViewSwitcher
android:id="@+id/file_main_switcher"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/card_view_margin_horizontal"
android:minHeight="48dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/file_container_basic_info"
android:orientation="horizontal"
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?android:attr/selectableItemBackground"
app:layout_constraintTop_toTopOf="parent"
android:elevation="8dp">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/file_alias"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:gravity="center_vertical"
android:layout_marginStart="@dimen/default_margin"
android:layout_marginLeft="@dimen/default_margin"
android:layout_marginEnd="@dimen/default_margin"
android:layout_marginRight="@dimen/default_margin"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/default_file_button"
android:textColor="?attr/colorOnPrimary"
tools:text="DatabaseAlias" />
<androidx.appcompat.widget.AppCompatCheckBox
android:id="@+id/default_file_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/file_information_button"
android:button="@drawable/checkbox_star"
android:buttonTint="?android:attr/textColorSecondaryInverse"
app:buttonTint="?android:attr/textColorSecondaryInverse"
android:gravity="center"
android:contentDescription="@string/default_checkbox" />
<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/file_information_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:src="@drawable/ic_arrow_down_white_24dp"
android:contentDescription="@string/content_description_file_information"
style="@style/KeepassDXStyle.ImageButton.Simple.Secondary"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/file_container_alias_register"
android:orientation="horizontal"
android:layout_height="wrap_content"
style="@style/KeepassDXStyle.Cardview.SurfaceContainer.Small">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/file_container_basic_info"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?android:attr/selectableItemBackground"
app:layout_constraintTop_toTopOf="parent">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/file_alias"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:gravity="center_vertical"
android:layout_marginStart="@dimen/default_margin"
android:layout_marginLeft="@dimen/default_margin"
android:layout_marginEnd="@dimen/default_margin"
android:layout_marginRight="@dimen/default_margin"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/default_file_button"
android:textColor="?attr/colorOnSurface"
tools:text="DatabaseAlias" />
<androidx.appcompat.widget.AppCompatCheckBox
android:id="@+id/default_file_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/file_information_button"
android:button="@drawable/checkbox_star"
android:buttonTint="?attr/colorOnSurface"
app:buttonTint="?attr/colorOnSurface"
android:gravity="center"
android:contentDescription="@string/default_checkbox" />
<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/file_information_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:src="@drawable/ic_arrow_down_white_24dp"
android:contentDescription="@string/content_description_file_information"
style="@style/KeepassDXStyle.ImageButton.OnSurface"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?android:attr/windowBackground"
app:layout_constraintTop_toTopOf="parent"
android:elevation="8dp">
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/file_alias_edit"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:minHeight="48dp"
android:layout_centerVertical="true"
android:maxLines="2"
android:gravity="center_vertical"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginLeft="24dp"
android:layout_marginRight="24dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/file_alias_save"
android:textColor="?android:attr/textColor"
tools:text="DatabaseAlias" />
<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/file_alias_save"
android:layout_width="48dp"
android:layout_height="48dp"
android:padding="12dp"
android:layout_centerVertical="true"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/file_alias_edit"
app:layout_constraintEnd_toEndOf="parent"
android:src="@drawable/ic_save_white_24dp"
android:contentDescription="@string/content_description_file_information"
style="@style/KeepassDXStyle.ImageButton.Simple"/>
</androidx.constraintlayout.widget.ConstraintLayout>
android:layout_height="wrap_content"
style="@style/KeepassDXStyle.Cardview.Surface"
android:layout_marginHorizontal="@dimen/card_view_margin_horizontal">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/file_container_alias_register"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_constraintTop_toTopOf="parent">
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/file_alias_edit"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:minHeight="48dp"
android:layout_centerVertical="true"
android:maxLines="2"
android:gravity="center_vertical"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginLeft="24dp"
android:layout_marginRight="24dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/file_alias_save"
android:textColor="?android:attr/textColor"
tools:text="DatabaseAlias" />
<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/file_alias_save"
android:layout_width="48dp"
android:layout_height="48dp"
android:padding="12dp"
android:layout_centerVertical="true"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/file_alias_edit"
app:layout_constraintEnd_toEndOf="parent"
android:src="@drawable/ic_save_white_24dp"
android:contentDescription="@string/content_description_file_information"
style="@style/KeepassDXStyle.ImageButton.OnSurface"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
</ViewSwitcher>
<androidx.constraintlayout.widget.ConstraintLayout
<FrameLayout
android:id="@+id/file_expand_container"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="@dimen/item_file_info_height"
android:background="?attr/colorPrimaryDark"
app:layout_constraintTop_toBottomOf="@+id/file_main_switcher">
android:layout_height="@dimen/item_file_info_height">
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="match_parent"
style="@style/KeepassDXStyle.Cardview.SurfaceContainer.High"
android:layout_marginHorizontal="@dimen/card_view_margin_horizontal">
<androidx.constraintlayout.widget.ConstraintLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/file_modify_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_mode_edit_white_24dp"
android:scaleX="-1"
android:scaleY="-1"
android:contentDescription="@string/content_description_update_from_list"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:tint="?android:attr/textColorHintInverse"
style="@style/KeepassDXStyle.ImageButton.Simple.Secondary"/>
<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/file_modify_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_mode_edit_white_24dp"
android:scaleX="-1"
android:scaleY="-1"
android:contentDescription="@string/content_description_update_from_list"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:tint="?attr/colorOnSurface"
style="@style/KeepassDXStyle.ImageButton.OnSurface"/>
<LinearLayout
android:id="@+id/file_modification_container"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="start|center_vertical"
android:orientation="vertical"
android:paddingTop="8dp"
android:layout_marginLeft="@dimen/default_margin"
android:layout_marginStart="@dimen/default_margin"
android:layout_marginRight="@dimen/default_margin"
android:layout_marginEnd="@dimen/default_margin"
app:layout_constraintEnd_toStartOf="@+id/file_size"
app:layout_constraintStart_toEndOf="@+id/file_modify_button"
app:layout_constraintTop_toTopOf="parent">
<LinearLayout
android:id="@+id/file_modification_container"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="start|center_vertical"
android:orientation="vertical"
android:paddingTop="8dp"
android:layout_marginLeft="@dimen/default_margin"
android:layout_marginStart="@dimen/default_margin"
android:layout_marginRight="@dimen/default_margin"
android:layout_marginEnd="@dimen/default_margin"
app:layout_constraintEnd_toStartOf="@+id/file_size"
app:layout_constraintStart_toEndOf="@+id/file_modify_button"
app:layout_constraintTop_toTopOf="parent">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/file_modification_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/entry_modified"
android:textColor="?android:attr/textColorSecondaryInverse"
android:textSize="12sp" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/file_modification_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/entry_modified"
android:textColor="?attr/colorOnSurface"
android:textSize="12sp" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/file_modification"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?android:attr/textColorSecondaryInverse"
tools:text="Aug 21, 2020 3:40:14 PM" />
</LinearLayout>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/file_modification"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="Aug 21, 2020 3:40:14 PM"
android:textColor="?attr/colorOnSurface" />
</LinearLayout>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/file_size"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="end|center_vertical"
android:paddingTop="8dp"
android:layout_marginRight="@dimen/default_margin"
android:layout_marginEnd="@dimen/default_margin"
android:textColor="?android:attr/textColorSecondaryInverse"
app:layout_constraintBottom_toBottomOf="@+id/file_modification_container"
app:layout_constraintEnd_toEndOf="parent"
tools:text="8 bytes" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/file_size"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="end|center_vertical"
android:paddingTop="8dp"
android:layout_marginRight="@dimen/default_margin"
android:layout_marginEnd="@dimen/default_margin"
app:layout_constraintBottom_toBottomOf="@+id/file_modification_container"
app:layout_constraintEnd_toEndOf="parent"
tools:text="8 bytes"
android:textColor="?attr/colorOnSurface" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/file_delete_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/content_description_remove_from_list"
android:src="@drawable/ic_content_delete_white_24dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:tint="?android:attr/textColorSecondaryInverse"
style="@style/KeepassDXStyle.ImageButton.Simple.Secondary"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/file_delete_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/content_description_remove_from_list"
android:src="@drawable/ic_content_delete_white_24dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:tint="?attr/colorOnSecondaryContainer"
style="@style/KeepassDXStyle.ImageButton.OnSurface"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/file_path"
android:textIsSelectable="true"
android:layout_width="0dp"
android:layout_height="0dp"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:paddingLeft="12dp"
android:paddingRight="12dp"
app:layout_constraintTop_toBottomOf="@+id/file_modification_container"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/file_delete_button"
app:layout_constraintEnd_toEndOf="parent"
tools:text="/path/to/DatabaseName.kdbx"
android:textColor="?android:attr/textColorSecondaryInverse"
android:gravity="center_vertical|end"
android:textStyle="italic"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/file_path"
android:textIsSelectable="true"
android:layout_width="0dp"
android:layout_height="0dp"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:paddingLeft="12dp"
android:paddingRight="12dp"
app:layout_constraintTop_toBottomOf="@+id/file_modification_container"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/file_delete_button"
app:layout_constraintEnd_toEndOf="parent"
tools:text="/path/to/DatabaseName.kdbx"
android:gravity="center_vertical|end"
android:textStyle="italic"
android:textColor="?attr/colorOnSurface"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
</FrameLayout>
</LinearLayout>

76
app/src/main/res/layout/item_group.xml
View File

@@ -1,76 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2021 Jeremy Jamet / Kunzisoft.
This file is part of KeePassDX.
KeePassDX is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
KeePassDX is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/breadcrumb_group"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="horizontal"
android:gravity="center_vertical"
android:baselineAligned="false"
android:background="?android:attr/selectableItemBackground">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="6dp"
android:layout_marginRight="6dp"
android:gravity="center_vertical">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/group_icon"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_gravity="end|center_vertical"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:scaleType="fitXY" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/group_numbers"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="3"
style="@style/KeepassDXStyle.TextAppearance.Info" />
</RelativeLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_gravity="start|center_vertical"
android:layout_marginEnd="6dp"
android:layout_marginRight="6dp"
android:layout_weight="1">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/group_name"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/root"
android:maxLines="2"
android:ellipsize="end"
style="@style/KeepassDXStyle.TextAppearance.Title.TextOnPrimary" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/group_meta"
android:layout_height="match_parent"
android:layout_width="match_parent"
tools:text="7543A7EAB2EA7CFD1394F1615EBEB08C"
android:lines="1"
android:singleLine="true"
style="@style/KeepassDXStyle.TextAppearance.Meta.TextOnPrimary" />
</LinearLayout>
</LinearLayout>

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

@@ -5,11 +5,10 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:background="?attr/colorSurface"
android:gravity="bottom"
android:orientation="vertical"
android:layout_marginBottom="6dp"
android:elevation="4dp"
android:paddingTop="36dp"
android:paddingLeft="@dimen/default_margin"
android:paddingRight="@dimen/default_margin"
@@ -26,7 +25,7 @@
android:paddingLeft="8dp"
android:paddingEnd="8dp"
android:paddingRight="8dp"
style="@style/KeepassDXStyle.TextAppearance.Secondary.TextOnPrimary"
style="@style/KeepassDXStyle.Text.Info.OnSurface"
android:textSize="11sp"
tools:text="version"
android:textIsSelectable="true" />
@@ -70,7 +69,7 @@
<TextView
android:id="@+id/nav_database_name"
style="@style/KeepassDXStyle.TextAppearance.Title.TextOnPrimary"
style="@style/KeepassDXStyle.Title.OnSurface"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="6dp"
@@ -83,7 +82,7 @@
<TextView
android:id="@+id/nav_database_path"
style="@style/KeepassDXStyle.TextAppearance.Secondary.TextOnPrimary"
style="@style/KeepassDXStyle.Text.Info.OnSurface"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"

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

@@ -66,7 +66,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/enable"
android:theme="?attr/switchAppearance"
android:layout_marginTop="8dp"
android:layout_marginStart="20dp"
android:layout_marginLeft="20dp"

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

@@ -41,9 +41,9 @@
android:layout_height="wrap_content"
android:layout_margin="24dp"
android:text="@string/enable"
android:background="@drawable/background_button_small"
android:background="@drawable/background_switch"
android:backgroundTint="?attr/colorSecondary"
android:textColor="?attr/colorOnSecondary"
android:theme="?attr/switchAppearance"
android:minHeight="48dp"/>
<androidx.constraintlayout.widget.ConstraintLayout

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

@@ -43,7 +43,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/enable"
android:theme="?attr/switchAppearance"
app:layout_constraintTop_toBottomOf="@+id/explanation_text"
app:layout_constraintStart_toStartOf="parent"
android:minHeight="48dp"/>

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

@@ -43,7 +43,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/enable"
android:theme="?attr/switchAppearance"
app:layout_constraintTop_toBottomOf="@+id/explanation_text"
app:layout_constraintStart_toStartOf="parent"
android:minHeight="48dp"/>

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

@@ -42,7 +42,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/enable"
android:theme="?attr/switchAppearance"
app:layout_constraintTop_toBottomOf="@+id/explanation_text"
app:layout_constraintStart_toStartOf="parent"
android:minHeight="48dp"/>

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

@@ -4,7 +4,6 @@
android:id="@+id/switchWidget"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:theme="?attr/switchAppearance"
android:focusable="false"
android:clickable="false"
android:background="@null" />

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

@@ -17,14 +17,9 @@
You should have received a copy of the GNU General Public License
along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
-->
<androidx.appcompat.widget.Toolbar
<com.google.android.material.appbar.MaterialToolbar
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/toolbar"
android:title="@string/app_name"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="?attr/toolbarAppearance"
android:elevation="4dp"
tools:targetApi="lollipop" />
android:layout_height="wrap_content" />

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

@@ -18,7 +18,6 @@
along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:filterTouchesWhenObscured="true"
@@ -35,28 +34,17 @@
android:layout_marginBottom="-12dp"
android:descendantFocusability="blocksDescendants"
android:visibility="gone">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_add_entry"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:text="@string/add_entry"
style="@style/KeepassDXStyle.FabMenu"
tools:ignore="UnusedAttribute" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
android:id="@+id/fab_add_entry"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="@dimen/button_small_size"
android:layout_gravity="center_horizontal"
android:layout_marginRight="@dimen/image_button_margin"
android:layout_marginEnd="@dimen/image_button_margin"
android:src="@drawable/ic_key_white_24dp"
app:icon="@drawable/ic_key_white_24dp"
android:contentDescription="@string/add_entry"
app:tint="?attr/colorOnSecondary"
app:backgroundTint="?attr/colorSecondary"
app:fabSize="mini"
app:fabCustomSize="@dimen/button_small_size"
app:useCompatPadding="true" />
style="@style/KeepassDXStyle.Fab.Menu"
android:text="@string/add_entry" />
</LinearLayout>
<LinearLayout
@@ -70,27 +58,16 @@
android:layout_marginBottom="-12dp"
android:descendantFocusability="blocksDescendants"
android:visibility="gone">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_add_group"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/add_group"
style="@style/KeepassDXStyle.FabMenu"
tools:ignore="UnusedAttribute" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
android:id="@+id/fab_add_group"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="@dimen/button_small_size"
android:layout_marginRight="@dimen/image_button_margin"
android:layout_marginEnd="@dimen/image_button_margin"
android:src="@drawable/ic_folder_white_24dp"
app:icon="@drawable/ic_folder_white_24dp"
android:contentDescription="@string/add_group"
app:tint="?attr/colorOnSecondary"
app:backgroundTint="?attr/colorSecondary"
app:fabSize="mini"
app:fabCustomSize="@dimen/button_small_size"
app:useCompatPadding="true" />
style="@style/KeepassDXStyle.Fab.Menu"
android:text="@string/add_group"/>
</LinearLayout>
<com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -103,8 +80,6 @@
android:layout_alignParentBottom="true"
android:contentDescription="@string/content_description_add_node"
android:src="@drawable/ic_add_white_24dp"
app:tint="?attr/colorOnSecondary"
app:fabSize="normal"
app:useCompatPadding="true" />
</RelativeLayout>

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

@@ -10,8 +10,6 @@
style="@style/KeepassDXStyle.Fab.Special"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:fabSize="mini"
app:fabCustomSize="@dimen/button_small_size"
app:useCompatPadding="false"
android:layout_margin="8dp"
android:contentDescription="@string/lock"

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

@@ -36,6 +36,5 @@
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="@+id/expiration_label"
app:layout_constraintBottom_toBottomOf="@+id/expiration_label"
android:theme="?attr/switchAppearance"
app:layout_constraintEnd_toEndOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -27,8 +27,7 @@
android:layout_height="wrap_content"
android:layout_toStartOf="@+id/password_checkbox"
android:layout_toLeftOf="@+id/password_checkbox"
app:endIconMode="password_toggle"
app:endIconTint="?attr/colorSecondary">
app:endIconMode="password_toggle">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/password_text_view"
@@ -57,7 +56,6 @@
android:layout_marginStart="12dp"
android:layout_marginLeft="12dp"
android:contentDescription="@string/content_description_password_checkbox"
android:theme="?attr/switchAppearance"
android:focusable="false"
android:gravity="center_vertical" />
</RelativeLayout>
@@ -90,7 +88,6 @@
android:layout_marginStart="12dp"
android:layout_marginLeft="12dp"
android:contentDescription="@string/content_description_keyfile_checkbox"
android:theme="?attr/switchAppearance"
android:focusable="false"
android:gravity="center_vertical" />
</RelativeLayout>
@@ -122,7 +119,6 @@
android:layout_marginStart="12dp"
android:layout_marginLeft="12dp"
android:contentDescription="@string/content_description_hardware_key_checkbox"
android:theme="?attr/switchAppearance"
android:focusable="false"
android:gravity="center_vertical" />
</RelativeLayout>

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

@@ -5,13 +5,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:filterTouchesWhenObscured="true"
android:minHeight="?attr/actionBarSize"
android:orientation="vertical">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/search_container"
android:layout_width="match_parent"
android:background="?attr/colorPrimary"
android:layout_height="?attr/actionBarSize"
android:layout_height="wrap_content"
android:background="?attr/colorSurfaceContainer"
android:visibility="gone">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/search_numbers"
@@ -61,13 +60,13 @@
style="@style/KeepassDXStyle.ImageButton.Simple"
android:contentDescription="@string/search_filters"
android:src="@drawable/ic_list_white_24dp"
app:tint="?attr/colorOnPrimary"/>
app:tint="?attr/colorOnSurface"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:id="@+id/search_advance_filters"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:background="?attr/colorSurfaceContainer"
android:orientation="vertical">
<com.google.android.material.chip.ChipGroup
android:layout_width="match_parent"

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

@@ -25,23 +25,24 @@
</style>
<style name="KeepassDXStyle.Light.v21" parent="KeepassDXStyle.Light.v14" >
<item name="preferenceTheme">@style/KeepassDXStyle.Preference.v21</item>
<item name="android:statusBarColor">?attr/colorPrimaryDark</item>
<item name="android:navigationBarColor">?attr/colorPrimaryDark</item>
<item name="android:statusBarColor">?attr/colorSurface</item>
<item name="android:navigationBarColor">?attr/colorSurface</item>
<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.v21" parent="KeepassDXStyle.Light.Base" >
<item name="android:statusBarColor">@color/grey_darker</item>
<item name="android:navigationBarColor">@color/grey_darker</item>
</style>
<style name="KeepassDXStyle.Night.v21" parent="KeepassDXStyle.Night.v14" >
<item name="preferenceTheme">@style/KeepassDXStyle.Preference.v21</item>
<item name="android:statusBarColor">?attr/colorPrimaryDark</item>
<item name="android:navigationBarColor">?attr/colorPrimaryDark</item>
<item name="android:statusBarColor">?attr/colorSurface</item>
<item name="android:navigationBarColor">?attr/colorSurface</item>
<item name="android:timePickerDialogTheme">@style/KeepassDXStyle.Night.DateTime.Dialog</item>
<item name="android:datePickerDialogTheme">@style/KeepassDXStyle.Night.DateTime.Dialog</item>
</style>
<!-- Toolbar -->
<style name="KeepassDXStyle.Toolbar.v21" parent="KeepassDXStyle.Toolbar.Base">
<item name="android:elevation">0dp</item>
</style>
<!-- Preference Theme -->
<style name="KeepassDXStyle.Preference.v21" parent="@style/PreferenceThemeOverlay.v14.Material">
<item name="android:tint">?attr/iconPreferenceColor</item>
@@ -52,13 +53,8 @@
<item name="android:elevation">4dp</item>
</style>
<!-- FAB -->
<style name="KeepassDXStyle.v21.Fab" parent="Widget.Design.FloatingActionButton">
<item name="android:elevation">4dp</item>
</style>
<!-- Menu FAB -->
<style name="KeepassDXStyle.v21.FabMenu" parent="KeepassDXStyle.TextAppearance.Default.TextOnPrimary">
<style name="KeepassDXStyle.Fab.MenuText.v21" parent="android:style/TextAppearance">
<item name="android:elevation">2dp</item>
</style>
</resources>

10
app/src/main/res/values-v21/styles_divine.xml
View File

@@ -18,17 +18,11 @@
along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
-->
<resources>
<style name="KeepassDXStyle.White.v21" parent="KeepassDXStyle.White.Base" >
<item name="preferenceTheme">@style/KeepassDXStyle.Preference.v21</item>
<item name="android:statusBarColor">@color/grey_dark</item>
<item name="android:navigationBarColor">@color/grey_dark</item>
<style name="KeepassDXStyle.White.v21" parent="KeepassDXStyle.White.Base">
<item name="android:timePickerDialogTheme">@style/KeepassDXStyle.White.DateTime.Dialog</item>
<item name="android:datePickerDialogTheme">@style/KeepassDXStyle.White.DateTime.Dialog</item>
</style>
<style name="KeepassDXStyle.Black" parent="KeepassDXStyle.Black.v21" >
<item name="preferenceTheme">@style/KeepassDXStyle.Preference.v21</item>
<item name="android:statusBarColor">?attr/colorPrimaryDark</item>
<item name="android:navigationBarColor">?attr/colorPrimaryDark</item>
<style name="KeepassDXStyle.Black.v21" parent="KeepassDXStyle.Black.Base">
<item name="android:timePickerDialogTheme">@style/KeepassDXStyle.Black.DateTime.Dialog</item>
<item name="android:datePickerDialogTheme">@style/KeepassDXStyle.Black.DateTime.Dialog</item>
</style>

10
app/src/main/res/values-v23/styles.xml
View File

@@ -19,11 +19,11 @@
-->
<resources>
<style name="KeepassDXStyle.Light.v23" parent="KeepassDXStyle.Light.v21" >
<item name="android:statusBarColor">?attr/colorPrimaryDark</item>
<item name="android:windowLightStatusBar">false</item>
</style>
<style name="KeepassDXStyle.Light.WhiteBar.v23" parent="KeepassDXStyle.Light.WhiteBar.v21" >
<item name="android:statusBarColor">@color/white</item>
<item name="android:statusBarColor">?attr/colorSurface</item>
<item name="android:windowLightStatusBar">true</item>
</style>
<style name="KeepassDXStyle.Night.v23" parent="KeepassDXStyle.Night.v21" >
<item name="android:statusBarColor">?attr/colorSurface</item>
<item name="android:windowLightStatusBar">false</item>
</style>
</resources>

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

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

4
app/src/main/res/values-v27/styles.xml
View File

@@ -19,11 +19,11 @@
-->
<resources>
<style name="KeepassDXStyle.Light.v27" parent="KeepassDXStyle.Light.v23" >
<item name="android:navigationBarColor">@color/green_white_dark</item>
<item name="android:navigationBarColor">?attr/colorSurface</item>
<item name="android:windowLightNavigationBar">true</item>
</style>
<style name="KeepassDXStyle.Night.v27" parent="KeepassDXStyle.Night.v23" >
<item name="android:navigationBarColor">@color/green_black</item>
<item name="android:navigationBarColor">?attr/colorSurface</item>
<item name="android:windowLightNavigationBar">false</item>
</style>
</resources>

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

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

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

@@ -18,12 +18,8 @@
along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
-->
<resources>
<attr name="toolbarAppearance" format="reference" />
<attr name="toolbarHomeAppearance" format="reference" />
<attr name="toolbarSpecialAppearance" format="reference" />
<attr name="toolbarActionAppearance" format="reference" />
<attr name="switchAppearance" format="reference" />
<attr name="toolbarSpecialStyle" format="reference" />
<attr name="toolbarActionStyle" format="reference" />
<attr name="chipFilterTextColor" format="color" />
<attr name="chipFilterBackgroundColor" format="color" />
@@ -31,7 +27,6 @@
<attr name="cardBackgroundTransparentColor" format="reference|color" />
<attr name="iconPreferenceColor" format="reference|color" />
<attr name="toolbarColorControl" format="reference|color" />
<attr name="educationCircleColor" format="reference|color" />
<attr name="educationTextColor" format="reference|color" />

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

@@ -125,4 +125,66 @@
<color name="reply_black_dark">#27343A</color>
<color name="reply_grey">#414445</color>
<color name="md_theme_light_primary">#006E1C</color>
<color name="md_theme_light_onPrimary">#FFFFFF</color>
<color name="md_theme_light_primaryContainer">#98F994</color>
<color name="md_theme_light_onPrimaryContainer">#002204</color>
<color name="md_theme_light_secondary">#8F4E00</color>
<color name="md_theme_light_onSecondary">#FFFFFF</color>
<color name="md_theme_light_secondaryContainer">#FFDCC2</color>
<color name="md_theme_light_onSecondaryContainer">#2E1500</color>
<color name="md_theme_light_tertiary">#835500</color>
<color name="md_theme_light_onTertiary">#FFFFFF</color>
<color name="md_theme_light_tertiaryContainer">#FFDDB4</color>
<color name="md_theme_light_onTertiaryContainer">#291800</color>
<color name="md_theme_light_error">#BA1A1A</color>
<color name="md_theme_light_errorContainer">#FFDAD6</color>
<color name="md_theme_light_onError">#FFFFFF</color>
<color name="md_theme_light_onErrorContainer">#410002</color>
<color name="md_theme_light_background">#FCFDF6</color>
<color name="md_theme_light_onBackground">#1A1C19</color>
<color name="md_theme_light_surface">#FCFDF6</color>
<color name="md_theme_light_onSurface">#1A1C19</color>
<color name="md_theme_light_surfaceVariant">#DEE5D8</color>
<color name="md_theme_light_onSurfaceVariant">#424940</color>
<color name="md_theme_light_outline">#72796F</color>
<color name="md_theme_light_inverseOnSurface">#F0F1EB</color>
<color name="md_theme_light_inverseSurface">#2F312D</color>
<color name="md_theme_light_inversePrimary">#7DDC7A</color>
<color name="md_theme_light_shadow">#000000</color>
<color name="md_theme_light_surfaceTint">#006E1C</color>
<color name="md_theme_light_outlineVariant">#C2C9BD</color>
<color name="md_theme_light_scrim">#000000</color>
<color name="md_theme_dark_primary">#7DDC7A</color>
<color name="md_theme_dark_onPrimary">#00390A</color>
<color name="md_theme_dark_primaryContainer">#005313</color>
<color name="md_theme_dark_onPrimaryContainer">#98F994</color>
<color name="md_theme_dark_secondary">#FFB77B</color>
<color name="md_theme_dark_onSecondary">#4C2700</color>
<color name="md_theme_dark_secondaryContainer">#6D3A00</color>
<color name="md_theme_dark_onSecondaryContainer">#FFDCC2</color>
<color name="md_theme_dark_tertiary">#FFB953</color>
<color name="md_theme_dark_onTertiary">#452B00</color>
<color name="md_theme_dark_tertiaryContainer">#633F00</color>
<color name="md_theme_dark_onTertiaryContainer">#FFDDB4</color>
<color name="md_theme_dark_error">#FFB4AB</color>
<color name="md_theme_dark_errorContainer">#93000A</color>
<color name="md_theme_dark_onError">#690005</color>
<color name="md_theme_dark_onErrorContainer">#FFDAD6</color>
<color name="md_theme_dark_background">#1A1C19</color>
<color name="md_theme_dark_onBackground">#E2E3DD</color>
<color name="md_theme_dark_surface">#1A1C19</color>
<color name="md_theme_dark_onSurface">#E2E3DD</color>
<color name="md_theme_dark_surfaceVariant">#424940</color>
<color name="md_theme_dark_onSurfaceVariant">#C2C9BD</color>
<color name="md_theme_dark_outline">#8C9388</color>
<color name="md_theme_dark_inverseOnSurface">#1A1C19</color>
<color name="md_theme_dark_inverseSurface">#E2E3DD</color>
<color name="md_theme_dark_inversePrimary">#006E1C</color>
<color name="md_theme_dark_shadow">#000000</color>
<color name="md_theme_dark_surfaceTint">#7DDC7A</color>
<color name="md_theme_dark_outlineVariant">#424940</color>
<color name="md_theme_dark_scrim">#000000</color>
</resources>

4
app/src/main/res/values/dimens.xml
View File

@@ -33,7 +33,9 @@
<dimen name="lock_button_size">48dp</dimen>
<dimen name="hidden_lock_button_size">0dp</dimen>
<dimen name="content_percent">1</dimen>
<dimen name="toolbar_parallax_height">160dp</dimen>
<dimen name="dialog_radius">16dp</dimen>
<dimen name="card_radius">12dp</dimen>
<dimen name="small_card_radius">48dp</dimen>
<dimen name="min_height_breadcrumb">48dp</dimen>
<integer name="animation_duration">260</integer>
</resources>

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

@@ -27,7 +27,7 @@
</style>
<style name="KeepassDXStyle.SplashScreen" parent="KeepassDXStyle.SplashScreen.v21"/>
<!-- Light application theme -->
<!-- Light WhiteBar Style -->
<style name="KeepassDXStyle.Light" parent="KeepassDXStyle.Light.v27" />
<style name="KeepassDXStyle.Light.v27" parent="KeepassDXStyle.Light.v23" />
<style name="KeepassDXStyle.Light.v23" parent="KeepassDXStyle.Light.v21" />
@@ -35,35 +35,52 @@
<style name="KeepassDXStyle.Light.v14" parent="KeepassDXStyle.Light.Base" />
<style name="KeepassDXStyle.Light.Base" parent="Theme.Material3.Light">
<item name="colorPrimary">@color/green</item>
<item name="colorPrimaryDark">?attr/colorSurface</item>
<item name="colorOnPrimary">@color/md_theme_light_onPrimary</item>
<item name="colorPrimaryContainer">@color/md_theme_light_primaryContainer</item>
<item name="colorOnPrimaryContainer">@color/md_theme_light_onPrimaryContainer</item>
<item name="colorSecondary">@color/orange</item>
<item name="colorOnSecondary">@color/md_theme_light_onSecondary</item>
<item name="colorSecondaryContainer">@color/md_theme_light_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/md_theme_light_onSecondaryContainer</item>
<item name="colorTertiary">@color/md_theme_light_tertiary</item>
<item name="colorOnTertiary">@color/md_theme_light_onTertiary</item>
<item name="colorTertiaryContainer">@color/md_theme_light_tertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/md_theme_light_onTertiaryContainer</item>
<item name="colorError">@color/md_theme_light_error</item>
<item name="colorErrorContainer">@color/md_theme_light_errorContainer</item>
<item name="colorOnError">@color/md_theme_light_onError</item>
<item name="colorOnErrorContainer">@color/md_theme_light_onErrorContainer</item>
<item name="android:colorBackground">@color/md_theme_light_background</item>
<item name="colorOnBackground">@color/md_theme_light_onBackground</item>
<item name="colorSurface">@color/md_theme_light_surface</item>
<item name="colorOnSurface">@color/md_theme_light_onSurface</item>
<item name="colorSurfaceContainerLowest">#F7FAF6</item>
<item name="colorSurfaceContainerLow">#F0F8EF</item>
<item name="colorSurfaceContainer">#F1FBEF</item>
<item name="colorSurfaceContainerHigh">#E5F8E2</item>
<item name="colorSurfaceContainerHighest">#E0FADC</item>
<item name="colorSurfaceVariant">@color/md_theme_light_surfaceVariant</item>
<item name="colorOnSurfaceVariant">@color/md_theme_light_onSurfaceVariant</item>
<item name="colorOutline">@color/md_theme_light_outline</item>
<item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>
<item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
<item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item>
<item name="windowNoTitle">true</item>
<item name="windowActionBar">false</item>
<item name="android:buttonStyle">@style/KeepassDXStyle.Button.Primary</item>
<item name="buttonStyle">@style/KeepassDXStyle.Button.Primary</item>
<item name="materialButtonStyle">@style/KeepassDXStyle.Button.Primary</item>
<item name="android:fitsSystemWindows">false</item>
<item name="android:windowBackground">?attr/colorSurfaceContainerLowest</item>
<item name="android:imageButtonStyle">@style/KeepassDXStyle.ImageButton</item>
<item name="imageButtonStyle">@style/KeepassDXStyle.ImageButton</item>
<item name="android:checkboxStyle">@style/KeepassDXStyle.CheckBox</item>
<item name="colorPrimary">@color/green</item>
<item name="colorPrimaryDark">@color/green_dark</item>
<item name="colorOnPrimary">@color/white</item>
<item name="colorSecondary">@color/orange</item>
<item name="colorOnSecondary">@color/white</item>
<item name="colorTertiary">@color/green_lightest</item>
<item name="colorOnTertiary">@color/green_white_dark</item>
<item name="colorSurface">@color/green_white</item>
<item name="colorOnSurface">@color/text_color_light</item>
<item name="colorControlNormal">@color/grey_lighter</item>
<item name="colorControlActivated">@color/orange</item>
<item name="android:textAppearance">@style/KeepassDXStyle.TextAppearance</item>
<item name="android:textAppearanceMedium">@style/KeepassDXStyle.TextAppearance</item>
<item name="android:windowBackground">@color/green_white_dark</item>
<item name="cardBackgroundTransparentColor">#DDFFFFFF</item>
<item name="android:textColor">@color/text_color_light</item>
@@ -83,17 +100,16 @@
<item name="alertDialogTheme">@style/KeepassDXStyle.Light.Dialog</item>
<!-- CardView -->
<item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Light</item>
<item name="materialCardViewStyle">@style/KeepassDXStyle.Cardview</item>
<item name="cardViewStyle">@style/KeepassDXStyle.Cardview</item>
<!-- Toolbar -->
<item name="toolbarStyle">@style/Widget.AppCompat.Toolbar</item>
<item name="toolbarColorControl">@color/white</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Light</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Light</item>
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Light</item>
<item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Light</item>
<item name="expandedTitleTextAppearance">@style/KeepassDXStyle.Expanded.Title</item>
<item name="collapsedTitleTextAppearance">@style/KeepassDXStyle.Collapsed.Title</item>
<item name="collapsingToolbarLayoutStyle">@style/KeepassDXStyle.CollapsingLayout</item>
<item name="collapsedTitleTextColor">@color/white</item>
<item name="expandedTitleTextColor">@color/white</item>
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar</item>
<item name="toolbarSpecialStyle">@style/KeepassDXStyle.Toolbar.Special</item>
<item name="toolbarActionStyle">@style/KeepassDXStyle.Toolbar.Action</item>
<!-- Tab -->
<item name="tabStyle">@style/KeepassDXStyle.TabLayout</item>
@@ -102,7 +118,6 @@
<item name="android:switchPreferenceStyle">@style/KeepassDXStyle.SwitchPreference</item>
<item name="switchPreferenceStyle">@style/KeepassDXStyle.SwitchPreference</item>
<item name="switchPreferenceCompatStyle">@style/KeepassDXStyle.SwitchPreference</item>
<item name="switchAppearance">@style/KeepassDXStyle.Switch.Light</item>
<!-- Chip -->
<item name="chipFilterTextColor">@color/white</item>
@@ -131,10 +146,6 @@
<item name="windowNoTitle">true</item>
<item name="windowActionBar">false</item>
<item name="android:buttonStyle">@style/KeepassDXStyle.Button.Primary</item>
<item name="buttonStyle">@style/KeepassDXStyle.Button.Primary</item>
<item name="materialButtonStyle">@style/KeepassDXStyle.Button.Primary</item>
<item name="android:imageButtonStyle">@style/KeepassDXStyle.ImageButton</item>
<item name="imageButtonStyle">@style/KeepassDXStyle.ImageButton</item>
@@ -142,16 +153,12 @@
<item name="colorPrimary">@color/green</item>
<item name="colorPrimaryDark">@color/green_dark</item>
<item name="colorOnPrimary">@color/white</item>
<item name="colorSecondary">@color/orange</item>
<item name="colorOnSecondary">@color/white</item>
<item name="colorTertiary">@color/green_black_light</item>
<item name="colorOnTertiary">@color/green_black</item>
<item name="colorSurface">@color/green_black_light</item>
<item name="colorOnSurface">@color/text_color_night</item>
<item name="colorPrimaryContainer">@color/green</item>
<item name="colorControlNormal">@color/grey_lighter</item>
<item name="colorControlActivated">@color/orange</item>
<item name="colorSecondary">@color/orange</item>
<item name="colorTertiary">@color/green_black_light</item>
<item name="colorSurface">@color/green_black</item>
<item name="android:textAppearance">@style/KeepassDXStyle.TextAppearance</item>
<item name="android:textAppearanceMedium">@style/KeepassDXStyle.TextAppearance</item>
@@ -176,17 +183,14 @@
<item name="alertDialogTheme">@style/KeepassDXStyle.Night.Dialog</item>
<!-- CardView -->
<item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Night</item>
<item name="materialCardViewStyle">@style/KeepassDXStyle.Cardview</item>
<item name="cardViewStyle">@style/KeepassDXStyle.Cardview</item>
<!-- Toolbar -->
<item name="toolbarStyle">@style/Widget.AppCompat.Toolbar</item>
<item name="toolbarColorControl">@color/white</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Night</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Night</item>
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Night</item>
<item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Night</item>
<item name="expandedTitleTextAppearance">@style/KeepassDXStyle.Expanded.Title</item>
<item name="collapsedTitleTextAppearance">@style/KeepassDXStyle.Collapsed.Title</item>
<item name="collapsingToolbarLayoutStyle">@style/KeepassDXStyle.CollapsingLayout</item>
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar</item>
<item name="toolbarSpecialStyle">@style/KeepassDXStyle.Toolbar.Special</item>
<item name="toolbarActionStyle">@style/KeepassDXStyle.Toolbar.Action</item>
<!-- Tab -->
<item name="tabStyle">@style/KeepassDXStyle.TabLayout</item>
@@ -195,7 +199,6 @@
<item name="android:switchPreferenceStyle">@style/KeepassDXStyle.SwitchPreference</item>
<item name="switchPreferenceStyle">@style/KeepassDXStyle.SwitchPreference</item>
<item name="switchPreferenceCompatStyle">@style/KeepassDXStyle.SwitchPreference</item>
<item name="switchAppearance">@style/KeepassDXStyle.Switch.Night</item>
<!-- Chip -->
<item name="chipFilterTextColor">@color/white</item>
@@ -213,103 +216,39 @@
<item name="snackbarStyle">@style/KeepassDXStyle.SnackBar</item>
</style>
<!-- Light WhiteBar Style -->
<style name="KeepassDXStyle.Light.WhiteBar" parent="KeepassDXStyle.Light.WhiteBar.v27" />
<style name="KeepassDXStyle.Light.WhiteBar.v27" parent="KeepassDXStyle.Light.WhiteBar.v23" />
<style name="KeepassDXStyle.Light.WhiteBar.v23" parent="KeepassDXStyle.Light.WhiteBar.v21" />
<style name="KeepassDXStyle.Light.WhiteBar.v21" parent="KeepassDXStyle.Light.WhiteBar.Base" />
<style name="KeepassDXStyle.Light.WhiteBar.Base" parent="KeepassDXStyle.Light" />
<!-- Toolbar Style -->
<style name="KeepassDXStyle.Toolbar.Light" parent="KeepassDXStyle.Light.v21">
<item name="colorControlNormal">@color/white</item>
<item name="android:textColorPrimary">@color/white</item>
<item name="android:textColorSecondary">@color/white</item>
<item name="android:editTextColor">@color/white</item>
<item name="android:textColorHint">@color/green_lightest</item>
<item name="android:tint">@color/white</item>
<style name="KeepassDXStyle.Toolbar.Base" parent="Widget.Material3.Toolbar.Surface" />
<style name="KeepassDXStyle.Toolbar.v21" parent="KeepassDXStyle.Toolbar.Base" />
<style name="KeepassDXStyle.Toolbar" parent="KeepassDXStyle.Toolbar.v21" >
<item name="elevation">0dp</item>
</style>
<style name="KeepassDXStyle.Toolbar.Night" parent="KeepassDXStyle.Night.v21">
<item name="colorControlNormal">@color/white</item>
<item name="android:textColorPrimary">@color/white</item>
<item name="android:textColorSecondary">@color/white</item>
<item name="android:editTextColor">@color/white</item>
<item name="android:textColorHint">@color/green_lightest</item>
<item name="android:tint">@color/white</item>
<style name="KeepassDXStyle.CollapsingLayout" parent="Widget.Material3.CollapsingToolbar">
<item name="android:background">?attr/colorSurface</item>
<item name="background">?attr/colorSurface</item>
<item name="contentScrim">?attr/colorSurface</item>
</style>
<!-- Toolbar Home -->
<style name="KeepassDXStyle.Toolbar.Navigation.Tinted" parent="Widget.AppCompat.Toolbar.Button.Navigation">
<item name="tint">?android:attr/textColorSecondaryInverse</item>
<style name="KeepassDXStyle.Toolbar.Transparent" parent="Widget.Material3.Toolbar">
<item name="android:background">@color/transparent</item>
<item name="background">@color/transparent</item>
</style>
<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.Toolbar.Night">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<!-- 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.Special.Night" parent="KeepassDXStyle.Toolbar.Night">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special.Green</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Special" parent="Widget.Material3.Toolbar">
<style name="KeepassDXStyle.Toolbar.Special" parent="KeepassDXStyle.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>
<item name="android:background">?attr/colorSurfaceContainer</item>
</style>
<style name="KeepassDXStyle.TextAppearance.Toolbar.Special.Title" parent="KeepassDXStyle.TextAppearance.Small">
<item name="android:textColor">?android:attr/textColorHintInverse</item>
<item name="android:textColor">?attr/colorOnSurface</item>
</style>
<style name="KeepassDXStyle.TextAppearance.Toolbar.Special.SubTitle" parent="KeepassDXStyle.TextAppearance.Tiny">
<item name="android:textColor">?attr/colorControlNormal</item>
<item name="android:textColor">?attr/colorOnSurfaceVariant</item>
</style>
<!-- Action Style -->
<style name="KeepassDXStyle.Toolbar.Action.Light" parent="KeepassDXStyle.Toolbar.Light">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Green</item>
</style>
<style name="KeepassDXStyle.Toolbar.Action.Night" parent="KeepassDXStyle.Toolbar.Night">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Green</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Action.Green" parent="Widget.Material3.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>
<style name="KeepassDXStyle.Toolbar.Action" parent="KeepassDXStyle.Toolbar" />
<!-- Edit Text -->
<style name="ThemeOverlay.KeepassDXTheme.TextInputEditText" parent="ThemeOverlay.Material3.TextInputEditText.OutlinedBox">
<item name="colorControlActivated">?attr/colorSecondary</item>
</style>
<style name="ThemeOverlay.KeepassDXTheme.CompleteTextView" parent="ThemeOverlay.Material3.AutoCompleteTextView.OutlinedBox">
<item name="colorControlActivated">?attr/colorSecondary</item>
</style>
<style name="KeepassDXStyle.TextInputLayout" parent="Widget.Material3.TextInputLayout.OutlinedBox">
<item name="android:paddingTop">2dp</item>
<item name="android:paddingBottom">2dp</item>
<item name="boxStrokeColor">@color/edit_text_stroke_color</item>
<item name="hintTextColor">?attr/colorSecondary</item>
<item name="materialThemeOverlay">@style/ThemeOverlay.KeepassDXTheme.TextInputEditText</item>
</style>
<style name="KeepassDXStyle.TextInputLayout.ExposedMenu" parent="Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu">
<item name="android:paddingTop">2dp</item>
<item name="android:paddingBottom">2dp</item>
<item name="boxStrokeColor">@color/edit_text_stroke_color</item>
<item name="hintTextColor">?attr/colorSecondary</item>
<item name="materialThemeOverlay">@style/ThemeOverlay.KeepassDXTheme.CompleteTextView</item>
</style>
<style name="KeepassDXStyle.TextInputLayout" parent="Widget.Material3.TextInputLayout.OutlinedBox"/>
<style name="KeepassDXStyle.TextInputLayout.ExposedMenu" parent="Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu"/>
<!-- Tab -->
<style name="KeepassDXStyle.TabLayout" parent="@style/Widget.Material3.TabLayout" />
@@ -318,22 +257,6 @@
<style name="KeepassDXStyle.SwitchPreference" parent="@style/Preference.SwitchPreferenceCompat.Material">
<item name="widgetLayout">@layout/preference_material_switch</item>
</style>
<style name="KeepassDXStyle.Switch.Light" parent="KeepassDXStyle.Light">
<item name="colorPrimary">@color/orange</item>
<item name="colorOnPrimary">@color/green_white</item>
<item name="colorOnSecondary">@color/white</item>
<item name="colorPrimaryContainer">?android:attr/windowBackground</item>
<item name="colorOutline">@color/orange</item>
<item name="colorSurfaceVariant">@color/green_white</item>
</style>
<style name="KeepassDXStyle.Switch.Night" parent="KeepassDXStyle.Night">
<item name="colorPrimary">@color/orange</item>
<item name="colorOnPrimary">@color/green_black_light</item>
<item name="colorOnSecondary">@color/white</item>
<item name="colorPrimaryContainer">?android:attr/windowBackground</item>
<item name="colorOutline">@color/orange</item>
<item name="colorSurfaceVariant">?android:attr/windowBackground</item>
</style>
<!-- Chip -->
<style name="KeepassDXStyle.Chip.Filter" parent="Widget.MaterialComponents.Chip.Filter">
@@ -410,21 +333,54 @@
</style>
<!-- CardView -->
<style name="KeepassDXStyle.Cardview" parent="CardView">
<style name="KeepassDXStyle.Cardview" parent="Widget.Material3.CardView.Filled">
<item name="android:layout_marginTop">@dimen/card_view_margin_vertical</item>
<item name="android:layout_marginBottom">@dimen/card_view_margin_vertical</item>
<item name="android:layout_marginStart">@dimen/card_view_margin_horizontal</item>
<item name="android:layout_marginEnd">@dimen/card_view_margin_horizontal</item>
<item name="android:layout_marginLeft">@dimen/card_view_margin_horizontal</item>
<item name="android:layout_marginRight">@dimen/card_view_margin_horizontal</item>
<item name="cardBackgroundColor">?attr/colorSurfaceContainer</item>
<item name="android:padding">@dimen/card_view_padding</item>
<item name="cardCornerRadius">@dimen/dialog_radius</item>
<item name="cardCornerRadius">@dimen/card_radius</item>
</style>
<style name="KeepassDXStyle.Cardview.Light" parent="KeepassDXStyle.Cardview">
<item name="cardBackgroundColor">@color/green_white</item>
<style name="KeepassDXStyle.Cardview.Surface" parent="KeepassDXStyle.Cardview">
<item name="cardBackgroundColor">?attr/colorSurface</item>
</style>
<style name="KeepassDXStyle.Cardview.Night" parent="KeepassDXStyle.Cardview">
<item name="cardBackgroundColor">@color/green_black_light</item>
<style name="KeepassDXStyle.Cardview.Surface.Small" parent="Widget.Material3.CardView.Filled">
<item name="cardCornerRadius">@dimen/small_card_radius</item>
<item name="cardBackgroundColor">?attr/colorSurface</item>
</style>
<style name="KeepassDXStyle.Cardview.SurfaceContainer.Small" parent="Widget.Material3.CardView.Filled">
<item name="cardCornerRadius">@dimen/small_card_radius</item>
<item name="cardBackgroundColor">?attr/colorSurfaceContainer</item>
</style>
<style name="KeepassDXStyle.Cardview.SurfaceContainer.High" parent="KeepassDXStyle.Cardview">
<item name="cardBackgroundColor">?attr/colorSurfaceContainerHigh</item>
</style>
<style name="KeepassDXStyle.Cardview.Primary" parent="KeepassDXStyle.Cardview">
<item name="cardBackgroundColor">?attr/colorPrimary</item>
</style>
<style name="KeepassDXStyle.Cardview.Primary.Small" parent="Widget.Material3.CardView.Filled">
<item name="cardBackgroundColor">?attr/colorPrimary</item>
<item name="cardCornerRadius">@dimen/small_card_radius</item>
</style>
<style name="KeepassDXStyle.Cardview.PrimaryContainer" parent="KeepassDXStyle.Cardview">
<item name="cardBackgroundColor">?attr/colorPrimaryContainer</item>
</style>
<style name="KeepassDXStyle.Cardview.Secondary" parent="KeepassDXStyle.Cardview">
<item name="cardBackgroundColor">?attr/colorSecondary</item>
</style>
<style name="KeepassDXStyle.Cardview.Secondary.Small" parent="Widget.Material3.CardView.Filled">
<item name="cardBackgroundColor">?attr/colorSecondary</item>
<item name="cardCornerRadius">@dimen/small_card_radius</item>
</style>
<style name="KeepassDXStyle.Cardview.SecondaryContainer" parent="KeepassDXStyle.Cardview">
<item name="cardBackgroundColor">?attr/colorSecondaryContainer</item>
</style>
<style name="KeepassDXStyle.Cardview.SecondaryContainer.Small" parent="Widget.Material3.CardView.Filled">
<item name="cardBackgroundColor">?attr/colorSecondaryContainer</item>
<item name="cardCornerRadius">@dimen/small_card_radius</item>
</style>
<!-- CheckBox -->
@@ -441,27 +397,39 @@
<item name="drawableTint">?attr/colorOnPrimary</item>
<item name="android:drawablePadding">8dp</item>
</style>
<style name="KeepassDXStyle.TextAppearance.Secondary.TextOnPrimary" parent="KeepassDXStyle.TextAppearance.Default.TextOnPrimary">
<item name="android:textColor">?android:attr/textColorSecondaryInverse</item>
<item name="android:textSize">14sp</item>
<item name="android:textStyle">italic</item>
</style>
<style name="KeepassDXStyle.TextAppearance.Warning.TextOnPrimary" parent="KeepassDXStyle.TextAppearance.Default.TextOnPrimary">
<item name="android:textColor">?attr/colorOnPrimary</item>
<item name="android:textSize">14sp</item>
<item name="android:textStyle">italic</item>
</style>
<style name="KeepassDXStyle.TextAppearance.Title.TextOnPrimary" parent="KeepassDXStyle.TextAppearance.Default.TextOnPrimary">
<style name="KeepassDXStyle.Title.OnSurface" parent="android:style/TextAppearance">
<item name="android:textColor">?attr/colorOnSurface</item>
<item name="android:textSize">20sp</item>
<item name="android:textStyle">bold</item>
</style>
<style name="KeepassDXStyle.SubTitle.OnSurface" parent="KeepassDXStyle.Title.OnSurface">
<item name="android:textSize">14sp</item>
<item name="android:textStyle">bold</item>
</style>
<style name="KeepassDXStyle.SubTitle.Important.OnSurface" parent="KeepassDXStyle.SubTitle.OnSurface">
<item name="android:textSize">16sp</item>
<item name="android:textStyle">bold</item>
</style>
<style name="KeepassDXStyle.TextAppearance.SubTitle.TextOnPrimary" parent="KeepassDXStyle.TextAppearance.Default.TextOnPrimary">
<style name="KeepassDXStyle.Text.OnSurface" parent="KeepassDXStyle.Title.OnSurface">
<item name="android:textSize">14sp</item>
<item name="android:textStyle">normal</item>
</style>
<style name="KeepassDXStyle.TextAppearance.Meta.TextOnPrimary" parent="KeepassDXStyle.TextAppearance.Default.TextOnPrimary">
<style name="KeepassDXStyle.Text.Info.OnSurface" parent="KeepassDXStyle.Title.OnSurface">
<item name="android:textSize">14sp</item>
<item name="android:textStyle">italic</item>
</style>
<style name="KeepassDXStyle.Text.Meta.OnSurface" parent="KeepassDXStyle.Title.OnSurface">
<item name="android:textSize">11sp</item>
</style>
<style name="KeepassDXStyle.Expanded.Title" parent="KeepassDXStyle.TextAppearance.Default.TextOnPrimary">
<item name="android:textSize">28sp</item>
<item name="android:textStyle">bold</item>
</style>
<style name="KeepassDXStyle.TextAppearance.Default" parent="KeepassDXStyle.TextAppearance">
<item name="android:textSize">16sp</item>
@@ -547,16 +515,10 @@
</style>
<!-- Button Style -->
<style name="KeepassDXStyle.Button.Primary" parent="Widget.Material3.Button.ElevatedButton">
<item name="backgroundTint">@color/color_button_primary</item>
<item name="android:textColor">@color/color_on_button_primary</item>
<item name="iconTint">@color/color_on_button_primary</item>
<style name="KeepassDXStyle.Button.Primary" parent="Widget.Material3.Button">
<item name="android:layout_margin">8dp</item>
</style>
<style name="KeepassDXStyle.Button.Secondary" parent="Widget.Material3.Button.OutlinedButton">
<item name="strokeColor">@color/color_button_secondary</item>
<item name="android:textColor">@color/color_button_secondary</item>
<item name="iconTint">@color/color_button_secondary</item>
<item name="android:layout_margin">8dp</item>
</style>
<style name="KeepassDXStyle.Base.ImageButton" parent="Widget.AppCompat.ImageButton" />
@@ -577,15 +539,27 @@
<item name="android:layout_width">48dp</item>
<item name="android:layout_height">48dp</item>
</style>
<style name="KeepassDXStyle.ImageButton.Simple.Secondary" parent="KeepassDXStyle.ImageButton.Simple">
<item name="android:colorForeground">@color/background_button_color_on_primary</item>
<item name="tint">@color/background_button_color_on_primary</item>
<style name="KeepassDXStyle.ImageButton.OnSurface" parent="KeepassDXStyle.ImageButton.Simple">
<item name="android:colorForeground">?attr/colorOnSurface</item>
<item name="tint">?attr/colorOnSurface</item>
</style>
<style name="KeepassDXStyle.ImageButton.OnPrimary" parent="KeepassDXStyle.ImageButton.Simple">
<item name="android:colorForeground">?attr/colorOnPrimary</item>
<item name="tint">?attr/colorOnPrimary</item>
</style>
<style name="KeepassDXStyle.ImageButton.OnPrimaryContainer" parent="KeepassDXStyle.ImageButton.Simple">
<item name="android:colorForeground">?attr/colorOnPrimaryContainer</item>
<item name="tint">?attr/colorOnPrimaryContainer</item>
</style>
<style name="KeepassDXStyle.ImageButton.OnSecondary" parent="KeepassDXStyle.ImageButton.Simple">
<item name="android:colorForeground">?attr/colorOnSecondary</item>
<item name="tint">?attr/colorOnSecondary</item>
</style>
<style name="KeepassDXStyle.ImageButton.Simple.Mini" parent="KeepassDXStyle.ImageButton.Simple">
<item name="android:padding">12dp</item>
<item name="android:layout_width">36dp</item>
<item name="android:layout_height">36dp</item>
<item name="android:colorForeground">@color/background_button_color_on_primary</item>
<item name="android:colorForeground">@color/color_on_primary</item>
<item name="tint">?android:attr/textColor</item>
</style>
@@ -602,22 +576,15 @@
</style>
<!-- FAB -->
<style name="KeepassDXStyle.v21.Fab" parent="Widget.Design.FloatingActionButton" />
<style name="KeepassDXStyle.Fab" parent="KeepassDXStyle.v21.Fab">
</style>
<style name="KeepassDXStyle.Fab.Special" parent="KeepassDXStyle.v21.Fab">
<item name="backgroundTint">?attr/colorPrimary</item>
<item name="tint">?attr/colorOnPrimary</item>
<style name="KeepassDXStyle.Fab" parent="Widget.Material3.FloatingActionButton.Primary" />
<style name="KeepassDXStyle.Fab.Special" parent="Widget.Material3.FloatingActionButton.Secondary" >
<item name="fabCustomSize">@dimen/button_small_size</item>
</style>
<!-- Menu FAB -->
<style name="KeepassDXStyle.v21.FabMenu" parent="KeepassDXStyle.TextAppearance.Default.TextOnPrimary">
</style>
<style name="KeepassDXStyle.FabMenu" parent="KeepassDXStyle.v21.FabMenu">
<item name="android:textSize">15sp</item>
<item name="android:textColor">?attr/colorOnSecondary</item>
<item name="android:background">@drawable/background_button_small</item>
<item name="backgroundTint">@color/color_button_secondary</item>
<style name="KeepassDXStyle.Fab.Menu" parent="Widget.Material3.ExtendedFloatingActionButton.Icon.Primary" >
<item name="android:layout_marginTop">8dp</item>
<item name="android:layout_marginBottom">16dp</item>
</style>
<!-- Form -->

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

@@ -37,11 +37,9 @@
<item name="android:textColorPrimary">@color/cyan_lightest</item>
<item name="android:textColorHintInverse">@color/cyan_lightest</item>
<item name="android:windowBackground">@color/white_darkest</item>
<item name="toolbarColorControl">@color/grey_light</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="toolbarStyle">@style/KeepassDXStyle.Toolbar.Clear</item>
<item name="toolbarSpecialStyle">@style/KeepassDXStyle.Toolbar.Special.Clear</item>
<item name="toolbarActionStyle">@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>
@@ -61,8 +59,6 @@
<item name="chipFilterTextColor">@color/text_color_light</item>
<item name="chipFilterBackgroundColor">@color/white_darkest</item>
<item name="chipFilterBackgroundColorDisabled">@color/white_grey_lighter</item>
<item name="switchAppearance">@style/KeepassDXStyle.Switch.Clear</item>
</style>
<!-- Toolbar Style Clear -->
<style name="KeepassDXStyle.Toolbar.Clear" parent="KeepassDXStyle.Clear">
@@ -75,15 +71,8 @@
<style name="KeepassDXStyle.Toolbar.Popup.Clear" parent="KeepassDXStyle.Toolbar.Clear">
<item name="android:colorBackground">@color/white_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/white_grey_lighter</item>
</style>
<!-- Action Toolbar Clear -->
@@ -126,10 +115,9 @@
<item name="android:textColorHintInverse">@color/cyan_lightest</item>
<item name="android:textColorSecondaryInverse">@color/white_dark</item>
<item name="android:windowBackground">@color/black</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Dark</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Dark</item>
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Dark</item>
<item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Dark</item>
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Dark</item>
<item name="toolbarSpecialStyle">@style/KeepassDXStyle.Toolbar.Special.Dark</item>
<item name="toolbarActionStyle">@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>
@@ -140,8 +128,6 @@
<item name="chipFilterTextColor">@color/white</item>
<item name="chipFilterBackgroundColor">@color/black_lighter</item>
<item name="chipFilterBackgroundColorDisabled">@color/grey_darker</item>
<item name="switchAppearance">@style/KeepassDXStyle.Switch.Dark</item>
</style>
<!-- Toolbar Style Dark -->
<style name="KeepassDXStyle.Toolbar.Dark" parent="KeepassDXStyle.Dark">
@@ -150,15 +136,8 @@
<item name="android:textColorSecondary">@color/grey_lighter</item>
<item name="android:tint">@color/white</item>
</style>
<!-- Toolbar Home 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/black_light</item>
</style>
<!-- Action Toolbar Dark -->
@@ -184,21 +163,4 @@
<style name="KeepassDXStyle.Cardview.Dark" parent="KeepassDXStyle.Cardview">
<item name="cardBackgroundColor">@color/black_light</item>
</style>
<!-- Switch -->
<style name="KeepassDXStyle.Switch.Clear" parent="KeepassDXStyle.Clear">
<item name="colorPrimary">@color/cyan_lighter</item>
<item name="colorOnPrimary">?android:attr/windowBackground</item>
<item name="colorOnSecondary">@color/white</item>
<item name="colorPrimaryContainer">?android:attr/windowBackground</item>
<item name="colorOutline">?attr/colorPrimary</item>
<item name="colorSurfaceVariant">?android:attr/windowBackground</item>
</style>
<style name="KeepassDXStyle.Switch.Dark" parent="KeepassDXStyle.Dark">
<item name="colorPrimary">@color/cyan_lighter</item>
<item name="colorOnPrimary">?android:attr/windowBackground</item>
<item name="colorOnSecondary">@color/white</item>
<item name="colorPrimaryContainer">?android:attr/windowBackground</item>
<item name="colorOutline">?attr/colorPrimary</item>
<item name="colorSurfaceVariant">?android:attr/windowBackground</item>
</style>
</resources>

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

@@ -19,31 +19,25 @@
-->
<resources>
<!-- White Style -->
<style name="KeepassDXStyle.White" parent="KeepassDXStyle.White.v27" />
<style name="KeepassDXStyle.White.v27" parent="KeepassDXStyle.White.v23" />
<style name="KeepassDXStyle.White.v23" parent="KeepassDXStyle.White.v21" />
<style name="KeepassDXStyle.White" parent="KeepassDXStyle.White.v21" />
<style name="KeepassDXStyle.White.v21" parent="KeepassDXStyle.White.Base" />
<style name="KeepassDXStyle.White.Base" parent="KeepassDXStyle.Light" >
<item name="colorPrimary">@color/white</item>
<style name="KeepassDXStyle.White.Base" parent="KeepassDXStyle.Light">
<item name="colorPrimary">@color/orange</item>
<item name="colorPrimaryDark">@color/white</item>
<item name="colorOnPrimary">@color/grey_light</item>
<item name="colorOnPrimary">@color/white</item>
<item name="colorSecondary">@color/orange</item>
<item name="colorOnSecondary">@color/white</item>
<item name="colorTertiary">@color/white_darkest</item>
<item name="colorOnTertiary">@color/white</item>
<item name="colorSurface">@color/white</item>
<item name="colorControlNormal">@color/grey_light</item>
<item name="colorOnContainer">@color/text_color_light</item>
<item name="colorControlActivated">@color/orange</item>
<item name="android:textColorPrimary">@color/orange_light</item>
<item name="android:textColorHintInverse">@color/orange_lighter</item>
<item name="android:windowBackground">@color/white</item>
<item name="toolbarColorControl">@color/grey_light</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>
@@ -54,7 +48,6 @@
<item name="android:textColor">@color/text_color_light</item>
<item name="android:textColorLink">@color/text_color_light</item>
<item name="android:editTextColor">@color/grey_light</item>
<item name="android:textColorPrimaryInverse">@color/grey_light</item>
<item name="android:textColorSecondary">@color/text_color_secondary_light</item>
<item name="android:textColorSecondaryInverse">@color/grey_lighter</item>
<item name="android:textColorHint">@color/grey_lighter</item>
@@ -62,40 +55,6 @@
<item name="chipFilterTextColor">@color/grey_light</item>
<item name="chipFilterBackgroundColor">@color/white_darkest</item>
<item name="chipFilterBackgroundColorDisabled">@color/white</item>
<item name="switchAppearance">@style/KeepassDXStyle.Switch.White</item>
</style>
<!-- Toolbar Style White -->
<style name="KeepassDXStyle.Toolbar.White" parent="KeepassDXStyle.White">
<item name="colorControlNormal">@color/grey_light</item>
<item name="android:textColorPrimary">@color/grey_light</item>
<item name="android:textColorSecondary">@color/grey_lighter</item>
<item name="android:editTextColor">@color/grey_light</item>
<item name="android:textColorHint">@color/grey_lighter</item>
<item name="android:tint">@color/grey_light</item>
<item name="tint">@color/grey_light</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">
@@ -116,7 +75,9 @@
<!-- Black Style -->
<style name="KeepassDXStyle.Black" parent="KeepassDXStyle.Black.v21" />
<style name="KeepassDXStyle.Black.v21" parent="KeepassDXStyle.Night.v21" >
<style name="KeepassDXStyle.Black.v21" parent="KeepassDXStyle.Black.Base" />
<style name="KeepassDXStyle.Black.Base" parent="KeepassDXStyle.Night" >
<item name="colorPrimary">@color/black_light</item>
<item name="colorPrimaryDark">@color/black</item>
<item name="colorSecondary">@color/orange_darker</item>
@@ -125,17 +86,12 @@
<item name="colorOnTertiary">@color/black</item>
<item name="colorSurface">@color/black</item>
<item name="colorControlNormal">@color/grey_light</item>
<item name="colorControlActivated">@color/orange</item>
<item name="android:textColorPrimary">@color/orange_lighter</item>
<item name="android:textColorHintInverse">@color/orange_lighter</item>
<item name="android:textColorSecondaryInverse">@color/white_dark</item>
<item name="android:windowBackground">@color/black</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Black</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.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>
@@ -146,8 +102,6 @@
<item name="chipFilterTextColor">@color/white</item>
<item name="chipFilterBackgroundColor">@color/grey_darker</item>
<item name="chipFilterBackgroundColorDisabled">@color/black_light</item>
<item name="switchAppearance">@style/KeepassDXStyle.Switch.Black</item>
</style>
<!-- Toolbar Style Black -->
<style name="KeepassDXStyle.Toolbar.Black" parent="KeepassDXStyle.Black">
@@ -158,28 +112,6 @@
<item name="android:textColorHint">@color/white</item>
<item name="android:tint">@color/white</item>
</style>
<!-- Toolbar Popup menu -->
<style name="KeepassDXStyle.Toolbar.Popup.Black" parent="KeepassDXStyle.Toolbar.Black">
<item name="android:colorBackground">@color/black_lighter</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>
</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/black_light</item>
</style>
<!-- Dialog -->
<style name="KeepassDXStyle.Black.Dialog" parent="KeepassDXStyle.Night.Dialog">
<item name="colorSecondary">@color/orange_darker</item>
@@ -196,21 +128,4 @@
<style name="KeepassDXStyle.Cardview.Black" parent="KeepassDXStyle.Cardview">
<item name="cardBackgroundColor">@color/black_light</item>
</style>
<!-- Switch -->
<style name="KeepassDXStyle.Switch.White" parent="KeepassDXStyle.White">
<item name="colorPrimary">@color/orange</item>
<item name="colorOnPrimary">?android:attr/windowBackground</item>
<item name="colorOnSecondary">@color/white</item>
<item name="colorPrimaryContainer">?android:attr/windowBackground</item>
<item name="colorOutline">?attr/colorPrimary</item>
<item name="colorSurfaceVariant">?android:attr/windowBackground</item>
</style>
<style name="KeepassDXStyle.Switch.Black" parent="KeepassDXStyle.Black">
<item name="colorPrimary">@color/orange_darker</item>
<item name="colorOnPrimary">?android:attr/windowBackground</item>
<item name="colorOnSecondary">@color/white</item>
<item name="colorPrimaryContainer">?android:attr/windowBackground</item>
<item name="colorOutline">?attr/colorPrimary</item>
<item name="colorSurfaceVariant">?android:attr/windowBackground</item>
</style>
</resources>

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

@@ -35,10 +35,9 @@
<item name="android:textColorHintInverse">@color/purple_lighter</item>
<item name="android:textColorSecondaryInverse">@color/purple_lighter</item>
<item name="android:windowBackground">@color/white_purple</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Purple</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Purple</item>
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Purple</item>
<item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Purple</item>
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Purple</item>
<item name="toolbarSpecialStyle">@style/KeepassDXStyle.Toolbar.Special.Purple</item>
<item name="toolbarActionStyle">@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>
@@ -50,8 +49,6 @@
<item name="chipFilterTextColor">@color/white_purple_light</item>
<item name="chipFilterBackgroundColor">@color/purple_light</item>
<item name="chipFilterBackgroundColorDisabled">@color/purple</item>
<item name="switchAppearance">@style/KeepassDXStyle.Switch.Purple</item>
</style>
<!-- Toolbar Style Purple -->
<style name="KeepassDXStyle.Toolbar.Purple" parent="KeepassDXStyle.Purple">
@@ -67,15 +64,8 @@
<style name="KeepassDXStyle.Toolbar.Popup.Purple" parent="KeepassDXStyle.Toolbar.Purple">
<item name="android:colorBackground">@color/white_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="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 -->
@@ -119,11 +109,9 @@
<item name="android:textColorHintInverse">@color/purple_lighter</item>
<item name="android:textColorSecondaryInverse">@color/purple_lighter</item>
<item name="android:windowBackground">@color/black_purple_dark</item>
<item name="toolbarColorControl">@color/white</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Purple.Dark</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.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="toolbarStyle">@style/KeepassDXStyle.Toolbar.Purple.Dark</item>
<item name="toolbarSpecialStyle">@style/KeepassDXStyle.Toolbar.Special.Purple.Dark</item>
<item name="toolbarActionStyle">@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>
@@ -135,8 +123,6 @@
<item name="chipFilterTextColor">@color/white_purple_light</item>
<item name="chipFilterBackgroundColor">@color/purple_dark</item>
<item name="chipFilterBackgroundColorDisabled">@color/purple_darker</item>
<item name="switchAppearance">@style/KeepassDXStyle.Switch.Purple.Dark</item>
</style>
<!-- Toolbar Style Purple -->
<style name="KeepassDXStyle.Toolbar.Purple.Dark" parent="KeepassDXStyle.Purple.Dark">
@@ -152,15 +138,8 @@
<style name="KeepassDXStyle.Toolbar.Popup.Purple.Dark" parent="KeepassDXStyle.Toolbar.Purple.Dark">
<item name="android:colorBackground">@color/black_purple</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="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/black_purple</item>
</style>
<!-- Action Toolbar Purple -->
@@ -186,21 +165,4 @@
<style name="KeepassDXStyle.Cardview.Purple.Dark" parent="KeepassDXStyle.Cardview">
<item name="cardBackgroundColor">@color/black_purple</item>
</style>
<!-- Switch -->
<style name="KeepassDXStyle.Switch.Purple" parent="KeepassDXStyle.Purple">
<item name="colorPrimary">@color/purple</item>
<item name="colorOnPrimary">@color/white_purple_light</item>
<item name="colorOnSecondary">@color/white</item>
<item name="colorPrimaryContainer">?android:attr/windowBackground</item>
<item name="colorOutline">@color/purple_light</item>
<item name="colorSurfaceVariant">?android:attr/windowBackground</item>
</style>
<style name="KeepassDXStyle.Switch.Purple.Dark" parent="KeepassDXStyle.Purple.Dark">
<item name="colorPrimary">@color/purple</item>
<item name="colorOnPrimary">@color/purple_darker</item>
<item name="colorOnSecondary">@color/white</item>
<item name="colorPrimaryContainer">?android:attr/windowBackground</item>
<item name="colorOutline">@color/purple_dark</item>
<item name="colorSurfaceVariant">?android:attr/windowBackground</item>
</style>
</resources>

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

@@ -35,11 +35,9 @@
<item name="android:textColorHintInverse">@color/blue_white_dark</item>
<item name="android:textColorSecondaryInverse">@color/blue_white_dark</item>
<item name="android:windowBackground">@color/blue_white</item>
<item name="toolbarColorControl">@color/white</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Blue</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Blue</item>
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Blue</item>
<item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Blue</item>
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Blue</item>
<item name="toolbarSpecialStyle">@style/KeepassDXStyle.Toolbar.Special.Blue</item>
<item name="toolbarActionStyle">@style/KeepassDXStyle.Toolbar.Action.Blue</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Blue.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Blue.Dialog</item>
<item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Blue</item>
@@ -49,8 +47,6 @@
<item name="chipFilterTextColor">@color/white</item>
<item name="chipFilterBackgroundColor">@color/blue_light</item>
<item name="chipFilterBackgroundColorDisabled">@color/blue</item>
<item name="switchAppearance">@style/KeepassDXStyle.Switch.Blue</item>
</style>
<!-- Toolbar Style Blue -->
<style name="KeepassDXStyle.Toolbar.Blue" parent="KeepassDXStyle.Blue">
@@ -62,15 +58,8 @@
<item name="android:textColorHint">@color/blue_white_dark</item>
<item name="android:tint">@color/white</item>
</style>
<!-- Toolbar Home 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="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>
</style>
<!-- Action Toolbar Blue -->
@@ -111,10 +100,9 @@
<item name="android:textColorHintInverse">@color/blue_white_dark</item>
<item name="android:textColorSecondaryInverse">@color/blue_white_dark</item>
<item name="android:windowBackground">@color/blue_black_dark</item>
<item name="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="toolbarStyle">@style/KeepassDXStyle.Toolbar.Blue.Night</item>
<item name="toolbarSpecialStyle">@style/KeepassDXStyle.Toolbar.Special.Blue.Night</item>
<item name="toolbarActionStyle">@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>
<item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Blue.Night</item>
@@ -124,8 +112,6 @@
<item name="chipFilterTextColor">@color/white</item>
<item name="chipFilterBackgroundColor">@color/blue_light</item>
<item name="chipFilterBackgroundColorDisabled">@color/blue</item>
<item name="switchAppearance">@style/KeepassDXStyle.Switch.Blue.Night</item>
</style>
<!-- Toolbar Style Blue -->
<style name="KeepassDXStyle.Toolbar.Blue.Night" parent="KeepassDXStyle.Blue.Night">
@@ -137,15 +123,8 @@
<item name="android:textColorHint">@color/blue_white_dark</item>
<item name="android:tint">@color/white</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 -->
@@ -174,19 +153,4 @@
<style name="KeepassDXStyle.Cardview.Blue.Night" parent="KeepassDXStyle.Cardview">
<item name="cardBackgroundColor">@color/blue_black</item>
</style>
<!-- Switch -->
<style name="KeepassDXStyle.Switch.Blue" parent="KeepassDXStyle.Blue">
<item name="colorOnPrimary">@color/blue_white_light</item>
<item name="colorOnSecondary">@color/white</item>
<item name="colorPrimaryContainer">?android:attr/windowBackground</item>
<item name="colorOutline">@color/blue_lighter</item>
<item name="colorSurfaceVariant">?android:attr/windowBackground</item>
</style>
<style name="KeepassDXStyle.Switch.Blue.Night" parent="KeepassDXStyle.Blue.Night">
<item name="colorOnPrimary">@color/blue_black_dark</item>
<item name="colorOnSecondary">@color/white</item>
<item name="colorPrimaryContainer">?android:attr/windowBackground</item>
<item name="colorOutline">@color/blue_lighter</item>
<item name="colorSurfaceVariant">?android:attr/windowBackground</item>
</style>
</resources>

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

@@ -35,11 +35,9 @@
<item name="android:textColorHintInverse">@color/reply_orange</item>
<item name="android:textColorSecondaryInverse">@color/reply_orange</item>
<item name="android:windowBackground">@color/reply_blue_lighter</item>
<item name="toolbarColorControl">@color/reply_blue_light</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Reply</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Reply</item>
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Reply</item>
<item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Reply</item>
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Reply</item>
<item name="toolbarSpecialStyle">@style/KeepassDXStyle.Toolbar.Special.Reply</item>
<item name="toolbarActionStyle">@style/KeepassDXStyle.Toolbar.Action.Reply</item>
<item name="popupTheme">@style/KeepassDXStyle.Toolbar.Popup.Reply</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Reply.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Reply.Dialog</item>
@@ -50,8 +48,6 @@
<item name="chipFilterTextColor">@color/reply_black</item>
<item name="chipFilterBackgroundColor">@color/reply_orange</item>
<item name="chipFilterBackgroundColorDisabled">@color/reply_blue_light</item>
<item name="switchAppearance">@style/KeepassDXStyle.Switch.Reply</item>
</style>
<!-- Toolbar Style Reply -->
<style name="KeepassDXStyle.Toolbar.Reply" parent="KeepassDXStyle.Reply">
@@ -67,15 +63,8 @@
<style name="KeepassDXStyle.Toolbar.Popup.Reply" parent="KeepassDXStyle.Toolbar.Reply">
<item name="android:colorBackground">@color/reply_blue_lighter</item>
</style>
<!-- Toolbar Home Reply -->
<style name="KeepassDXStyle.Toolbar.Home.Reply" parent="KeepassDXStyle.Toolbar.Reply">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<!-- Special Toolbar Reply -->
<style name="KeepassDXStyle.Toolbar.Special.Reply" parent="KeepassDXStyle.Toolbar.Reply">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special.Reply</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Special.Reply" parent="KeepassDXStyle.Toolbar.Widget.Special">
<item name="android:background">@color/reply_blue_dark</item>
</style>
<!-- Action Toolbar Reply -->
@@ -120,10 +109,9 @@
<item name="android:textColorHintInverse">@color/reply_blue_light</item>
<item name="android:textColorSecondaryInverse">@color/reply_blue_light</item>
<item name="android:windowBackground">@color/reply_black</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Reply.Night</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Reply.Night</item>
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Reply.Night</item>
<item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Reply.Night</item>
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Reply.Night</item>
<item name="toolbarSpecialStyle">@style/KeepassDXStyle.Toolbar.Special.Reply.Night</item>
<item name="toolbarActionStyle">@style/KeepassDXStyle.Toolbar.Action.Reply.Night</item>
<item name="popupTheme">@style/KeepassDXStyle.Toolbar.Popup.Reply.Night</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Reply.Night.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Reply.Night.Dialog</item>
@@ -135,8 +123,6 @@
<item name="chipFilterTextColor">@color/reply_black</item>
<item name="chipFilterBackgroundColor">@color/reply_orange</item>
<item name="chipFilterBackgroundColorDisabled">@color/reply_blue_light</item>
<item name="switchAppearance">@style/KeepassDXStyle.Switch.Reply.Night</item>
</style>
<!-- Toolbar Style Reply -->
<style name="KeepassDXStyle.Toolbar.Reply.Night" parent="KeepassDXStyle.Reply.Night">
@@ -152,15 +138,8 @@
<style name="KeepassDXStyle.Toolbar.Popup.Reply.Night" parent="KeepassDXStyle.Toolbar.Reply.Night">
<item name="android:colorBackground">@color/reply_black</item>
</style>
<!-- Toolbar Home Reply -->
<style name="KeepassDXStyle.Toolbar.Home.Reply.Night" parent="KeepassDXStyle.Toolbar.Reply.Night">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<!-- Special Toolbar Reply -->
<style name="KeepassDXStyle.Toolbar.Special.Reply.Night" parent="KeepassDXStyle.Toolbar.Reply.Night">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special.Reply.Night</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Special.Reply.Night" parent="KeepassDXStyle.Toolbar.Widget.Special">
<item name="android:background">@color/reply_black</item>
</style>
<!-- Action Toolbar Reply -->
@@ -186,21 +165,4 @@
<style name="KeepassDXStyle.Cardview.Reply.Night" parent="KeepassDXStyle.Cardview">
<item name="cardBackgroundColor">@color/reply_black_dark</item>
</style>
<!-- Switch -->
<style name="KeepassDXStyle.Switch.Reply" parent="KeepassDXStyle.Reply">
<item name="colorPrimary">@color/reply_orange</item>
<item name="colorOnPrimary">@color/reply_blue_lightest</item>
<item name="colorOnSecondary">@color/white</item>
<item name="colorPrimaryContainer">?android:attr/windowBackground</item>
<item name="colorOutline">@color/reply_orange</item>
<item name="colorSurfaceVariant">?android:attr/windowBackground</item>
</style>
<style name="KeepassDXStyle.Switch.Reply.Night" parent="KeepassDXStyle.Reply.Night">
<item name="colorPrimary">@color/reply_orange</item>
<item name="colorOnPrimary">@color/reply_black</item>
<item name="colorOnSecondary">@color/white</item>
<item name="colorPrimaryContainer">?android:attr/windowBackground</item>
<item name="colorOutline">@color/reply_orange</item>
<item name="colorSurfaceVariant">?android:attr/windowBackground</item>
</style>
</resources>

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

@@ -37,11 +37,9 @@
<item name="android:textColorPrimary">@color/grey</item>
<item name="android:textColorHintInverse">@color/grey</item>
<item name="android:windowBackground">@color/white_slight</item>
<item name="toolbarColorControl">@color/grey_light</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Simple</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Simple</item>
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Simple</item>
<item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Simple</item>
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Simple</item>
<item name="toolbarSpecialStyle">@style/KeepassDXStyle.Toolbar.Special.Simple</item>
<item name="toolbarActionStyle">@style/KeepassDXStyle.Toolbar.Action.Simple</item>
<item name="popupTheme">@style/KeepassDXStyle.Toolbar.Popup.Simple</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Simple.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Simple.Dialog</item>
@@ -61,8 +59,6 @@
<item name="chipFilterTextColor">@color/text_color_light</item>
<item name="chipFilterBackgroundColor">@color/blue_white</item>
<item name="chipFilterBackgroundColorDisabled">@color/white_dark</item>
<item name="switchAppearance">@style/KeepassDXStyle.Switch.Simple</item>
</style>
<!-- Toolbar Style Simple -->
<style name="KeepassDXStyle.Toolbar.Simple" parent="KeepassDXStyle.Simple">
@@ -75,15 +71,8 @@
<style name="KeepassDXStyle.Toolbar.Popup.Simple" parent="KeepassDXStyle.Toolbar.Simple">
<item name="android:colorBackground">@color/white</item>
</style>
<!-- Toolbar Home Simple -->
<style name="KeepassDXStyle.Toolbar.Home.Simple" parent="KeepassDXStyle.Toolbar.Simple">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<!-- Special Toolbar Simple -->
<style name="KeepassDXStyle.Toolbar.Special.Simple" parent="KeepassDXStyle.Toolbar.Simple">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special.Simple</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Special.Simple" parent="KeepassDXStyle.Toolbar.Widget.Special">
<item name="android:background">@color/white_slight</item>
</style>
<!-- Action Toolbar Simple -->
@@ -126,10 +115,9 @@
<item name="android:textColorHintInverse">@color/white</item>
<item name="android:textColorSecondaryInverse">@color/white_dark</item>
<item name="android:windowBackground">@color/grey_slight</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Simple.Night</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Simple.Night</item>
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Simple.Night</item>
<item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Simple.Night</item>
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Simple.Night</item>
<item name="toolbarSpecialStyle">@style/KeepassDXStyle.Toolbar.Special.Simple.Night</item>
<item name="toolbarActionStyle">@style/KeepassDXStyle.Toolbar.Action.Simple.Night</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Simple.Night.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Simple.Night.Dialog</item>
<item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Simple.Night</item>
@@ -140,8 +128,6 @@
<item name="chipFilterTextColor">@color/white</item>
<item name="chipFilterBackgroundColor">@color/grey_black_slight</item>
<item name="chipFilterBackgroundColorDisabled">@color/grey_darker</item>
<item name="switchAppearance">@style/KeepassDXStyle.Switch.Simple.Night</item>
</style>
<!-- Toolbar Style Night -->
<style name="KeepassDXStyle.Toolbar.Simple.Night" parent="KeepassDXStyle.Simple.Night">
@@ -150,15 +136,8 @@
<item name="android:textColorSecondary">@color/grey_lighter</item>
<item name="android:tint">@color/white</item>
</style>
<!-- Toolbar Home Night -->
<style name="KeepassDXStyle.Toolbar.Home.Simple.Night" parent="KeepassDXStyle.Toolbar.Simple.Night">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<!-- Special Toolbar Night -->
<style name="KeepassDXStyle.Toolbar.Special.Simple.Night" parent="KeepassDXStyle.Toolbar.Simple.Night">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special.Simple.Night</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Special.Simple.Night" parent="KeepassDXStyle.Toolbar.Widget.Special">
<item name="android:background">@color/grey_slight</item>
</style>
<!-- Action Toolbar Night -->
@@ -184,21 +163,4 @@
<style name="KeepassDXStyle.Cardview.Simple.Night" parent="KeepassDXStyle.Cardview">
<item name="cardBackgroundColor">@color/grey_slight_dark</item>
</style>
<!-- Switch -->
<style name="KeepassDXStyle.Switch.Simple" parent="KeepassDXStyle.Simple">
<item name="colorPrimary">@color/blue_slight</item>
<item name="colorOnPrimary">?android:attr/windowBackground</item>
<item name="colorOnSecondary">@color/white</item>
<item name="colorPrimaryContainer">?android:attr/windowBackground</item>
<item name="colorOutline">?attr/colorPrimary</item>
<item name="colorSurfaceVariant">?android:attr/windowBackground</item>
</style>
<style name="KeepassDXStyle.Switch.Simple.Night" parent="KeepassDXStyle.Simple.Night">
<item name="colorPrimary">@color/blue_slight</item>
<item name="colorOnPrimary">?android:attr/windowBackground</item>
<item name="colorOnSecondary">@color/white</item>
<item name="colorPrimaryContainer">?android:attr/windowBackground</item>
<item name="colorOutline">?attr/colorPrimary</item>
<item name="colorSurfaceVariant">?android:attr/windowBackground</item>
</style>
</resources>

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

@@ -35,11 +35,9 @@
<item name="android:textColorHintInverse">@color/red_lightest</item>
<item name="android:textColorSecondaryInverse">@color/red_lightest</item>
<item name="android:windowBackground">@color/red_white_light</item>
<item name="toolbarColorControl">@color/white</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Red</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Red</item>
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Red</item>
<item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Red</item>
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Red</item>
<item name="toolbarSpecialStyle">@style/KeepassDXStyle.Toolbar.Special.Red</item>
<item name="toolbarActionStyle">@style/KeepassDXStyle.Toolbar.Action.Red</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Red.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Red.Dialog</item>
<item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Red</item>
@@ -49,8 +47,6 @@
<item name="chipFilterTextColor">@color/white</item>
<item name="chipFilterBackgroundColor">@color/red_lighter</item>
<item name="chipFilterBackgroundColorDisabled">@color/red</item>
<item name="switchAppearance">@style/KeepassDXStyle.Switch.Red</item>
</style>
<!-- Toolbar Style Red -->
<style name="KeepassDXStyle.Toolbar.Red" parent="KeepassDXStyle.Red">
@@ -62,15 +58,8 @@
<item name="android:textColorHint">@color/red_lightest</item>
<item name="android:tint">@color/white</item>
</style>
<!-- Toolbar Home 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>
</style>
<!-- Action Toolbar Red -->
@@ -110,10 +99,9 @@
<item name="android:textColorHintInverse">@color/red_lightest</item>
<item name="android:textColorSecondaryInverse">@color/red_lightest</item>
<item name="android:windowBackground">@color/red_black_dark</item>
<item name="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="toolbarStyle">@style/KeepassDXStyle.Toolbar.Red.Night</item>
<item name="toolbarSpecialStyle">@style/KeepassDXStyle.Toolbar.Special.Red.Night</item>
<item name="toolbarActionStyle">@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>
<item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Red.Night</item>
@@ -123,8 +111,6 @@
<item name="chipFilterTextColor">@color/white</item>
<item name="chipFilterBackgroundColor">@color/red_lighter</item>
<item name="chipFilterBackgroundColorDisabled">@color/red</item>
<item name="switchAppearance">@style/KeepassDXStyle.Switch.Red.Night</item>
</style>
<!-- Toolbar Style Red -->
<style name="KeepassDXStyle.Toolbar.Red.Night" parent="KeepassDXStyle.Red.Night">
@@ -136,15 +122,8 @@
<item name="android:textColorHint">@color/red_lightest</item>
<item name="android:tint">@color/white</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 -->
@@ -173,21 +152,4 @@
<style name="KeepassDXStyle.Cardview.Red.Night" parent="KeepassDXStyle.Cardview">
<item name="cardBackgroundColor">@color/red_black</item>
</style>
<!-- Switch -->
<style name="KeepassDXStyle.Switch.Red" parent="KeepassDXStyle.Red">
<item name="colorPrimary">@color/orange</item>
<item name="colorOnPrimary">@color/red_white_lightest</item>
<item name="colorOnSecondary">@color/white</item>
<item name="colorPrimaryContainer">?android:attr/windowBackground</item>
<item name="colorOutline">@color/orange</item>
<item name="colorSurfaceVariant">?android:attr/windowBackground</item>
</style>
<style name="KeepassDXStyle.Switch.Red.Night" parent="KeepassDXStyle.Red.Night">
<item name="colorPrimary">@color/orange_dark</item>
<item name="colorOnPrimary">@color/red_black_dark</item>
<item name="colorOnSecondary">@color/white</item>
<item name="colorPrimaryContainer">?android:attr/windowBackground</item>
<item name="colorOutline">@color/orange_dark</item>
<item name="colorSurfaceVariant">?android:attr/windowBackground</item>
</style>
</resources>