Fix color style and remove colorAccentCompat

2025-12-04 15:49:33 +01:00 · 2019-08-13 14:19:13 +02:00
parent 4aa8d892a4
commit 37e722847a
20 changed files with 67 additions and 26 deletions
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/FileDatabaseHistoryAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/FileDatabaseHistoryAdapter.kt
@@ -48,7 +48,7 @@ class FileDatabaseHistoryAdapter(private val context: Context, private val listF

        val typedValue = TypedValue()
        val theme = context.theme
-        theme.resolveAttribute(R.attr.colorAccentCompat, typedValue, true)
+        theme.resolveAttribute(R.attr.colorAccent, typedValue, true)
        warningColor = typedValue.data
        theme.resolveAttribute(android.R.attr.textColorHintInverse, typedValue, true)
        defaultColor = typedValue.data
--- a/app/src/main/java/com/kunzisoft/keepass/view/EntryContentsView.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/view/EntryContentsView.kt
@@ -97,7 +97,7 @@ class EntryContentsView @JvmOverloads constructor(context: Context, attrs: Attri
        lastAccessDateView = findViewById(R.id.entry_accessed)
        expiresDateView = findViewById(R.id.entry_expires)

-        val attrColorAccent = intArrayOf(R.attr.colorAccentCompat)
+        val attrColorAccent = intArrayOf(R.attr.colorAccent)
        val taColorAccent = context.theme.obtainStyledAttributes(attrColorAccent)
        colorAccent = taColorAccent.getColor(0, Color.BLACK)
        taColorAccent.recycle()
--- a/app/src/main/res/color/background_button_color_accent.xml
+++ b/app/src/main/res/color/background_button_color_accent.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?attr/colorAccentLight" android:state_pressed="true" />
    <item android:color="@color/grey_dark" android:state_enabled="false" />
-    <item android:color="?attr/colorAccentCompat" android:state_enabled="true" />
+    <item android:color="?attr/colorAccent" android:state_enabled="true" />
 </selector>
--- a/app/src/main/res/color/background_button_color_primary.xml
+++ b/app/src/main/res/color/background_button_color_primary.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?attr/colorPrimaryDark" android:state_pressed="true" />
    <item android:color="@color/grey_dark" android:state_enabled="false" />
    <item android:color="?attr/colorPrimary" android:state_enabled="true" />
 </selector>
--- a/app/src/main/res/drawable-v21/background_button.xml
+++ b/app/src/main/res/drawable-v21/background_button.xml
@@ -12,7 +12,7 @@
                android:right="0dp"
                android:top="12dp"
                android:bottom="12dp"/>
-            <solid android:color="?attr/colorAccentCompat"/>
+            <solid android:color="?attr/colorAccent"/>
        </shape>
    </item>
 </ripple>
--- a/app/src/main/res/drawable-v21/background_button_small.xml
+++ b/app/src/main/res/drawable-v21/background_button_small.xml
@@ -14,7 +14,7 @@
                        android:right="14dp"
                        android:top="4dp"
                        android:bottom="8dp"/>
-                    <solid android:color="?attr/colorAccentCompat"/>
+                    <solid android:color="?attr/colorAccent"/>
                </shape>
            </item>
        </layer-list>
--- a/app/src/main/res/drawable/background_button.xml
+++ b/app/src/main/res/drawable/background_button.xml
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape>
+            <corners
+                android:radius="0dp" />
+            <padding
+                android:left="0dp"
+                android:right="0dp"
+                android:top="12dp"
+                android:bottom="12dp"/>
+            <solid android:color="@color/orange_light"/>
+        </shape>
+    </item>
    <item>
        <shape>
            <corners
@@ -12,4 +24,4 @@
            <solid android:color="@color/orange"/>
        </shape>
    </item>
-</layer-list>
+</selector>
--- a/app/src/main/res/drawable/background_button_small.xml
+++ b/app/src/main/res/drawable/background_button_small.xml
@@ -1,5 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <layer-list>
+            <item android:bottom="2dp" android:left="2dp">
+                <shape>
+                    <corners
+                        android:radius="8dp" />
+                    <padding
+                        android:left="14dp"
+                        android:right="14dp"
+                        android:top="4dp"
+                        android:bottom="8dp"/>
+                    <solid android:color="@color/orange_light"/>
+                </shape>
+            </item>
+        </layer-list>
+    </item>
    <item>
        <layer-list>
            <item android:bottom="2dp" android:left="2dp">
@@ -16,4 +32,4 @@
            </item>
        </layer-list>
    </item>
-</layer-list>
+</selector>
--- a/app/src/main/res/drawable/background_image_button.xml
+++ b/app/src/main/res/drawable/background_image_button.xml
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape
+            android:shape="oval">
+            <stroke android:color="@color/orange_light" android:width="2dp"/>
+            <padding
+                android:left="12dp"
+                android:right="12dp"
+                android:top="12dp"
+                android:bottom="12dp"/>
+            <solid android:color="@color/transparent"/>
+        </shape>
+    </item>
    <item>
        <shape
            android:shape="oval">
@@ -12,4 +24,4 @@
            <solid android:color="@color/transparent"/>
        </shape>
    </item>
-</layer-list>
+</selector>
--- a/app/src/main/res/layout/activity_file_selection.xml
+++ b/app/src/main/res/layout/activity_file_selection.xml
@@ -85,7 +85,7 @@
                    android:shadowDy="2"
                    android:shadowRadius="4"
                    android:paddingTop="?attr/actionBarSize"
-                    android:textColor="?attr/colorAccentCompat"
+                    android:textColor="?attr/colorAccent"
                    android:gravity="center"
                    android:text="@string/app_name_part2"/>
                <TextView
--- a/app/src/main/res/layout/activity_password.xml
+++ b/app/src/main/res/layout/activity_password.xml
@@ -199,7 +199,7 @@
                            android:padding="8dp"
                            android:focusable="true"
                            android:src="@drawable/ic_folder_white_24dp"
-                            android:tint="?attr/colorAccentCompat" />
+                            android:tint="?attr/colorAccent" />
                    </RelativeLayout>

                </LinearLayout>
--- a/app/src/main/res/layout/fragment_file_creation.xml
+++ b/app/src/main/res/layout/fragment_file_creation.xml
@@ -21,7 +21,7 @@
            android:layout_alignParentEnd="true"
            android:layout_alignBottom="@+id/folder_path_input_layout"
            android:src="@drawable/ic_folder_white_24dp"
-            android:tint="?attr/colorAccentCompat" />
+            android:tint="?attr/colorAccent" />

        <android.support.design.widget.TextInputLayout
            android:id="@+id/folder_path_input_layout"
--- a/app/src/main/res/layout/fragment_set_password.xml
+++ b/app/src/main/res/layout/fragment_set_password.xml
@@ -114,7 +114,7 @@
                        android:layout_alignParentRight="true"
                        android:padding="12dp"
                        android:src="@drawable/ic_folder_white_24dp"
-                        android:tint="?attr/colorAccentCompat" />
+                        android:tint="?attr/colorAccent" />

                    <android.support.v7.widget.AppCompatEditText
                        android:id="@+id/pass_keyfile"
--- a/app/src/main/res/layout/view_button_add_node.xml
+++ b/app/src/main/res/layout/view_button_add_node.xml
@@ -43,7 +43,6 @@
            android:layout_marginRight="@dimen/image_button_margin"
            android:layout_marginEnd="@dimen/image_button_margin"
            android:src="@drawable/ic_key_white_24dp"
-            android:tint="?attr/colorAccentCompat"
            android:theme="@style/KeepassDXStyle.Fab.White"
            app:fabSize="mini"
            app:useCompatPadding="true" />
@@ -74,7 +73,6 @@
            android:layout_marginRight="@dimen/image_button_margin"
            android:layout_marginEnd="@dimen/image_button_margin"
            android:src="@drawable/ic_folder_white_24dp"
-            android:tint="?attr/colorAccentCompat"
            android:theme="@style/KeepassDXStyle.Fab.White"
            app:fabSize="mini"
            app:useCompatPadding="true" />
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -22,7 +22,7 @@
    <attr name="toolbarBottomAppearance" format="reference" />
    <attr name="toolbarPopupAppearance" format="reference" />

-    <attr name="colorAccentCompat" format="reference|color" />
+    <attr name="colorAccentLight" format="reference|color" />

    <attr name="iconPreferenceColor" format="reference|color" />

--- a/app/src/main/res/values/style_blue.xml
+++ b/app/src/main/res/values/style_blue.xml
@@ -23,7 +23,7 @@
        <item name="colorPrimary">@color/blue</item>
        <item name="colorPrimaryDark">@color/blue_dark</item>
        <item name="colorAccent">@color/blue_white</item>
-        <item name="colorAccentCompat">@color/blue_white</item>
+        <item name="colorAccentLight">@color/blue_lighter</item>
        <item name="colorControlActivated">@color/blue</item>
        <item name="android:textColorPrimary">@color/blue_light</item>
        <item name="android:textColorHintInverse">@color/blue_lighter</item>
--- a/app/src/main/res/values/style_dark.xml
+++ b/app/src/main/res/values/style_dark.xml
@@ -23,7 +23,7 @@
        <item name="colorPrimary">#212121</item>
        <item name="colorPrimaryDark">@color/dark</item>
        <item name="colorAccent">#26a69a</item>
-        <item name="colorAccentCompat">#26a69a</item>
+        <item name="colorAccentLight">#80cbc4</item>
        <item name="colorControlActivated">#80cbc4</item>
        <item name="android:textColorPrimary">#80cbc4</item>
        <item name="android:textColorHintInverse">#80cbc4</item>
--- a/app/src/main/res/values/style_purple.xml
+++ b/app/src/main/res/values/style_purple.xml
@@ -23,7 +23,7 @@
        <item name="colorPrimary">@color/purple</item>
        <item name="colorPrimaryDark">@color/purple_dark</item>
        <item name="colorAccent">@color/red</item>
-        <item name="colorAccentCompat">@color/red</item>
+        <item name="colorAccentLight">@color/red_light</item>
        <item name="android:textColor">@color/purple_dark</item>
        <item name="android:editTextColor">@color/purple</item>
        <item name="colorControlActivated">@color/green</item>
--- a/app/src/main/res/values/style_red.xml
+++ b/app/src/main/res/values/style_red.xml
@@ -23,7 +23,7 @@
        <item name="colorPrimary">@color/red</item>
        <item name="colorPrimaryDark">@color/red_dark</item>
        <item name="colorAccent">@color/orange</item>
-        <item name="colorAccentCompat">@color/orange</item>
+        <item name="colorAccentLight">@color/orange_light</item>
        <item name="colorControlActivated">@color/red</item>
        <item name="android:textColorPrimary">@color/red</item>
        <item name="android:textColorHintInverse">@color/red_lighter</item>
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -45,7 +45,7 @@
        <item name="colorPrimary">@color/green</item>
        <item name="colorPrimaryDark">@color/green_dark</item>
        <item name="colorAccent">@color/orange</item>
-        <item name="colorAccentCompat">@color/orange</item>
+        <item name="colorAccentLight">@color/orange_light</item>

        <item name="colorControlNormal">@color/colorTextSecondary</item>
        <item name="colorControlActivated">@color/orange</item>
@@ -102,7 +102,7 @@
        <item name="colorPrimary">@color/green</item>
        <item name="colorPrimaryDark">@color/green_dark</item>
        <item name="colorAccent">@color/orange</item>
-        <item name="colorAccentCompat">@color/orange</item>
+        <item name="colorAccentLight">@color/orange_light</item>

        <item name="colorControlNormal">@color/colorTextSecondary</item>
        <item name="colorControlActivated">@color/orange</item>
@@ -291,12 +291,13 @@
    </style>

    <!-- FAB -->
-    <style name="KeepassDXStyle.v21.Fab" parent="Theme.AppCompat" />
+    <style name="KeepassDXStyle.v21.Fab" parent="KeepassDXStyle.Light.v21" />
    <style name="KeepassDXStyle.Fab" parent="KeepassDXStyle.v21.Fab">
    </style>
    <style name="KeepassDXStyle.Fab.White" parent="KeepassDXStyle.v21.Fab">
        <item name="colorAccent">@color/white</item>
-        <item name="tint">?attr/colorAccentCompat</item>
+        <item name="tint">?attr/colorAccentLight</item>
+        <item name="android:tint">?attr/colorAccentLight</item>
    </style>

    <!-- Menu FAB -->