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 color style and remove colorAccentCompat

Browse Source
This commit is contained in:
J-Jamet
2019-08-13 14:19:13 +02:00
parent 4aa8d892a4
commit 37e722847a
20 changed files with 67 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/kunzisoft/keepass/adapters/FileDatabaseHistoryAdapter.kt
View File

@@ -48,7 +48,7 @@ class FileDatabaseHistoryAdapter(private val context: Context, private val listF
val typedValue = TypedValue() val typedValue = TypedValue()
val theme = context.theme val theme = context.theme
theme.resolveAttribute(R.attr.colorAccentCompat, typedValue, true) theme.resolveAttribute(R.attr.colorAccent, typedValue, true)
warningColor = typedValue.data warningColor = typedValue.data
theme.resolveAttribute(android.R.attr.textColorHintInverse, typedValue, true) theme.resolveAttribute(android.R.attr.textColorHintInverse, typedValue, true)
defaultColor = typedValue.data defaultColor = typedValue.data

2
app/src/main/java/com/kunzisoft/keepass/view/EntryContentsView.kt
View File

@@ -97,7 +97,7 @@ class EntryContentsView @JvmOverloads constructor(context: Context, attrs: Attri
lastAccessDateView = findViewById(R.id.entry_accessed) lastAccessDateView = findViewById(R.id.entry_accessed)
expiresDateView = findViewById(R.id.entry_expires) expiresDateView = findViewById(R.id.entry_expires)
val attrColorAccent = intArrayOf(R.attr.colorAccentCompat) val attrColorAccent = intArrayOf(R.attr.colorAccent)
val taColorAccent = context.theme.obtainStyledAttributes(attrColorAccent) val taColorAccent = context.theme.obtainStyledAttributes(attrColorAccent)
colorAccent = taColorAccent.getColor(0, Color.BLACK) colorAccent = taColorAccent.getColor(0, Color.BLACK)
taColorAccent.recycle() taColorAccent.recycle()

3
app/src/main/res/color/background_button_color_accent.xml
View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <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="@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> </selector>

1
app/src/main/res/color/background_button_color_primary.xml
View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <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="@color/grey_dark" android:state_enabled="false" />
<item android:color="?attr/colorPrimary" android:state_enabled="true" /> <item android:color="?attr/colorPrimary" android:state_enabled="true" />
</selector> </selector>

2
app/src/main/res/drawable-v21/background_button.xml
View File

@@ -12,7 +12,7 @@
android:right="0dp" android:right="0dp"
android:top="12dp" android:top="12dp"
android:bottom="12dp"/> android:bottom="12dp"/>
<solid android:color="?attr/colorAccentCompat"/> <solid android:color="?attr/colorAccent"/>
</shape> </shape>
</item> </item>
</ripple> </ripple>

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

@@ -14,7 +14,7 @@
android:right="14dp" android:right="14dp"
android:top="4dp" android:top="4dp"
android:bottom="8dp"/> android:bottom="8dp"/>
<solid android:color="?attr/colorAccentCompat"/> <solid android:color="?attr/colorAccent"/>
</shape> </shape>
</item> </item>
</layer-list> </layer-list>

16
app/src/main/res/drawable/background_button.xml
View File

@@ -1,5 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?> <?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> <item>
<shape> <shape>
<corners <corners
@@ -12,4 +24,4 @@
<solid android:color="@color/orange"/> <solid android:color="@color/orange"/>
</shape> </shape>
</item> </item>
</layer-list> </selector>

20
app/src/main/res/drawable/background_button_small.xml
View File

@@ -1,5 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?> <?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> <item>
<layer-list> <layer-list>
<item android:bottom="2dp" android:left="2dp"> <item android:bottom="2dp" android:left="2dp">
@@ -16,4 +32,4 @@
</item> </item>
</layer-list> </layer-list>
</item> </item>
</layer-list> </selector>

16
app/src/main/res/drawable/background_image_button.xml
View File

@@ -1,5 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?> <?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> <item>
<shape <shape
android:shape="oval"> android:shape="oval">
@@ -12,4 +24,4 @@
<solid android:color="@color/transparent"/> <solid android:color="@color/transparent"/>
</shape> </shape>
</item> </item>
</layer-list> </selector>

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

@@ -85,7 +85,7 @@
android:shadowDy="2" android:shadowDy="2"
android:shadowRadius="4" android:shadowRadius="4"
android:paddingTop="?attr/actionBarSize" android:paddingTop="?attr/actionBarSize"
android:textColor="?attr/colorAccentCompat" android:textColor="?attr/colorAccent"
android:gravity="center" android:gravity="center"
android:text="@string/app_name_part2"/> android:text="@string/app_name_part2"/>
<TextView <TextView

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

@@ -199,7 +199,7 @@
android:padding="8dp" android:padding="8dp"
android:focusable="true" android:focusable="true"
android:src="@drawable/ic_folder_white_24dp" android:src="@drawable/ic_folder_white_24dp"
android:tint="?attr/colorAccentCompat" /> android:tint="?attr/colorAccent" />
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>

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

@@ -21,7 +21,7 @@
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignBottom="@+id/folder_path_input_layout" android:layout_alignBottom="@+id/folder_path_input_layout"
android:src="@drawable/ic_folder_white_24dp" android:src="@drawable/ic_folder_white_24dp"
android:tint="?attr/colorAccentCompat" /> android:tint="?attr/colorAccent" />
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:id="@+id/folder_path_input_layout" android:id="@+id/folder_path_input_layout"

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

@@ -114,7 +114,7 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:padding="12dp" android:padding="12dp"
android:src="@drawable/ic_folder_white_24dp" android:src="@drawable/ic_folder_white_24dp"
android:tint="?attr/colorAccentCompat" /> android:tint="?attr/colorAccent" />
<android.support.v7.widget.AppCompatEditText <android.support.v7.widget.AppCompatEditText
android:id="@+id/pass_keyfile" android:id="@+id/pass_keyfile"

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

@@ -43,7 +43,6 @@
android:layout_marginRight="@dimen/image_button_margin" android:layout_marginRight="@dimen/image_button_margin"
android:layout_marginEnd="@dimen/image_button_margin" android:layout_marginEnd="@dimen/image_button_margin"
android:src="@drawable/ic_key_white_24dp" android:src="@drawable/ic_key_white_24dp"
android:tint="?attr/colorAccentCompat"
android:theme="@style/KeepassDXStyle.Fab.White" android:theme="@style/KeepassDXStyle.Fab.White"
app:fabSize="mini" app:fabSize="mini"
app:useCompatPadding="true" /> app:useCompatPadding="true" />
@@ -74,7 +73,6 @@
android:layout_marginRight="@dimen/image_button_margin" android:layout_marginRight="@dimen/image_button_margin"
android:layout_marginEnd="@dimen/image_button_margin" android:layout_marginEnd="@dimen/image_button_margin"
android:src="@drawable/ic_folder_white_24dp" android:src="@drawable/ic_folder_white_24dp"
android:tint="?attr/colorAccentCompat"
android:theme="@style/KeepassDXStyle.Fab.White" android:theme="@style/KeepassDXStyle.Fab.White"
app:fabSize="mini" app:fabSize="mini"
app:useCompatPadding="true" /> app:useCompatPadding="true" />

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

@@ -22,7 +22,7 @@
<attr name="toolbarBottomAppearance" format="reference" /> <attr name="toolbarBottomAppearance" format="reference" />
<attr name="toolbarPopupAppearance" 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" /> <attr name="iconPreferenceColor" format="reference|color" />

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

@@ -23,7 +23,7 @@
<item name="colorPrimary">@color/blue</item> <item name="colorPrimary">@color/blue</item>
<item name="colorPrimaryDark">@color/blue_dark</item> <item name="colorPrimaryDark">@color/blue_dark</item>
<item name="colorAccent">@color/blue_white</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="colorControlActivated">@color/blue</item>
<item name="android:textColorPrimary">@color/blue_light</item> <item name="android:textColorPrimary">@color/blue_light</item>
<item name="android:textColorHintInverse">@color/blue_lighter</item> <item name="android:textColorHintInverse">@color/blue_lighter</item>

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

@@ -23,7 +23,7 @@
<item name="colorPrimary">#212121</item> <item name="colorPrimary">#212121</item>
<item name="colorPrimaryDark">@color/dark</item> <item name="colorPrimaryDark">@color/dark</item>
<item name="colorAccent">#26a69a</item> <item name="colorAccent">#26a69a</item>
<item name="colorAccentCompat">#26a69a</item> <item name="colorAccentLight">#80cbc4</item>
<item name="colorControlActivated">#80cbc4</item> <item name="colorControlActivated">#80cbc4</item>
<item name="android:textColorPrimary">#80cbc4</item> <item name="android:textColorPrimary">#80cbc4</item>
<item name="android:textColorHintInverse">#80cbc4</item> <item name="android:textColorHintInverse">#80cbc4</item>

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

@@ -23,7 +23,7 @@
<item name="colorPrimary">@color/purple</item> <item name="colorPrimary">@color/purple</item>
<item name="colorPrimaryDark">@color/purple_dark</item> <item name="colorPrimaryDark">@color/purple_dark</item>
<item name="colorAccent">@color/red</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:textColor">@color/purple_dark</item>
<item name="android:editTextColor">@color/purple</item> <item name="android:editTextColor">@color/purple</item>
<item name="colorControlActivated">@color/green</item> <item name="colorControlActivated">@color/green</item>

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

@@ -23,7 +23,7 @@
<item name="colorPrimary">@color/red</item> <item name="colorPrimary">@color/red</item>
<item name="colorPrimaryDark">@color/red_dark</item> <item name="colorPrimaryDark">@color/red_dark</item>
<item name="colorAccent">@color/orange</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="colorControlActivated">@color/red</item>
<item name="android:textColorPrimary">@color/red</item> <item name="android:textColorPrimary">@color/red</item>
<item name="android:textColorHintInverse">@color/red_lighter</item> <item name="android:textColorHintInverse">@color/red_lighter</item>

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

@@ -45,7 +45,7 @@
<item name="colorPrimary">@color/green</item> <item name="colorPrimary">@color/green</item>
<item name="colorPrimaryDark">@color/green_dark</item> <item name="colorPrimaryDark">@color/green_dark</item>
<item name="colorAccent">@color/orange</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="colorControlNormal">@color/colorTextSecondary</item>
<item name="colorControlActivated">@color/orange</item> <item name="colorControlActivated">@color/orange</item>
@@ -102,7 +102,7 @@
<item name="colorPrimary">@color/green</item> <item name="colorPrimary">@color/green</item>
<item name="colorPrimaryDark">@color/green_dark</item> <item name="colorPrimaryDark">@color/green_dark</item>
<item name="colorAccent">@color/orange</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="colorControlNormal">@color/colorTextSecondary</item>
<item name="colorControlActivated">@color/orange</item> <item name="colorControlActivated">@color/orange</item>
@@ -291,12 +291,13 @@
</style> </style>
<!-- FAB --> <!-- 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 name="KeepassDXStyle.Fab" parent="KeepassDXStyle.v21.Fab">
</style> </style>
<style name="KeepassDXStyle.Fab.White" parent="KeepassDXStyle.v21.Fab"> <style name="KeepassDXStyle.Fab.White" parent="KeepassDXStyle.v21.Fab">
<item name="colorAccent">@color/white</item> <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> </style>
<!-- Menu FAB --> <!-- Menu FAB -->