From 44078def3902d75fc2e2636468c2ea9281203a9e Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Thu, 4 Apr 2019 12:45:39 +0200
Subject: [PATCH] Improve visibility of icons
---
app/src/main/res/color/color_icons.xml | 21 +++++++++++++++++++
app/src/main/res/color/color_indicator.xml | 6 ------
app/src/main/res/drawable/bg_spinner.xml | 7 -------
.../layout/widget_material_spinner_label.xml | 16 --------------
app/src/main/res/values/styles_widgets.xml | 1 +
5 files changed, 22 insertions(+), 29 deletions(-)
create mode 100644 app/src/main/res/color/color_icons.xml
delete mode 100644 app/src/main/res/color/color_indicator.xml
delete mode 100644 app/src/main/res/drawable/bg_spinner.xml
delete mode 100644 app/src/main/res/layout/widget_material_spinner_label.xml
diff --git a/app/src/main/res/color/color_icons.xml b/app/src/main/res/color/color_icons.xml
new file mode 100644
index 000000000..42d390528
--- /dev/null
+++ b/app/src/main/res/color/color_icons.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ Copyright (C) 2018 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:color="?colorAccent" android:state_focused="true" />
+ <item android:alpha="1.00" android:color="?colorTextSecondary" android:state_hovered="true" />
+ <item android:alpha="0.38" android:color="?colorTextSecondary" android:state_enabled="false" />
+ <item android:alpha="0.87" android:color="?colorTextSecondary" />
+</selector>
diff --git a/app/src/main/res/color/color_indicator.xml b/app/src/main/res/color/color_indicator.xml
deleted file mode 100644
index 7ade179a9..000000000
--- a/app/src/main/res/color/color_indicator.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:color="?attr/colorAccent" android:state_activated="true" />
- <item android:alpha="0.38" android:color="?attr/colorOnSurface" android:state_enabled="false" />
- <item android:alpha="0.6" android:color="?attr/colorOnSurface" />
-</selector>
diff --git a/app/src/main/res/drawable/bg_spinner.xml b/app/src/main/res/drawable/bg_spinner.xml
deleted file mode 100644
index 60a856a1d..000000000
--- a/app/src/main/res/drawable/bg_spinner.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
- <corners android:radius="4dp" />
- <stroke
- android:width="1dp"
- android:color="@color/color_indicator" />
-</shape>
diff --git a/app/src/main/res/layout/widget_material_spinner_label.xml b/app/src/main/res/layout/widget_material_spinner_label.xml
deleted file mode 100644
index 5c6b555c9..000000000
--- a/app/src/main/res/layout/widget_material_spinner_label.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:id="@+id/spinner_label"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="start|top"
- android:layout_marginStart="8dp"
- android:layout_marginLeft="8dp"
- android:letterSpacing="0.0333333333"
- android:paddingLeft="4dp"
- android:paddingRight="4dp"
- android:textColor="@color/color_indicator"
- android:textSize="12sp"
- tools:ignore="UnusedAttribute"
- tools:text="Name" />
diff --git a/app/src/main/res/values/styles_widgets.xml b/app/src/main/res/values/styles_widgets.xml
index 20bb96178..12b73b3c2 100644
--- a/app/src/main/res/values/styles_widgets.xml
+++ b/app/src/main/res/values/styles_widgets.xml
@@ -134,6 +134,7 @@
<item name="android:textColorHint">?colorTextSecondary</item>
<item name="hintTextColor">?colorAccent</item>
<item name="boxStrokeColor">@color/color_outlined_stroke</item>
+ <item name="passwordToggleTint">@color/color_icons</item>
</style>
<style name="Widget.CoreSettings.Wrapper" parent="">
--
GitLab