android - fix game update icon, add app icon

src/RyujinxAndroid/app/src/main/AndroidManifest.xml

@@ -24,7 +24,6 @@
         android:icon="@mipmap/ic_launcher"
         android:isGame="true"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.RyujinxAndroid"
         tools:targetApi="31">

src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/Icons.kt

@@ -129,6 +129,83 @@ class Icons {
             }
         }
         @Composable
+        fun gameUpdate(): ImageVector {
+            val primaryColor = MaterialTheme.colorScheme.primary
+            return remember {
+                ImageVector.Builder(
+                    name = "game_update_alt",
+                    defaultWidth = 40.0.dp,
+                    defaultHeight = 40.0.dp,
+                    viewportWidth = 40.0f,
+                    viewportHeight = 40.0f
+                ).apply {
+                    path(
+                        fill = SolidColor(Color.Black.copy(alpha = 0.5f)),
+                        stroke = SolidColor(primaryColor),
+                        fillAlpha = 1f,
+                        strokeAlpha = 1f,
+                        strokeLineWidth = 1.0f,
+                        strokeLineCap = StrokeCap.Butt,
+                        strokeLineJoin = StrokeJoin.Miter,
+                        strokeLineMiter = 1f,
+                        pathFillType = PathFillType.NonZero
+                    ) {
+                        moveTo(6.25f, 33.083f)
+                        quadToRelative(-1.083f, 0f, -1.854f, -0.791f)
+                        quadToRelative(-0.771f, -0.792f, -0.771f, -1.834f)
+                        verticalLineTo(9.542f)
+                        quadToRelative(0f, -1.042f, 0.771f, -1.854f)
+                        quadToRelative(0.771f, -0.813f, 1.854f, -0.813f)
+                        horizontalLineToRelative(8.458f)
+                        quadToRelative(0.584f, 0f, 0.959f, 0.396f)
+                        reflectiveQuadToRelative(0.375f, 0.937f)
+                        quadToRelative(0f, 0.584f, -0.375f, 0.959f)
+                        reflectiveQuadToRelative(-0.959f, 0.375f)
+                        horizontalLineTo(6.25f)
+                        verticalLineToRelative(20.916f)
+                        horizontalLineToRelative(27.542f)
+                        verticalLineTo(9.542f)
+                        horizontalLineToRelative(-8.5f)
+                        quadToRelative(-0.584f, 0f, -0.959f, -0.375f)
+                        reflectiveQuadToRelative(-0.375f, -0.959f)
+                        quadToRelative(0f, -0.541f, 0.375f, -0.937f)
+                        reflectiveQuadToRelative(0.959f, -0.396f)
+                        horizontalLineToRelative(8.5f)
+                        quadToRelative(1.041f, 0f, 1.833f, 0.813f)
+                        quadToRelative(0.792f, 0.812f, 0.792f, 1.854f)
+                        verticalLineToRelative(20.916f)
+                        quadToRelative(0f, 1.042f, -0.792f, 1.834f)
+                        quadToRelative(-0.792f, 0.791f, -1.833f, 0.791f)
+                        close()
+                        moveTo(20f, 25f)
+                        quadToRelative(-0.25f, 0f, -0.479f, -0.083f)
+                        quadToRelative(-0.229f, -0.084f, -0.396f, -0.292f)
+                        lineTo(12.75f, 18.25f)
+                        quadToRelative(-0.375f, -0.333f, -0.375f, -0.896f)
+                        quadToRelative(0f, -0.562f, 0.417f, -0.979f)
+                        quadToRelative(0.375f, -0.375f, 0.916f, -0.375f)
+                        quadToRelative(0.542f, 0f, 0.959f, 0.375f)
+                        lineToRelative(4.041f, 4.083f)
+                        verticalLineTo(8.208f)
+                        quadToRelative(0f, -0.541f, 0.375f, -0.937f)
+                        reflectiveQuadTo(20f, 6.875f)
+                        quadToRelative(0.542f, 0f, 0.938f, 0.396f)
+                        quadToRelative(0.395f, 0.396f, 0.395f, 0.937f)
+                        verticalLineToRelative(12.25f)
+                        lineToRelative(4.084f, -4.083f)
+                        quadToRelative(0.333f, -0.333f, 0.875f, -0.333f)
+                        quadToRelative(0.541f, 0f, 0.916f, 0.375f)
+                        quadToRelative(0.417f, 0.416f, 0.417f, 0.958f)
+                        reflectiveQuadToRelative(-0.375f, 0.917f)
+                        lineToRelative(-6.333f, 6.333f)
+                        quadToRelative(-0.209f, 0.208f, -0.438f, 0.292f)
+                        quadTo(20.25f, 25f, 20f, 25f)
+                        close()
+                    }
+                }.build()
+            }
+        }
+        @Composable
         fun download(): ImageVector {
             val primaryColor = MaterialTheme.colorScheme.primary
             return remember {

src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/views/HomeViews.kt

@@ -54,14 +54,12 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavHostController
 import coil.compose.AsyncImage
 import com.anggrayudi.storage.extension.launchOnUiThread
 import org.ryujinx.android.MainActivity
-import org.ryujinx.android.R
 import org.ryujinx.android.RyujinxNative
 import org.ryujinx.android.viewmodels.GameModel
 import org.ryujinx.android.viewmodels.HomeViewModel
@@ -154,7 +152,7 @@ class HomeViews {
                 },
                 bottomBar = {
                     BottomAppBar(actions = {
-                        if (!showAppActions.value) {
+                        if (showAppActions.value) {
                             IconButton(onClick = {
                             }) {
                                 Icon(
@@ -178,11 +176,11 @@ class HomeViews {
                                     DropdownMenuItem(text = {
                                         Text(text = "Manage Updates")
                                     }, onClick = {
-
+                                        showAppMenu.value = false
                                         openTitleUpdateDialog.value = true
                                     }, leadingIcon = {
                                         Icon(
-                                            painter = painterResource(R.drawable.app_update),
+                                            imageVector = org.ryujinx.android.Icons.gameUpdate(),
                                             contentDescription = "Updates",
                                             tint = MaterialTheme.colorScheme.onSurface
                                         )
@@ -190,7 +188,7 @@ class HomeViews {
                                     DropdownMenuItem(text = {
                                         Text(text = "Manage DLC")
                                     }, onClick = {
-
+                                        showAppMenu.value = false
                                         openDlcDialog.value = true
                                     }, leadingIcon = {
                                         Icon(

src/RyujinxAndroid/app/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="85.84757"
-                android:endY="92.4963"
-                android:startX="42.9492"
-                android:startY="49.59793"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-</vector>

src/RyujinxAndroid/app/src/main/res/drawable/ic_launcher_background.xml

@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>

src/RyujinxAndroid/app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,35 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="255.76"
+    android:viewportHeight="255.76">
+  <group android:scaleX="0.44"
+      android:scaleY="0.44"
+      android:translateX="71.6128"
+      android:translateY="71.6128">
+    <path
+        android:pathData="M80.63,0V220.39H44.37c-14,0 -35.74,-20.74 -35.74,-39.13V40.13C8.63,19.19 31.36,0 49.06,0Z"
+        android:fillColor="#02c5e5"/>
+    <path
+        android:pathData="M175.13,35.37V255.76h36.26c14,0 35.74,-20.74 35.74,-39.13V75.5c0,-20.94 -22.73,-40.13 -40.43,-40.13Z"
+        android:fillColor="#ff5f55"/>
+    <path
+        android:pathData="M124.34,137.96l-1.76,7.61l-31.94,0l2.25,-7.61l31.45,0z"
+        android:fillColor="#02c5e5"/>
+    <path
+        android:pathData="M160.29,137.96l-2.45,7.61l-35.26,0l1.76,-7.61l35.95,0z"
+        android:fillColor="#ff5f55"/>
+    <path
+        android:pathData="M130.39,111.86l-1.77,7.61l-33.48,0l2.25,-7.61l33,0z"
+        android:fillColor="#02c5e5"/>
+    <path
+        android:pathData="M164.79,111.86l-2.45,7.61l-33.72,0l1.77,-7.61l34.4,0z"
+        android:fillColor="#ff5f55"/>
+    <path
+        android:pathData="M104.24,167.99l18.59,-80.22l6.95,0l-18.59,80.22l-6.95,0z"
+        android:fillColor="#02c5e5"/>
+    <path
+        android:pathData="M128.18,167.99l18.59,-80.22l7.12,0l-18.59,80.22l-7.12,0z"
+        android:fillColor="#ff5f55"/>
+  </group>
+</vector>

src/RyujinxAndroid/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
+    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>

src/RyujinxAndroid/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
+    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>

src/RyujinxAndroid/app/src/main/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>