Use less hacky way to tint icons (#44)

cuberite · Jan 4, 2020 · a0be8bd · a0be8bd
1 parent c2e622d
commit a0be8bd
Show file tree

Hide file tree

Showing 19 changed files with 69 additions and 115 deletions.
diff --git a/app/src/main/java/org/cuberite/android/fragments/ControlFragment.java b/app/src/main/java/org/cuberite/android/fragments/ControlFragment.java
@@ -109,7 +109,7 @@ public void onClick(View view) {
                 }
             });
         } else if (state == State.READY) {
-            int colorTo = ContextCompat.getColor(getContext(), R.color.success);
+            int colorTo = ContextCompat.getColor(getContext(), R.color.accent);
             animateColorChange(mainButton, mainButtonColor, colorTo);
             mainButton.setText(getText(R.string.do_start_cuberite));
             mainButton.setOnClickListener(new View.OnClickListener() {
@@ -119,7 +119,7 @@ public void onClick(View view) {
                 }
             });
         } else {
-            int colorTo = ContextCompat.getColor(getContext(), R.color.primary);
+            int colorTo = ContextCompat.getColor(getContext(), R.color.accent);
             animateColorChange(mainButton, mainButtonColor, colorTo);
             mainButton.setText(getText(R.string.do_install_cuberite));
             mainButton.setOnClickListener(new View.OnClickListener() {

diff --git a/app/src/main/res/color/menu_item_color.xml b/app/src/main/res/color/menu_item_color.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_checked="true" android:color="@color/accent"/>
-    <item android:color="?android:attr/textColorSecondary"/>
+    <item android:color="@color/primary"/>
 </selector>
diff --git a/app/src/main/res/drawable/ic_cloud_download.xml b/app/src/main/res/drawable/ic_cloud_download.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="?attr/colorPrimary"
       android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM19,18L6,18c-2.21,0 -4,-1.79 -4,-4 0,-2.05 1.53,-3.76 3.56,-3.97l1.07,-0.11 0.5,-0.95C8.08,7.14 9.94,6 12,6c2.62,0 4.88,1.86 5.39,4.43l0.3,1.5 1.53,0.11c1.56,0.1 2.78,1.41 2.78,2.96 0,1.65 -1.35,3 -3,3zM13.45,10h-2.9v3L8,13l4,4 4,-4h-2.55z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_execute.xml b/app/src/main/res/drawable/ic_execute.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="?attr/colorPrimary"
       android:pathData="M4.01,6.03l7.51,3.22 -7.52,-1 0.01,-2.22m7.5,8.72L4,17.97v-2.22l7.51,-1M2.01,3L2,10l15,2 -15,2 0.01,7L23,12 2.01,3z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_info.xml b/app/src/main/res/drawable/ic_info.xml
diff --git a/app/src/main/res/drawable/ic_install.xml b/app/src/main/res/drawable/ic_install.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="?attr/colorPrimary"
       android:pathData="M20.54,5.23l-1.39,-1.68C18.88,3.21 18.47,3 18,3L6,3c-0.47,0 -0.88,0.21 -1.16,0.55L3.46,5.23C3.17,5.57 3,6.02 3,6.5L3,19c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,6.5c0,-0.48 -0.17,-0.93 -0.46,-1.27zM6.24,5h11.52l0.81,0.97L5.44,5.97l0.8,-0.97zM5,19L5,8h14v11L5,19zM13.45,10h-2.9v3L8,13l4,4 4,-4h-2.55z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_policy.xml b/app/src/main/res/drawable/ic_policy.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="?attr/colorPrimary"
       android:pathData="M12,1L3,5v6c0,5.55 3.84,10.74 9,12c5.16,-1.26 9,-6.45 9,-12V5L12,1zM19,11c0,1.85 -0.51,3.65 -1.38,5.21l-1.45,-1.45c1.29,-1.94 1.07,-4.58 -0.64,-6.29c-1.95,-1.95 -5.12,-1.95 -7.07,0c-1.95,1.95 -1.95,5.12 0,7.07c1.71,1.71 4.35,1.92 6.29,0.64l1.72,1.72c-1.19,1.42 -2.73,2.51 -4.47,3.04C7.98,19.69 5,15.52 5,11V6.3l7,-3.11l7,3.11V11zM12,15c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3s3,1.34 3,3S13.66,15 12,15z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_webadmin.xml b/app/src/main/res/drawable/ic_webadmin.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="?attr/colorPrimary"
       android:pathData="M22.61,18.99l-9.08,-9.08c0.93,-2.34 0.45,-5.1 -1.44,-7C9.79,0.61 6.21,0.4 3.66,2.26L7.5,6.11 6.08,7.52 2.25,3.69C0.39,6.23 0.6,9.82 2.9,12.11c1.86,1.86 4.57,2.35 6.89,1.48l9.11,9.11c0.39,0.39 1.02,0.39 1.41,0l2.3,-2.3c0.4,-0.38 0.4,-1.01 0,-1.41zM19.61,20.59l-9.46,-9.46c-0.61,0.45 -1.29,0.72 -2,0.82 -1.36,0.2 -2.79,-0.21 -3.83,-1.25C3.37,9.76 2.93,8.5 3,7.26l3.09,3.09 4.24,-4.24 -3.09,-3.09c1.24,-0.07 2.49,0.37 3.44,1.31 1.08,1.08 1.49,2.57 1.24,3.96 -0.12,0.71 -0.42,1.37 -0.88,1.96l9.45,9.45 -0.88,0.89z"/>
 </vector>
diff --git a/app/src/main/res/layout/fragment_console.xml b/app/src/main/res/layout/fragment_console.xml
@@ -54,7 +54,6 @@
                 android:contentDescription="@string/do_execute_line"
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"
-                android:tint="@color/execute_button"
                 app:srcCompat="@drawable/ic_execute" />
         </RelativeLayout>
     </androidx.cardview.widget.CardView>

diff --git a/app/src/main/res/layout/fragment_control.xml b/app/src/main/res/layout/fragment_control.xml
@@ -14,7 +14,7 @@
         android:insetBottom="0dp"
         android:padding="6dp"
         android:textAllCaps="false"
-        android:textColor="@color/main_button_text"
+        android:textColor="@color/white"
         app:elevation="0dp"
         app:cornerRadius="75dp" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/settings_description_icon.xml b/app/src/main/res/layout/settings_description_icon.xml
diff --git a/app/src/main/res/values-night-v23/styles.xml b/app/src/main/res/values-night-v23/styles.xml
@@ -7,7 +7,7 @@
         <item name="android:windowBackground">@color/bg</item>
         <item name="android:windowLightStatusBar">false</item>
         <item name="colorAccent">@color/accent</item>
-        <item name="colorPrimary">?android:attr/textColorSecondary</item>
+        <item name="colorPrimary">@color/primary</item>
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>

diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="bg">#202124</color>
-    <color name="accent">#1E9E73</color>
+    <color name="primary">#bdbdbe</color>
     <color name="bar">#313236</color>
-    <color name="execute_button">#c2c2c3</color>
-    <color name="main_button_text">#ffffff</color>
-    <color name="primary">#1E9E73</color>
-    <color name="success">#1E9E73</color>
+    <color name="accent">#1E9E73</color>
     <color name="warning">#ED9D56</color>
     <color name="danger">#F65E5A</color>
+    <color name="white">#ffffff</color>
 </resources>
diff --git a/app/src/main/res/values-v23/styles.xml b/app/src/main/res/values-v23/styles.xml
@@ -5,7 +5,7 @@
         <item name="android:windowBackground">@color/bg</item>
         <item name="android:windowLightStatusBar">true</item>
         <item name="colorAccent">@color/accent</item>
-        <item name="colorPrimary">?android:attr/textColorSecondary</item>
+        <item name="colorPrimary">@color/primary</item>
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>

diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
@@ -7,7 +7,7 @@
         <item name="android:windowLightNavigationBar">true</item>
         <item name="android:windowLightStatusBar">true</item>
         <item name="colorAccent">@color/accent</item>
-        <item name="colorPrimary">?android:attr/textColorSecondary</item>
+        <item name="colorPrimary">@color/primary</item>
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="bg">#fafafa</color>
-    <color name="accent">#378B6F</color>
+    <color name="primary">#737373</color>
     <color name="bar">#fafafa</color>
-    <color name="execute_button">#737373</color>
-    <color name="main_button_text">#ffffff</color>
-    <color name="primary">#378B6F</color>
-    <color name="success">#378B6F</color>
+    <color name="accent">#378B6F</color>
     <color name="warning">#ED9D57</color>
     <color name="danger">#F0433F</color>
+    <color name="white">#ffffff</color>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -4,7 +4,7 @@
     <style name="AppTheme" parent="Theme.MaterialComponents.DayNight">
         <item name="android:windowBackground">@color/bg</item>
         <item name="colorAccent">@color/accent</item>
-        <item name="colorPrimary">?android:attr/textColorSecondary</item>
+        <item name="colorPrimary">@color/primary</item>
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
@@ -1,86 +1,89 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
     <PreferenceCategory
-        android:title="@string/title_activity_settings">
+        app:title="@string/title_activity_settings">
         <ListPreference
-            android:key="theme"
-            android:title="@string/settings_theme"
+            app:key="theme"
+            app:title="@string/settings_theme"
             app:useSimpleSummaryProvider="true" />
     </PreferenceCategory>
 
     <PreferenceCategory
-        android:title="@string/settings_webadmin_heading">
+        app:title="@string/settings_webadmin_heading">
         <Preference
-            android:key="webadminDescription"
-            android:summary="@string/settings_webadmin_explanation"
-            android:icon="@drawable/ic_webadmin"
-            android:layout="@layout/settings_description_icon"/>
+            app:key="webadminDescription"
+            app:summary="@string/settings_webadmin_explanation"
+            app:icon="@drawable/ic_webadmin"
+            app:enableCopying="true"
+            app:selectable="false" />
         <Preference
-            android:key="webadminOpen"
-            android:title="@string/settings_webadmin_open" />
+            app:key="webadminOpen"
+            app:title="@string/settings_webadmin_open" />
         <Preference
-            android:key="webadminLogin"
-            android:title="@string/settings_webadmin_login" />
+            app:key="webadminLogin"
+            app:title="@string/settings_webadmin_login" />
     </PreferenceCategory>
 
     <PreferenceCategory
-        android:title="@string/settings_install_update">
+        app:title="@string/settings_install_update">
         <Preference
-            android:summary="@string/settings_install_update_explanation"
-            android:icon="@drawable/ic_cloud_download"
-            android:layout="@layout/settings_description_icon"/>
+            app:summary="@string/settings_install_update_explanation"
+            app:icon="@drawable/ic_cloud_download"
+            app:enableCopying="true"
+            app:selectable="false" />
         <Preference
-            android:key="installUpdateBinary"
-            android:title="@string/settings_install_update_binary" />
+            app:key="installUpdateBinary"
+            app:title="@string/settings_install_update_binary" />
         <Preference
-            android:key="installUpdateServer"
-            android:title="@string/settings_install_update_server" />
+            app:key="installUpdateServer"
+            app:title="@string/settings_install_update_server" />
     </PreferenceCategory>
 
     <PreferenceCategory
-        android:title="@string/settings_install_no_sha">
+        app:title="@string/settings_install_no_sha">
         <Preference
-            android:summary="@string/settings_install_no_sha_explanation"
-            android:icon="@drawable/ic_policy"
-            android:layout="@layout/settings_description_icon"/>
+            app:summary="@string/settings_install_no_sha_explanation"
+            app:icon="@drawable/ic_policy"
+            app:enableCopying="true"
+            app:selectable="false" />
         <Preference
-            android:key="installNoShaButton"
-            android:title="@string/settings_install_no_sha_button" />
+            app:key="installNoShaButton"
+            app:title="@string/settings_install_no_sha_button" />
     </PreferenceCategory>
 
     <PreferenceCategory
-        android:title="@string/settings_install_manually">
+        app:title="@string/settings_install_manually">
         <Preference
-            android:key="abiText"
-            android:summary="@string/settings_install_manually_explanation"
-            android:icon="@drawable/ic_install"
-            android:layout="@layout/settings_description_icon"/>
+            app:key="abiText"
+            app:summary="@string/settings_install_manually_explanation"
+            app:icon="@drawable/ic_install"
+            app:enableCopying="true"
+            app:selectable="false" />
         <Preference
-            android:key="installBinary"
-            android:title="@string/settings_install_select_binary" />
+            app:key="installBinary"
+            app:title="@string/settings_install_select_binary" />
         <Preference
-            android:key="installServer"
-            android:title="@string/settings_install_select_server" />
+            app:key="installServer"
+            app:title="@string/settings_install_select_server" />
     </PreferenceCategory>
 
     <PreferenceCategory
-        android:title="@string/settings_troubleshooting_heading">
+        app:title="@string/settings_troubleshooting_heading">
         <SwitchPreference
-            android:key="troubleshootingAuthenticationToggle"
-            android:title="@string/settings_authentication_toggle"
-            android:summary="@string/settings_authentication_errors_explanation" />
+            app:key="troubleshootingAuthenticationToggle"
+            app:title="@string/settings_authentication_toggle"
+            app:summary="@string/settings_authentication_errors_explanation" />
     </PreferenceCategory>
 
     <PreferenceCategory
-        android:title="@string/settings_info_heading">
+        app:title="@string/settings_info_heading">
         <Preference
-            android:key="infoDebugInfo"
-            android:title="@string/settings_info_debug" />
+            app:key="infoDebugInfo"
+            app:title="@string/settings_info_debug" />
         <Preference
-            android:key="thirdPartyLicenses"
-            android:title="@string/settings_info_libraries" />
+            app:key="thirdPartyLicenses"
+            app:title="@string/settings_info_libraries" />
         <Preference
-            android:key="version" />
+            app:key="version" />
     </PreferenceCategory>
 </PreferenceScreen>