Cleaning MicroG vector drawable icons

WSTxda · Jan 11, 2024 · 9cde6af · 9cde6af
1 parent c07548b
commit 9cde6af
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 101 deletions.
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/auth/signin/AuthSignInActivity.kt b/play-services-core/src/main/kotlin/org/microg/gms/auth/signin/AuthSignInActivity.kt
@@ -127,7 +127,7 @@ class AuthSignInActivity : AppCompatActivity() {
                 emailView.visibility = View.GONE
             }
         } else {
-            photoView.setImageResource(R.drawable.ic_add_account_alt)
+            photoView.setImageResource(R.drawable.ic_add_new_account)
             displayNameView.setText(R.string.signin_picker_add_account_label)
             emailView.visibility = View.GONE
         }

diff --git a/play-services-core/src/main/res/drawable/ic_add_account_alt.xml b/play-services-core/src/main/res/drawable/ic_add_account_alt.xml
diff --git a/play-services-core/src/main/res/drawable/ic_developer.xml b/play-services-core/src/main/res/drawable/ic_developer.xml
@@ -6,11 +6,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#ff000000"
+        android:fillColor="#FF000000"
         android:fillType="evenOdd"
-        android:pathData="M4.12 5.56L4.09 5.53c-0.04 4.47-0.04 8.93 0 13.4 0.02 0 0.02-0.01 0.03-0.03l5.63-3.24c0.03-3.1 0.04-6.21 0.05-9.32 0.05-0.11 0.13-0.21 0.23-0.3 1.2-0.66 2.4-1.34 3.57-2.03 0.33-0.05 0.56 0.07 0.69 0.38l0.03 8.73 2.24-1.3c0.03-1.85 0.04-3.7 0.04-5.53 0.07-0.19 0.2-0.31 0.38-0.38L20.3 4c0.35-0.04 0.58 0.1 0.69 0.43v15.27c-0.18 0.42-0.48 0.52-0.88 0.32-0.09-0.07-0.15-0.16-0.18-0.26 0-4.76-0.02-9.51-0.05-14.27l-2.17 1.26c-0.03 1.81-0.04 3.63-0.04 5.44-0.06 0.21-0.18 0.37-0.38 0.46l-3.35 1.93c-0.35 0.07-0.58-0.05-0.71-0.38 0-2.9-0.02-5.8-0.04-8.7l-2.3 1.33-0.03 9.24c-0.04 0.15-0.12 0.26-0.24 0.35l-6.78 3.9C3.45 20.52 3.18 20.4 3 20.03V4.42C3.17 4.08 3.43 3.98 3.78 4.1 4.9 4.75 6.01 5.39 7.13 6.02 7.23 6.1 7.33 6.18 7.4 6.3c0.04 2.63 0.05 5.26 0.02 7.9-0.07 0.27-0.24 0.4-0.53 0.41-0.28-0.01-0.46-0.16-0.53-0.44L6.33 6.84 4.12 5.56Z" />
-    <path
-        android:fillColor="#ff000000"
-        android:fillType="evenOdd"
-        android:pathData="M17 15.8c0.3-0.02 0.51 0.1 0.64 0.37 0.05 0.22 0 0.42-0.16 0.6l-5.75 3.32c-0.51 0.1-0.77-0.1-0.76-0.63 0.05-0.14 0.14-0.26 0.26-0.35 1.93-1.11 3.85-2.21 5.78-3.3Z" />
+        android:pathData="M11.62 5.16L13.5 4.1C13.6 4.04 13.73 4 13.77 4c0.13 0 0.37 0.14 0.46 0.25 0.07 0.1 0.07 0.11 0.08 4.47v0.01c0 2.41 0.01 4.39 0.02 4.39l0.79-0.44 0.77-0.45 0.36-0.2 0.36-0.21V9.09c0-2.6 0-2.84 0.12-2.97l0.05-0.05 1.8-1.06c1.66-0.95 1.73-0.99 1.9-0.99 0.2 0 0.32 0.06 0.45 0.25L21 4.38v7.7 7.68l-0.07 0.11c-0.11 0.16-0.23 0.24-0.4 0.26-0.17 0.03-0.4-0.08-0.5-0.23l-0.08-0.12v-7.14c0-3.94 0-7.15-0.02-7.15L18.8 6.12l-1.1 0.64-0.01 2.76c-0.01 2.02-0.03 2.79-0.06 2.84-0.08 0.14-0.29 0.28-1.95 1.23l-0.01 0.01c-1.67 0.96-1.72 0.99-1.9 0.99-0.22 0-0.37-0.1-0.47-0.29-0.07-0.13-0.07-0.22-0.07-4.47 0-2.4-0.01-4.34-0.02-4.34L11.27 6.6 10.9 6.82l-0.02 4.66c-0.01 3.45-0.03 4.68-0.06 4.73-0.06 0.11-0.18 0.2-0.55 0.41L8.5 17.64 6.82 18.6 6.7 18.68c-2.97 1.71-2.98 1.72-3.17 1.72-0.2 0-0.32-0.07-0.45-0.26L3 20.04v-7.8c0-6.82 0-7.82 0.05-7.9C3.16 4.12 3.43 4 3.67 4.08S7.25 6.1 7.33 6.2l0.08 0.1v3.96l0.01 3.95-0.07 0.11c-0.12 0.17-0.24 0.25-0.42 0.26-0.2 0.02-0.4-0.08-0.5-0.26-0.07-0.11-0.07-0.15-0.08-3.8v-0.01l-0.01-3.7-1.12-0.65C4.6 5.82 4.09 5.53 4.07 5.54 4.03 5.57 4.04 18.93 4.08 18.93c0.03 0 0.79-0.44 4.66-2.67l1.03-0.6 0.02-4.65C9.8 6.53 9.8 6.34 9.87 6.24c0.05-0.08 0.44-0.32 1.75-1.08Zm-0.39 14c0.22-0.15 5.66-3.28 5.75-3.32 0.1-0.04 0.36 0 0.47 0.08 0.22 0.15 0.29 0.48 0.15 0.7l-0.01 0.04c-0.05 0.09-0.16 0.15-3.28 1.95-1.7 0.98-2.66 1.51-2.74 1.52-0.08 0.02-0.17 0-0.27-0.05-0.39-0.17-0.42-0.7-0.07-0.93Z" />
 </vector>
diff --git a/play-services-core/src/main/res/drawable/ic_launcher_monochrome.xml b/play-services-core/src/main/res/drawable/ic_launcher_monochrome.xml
@@ -6,5 +6,5 @@
     <path
         android:fillColor="#FF000000"
         android:fillType="evenOdd"
-        android:pathData="M70.24 37.74c-8.98-8.99-23.52-8.99-32.5 0-7.54 7.54-8.76 19.01-3.63 27.81 0.31-0.84 0.81-1.64 1.5-2.32 1.16-1.16 2.65-1.8 4.17-1.89-3.1-6.02-2.13-13.6 2.92-18.64 6.25-6.25 16.37-6.25 22.62 0 1.37 1.36 3.59 1.36 4.95 0 1.34-1.36 1.34-3.6-0.03-4.96ZM42.48 73.93c0.85-0.32 1.64-0.82 2.32-1.5 1.16-1.16 1.8-2.65 1.9-4.17 4.57 2.34 10.03 2.33 14.6-0.02 0.1 1.52 0.72 3 1.88 4.16 0.69 0.69 1.48 1.19 2.33 1.5-7.09 4.12-15.9 4.13-23.03 0.03Zm-6.47-1.13c0.59 0.56 1.19 1.09 1.81 1.58 9.46 7.5 22.87 7.5 32.3 0 0.64-0.5 1.27-1.05 1.87-1.63l0.37-0.35 0.02-0.01c10.16-10.16 10.16-26.62 0-36.77v0.02l-0.02-0.02c-10.15-10.16-26.59-10.16-36.74 0-9.44 9.44-10.1 24.31-2 34.52 0.44 0.56 0.91 1.1 1.41 1.64 0.17 0.22 0.37 0.44 0.58 0.65 0.13 0.13 0.26 0.26 0.4 0.37Zm8.8-27.98c5.09-5.08 13.31-5.08 18.4 0h-0.03c5.08 5.08 5.08 13.3 0 18.38v0.01h-0.02c-5.07 5.06-13.28 5.07-18.36 0.01l0.02-0.02-0.02-0.02c-5.06-5.08-5.05-13.29 0.02-18.36Z"/>
+        android:pathData="M70.24 37.74c-8.98-8.99-23.52-8.99-32.5 0-7.54 7.54-8.76 19.01-3.63 27.81 0.31-0.84 0.81-1.64 1.5-2.32 1.16-1.16 2.65-1.8 4.17-1.89-3.1-6.02-2.13-13.6 2.92-18.64 6.25-6.25 16.37-6.25 22.62 0 1.37 1.36 3.59 1.36 4.95 0 1.34-1.36 1.34-3.6-0.03-4.96ZM42.48 73.93c0.85-0.32 1.64-0.82 2.32-1.5 1.16-1.16 1.8-2.65 1.9-4.17 4.57 2.34 10.03 2.33 14.6-0.02 0.1 1.52 0.72 3 1.88 4.16 0.69 0.69 1.48 1.19 2.33 1.5-7.09 4.12-15.9 4.13-23.03 0.03Zm-6.47-1.12c0.59 0.55 1.2 1.08 1.81 1.57 9.46 7.5 22.87 7.5 32.3 0 0.64-0.5 1.27-1.05 1.87-1.63l0.37-0.35h0.01l0.01-0.02c10.16-10.15 10.16-26.6 0-36.76v0.02l-0.02-0.02c-10.15-10.16-26.59-10.16-36.74 0-9.44 9.44-10.1 24.31-2 34.52 0.44 0.56 0.91 1.1 1.4 1.64 0.18 0.22 0.38 0.44 0.59 0.65l0.4 0.38Zm8.8-28c5.09-5.07 13.31-5.07 18.4 0h-0.03c5.08 5.09 5.08 13.31 0 18.4h-0.02c-5.07 5.06-13.28 5.07-18.36 0.01l0.02-0.02-0.02-0.02c-5.06-5.08-5.05-13.29 0.02-18.36Z" />
 </vector>
diff --git a/play-services-core/src/main/res/drawable/ic_logo.xml b/play-services-core/src/main/res/drawable/ic_logo.xml
@@ -1,24 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="256dp"
     android:height="256dp"
-    android:viewportWidth="256.0"
-    android:viewportHeight="256.0">
+    android:viewportWidth="256"
+    android:viewportHeight="256">
     <group>
         <path
-            android:fillColor="#ffea4335"
-            android:pathData="M173.2,82.8 C198.2,107.8 198.2,148.3 173.2,173.3 C160.7,185.8 160.7,206.1 173.2,218.5 C185.7,231 206,231 218.5,218.5 C268.5,168.5 268.5,87.5 218.5,37.5 L173.2,82.8 Z" />
+            android:fillColor="#FFEA4335"
+            android:pathData="M173.2 82.8c25 25 25 65.5 0 90.5-12.5 12.5-12.5 32.8 0 45.2 12.5 12.5 32.8 12.5 45.3 0 50-50 50-131 0-181l-45.3 45.3Z" />
         <path
-            android:fillColor="#ff1a73e8"
-            android:pathData="M218.4,37.5 C168.4,-12.5 87.5,-12.5 37.5,37.5 C-12.5,87.5 -12.5,168.5 37.5,218.5 L82.8,173.3 C57.8,148.3 57.8,107.8 82.8,82.8 C107.8,57.8 148.3,57.8 173.3,82.8 C185.8,95.3 206.1,95.3 218.6,82.8 C230.9,70.3 230.9,50 218.4,37.5 Z" />
+            android:fillColor="#FF246FDB"
+            android:pathData="M218.4 37.5c-50-50-130.9-50-180.9 0s-50 131 0 181l45.3-45.2c-25-25-25-65.5 0-90.5s65.5-25 90.5 0c12.5 12.5 32.8 12.5 45.3 0 12.3-12.5 12.3-32.8-0.2-45.3Z" />
         <path
-            android:fillColor="#fffbbc04"
-            android:pathData="M218.4,218.5 L173.1,173.3 C148.1,198.3 107.6,198.3 82.6,173.3 L37.3,218.5 C87.5,268.5 168.4,268.5 218.4,218.5 Z" />
+            android:fillColor="#FFFBBC04"
+            android:pathData="M218.4 218.5l-45.3-45.2c-25 25-65.5 25-90.5 0l-45.3 45.2c50.2 50 131.1 50 181.1 0Z" />
         <path
-            android:fillColor="#ffea4335"
-            android:pathData="M173.2,173.3 C185.7,160.8 205.9,160.8 218.4,173.3 C230.9,185.8 230.9,206.1 218.4,218.6 C205.9,231.1 185.7,231.1 173.2,218.6 C160.7,206.1 160.7,185.8 173.2,173.3 Z" />
+            android:fillColor="#FFEA4335"
+            android:pathData="M173.2 173.3c12.5-12.5 32.7-12.5 45.2 0s12.5 32.8 0 45.3-32.7 12.5-45.2 0-12.5-32.8 0-45.3Z" />
         <path
-            android:fillColor="#ff34a853"
-            android:pathData="M37.5,173.3 C50,160.8 70.2,160.8 82.7,173.3 C95.2,185.8 95.2,206.1 82.7,218.6 C70.2,231.1 50,231.1 37.5,218.6 C25,206.1 25,185.8 37.5,173.3 Z" />
+            android:fillColor="#FF34A853"
+            android:pathData="M37.5 173.3c12.5-12.5 32.7-12.5 45.2 0s12.5 32.8 0 45.3-32.7 12.5-45.2 0-12.5-32.8 0-45.3Z" />
     </group>
 </vector>
diff --git a/play-services-core/src/main/res/drawable/ic_microg_login_large.xml b/play-services-core/src/main/res/drawable/ic_microg_login_large.xml
@@ -1,46 +1,23 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
     android:width="96dp"
     android:height="96dp"
     android:viewportWidth="96"
     android:viewportHeight="96">
-    <path
-        android:fillColor="#FFEA4335"
-        android:pathData="M62.83 33.17c8.2 8.2 8.2 21.5 0 29.7-4.1 4.1-4.1 10.76 0 14.83 4.1 4.1 10.76 4.1 14.87 0 16.4-16.41 16.4-42.99 0-59.4L62.83 33.17Z"/>
-    <path
-        android:pathData="M77.66 18.3c-16.4-16.4-42.95-16.4-59.36 0-16.4 16.41-16.4 42.99 0 59.4l14.87-14.84c-8.2-8.2-8.2-21.49 0-29.7 8.2-8.2 21.5-8.2 29.7 0 4.1 4.11 10.76 4.11 14.86 0 4.03-4.1 4.03-10.75-0.07-14.86Z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:type="linear"
-                android:startX="6"
-                android:startY="3590.76"
-                android:endX="7480.6"
-                android:endY="3590.76">
-                <item
-                    android:color="#FF246FDB"
-                    android:offset="0"/>
-                <item
-                    android:color="#FF2973DF"
-                    android:offset="0.06"/>
-                <item
-                    android:color="#FF377DEB"
-                    android:offset="0.28"/>
-                <item
-                    android:color="#FF3F83F2"
-                    android:offset="0.55"/>
-                <item
-                    android:color="#FF4285F4"
-                    android:offset="1"/>
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFBBC04"
-        android:pathData="M77.66 77.7L62.8 62.86c-8.2 8.2-21.5 8.2-29.7 0L18.24 77.7c16.47 16.4 43.02 16.4 59.42 0Z"/>
-    <path
-        android:fillColor="#FFEA4335"
-        android:pathData="M62.83 62.86c4.1-4.1 10.73-4.1 14.83 0s4.1 10.77 0 14.87-10.73 4.1-14.83 0-4.1-10.76 0-14.87Z"/>
-    <path
-        android:fillColor="#FF34A853"
-        android:pathData="M18.3 62.86c4.1-4.1 10.73-4.1 14.84 0 4.1 4.1 4.1 10.77 0 14.87s-10.73 4.1-14.84 0c-4.1-4.1-4.1-10.76 0-14.87Z"/>
-</vector>
+    <group>
+        <path
+            android:fillColor="#FFEA4335"
+            android:pathData="M64.95 31.05c9.38 9.37 9.38 24.56 0 33.94-4.69 4.69-4.69 12.3 0 16.95 4.69 4.69 12.3 4.69 16.99 0 18.75-18.75 18.75-49.13 0-67.88L64.95 31.05Z"/>
+        <path
+            android:fillColor="#FF246FDB"
+            android:pathData="M81.9 14.06c-18.75-18.75-49.09-18.75-67.84 0s-18.75 49.13 0 67.88l16.99-16.95c-9.38-9.38-9.38-24.56 0-33.94 9.37-9.38 24.56-9.38 33.94 0 4.69 4.69 12.3 4.69 16.98 0 4.62-4.69 4.62-12.3-0.07-16.99Z"/>
+        <path
+            android:fillColor="#FFFBBC04"
+            android:pathData="M81.9 81.94L64.91 64.99c-9.37 9.37-24.56 9.37-33.93 0l-17 16.95c18.83 18.75 49.17 18.75 67.92 0Z"/>
+        <path
+            android:fillColor="#FFEA4335"
+            android:pathData="M64.95 64.99c4.69-4.69 12.26-4.69 16.95 0 4.69 4.69 4.69 12.3 0 16.98-4.69 4.7-12.26 4.7-16.95 0-4.69-4.68-4.69-12.3 0-16.98Z"/>
+        <path
+            android:fillColor="#FF34A853"
+            android:pathData="M14.06 64.99c4.69-4.69 12.26-4.69 16.95 0 4.69 4.69 4.69 12.3 0 16.98-4.69 4.7-12.26 4.7-16.95 0-4.69-4.68-4.69-12.3 0-16.98Z"/>
+    </group>
+</vector>
diff --git a/play-services-core/src/main/res/drawable/ic_microg_login_small.xml b/play-services-core/src/main/res/drawable/ic_microg_login_small.xml
@@ -1,5 +1,4 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
     android:width="48dp"
     android:height="48dp"
     android:viewportWidth="48"
@@ -9,32 +8,8 @@
             android:fillColor="#FFEA4335"
             android:pathData="M32.48 15.53c4.68 4.68 4.68 12.28 0 16.96-2.35 2.35-2.35 6.15 0 8.48 2.34 2.34 6.15 2.34 8.49 0 9.37-9.38 9.37-24.56 0-33.94l-8.5 8.5Z"/>
         <path
-            android:pathData="M40.95 7.03c-9.38-9.37-24.54-9.37-33.92 0-9.37 9.38-9.37 24.56 0 33.94l8.5-8.48c-4.7-4.68-4.7-12.28 0-16.97 4.68-4.68 12.28-4.68 16.96 0 2.35 2.35 6.15 2.35 8.5 0 2.3-2.34 2.3-6.14-0.04-8.49Z">
-            <aapt:attr name="android:fillColor">
-                <gradient
-                    android:type="linear"
-                    android:startX="0"
-                    android:startY="2048.44"
-                    android:endX="4271.21"
-                    android:endY="2048.44">
-                    <item
-                        android:color="#FF246FDB"
-                        android:offset="0"/>
-                    <item
-                        android:color="#FF2973DF"
-                        android:offset="0.06"/>
-                    <item
-                        android:color="#FF377DEB"
-                        android:offset="0.28"/>
-                    <item
-                        android:color="#FF3F83F2"
-                        android:offset="0.55"/>
-                    <item
-                        android:color="#FF4285F4"
-                        android:offset="1"/>
-                </gradient>
-            </aapt:attr>
-        </path>
+            android:fillColor="#FF246FDB"
+            android:pathData="M40.95 7.03c-9.38-9.37-24.54-9.37-33.92 0-9.37 9.38-9.37 24.56 0 33.94l8.5-8.48c-4.7-4.68-4.7-12.28 0-16.97 4.68-4.68 12.28-4.68 16.96 0 2.35 2.35 6.15 2.35 8.5 0 2.3-2.34 2.3-6.14-0.04-8.49Z"/>
         <path
             android:fillColor="#FFFBBC04"
             android:pathData="M40.95 40.97l-8.5-8.48c-4.68 4.7-12.28 4.7-16.96 0l-8.5 8.48c9.42 9.37 24.58 9.37 33.96 0Z"/>
@@ -45,4 +20,4 @@
             android:fillColor="#FF34A853"
             android:pathData="M7.03 32.5c2.34-2.35 6.13-2.35 8.48 0 2.34 2.34 2.34 6.14 0 8.49-2.35 2.34-6.13 2.34-8.48 0-2.34-2.35-2.34-6.15 0-8.5Z"/>
     </group>
-</vector>
+</vector>