diff --git a/app/src/main/res/color/background_color_chip.xml b/app/src/main/res/color/background_color_chip.xml
new file mode 100644
index 000000000..18061d697
--- /dev/null
+++ b/app/src/main/res/color/background_color_chip.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_case_sensitive_white_24dp.xml b/app/src/main/res/drawable/ic_case_sensitive_white_24dp.xml
new file mode 100644
index 000000000..a39c09be8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_case_sensitive_white_24dp.xml
@@ -0,0 +1,11 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_current_folder_white_24dp.xml b/app/src/main/res/drawable/ic_current_folder_white_24dp.xml
new file mode 100644
index 000000000..a155c1081
--- /dev/null
+++ b/app/src/main/res/drawable/ic_current_folder_white_24dp.xml
@@ -0,0 +1,11 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_templates_white_24dp.xml b/app/src/main/res/drawable/ic_templates_white_24dp.xml
new file mode 100644
index 000000000..01a04086d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_templates_white_24dp.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_search_filters.xml b/app/src/main/res/layout/view_search_filters.xml
index 2d82d78a5..7cb581f1e 100644
--- a/app/src/main/res/layout/view_search_filters.xml
+++ b/app/src/main/res/layout/view_search_filters.xml
@@ -27,30 +27,35 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
tools:text="3" />
-
-
-
-
-
-
+ android:layout_marginStart="@dimen/default_margin"
+ android:layout_marginLeft="@dimen/default_margin"
+ app:singleLine="true">
+
+
+
+
-
+
+
+ style="@style/KeepassDXStyle.Chip.Filter.Icon"
+ app:closeIcon="@drawable/ic_warning_white_24dp"
+ android:text="@string/entry_expires" />
+
-
+
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index f5b7f7cac..11c9ca46a 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -23,13 +23,16 @@
+
+
+
+
-
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 3f27c7b43..005286453 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -56,13 +56,15 @@
#2486AB
#2c7a96
- #a5d6a7
+ #a5d6a7
+ #66BB6A
#4caf50
#43a047
#388e3c
#2e7d32
- #ef9a9a
+ #ef9a9a
+ #EF5350
#f44336
#e53935
#d32f2f
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 18b99e9a4..d9cdafb43 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -34,6 +34,6 @@
0dp
1
160dp
- 220dp
+ 260dp
260
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7530c5f11..105dec819 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -103,7 +103,9 @@
Period (seconds)
Counter
Digits
+ Search filters
Algorithm
+ Current group
Case sensitive
Debit / Credit Card
Holder
diff --git a/app/src/main/res/values/style_classic.xml b/app/src/main/res/values/style_classic.xml
index 4847d2018..a01c3a678 100644
--- a/app/src/main/res/values/style_classic.xml
+++ b/app/src/main/res/values/style_classic.xml
@@ -36,7 +36,6 @@
- @style/KeepassDXStyle.Toolbar.Home.Clear
- @style/KeepassDXStyle.Toolbar.Special.Clear
- @style/KeepassDXStyle.Toolbar.Action.Clear
- - @color/grey_lighter
- @style/KeepassDXStyle.Toolbar.Popup.Clear
- @style/KeepassDXStyle.Clear.Dialog
- @style/KeepassDXStyle.Clear.Dialog
@@ -52,6 +51,10 @@
- @color/text_color_secondary_light
- @color/grey_lighter
- @color/grey_lighter
+
+ - @color/text_color_light
+ - @color/white_darkest
+ - @color/white_grey_lighter
diff --git a/app/src/main/res/values/style_kunzite.xml b/app/src/main/res/values/style_kunzite.xml
index 3c492019a..60eff13c1 100644
--- a/app/src/main/res/values/style_kunzite.xml
+++ b/app/src/main/res/values/style_kunzite.xml
@@ -33,7 +33,6 @@
- @style/KeepassDXStyle.Toolbar.Home.Purple
- @style/KeepassDXStyle.Toolbar.Special.Purple
- @style/KeepassDXStyle.Toolbar.Action.Purple
- - @color/purple_light
- @style/KeepassDXStyle.Toolbar.Popup.Purple
- @style/KeepassDXStyle.Purple.Dialog
- @style/KeepassDXStyle.Purple.Dialog
@@ -41,6 +40,10 @@
- @color/white_purple_light_transparent
- @color/purple_dark
- @color/white
+
+ - @color/white_purple_light
+ - @color/purple_light
+ - @color/purple
@@ -88,26 +91,29 @@
- @color/orange_light
- @color/orange
- @color/red
- - @color/red_lighter
+ - @color/red_lightest
- @color/grey_dark
- @style/KeepassDXStyle.Toolbar.Red.Night
- @style/KeepassDXStyle.Toolbar.Home.Red.Night
- @style/KeepassDXStyle.Toolbar.Special.Red.Night
- @style/KeepassDXStyle.Toolbar.Action.Red.Night
- - @color/red_dark
- @style/KeepassDXStyle.Red.Night.Dialog
- @style/KeepassDXStyle.Red.Night.Dialog
- @color/red_dark
- @color/white
+
+ - @color/white
+ - @color/red_lighter
+ - @color/red
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index cbc2c73b6..17bb9d7ac 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -65,7 +65,7 @@
- @color/text_color_secondary_light
- @color/white_grey_darker
- @color/grey_lighter
- - @color/green_lighter
+ - @color/green_lightest
- @color/text_color_secondary_light
@@ -87,10 +87,14 @@
- @style/KeepassDXStyle.Toolbar.Action.Light
- @style/KeepassDXStyle.Expanded.Title
- @style/KeepassDXStyle.Collapsed.Title
+
+
+ - @color/white
- @color/green_light
+ - @color/green
- - @color/green_light
+ - @color/green_lighter
- @color/white
@@ -132,7 +136,7 @@
- @color/text_color_secondary_night
- @color/white_grey_darker
- @color/grey_lighter
- - @color/green_lighter
+ - @color/green_lightest
- @color/text_color_secondary_night
@@ -154,7 +158,11 @@
- @style/KeepassDXStyle.Toolbar.Action.Night
- @style/KeepassDXStyle.Expanded.Title
- @style/KeepassDXStyle.Collapsed.Title
- - @color/green_light
+
+
+ - @color/white
+ - @color/green_lighter
+ - @color/green
- @color/green_light
@@ -185,7 +193,7 @@
- @color/white
- @color/white
- @color/white
- - @color/green_lighter
+ - @color/green_lightest
- @color/white
@@ -273,9 +281,24 @@
+
diff --git a/art/ic_case_sensitive.svg b/art/ic_case_sensitive.svg
new file mode 100644
index 000000000..1bc09a9c9
--- /dev/null
+++ b/art/ic_case_sensitive.svg
@@ -0,0 +1,86 @@
+
+
diff --git a/art/ic_current_group.svg b/art/ic_current_group.svg
new file mode 100644
index 000000000..3e6893008
--- /dev/null
+++ b/art/ic_current_group.svg
@@ -0,0 +1,65 @@
+
+