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 chip style

Browse Source
This commit is contained in:
J-Jamet
2022-02-02 17:30:10 +01:00
parent 72712e8e0e
commit aa34d78052
17 changed files with 338 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/res/color/background_color_chip.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:alpha="0.97" android:color="?attr/chipFilterBackgroundColorDisabled" android:state_enabled="false" />
<item android:alpha="1.00" android:color="?attr/chipFilterBackgroundColor" android:state_checked="true" />
<item android:alpha="0.98" android:color="?attr/chipFilterBackgroundColor" />
</selector>

11
app/src/main/res/drawable/ic_case_sensitive_white_24dp.xml Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#ffffff"
android:strokeWidth="0.59883046"
android:pathData="M 8.6660156 3.5371094 L 2 21 L 4.4921875 21 L 6.0820312 16.519531 L 10.287109 16.519531 C 10.36083 15.806007 10.5606 15.14402 10.871094 14.554688 L 6.7949219 14.554688 L 10 5.8652344 L 11.210938 9.1367188 L 11.210938 7.8105469 L 11.849609 7.5644531 C 12.1567 7.4458738 12.458907 7.3490018 12.761719 7.2519531 L 11.345703 3.5371094 L 8.6660156 3.5371094 z M 16.666016 7.5839844 C 15.964262 7.5839844 15.242694 7.6624139 14.501953 7.8183594 C 13.761212 7.9665075 12.998462 8.1939533 12.210938 8.4980469 L 12.210938 10.486328 C 12.865908 10.127654 13.54826 9.8570716 14.257812 9.6777344 C 14.967364 9.4983971 15.696774 9.4101562 16.445312 9.4101562 C 17.622701 9.4101562 18.534467 9.6827067 19.181641 10.228516 C 19.836611 10.766528 20.164062 11.529278 20.164062 12.519531 L 20.164062 12.730469 L 17.146484 12.730469 C 15.189369 12.730469 13.714863 13.104978 12.724609 13.853516 C 11.742153 14.602054 11.251953 15.713816 11.251953 17.1875 C 11.251953 18.450658 11.64607 19.460462 12.433594 20.216797 C 13.228916 20.965335 14.295588 21.339844 15.636719 21.339844 C 16.697147 21.339844 17.595182 21.151612 18.328125 20.777344 C 19.061068 20.395277 19.672835 19.80704 20.164062 19.011719 L 20.164062 21 L 22.316406 21 L 22.316406 13.525391 C 22.316406 11.529289 21.847782 10.04105 20.912109 9.0585938 C 19.976437 8.0761376 18.560753 7.5839844 16.666016 7.5839844 z M 14.103516 10.777344 C 13.620766 10.928312 13.14846 11.11299 12.691406 11.363281 L 12.146484 11.662109 L 12.554688 12.767578 C 13.13989 12.410612 13.81914 12.16373 14.568359 11.996094 L 14.103516 10.777344 z M 18.023438 14.416016 L 20.164062 14.416016 L 20.164062 14.894531 C 20.164062 16.29804 19.801318 17.425488 19.076172 18.275391 C 18.358823 19.117496 17.40392 19.537109 16.210938 19.537109 C 15.34544 19.537109 14.659166 19.315538 14.152344 18.871094 C 13.653318 18.418852 13.404297 17.811007 13.404297 17.046875 C 13.404297 16.08781 13.739592 15.409379 14.410156 15.011719 C 15.080722 14.614058 16.284645 14.416016 18.023438 14.416016 z M 15.933594 15.576172 C 15.436083 15.663112 15.086511 15.772302 14.919922 15.871094 C 14.55273 16.088847 14.404297 16.320872 14.404297 17.046875 C 14.404297 17.589232 14.533543 17.860825 14.820312 18.123047 C 15.114517 18.378191 15.521588 18.537109 16.210938 18.537109 C 16.518099 18.537109 16.779218 18.49703 17.023438 18.4375 L 15.933594 15.576172 z" />
</vector>

11
app/src/main/res/drawable/ic_current_folder_white_24dp.xml Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#ffffff"
android:strokeWidth="0.0163282"
android:pathData="M 2.5,1 C 2.223,1 2,1.223 2,1.5 v 12 9 C 2,22.777 2.223,23 2.5,23 2.777,23 3,22.777 3,22.5 V 14 h 3 v 2.474609 C 6,17.313879 6.6858008,18 7.5234375,18 H 20.476562 C 21.314199,18 22,17.314199 22,16.476562 V 9.8085938 C 22,8.9709571 21.314199,8.2851562 20.476562,8.2851562 H 14 L 12.476562,6.5703125 H 7.5234375 C 6.6858008,6.5703125 6,7.2561133 6,8.09375 V 13 H 3 V 1.5 C 3,1.223 2.777,1 2.5,1 Z" />
</vector>

16
app/src/main/res/drawable/ic_templates_white_24dp.xml Normal file
View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:viewportWidth="32"
android:viewportHeight="32"
android:width="24dp"
android:height="24dp">
<group
android:scaleX="1.777778"
android:scaleY="1.777778"
android:translateX="-205.4844"
android:translateY="-31.99788">
<path
android:pathData="M131.1496 25.505423l-0.59661 -0.59661c-0.24714 -0.24714 -0.64781 -0.24714 -0.89493 0l-0.14916 0.14916 -2.98312 -2.9831 0.14916 -0.14915c0.24714 -0.24714 0.24714 -0.64782 0 -0.89493l-0.59661 -0.59664c-0.24714 -0.24713 -0.64781 -0.24713 -0.89492 0l-3.28142 3.28142c-0.24714 0.24714 -0.24714 0.64781 0 0.89492l0.59661 0.59661c0.24714 0.24714 0.64782 0.24714 0.89493 0l0.14916 -0.14916 1.04408 1.04409 -2.13679 2.13679 -0.14916 -0.14916c-0.32951 -0.32951 -0.86373 -0.32951 -1.19324 0l-3.02547 3.02552c-0.32951 0.32951 -0.32951 0.86373 0 1.19324l1.19324 1.19325c0.32951 0.32951 0.86374 0.32951 1.19325 0l3.02549 -3.0255c0.32951 -0.32951 0.32951 -0.86373 0 -1.19324l-0.14916 -0.14916 2.13679 -2.13679 1.04409 1.04409 -0.14916 0.14915c-0.24714 0.24714 -0.24714 0.64782 0 0.89493l0.59661 0.59661c0.24714 0.24714 0.64781 0.24714 0.89493 0l3.28141 -3.28141c0.24711 -0.24712 0.24711 -0.64779 0 -0.89493z"
android:fillColor="#ffffff" />
</group>
</vector>

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

@@ -27,30 +27,35 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
tools:text="3" />
<com.google.android.material.chip.ChipGroup
<HorizontalScrollView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/default_margin"
android:layout_marginLeft="@dimen/default_margin"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/search_expand"
app:layout_constraintStart_toEndOf="@+id/search_numbers"
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.chip.Chip
android:id="@+id/search_chip_case_sensitive"
style="@style/KeepassDXStyle.Chip.Filter"
android:layout_width="wrap_content"
<com.google.android.material.chip.ChipGroup
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/case_sensitive" />
<com.google.android.material.chip.Chip
android:id="@+id/search_chip_expires"
style="@style/KeepassDXStyle.Chip.Filter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/entry_expires" />
</com.google.android.material.chip.ChipGroup>
android:layout_marginStart="@dimen/default_margin"
android:layout_marginLeft="@dimen/default_margin"
app:singleLine="true">
<com.google.android.material.chip.Chip
android:id="@+id/search_chip_current_group"
style="@style/KeepassDXStyle.Chip.Filter.Icon"
app:closeIcon="@drawable/ic_current_folder_white_24dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/current_group" />
<com.google.android.material.chip.Chip
android:id="@+id/search_chip_case_sensitive"
style="@style/KeepassDXStyle.Chip.Filter.Icon"
app:closeIcon="@drawable/ic_case_sensitive_white_24dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/case_sensitive" />
</com.google.android.material.chip.ChipGroup>
</HorizontalScrollView>
<ImageButton
android:id="@+id/search_expand"
android:layout_width="wrap_content"
@@ -59,14 +64,16 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
style="@style/KeepassDXStyle.ImageButton.Simple"
android:contentDescription="@string/search_filters"
android:src="@drawable/ic_list_white_24dp"
app:tint="?attr/textColorInverse"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<FrameLayout
<LinearLayout
android:id="@+id/search_advance_filters"
android:layout_width="match_parent"
android:layout_height="@dimen/advanced_search_height"
android:background="?attr/colorPrimary"
android:orientation="vertical"
android:visibility="gone">
<com.google.android.material.chip.ChipGroup
android:layout_width="match_parent"
@@ -119,6 +126,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true"
android:enabled="false"
style="@style/KeepassDXStyle.Chip.Filter"
android:text="@string/other"/>
<com.google.android.material.chip.Chip
@@ -133,22 +141,44 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="false"
android:enabled="false"
style="@style/KeepassDXStyle.Chip.Filter"
android:text="@string/tags"/>
</com.google.android.material.chip.ChipGroup>
<com.google.android.material.chip.ChipGroup
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:chipSpacingVertical="16dp"
android:paddingTop="6dp"
android:paddingStart="@dimen/default_margin"
android:paddingLeft="@dimen/default_margin"
android:paddingEnd="@dimen/default_margin"
android:paddingRight="@dimen/default_margin"
android:paddingBottom="@dimen/default_margin">
<com.google.android.material.chip.Chip
android:id="@+id/search_chip_template"
android:id="@+id/search_chip_expires"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="false"
style="@style/KeepassDXStyle.Chip.Filter"
android:text="@string/template"/>
style="@style/KeepassDXStyle.Chip.Filter.Icon"
app:closeIcon="@drawable/ic_warning_white_24dp"
android:text="@string/entry_expires" />
<com.google.android.material.chip.Chip
android:id="@+id/search_chip_recycle_bin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/KeepassDXStyle.Chip.Filter.Icon"
app:closeIcon="@drawable/ic_content_delete_white_24dp"
android:checked="false"
style="@style/KeepassDXStyle.Chip.Filter"
android:text="@string/recycle_bin"/>
<com.google.android.material.chip.Chip
android:id="@+id/search_chip_template"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/KeepassDXStyle.Chip.Filter.Icon"
app:closeIcon="@drawable/ic_templates_white_24dp"
android:checked="false"
android:enabled="false"
android:text="@string/template"/>
</com.google.android.material.chip.ChipGroup>
</FrameLayout>
</LinearLayout>
</LinearLayout>

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

@@ -23,13 +23,16 @@
<attr name="toolbarSpecialAppearance" format="reference" />
<attr name="toolbarActionAppearance" format="reference" />
<attr name="chipFilterTextColor" format="color" />
<attr name="chipFilterBackgroundColor" format="color" />
<attr name="chipFilterBackgroundColorDisabled" format="color" />
<attr name="colorAccentLight" format="reference|color" />
<attr name="cardBackgroundTransparentColor" format="reference|color" />
<attr name="iconPreferenceColor" format="reference|color" />
<attr name="textColorInverse" format="reference|color" />
<attr name="colorOnAccentColor" format="reference|color" />
<attr name="toolbarColorControl" format="reference|color" />
<attr name="chipFilterBackgroundColor" format="reference|color" />
<attr name="educationCircleColor" format="reference|color" />
<attr name="educationTextColor" format="reference|color" />

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

@@ -56,13 +56,15 @@
<color name="cyan_light">#2486AB</color>
<color name="cyan">#2c7a96</color>
<color name="green_lighter">#a5d6a7</color>
<color name="green_lightest">#a5d6a7</color>
<color name="green_lighter">#66BB6A</color>
<color name="green_light">#4caf50</color>
<color name="green">#43a047</color>
<color name="green_dark">#388e3c</color>
<color name="green_darker">#2e7d32</color>
<color name="red_lighter">#ef9a9a</color>
<color name="red_lightest">#ef9a9a</color>
<color name="red_lighter">#EF5350</color>
<color name="red_light">#f44336</color>
<color name="red">#e53935</color>
<color name="red_dark">#d32f2f</color>

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

@@ -34,6 +34,6 @@
<dimen name="hidden_lock_button_size">0dp</dimen>
<dimen name="content_percent">1</dimen>
<dimen name="toolbar_parallax_height">160dp</dimen>
<dimen name="advanced_search_height">220dp</dimen>
<dimen name="advanced_search_height">260dp</dimen>
<integer name="animation_duration">260</integer>
</resources>

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

@@ -103,7 +103,9 @@
<string name="otp_period">Period (seconds)</string>
<string name="otp_counter">Counter</string>
<string name="otp_digits">Digits</string>
<string name="search_filters">Search filters</string>
<string name="otp_algorithm">Algorithm</string>
<string name="current_group">Current group</string>
<string name="case_sensitive">Case sensitive</string>
<string name="debit_credit_card">Debit / Credit Card</string>
<string name="holder">Holder</string>

10
app/src/main/res/values/style_classic.xml
View File

@@ -36,7 +36,6 @@
<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="chipFilterBackgroundColor">@color/grey_lighter</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>
@@ -52,6 +51,10 @@
<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>
<item name="chipFilterTextColor">@color/text_color_light</item>
<item name="chipFilterBackgroundColor">@color/white_darkest</item>
<item name="chipFilterBackgroundColorDisabled">@color/white_grey_lighter</item>
</style>
<!-- Toolbar Style Clear -->
<style name="KeepassDXStyle.Toolbar.Clear" parent="KeepassDXStyle.Clear">
@@ -114,13 +117,16 @@
<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="chipFilterBackgroundColor">@color/black_light</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>
<item name="cardBackgroundTransparentColor">@color/black_light_transparent</item>
<item name="educationCircleColor">@color/cyan</item>
<item name="educationTextColor">@color/white</item>
<item name="chipFilterTextColor">@color/white</item>
<item name="chipFilterBackgroundColor">@color/black_lighter</item>
<item name="chipFilterBackgroundColorDisabled">@color/grey_darker</item>
</style>
<!-- Toolbar Style Dark -->
<style name="KeepassDXStyle.Toolbar.Dark" parent="KeepassDXStyle.Dark">

12
app/src/main/res/values/style_divine.xml
View File

@@ -38,7 +38,6 @@
<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="chipFilterBackgroundColor">@color/grey_lighter</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>
@@ -54,6 +53,10 @@
<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>
<item name="chipFilterTextColor">@color/grey_light</item>
<item name="chipFilterBackgroundColor">@color/white_darkest</item>
<item name="chipFilterBackgroundColorDisabled">@color/white</item>
</style>
<!-- Toolbar Style White -->
<style name="KeepassDXStyle.Toolbar.White" parent="KeepassDXStyle.White">
@@ -115,7 +118,6 @@
<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="chipFilterBackgroundColor">@color/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>
@@ -123,6 +125,10 @@
<item name="cardBackgroundTransparentColor">@color/black_light_transparent</item>
<item name="educationCircleColor">@color/orange_dark</item>
<item name="educationTextColor">@color/white</item>
<item name="chipFilterTextColor">@color/white</item>
<item name="chipFilterBackgroundColor">@color/grey_darker</item>
<item name="chipFilterBackgroundColorDisabled">@color/black_light</item>
</style>
<!-- Toolbar Style Black -->
<style name="KeepassDXStyle.Toolbar.Black" parent="KeepassDXStyle.Black">
@@ -130,7 +136,7 @@
<item name="android:textColorPrimary">@color/white</item>
<item name="android:textColorSecondary">@color/grey_lighter</item>
<item name="android:editTextColor">@color/white</item>
<item name="android:textColorHint">@color/green_lighter</item>
<item name="android:textColorHint">@color/green_lightest</item>
<item name="android:tint">@color/white</item>
</style>
<!-- Toolbar Popup menu -->

10
app/src/main/res/values/style_kunzite.xml
View File

@@ -33,7 +33,6 @@
<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="chipFilterBackgroundColor">@color/purple_light</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>
@@ -41,6 +40,10 @@
<item name="cardBackgroundTransparentColor">@color/white_purple_light_transparent</item>
<item name="educationCircleColor">@color/purple_dark</item>
<item name="educationTextColor">@color/white</item>
<item name="chipFilterTextColor">@color/white_purple_light</item>
<item name="chipFilterBackgroundColor">@color/purple_light</item>
<item name="chipFilterBackgroundColorDisabled">@color/purple</item>
</style>
<!-- Toolbar Style Purple -->
<style name="KeepassDXStyle.Toolbar.Purple" parent="KeepassDXStyle.Purple">
@@ -107,7 +110,6 @@
<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="chipFilterBackgroundColor">@color/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>
@@ -115,6 +117,10 @@
<item name="cardBackgroundTransparentColor">@color/black_purple_transparent</item>
<item name="educationCircleColor">@color/black_purple</item>
<item name="educationTextColor">@color/white</item>
<item name="chipFilterTextColor">@color/white_purple_light</item>
<item name="chipFilterBackgroundColor">@color/purple_dark</item>
<item name="chipFilterBackgroundColorDisabled">@color/purple_darker</item>
</style>
<!-- Toolbar Style Purple -->
<style name="KeepassDXStyle.Toolbar.Purple.Dark" parent="KeepassDXStyle.Purple.Dark">

10
app/src/main/res/values/style_moon.xml
View File

@@ -34,11 +34,14 @@
<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="chipFilterBackgroundColor">@color/blue_light</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Blue.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Blue.Dialog</item>
<item name="educationCircleColor">@color/blue_dark</item>
<item name="educationTextColor">@color/white</item>
<item name="chipFilterTextColor">@color/white</item>
<item name="chipFilterBackgroundColor">@color/blue_light</item>
<item name="chipFilterBackgroundColorDisabled">@color/blue</item>
</style>
<!-- Toolbar Style Blue -->
<style name="KeepassDXStyle.Toolbar.Blue" parent="KeepassDXStyle.Blue">
@@ -95,11 +98,14 @@
<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="chipFilterBackgroundColor">@color/blue_dark</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Blue.Night.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Blue.Night.Dialog</item>
<item name="educationCircleColor">@color/blue_dark</item>
<item name="educationTextColor">@color/white</item>
<item name="chipFilterTextColor">@color/white</item>
<item name="chipFilterBackgroundColor">@color/blue_light</item>
<item name="chipFilterBackgroundColorDisabled">@color/blue</item>
</style>
<!-- Toolbar Style Blue -->
<style name="KeepassDXStyle.Toolbar.Blue.Night" parent="KeepassDXStyle.Blue.Night">

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

@@ -27,27 +27,30 @@
<item name="colorAccentLight">@color/orange_light</item>
<item name="colorControlActivated">@color/orange</item>
<item name="android:textColorPrimary">@color/red</item>
<item name="android:textColorHintInverse">@color/red_lighter</item>
<item name="android:textColorHintInverse">@color/red_lightest</item>
<item name="android:windowBackground">@color/white_dark</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="chipFilterBackgroundColor">@color/red_light</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Red.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Red.Dialog</item>
<item name="educationCircleColor">@color/red_dark</item>
<item name="educationTextColor">@color/white</item>
<item name="chipFilterTextColor">@color/white</item>
<item name="chipFilterBackgroundColor">@color/red_lighter</item>
<item name="chipFilterBackgroundColorDisabled">@color/red</item>
</style>
<!-- Toolbar Style Red -->
<style name="KeepassDXStyle.Toolbar.Red" parent="KeepassDXStyle.Red">
<item name="colorControlActivated">@color/red_lighter</item>
<item name="colorControlActivated">@color/red_lightest</item>
<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/red_lighter</item>
<item name="android:textColorHint">@color/red_lightest</item>
<item name="android:tint">@color/white</item>
</style>
<!-- Toolbar Home Red -->
@@ -88,26 +91,29 @@
<item name="colorAccentLight">@color/orange_light</item>
<item name="colorControlActivated">@color/orange</item>
<item name="android:textColorPrimary">@color/red</item>
<item name="android:textColorHintInverse">@color/red_lighter</item>
<item name="android:textColorHintInverse">@color/red_lightest</item>
<item name="android:windowBackground">@color/grey_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="chipFilterBackgroundColor">@color/red_dark</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Red.Night.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Red.Night.Dialog</item>
<item name="educationCircleColor">@color/red_dark</item>
<item name="educationTextColor">@color/white</item>
<item name="chipFilterTextColor">@color/white</item>
<item name="chipFilterBackgroundColor">@color/red_lighter</item>
<item name="chipFilterBackgroundColorDisabled">@color/red</item>
</style>
<!-- Toolbar Style Red -->
<style name="KeepassDXStyle.Toolbar.Red.Night" parent="KeepassDXStyle.Red.Night">
<item name="colorControlActivated">@color/red_lighter</item>
<item name="colorControlActivated">@color/red_lightest</item>
<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/red_lighter</item>
<item name="android:textColorHint">@color/red_lightest</item>
<item name="android:tint">@color/white</item>
</style>
<!-- Toolbar Home Red -->

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

@@ -65,7 +65,7 @@
<item name="android:textColorSecondary">@color/text_color_secondary_light</item>
<item name="android:textColorSecondaryInverse">@color/white_grey_darker</item>
<item name="android:textColorHint">@color/grey_lighter</item>
<item name="android:textColorHintInverse">@color/green_lighter</item>
<item name="android:textColorHintInverse">@color/green_lightest</item>
<item name="iconPreferenceColor">@color/text_color_secondary_light</item>
@@ -87,10 +87,14 @@
<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>
<!-- Chip -->
<item name="chipFilterTextColor">@color/white</item>
<item name="chipFilterBackgroundColor">@color/green_light</item>
<item name="chipFilterBackgroundColorDisabled">@color/green</item>
<!-- Education Hint -->
<item name="educationCircleColor">@color/green_light</item>
<item name="educationCircleColor">@color/green_lighter</item>
<item name="educationTextColor">@color/white</item>
<!-- Edit Text -->
@@ -132,7 +136,7 @@
<item name="android:textColorSecondary">@color/text_color_secondary_night</item>
<item name="android:textColorSecondaryInverse">@color/white_grey_darker</item>
<item name="android:textColorHint">@color/grey_lighter</item>
<item name="android:textColorHintInverse">@color/green_lighter</item>
<item name="android:textColorHintInverse">@color/green_lightest</item>
<item name="iconPreferenceColor">@color/text_color_secondary_night</item>
@@ -154,7 +158,11 @@
<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="chipFilterBackgroundColor">@color/green_light</item>
<!-- Chip -->
<item name="chipFilterTextColor">@color/white</item>
<item name="chipFilterBackgroundColor">@color/green_lighter</item>
<item name="chipFilterBackgroundColorDisabled">@color/green</item>
<!-- Education Hint -->
<item name="educationCircleColor">@color/green_light</item>
@@ -185,7 +193,7 @@
<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_lighter</item>
<item name="android:textColorHint">@color/green_lightest</item>
<item name="android:tint">@color/white</item>
</style>
<style name="KeepassDXStyle.Toolbar.Night" parent="KeepassDXStyle.Night.v21">
@@ -193,7 +201,7 @@
<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_lighter</item>
<item name="android:textColorHint">@color/green_lightest</item>
<item name="android:tint">@color/white</item>
</style>
@@ -273,9 +281,24 @@
<!-- Chip -->
<style name="KeepassDXStyle.Chip.Filter" parent="Widget.MaterialComponents.Chip.Filter">
<item name="chipCornerRadius">8dp</item>
<item name="chipBackgroundColor">?attr/chipFilterBackgroundColor</item>
<item name="android:textColor">@color/white</item>
<item name="chipBackgroundColor">@color/background_color_chip</item>
<item name="android:textColor">?attr/chipFilterTextColor</item>
<item name="checkedIcon">@drawable/ic_check_white_24dp</item>
<item name="checkedIconTint">?attr/chipFilterTextColor</item>
<item name="chipIconVisible">false</item>
<item name="closeIconSize">24dp</item>
<item name="ensureMinTouchTargetSize">false</item>
</style>
<style name="KeepassDXStyle.Chip.Filter.Icon" parent="Widget.MaterialComponents.Chip.Filter">
<item name="chipCornerRadius">8dp</item>
<item name="chipBackgroundColor">@color/background_color_chip</item>
<item name="android:textColor">?attr/chipFilterTextColor</item>
<item name="checkedIcon">@drawable/ic_check_white_24dp</item>
<item name="checkedIconTint">?attr/chipFilterTextColor</item>
<item name="chipIconVisible">true</item>
<item name="closeIconVisible">true</item>
<item name="closeIconSize">24dp</item>
<item name="closeIconTint">?attr/chipFilterTextColor</item>
<item name="ensureMinTouchTargetSize">false</item>
</style>

86
art/ic_case_sensitive.svg Normal file
View File

@@ -0,0 +1,86 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="24"
height="24"
viewBox="0 0 24 24"
version="1.1"
id="svg4"
sodipodi:docname="case_sensitive.svg"
inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
<metadata
id="metadata10">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs8">
<linearGradient
inkscape:collect="always"
id="linearGradient835">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop831" />
<stop
style="stop-color:#000000;stop-opacity:0;"
offset="1"
id="stop833" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient835"
id="linearGradient837"
x1="11.251463"
y1="14.461988"
x2="22.31579"
y2="14.461988"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
pagecolor="#c8c8c8"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0.28235294"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1016"
id="namedview6"
showgrid="true"
inkscape:zoom="11.313708"
inkscape:cx="7.3924142"
inkscape:cy="10.651633"
inkscape:window-x="1920"
inkscape:window-y="27"
inkscape:window-maximized="1"
inkscape:current-layer="svg4">
<inkscape:grid
type="xygrid"
id="grid818" />
</sodipodi:namedview>
<path
style="font-style:normal;font-weight:normal;font-size:23.95321655px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.59883046"
d="M 8.6660156 3.5371094 L 2 21 L 4.4921875 21 L 6.0820312 16.519531 L 10.287109 16.519531 C 10.36083 15.806007 10.5606 15.14402 10.871094 14.554688 L 6.7949219 14.554688 L 10 5.8652344 L 11.210938 9.1367188 L 11.210938 7.8105469 L 11.849609 7.5644531 C 12.1567 7.4458738 12.458907 7.3490018 12.761719 7.2519531 L 11.345703 3.5371094 L 8.6660156 3.5371094 z M 16.666016 7.5839844 C 15.964262 7.5839844 15.242694 7.6624139 14.501953 7.8183594 C 13.761212 7.9665075 12.998462 8.1939533 12.210938 8.4980469 L 12.210938 10.486328 C 12.865908 10.127654 13.54826 9.8570716 14.257812 9.6777344 C 14.967364 9.4983971 15.696774 9.4101562 16.445312 9.4101562 C 17.622701 9.4101562 18.534467 9.6827067 19.181641 10.228516 C 19.836611 10.766528 20.164062 11.529278 20.164062 12.519531 L 20.164062 12.730469 L 17.146484 12.730469 C 15.189369 12.730469 13.714863 13.104978 12.724609 13.853516 C 11.742153 14.602054 11.251953 15.713816 11.251953 17.1875 C 11.251953 18.450658 11.64607 19.460462 12.433594 20.216797 C 13.228916 20.965335 14.295588 21.339844 15.636719 21.339844 C 16.697147 21.339844 17.595182 21.151612 18.328125 20.777344 C 19.061068 20.395277 19.672835 19.80704 20.164062 19.011719 L 20.164062 21 L 22.316406 21 L 22.316406 13.525391 C 22.316406 11.529289 21.847782 10.04105 20.912109 9.0585938 C 19.976437 8.0761376 18.560753 7.5839844 16.666016 7.5839844 z M 14.103516 10.777344 C 13.620766 10.928312 13.14846 11.11299 12.691406 11.363281 L 12.146484 11.662109 L 12.554688 12.767578 C 13.13989 12.410612 13.81914 12.16373 14.568359 11.996094 L 14.103516 10.777344 z M 18.023438 14.416016 L 20.164062 14.416016 L 20.164062 14.894531 C 20.164062 16.29804 19.801318 17.425488 19.076172 18.275391 C 18.358823 19.117496 17.40392 19.537109 16.210938 19.537109 C 15.34544 19.537109 14.659166 19.315538 14.152344 18.871094 C 13.653318 18.418852 13.404297 17.811007 13.404297 17.046875 C 13.404297 16.08781 13.739592 15.409379 14.410156 15.011719 C 15.080722 14.614058 16.284645 14.416016 18.023438 14.416016 z M 15.933594 15.576172 C 15.436083 15.663112 15.086511 15.772302 14.919922 15.871094 C 14.55273 16.088847 14.404297 16.320872 14.404297 17.046875 C 14.404297 17.589232 14.533543 17.860825 14.820312 18.123047 C 15.114517 18.378191 15.521588 18.537109 16.210938 18.537109 C 16.518099 18.537109 16.779218 18.49703 17.023438 18.4375 L 15.933594 15.576172 z "
id="path839" />
<g
id="g829"
style="font-style:normal;font-weight:normal;font-size:23.95321655px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:url(#linearGradient837);stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none"
aria-label="a" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 5.0 KiB

65
art/ic_current_group.svg Normal file
View File

@@ -0,0 +1,65 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="24"
height="24"
viewBox="0 0 24 24"
version="1.1"
id="svg4"
sodipodi:docname="ic_current_group.svg"
inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
<metadata
id="metadata10">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs8" />
<sodipodi:namedview
pagecolor="#c8c8c8"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0.28235294"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1016"
id="namedview6"
showgrid="true"
inkscape:zoom="16.000001"
inkscape:cx="-3.2205535"
inkscape:cy="8.6694093"
inkscape:window-x="1920"
inkscape:window-y="27"
inkscape:window-maximized="1"
inkscape:current-layer="svg4">
<inkscape:grid
type="xygrid"
id="grid818" />
</sodipodi:namedview>
<g
id="g883"
transform="matrix(0.0163282,0,0,0.0163282,5.836718,4.12103)">
<path
style="fill:#ffffff;fill-opacity:1;stroke-width:0.0163282"
d="M 2.5,1 C 2.223,1 2,1.223 2,1.5 v 12 9 C 2,22.777 2.223,23 2.5,23 2.777,23 3,22.777 3,22.5 V 14 h 3 v 2.474609 C 6,17.313879 6.6858008,18 7.5234375,18 H 20.476562 C 21.314199,18 22,17.314199 22,16.476562 V 9.8085938 C 22,8.9709571 21.314199,8.2851562 20.476562,8.2851562 H 14 L 12.476562,6.5703125 H 7.5234375 C 6.6858008,6.5703125 6,7.2561133 6,8.09375 V 13 H 3 V 1.5 C 3,1.223 2.777,1 2.5,1 Z"
transform="matrix(61.243738,0,0,61.243738,-357.46243,-252.38728)"
id="path881"
inkscape:connector-curvature="0" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB