fix #1947 Auto icon color change (#1949)

syncthing · Jul 21, 2023 · c708f31 · c708f31
1 parent 9302357
commit c708f31
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 19 deletions.
diff --git a/...res/drawable/ic_add_folder_white_24dp.xml → .../main/res/drawable/ic_add_folder_24dp.xml b/...res/drawable/ic_add_folder_white_24dp.xml → .../main/res/drawable/ic_add_folder_24dp.xml
@@ -5,6 +5,6 @@
         android:viewportWidth="24.0"
         android:width="24dp">
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="?attr/colorControlNormal"
         android:pathData="M20,6h-8l-2,-2L4,4c-1.11,0 -1.99,0.89 -1.99,2L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2zM19,14h-3v3h-2v-3h-3v-2h3L14,9h2v3h3v2z"/>
 </vector>
diff --git a/...main/res/drawable/ic_check_white_24dp.xml → app/src/main/res/drawable/ic_check_24dp.xml b/...main/res/drawable/ic_check_white_24dp.xml → app/src/main/res/drawable/ic_check_24dp.xml
@@ -5,6 +5,6 @@
         android:viewportWidth="24.0"
         android:width="24dp">
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="?attr/colorControlNormal"
         android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
 </vector>
diff --git a/...ain/res/drawable/ic_delete_white_24dp.xml → app/src/main/res/drawable/ic_delete_24dp.xml b/...ain/res/drawable/ic_delete_white_24dp.xml → app/src/main/res/drawable/ic_delete_24dp.xml
@@ -5,6 +5,6 @@
         android:viewportWidth="24.0"
         android:width="24dp">
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="?attr/colorControlNormal"
         android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_share_white_24dp.xml b/app/src/main/res/drawable/ic_share_white_24dp.xml
diff --git a/app/src/main/res/menu/device_settings.xml b/app/src/main/res/menu/device_settings.xml
@@ -6,18 +6,18 @@
     <item
         android:id="@+id/create"
         android:title="@string/add"
-        android:icon="@drawable/ic_check_white_24dp"
+        android:icon="@drawable/ic_check_24dp"
         app:showAsAction="always|withText" />
 
     <item
         android:id="@+id/share_device_id"
-        android:icon="@drawable/ic_share_white_24dp"
+        android:icon="@drawable/ic_share_24dp"
         android:title="@string/share_device_id"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/remove"
-        android:icon="@drawable/ic_delete_white_24dp"
+        android:icon="@drawable/ic_delete_24dp"
         android:title="@string/delete_device"
         app:showAsAction="ifRoom" />
 

diff --git a/app/src/main/res/menu/folder_picker.xml b/app/src/main/res/menu/folder_picker.xml
@@ -11,7 +11,7 @@
     <item
         android:id="@+id/create_folder"
         android:title="@string/create_fs_folder"
-        android:icon="@drawable/ic_add_folder_white_24dp"
+        android:icon="@drawable/ic_add_folder_24dp"
         app:showAsAction="ifRoom" />
 
 </menu>
diff --git a/app/src/main/res/menu/folder_settings.xml b/app/src/main/res/menu/folder_settings.xml
@@ -5,13 +5,13 @@
 
     <item
         android:id="@+id/create"
-        android:icon="@drawable/ic_check_white_24dp"
+        android:icon="@drawable/ic_check_24dp"
         android:title="@string/create"
         app:showAsAction="always|withText" />
 
     <item
         android:id="@+id/remove"
-        android:icon="@drawable/ic_delete_white_24dp"
+        android:icon="@drawable/ic_delete_24dp"
         android:title="@string/delete_folder"
         app:showAsAction="ifRoom" />