Skip to content

Commit

Permalink
Update Icon
Browse files Browse the repository at this point in the history
  • Loading branch information
@mar-v-in
mar-v-in committed Aug 23, 2023
1 parent 03836ce commit 90f8a6a
Show file tree
Hide file tree
Showing 36 changed files with 251 additions and 18 deletions.
15 changes: 8 additions & 7 deletions play-services-core/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,8 @@
android:allowBackup="true"
android:forceQueryable="true"
android:fullBackupOnly="true"
android:icon="@mipmap/ic_core_service_app"
android:icon="@mipmap/ic_app"
android:roundIcon="@mipmap/ic_app"
android:label="@string/gms_app_name"
android:multiArch="true"
android:networkSecurityConfig="@xml/network_security_config"
Expand Down Expand Up @@ -477,10 +478,10 @@
<!-- microG Settings shown in Launcher -->
<activity
android:name="org.microg.gms.ui.SettingsActivity"
android:icon="@mipmap/ic_microg_settings"
android:icon="@mipmap/ic_app_settings"
android:label="@string/gms_settings_name"
android:process=":ui"
android:roundIcon="@mipmap/ic_microg_settings"
android:roundIcon="@mipmap/ic_app_settings"
android:taskAffinity="org.microg.gms.settings">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
Expand All @@ -503,16 +504,16 @@

<activity
android:name="org.microg.gms.ui.SettingsDashboardActivity"
android:icon="@mipmap/ic_microg_settings"
android:icon="@mipmap/ic_app_settings"
android:label="Legacy microG Settings"
android:process=":ui"
android:roundIcon="@mipmap/ic_microg_settings"
android:roundIcon="@mipmap/ic_app_settings"
android:taskAffinity="org.microg.gms.settings" />

<!-- microG Settings embedded in System Settings on SDK 23 and newer -->
<activity-alias
android:name="org.microg.gms.ui.SettingsActivityLink"
android:icon="@drawable/microg_light_color_24"
android:icon="@drawable/ic_app_settings_foreground_mono"
android:label="@string/gms_settings_name"
android:process=":ui"
android:targetActivity="org.microg.gms.ui.SettingsActivity"
Expand All @@ -526,7 +527,7 @@
android:value="com.android.settings.category.device" />
<meta-data
android:name="com.android.settings.icon"
android:resource="@drawable/microg_light_color_24" />
android:resource="@drawable/ic_app_settings_foreground_mono" />
<meta-data
android:name="com.android.settings.summary"
android:resource="@string/gms_settings_summary" />
Expand Down
47 changes: 47 additions & 0 deletions play-services-core/src/main/res/drawable-v26/ic_app_foreground.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ SPDX-FileCopyrightText: 2023 microG Project Team
~ SPDX-License-Identifier: CC-BY-SA-4.0
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="225.27"
android:viewportHeight="225.27">
<group
android:scaleX="0.50"
android:scaleY="0.50"
android:translateX="56.3175"
android:translateY="56.3175">
<path
android:pathData="M112.64,112.64m-105.55,0a105.55,105.55 0,1 1,211.1 0a105.55,105.55 0,1 1,-211.1 0"
android:strokeWidth="30.57332802"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:strokeLineCap="butt" />
<path
android:pathData="m151.55,151.53a55,55 0,0 1,-66.39 8.74"
android:strokeWidth="30"
android:fillColor="#00000000"
android:strokeColor="#e91e63"
android:strokeLineCap="butt" />
<path
android:pathData="M85.16,160.27A55,55 0,0 1,59.53 98.4"
android:strokeWidth="30"
android:fillColor="#00000000"
android:strokeColor="#ff9800"
android:strokeLineCap="butt" />
<path
android:pathData="m59.53,98.4a55,55 0,0 1,25.63 -33.4"
android:strokeWidth="30"
android:fillColor="#00000000"
android:strokeColor="#cddc39"
android:strokeLineCap="butt" />
<path
android:pathData="m85.16,65.01a55,55 0,0 1,66.39 8.74"
android:strokeWidth="30"
android:fillColor="#00000000"
android:strokeColor="#009688"
android:strokeLineCap="butt" />
</group>
</vector>
56 changes: 56 additions & 0 deletions play-services-core/src/main/res/drawable-v26/ic_app_foreground_mono.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ SPDX-FileCopyrightText: 2023 microG Project Team
~ SPDX-License-Identifier: CC-BY-SA-4.0
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="225.27"
android:viewportHeight="225.27">
<group
android:scaleX="0.50"
android:scaleY="0.50"
android:translateX="56.3175"
android:translateY="56.3175">
<path
android:pathData="M112.64,112.64m-105.55,0a105.55,105.55 0,1 1,211.1 0a105.55,105.55 0,1 1,-211.1 0"
android:strokeWidth="30.57332802"
android:fillColor="#000000"
android:strokeColor="#00000000"
android:fillAlpha="0.2"
android:strokeLineCap="butt" />
<path
android:pathData="m151.55,151.53a55,55 0,0 1,-66.39 8.74"
android:strokeAlpha="0.8"
android:strokeWidth="30"
android:fillColor="#00000000"
android:strokeColor="#000000"
android:fillAlpha="0.8"
android:strokeLineCap="butt" />
<path
android:pathData="M85.16,160.27A55,55 0,0 1,59.53 98.4"
android:strokeAlpha="0.6"
android:strokeWidth="30"
android:fillColor="#00000000"
android:strokeColor="#000000"
android:fillAlpha="0.6"
android:strokeLineCap="butt" />
<path
android:pathData="m59.53,98.4a55,55 0,0 1,25.63 -33.4"
android:strokeAlpha="0.5"
android:strokeWidth="30"
android:fillColor="#00000000"
android:strokeColor="#000000"
android:fillAlpha="0.5"
android:strokeLineCap="butt" />
<path
android:pathData="m85.16,65.01a55,55 0,0 1,66.39 8.74"
android:strokeAlpha="0.7"
android:strokeWidth="30"
android:fillColor="#00000000"
android:strokeColor="#000000"
android:fillAlpha="0.7"
android:strokeLineCap="butt" />
</group>
</vector>
50 changes: 50 additions & 0 deletions play-services-core/src/main/res/drawable-v26/ic_app_settings_foreground.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ SPDX-FileCopyrightText: 2023 microG Project Team
~ SPDX-License-Identifier: CC-BY-SA-4.0
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="225.27"
android:viewportHeight="225.27">
<group
android:translateX="40.635"
android:translateY="40.635"
android:scaleX="6.0"
android:scaleY="6.0">
<path
android:fillColor="#ffffff"
android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94z" />
</group>
<group
android:scaleX="0.40"
android:scaleY="0.40"
android:translateX="67.581"
android:translateY="67.581">
<path
android:pathData="m151.55,151.53a55,55 0,0 1,-66.39 8.74"
android:strokeWidth="36"
android:fillColor="#00000000"
android:strokeColor="#e91e63"
android:strokeLineCap="butt" />
<path
android:pathData="M85.16,160.27A55,55 0,0 1,59.53 98.4"
android:strokeWidth="36"
android:fillColor="#00000000"
android:strokeColor="#ff9800"
android:strokeLineCap="butt" />
<path
android:pathData="m59.53,98.4a55,55 0,0 1,25.63 -33.4"
android:strokeWidth="36"
android:fillColor="#00000000"
android:strokeColor="#cddc39"
android:strokeLineCap="butt" />
<path
android:pathData="m85.16,65.01a55,55 0,0 1,66.39 8.74"
android:strokeWidth="36"
android:fillColor="#00000000"
android:strokeColor="#009688"
android:strokeLineCap="butt" />
</group>
</vector>
59 changes: 59 additions & 0 deletions play-services-core/src/main/res/drawable-v26/ic_app_settings_foreground_mono.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ SPDX-FileCopyrightText: 2023 microG Project Team
~ SPDX-License-Identifier: CC-BY-SA-4.0
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="225.27"
android:viewportHeight="225.27">
<group
android:translateX="40.635"
android:translateY="40.635"
android:scaleX="6.0"
android:scaleY="6.0">
<path
android:fillColor="#000000"
android:fillAlpha="0.2"
android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94z" />
</group>
<group
android:scaleX="0.40"
android:scaleY="0.40"
android:translateX="67.581"
android:translateY="67.581">
<path
android:pathData="m151.55,151.53a55,55 0,0 1,-66.39 8.74"
android:strokeAlpha="0.8"
android:strokeWidth="36"
android:fillColor="#00000000"
android:strokeColor="#000000"
android:fillAlpha="0.8"
android:strokeLineCap="butt" />
<path
android:pathData="M85.16,160.27A55,55 0,0 1,59.53 98.4"
android:strokeAlpha="0.6"
android:strokeWidth="36"
android:fillColor="#00000000"
android:strokeColor="#000000"
android:fillAlpha="0.6"
android:strokeLineCap="butt" />
<path
android:pathData="m59.53,98.4a55,55 0,0 1,25.63 -33.4"
android:strokeAlpha="0.5"
android:strokeWidth="36"
android:fillColor="#00000000"
android:strokeColor="#000000"
android:fillAlpha="0.5"
android:strokeLineCap="butt" />
<path
android:pathData="m85.16,65.01a55,55 0,0 1,66.39 8.74"
android:strokeAlpha="0.7"
android:strokeWidth="36"
android:fillColor="#00000000"
android:strokeColor="#000000"
android:fillAlpha="0.7"
android:strokeLineCap="butt" />
</group>
</vector>
3 changes: 2 additions & 1 deletion play-services-core/src/main/res/layout/ask_permission.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
Expand Down Expand Up @@ -75,7 +76,7 @@
android:padding="10dp">

<ImageView
android:src="@mipmap/ic_core_service_app"
tools:src="@mipmap/ic_app"
android:id="@+id/app_icon"
android:layout_width="match_parent"
android:layout_height="match_parent" />
Expand Down
9 changes: 5 additions & 4 deletions play-services-core/src/main/res/layout/games_info.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@
-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical">

<TextView
android:layout_width="match_parent"
Expand Down Expand Up @@ -68,7 +69,7 @@
android:id="@+id/app_icon"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@mipmap/ic_core_service_app"/>
tools:src="@mipmap/ic_app"/>
</FrameLayout>
</LinearLayout>

Expand Down
10 changes: 10 additions & 0 deletions play-services-core/src/main/res/mipmap-anydpi-v26/ic_app.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ SPDX-FileCopyrightText: 2023 microG Project Team
~ SPDX-License-Identifier: CC-BY-SA-4.0
-->
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_app_background"/>
<foreground android:drawable="@drawable/ic_app_foreground"/>
<monochrome android:drawable="@drawable/ic_app_foreground_mono" />
</adaptive-icon>
10 changes: 10 additions & 0 deletions play-services-core/src/main/res/mipmap-anydpi-v26/ic_app_settings.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ SPDX-FileCopyrightText: 2023 microG Project Team
~ SPDX-License-Identifier: CC-BY-SA-4.0
-->
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_app_background"/>
<foreground android:drawable="@drawable/ic_app_settings_foreground"/>
<monochrome android:drawable="@drawable/ic_app_settings_foreground_mono" />
</adaptive-icon>
6 changes: 0 additions & 6 deletions play-services-core/src/main/res/mipmap-anydpi-v26/ic_microg_settings.xml
View file

This file was deleted.

Binary file added play-services-core/src/main/res/mipmap-hdpi/ic_app.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 ...in/res/mipmap-hdpi/ic_microg_settings.png → .../main/res/mipmap-hdpi/ic_app_settings.png
View file
File renamed without changes
Binary file removed play-services-core/src/main/res/mipmap-hdpi/ic_core_service_app.png
View file
Binary file not shown.
Binary file removed play-services-core/src/main/res/mipmap-hdpi/ic_microg_background.png
View file
Binary file not shown.
Binary file removed play-services-core/src/main/res/mipmap-hdpi/ic_microg_foreground.png
View file
Binary file not shown.
Binary file added play-services-core/src/main/res/mipmap-mdpi/ic_app.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 ...in/res/mipmap-mdpi/ic_microg_settings.png → .../main/res/mipmap-mdpi/ic_app_settings.png
View file
File renamed without changes
Binary file removed play-services-core/src/main/res/mipmap-mdpi/ic_core_service_app.png
View file
Binary file not shown.
Binary file removed play-services-core/src/main/res/mipmap-mdpi/ic_microg_background.png
View file
Binary file not shown.
Binary file removed play-services-core/src/main/res/mipmap-mdpi/ic_microg_foreground.png
View file
Binary file not shown.
Binary file added play-services-core/src/main/res/mipmap-xhdpi/ic_app.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 ...n/res/mipmap-xhdpi/ic_microg_settings.png → ...main/res/mipmap-xhdpi/ic_app_settings.png
View file
File renamed without changes
Binary file removed play-services-core/src/main/res/mipmap-xhdpi/ic_core_service_app.png
View file
Binary file not shown.
Binary file removed play-services-core/src/main/res/mipmap-xhdpi/ic_microg_background.png
View file
Binary file not shown.
Binary file removed play-services-core/src/main/res/mipmap-xhdpi/ic_microg_foreground.png
View file
Binary file not shown.
Binary file added play-services-core/src/main/res/mipmap-xxhdpi/ic_app.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 .../res/mipmap-xxhdpi/ic_microg_settings.png → ...ain/res/mipmap-xxhdpi/ic_app_settings.png
View file
File renamed without changes
Binary file removed play-services-core/src/main/res/mipmap-xxhdpi/ic_core_service_app.png
View file
Binary file not shown.
Binary file removed play-services-core/src/main/res/mipmap-xxhdpi/ic_microg_background.png
View file
Binary file not shown.
Binary file removed play-services-core/src/main/res/mipmap-xxhdpi/ic_microg_foreground.png
View file
Binary file not shown.
Binary file added play-services-core/src/main/res/mipmap-xxxhdpi/ic_app.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 ...res/mipmap-xxxhdpi/ic_microg_settings.png → ...in/res/mipmap-xxxhdpi/ic_app_settings.png
View file
File renamed without changes
Binary file removed play-services-core/src/main/res/mipmap-xxxhdpi/ic_core_service_app.png
View file
Binary file not shown.
Binary file removed play-services-core/src/main/res/mipmap-xxxhdpi/ic_microg_background.png
View file
Binary file not shown.
Binary file removed play-services-core/src/main/res/mipmap-xxxhdpi/ic_microg_foreground.png
View file
Binary file not shown.
4 changes: 4 additions & 0 deletions play-services-core/src/main/res/values-v26/ic_app_background.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_app_background">#00897B</color>
</resources>

0 comments on commit 90f8a6a

Please sign in to comment.