diff --git a/src/RyujinxAndroid/app/src/main/AndroidManifest.xml b/src/RyujinxAndroid/app/src/main/AndroidManifest.xml index 4a05d62e4..73e7d70d3 100644 --- a/src/RyujinxAndroid/app/src/main/AndroidManifest.xml +++ b/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"> diff --git a/src/RyujinxAndroid/app/src/main/ic_launcher-playstore.png b/src/RyujinxAndroid/app/src/main/ic_launcher-playstore.png new file mode 100644 index 000000000..e27d7167c Binary files /dev/null and b/src/RyujinxAndroid/app/src/main/ic_launcher-playstore.png differ diff --git a/src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/Icons.kt b/src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/Icons.kt index 9e666df73..54a508298 100644 --- a/src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/Icons.kt +++ b/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 { diff --git a/src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/views/HomeViews.kt b/src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/views/HomeViews.kt index 299b9250a..49b1a582f 100644 --- a/src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/views/HomeViews.kt +++ b/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( diff --git a/src/RyujinxAndroid/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/src/RyujinxAndroid/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d114..000000000 --- a/src/RyujinxAndroid/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/RyujinxAndroid/app/src/main/res/drawable/ic_launcher_background.xml b/src/RyujinxAndroid/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9cb..000000000 --- a/src/RyujinxAndroid/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/RyujinxAndroid/app/src/main/res/drawable/ic_launcher_foreground.xml b/src/RyujinxAndroid/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 000000000..c4dd11353 --- /dev/null +++ b/src/RyujinxAndroid/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + diff --git a/src/RyujinxAndroid/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/src/RyujinxAndroid/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755bf..7353dbd1f 100644 --- a/src/RyujinxAndroid/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/src/RyujinxAndroid/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/src/RyujinxAndroid/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/src/RyujinxAndroid/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755bf..7353dbd1f 100644 --- a/src/RyujinxAndroid/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/src/RyujinxAndroid/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/src/RyujinxAndroid/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/src/RyujinxAndroid/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78ec..000000000 Binary files a/src/RyujinxAndroid/app/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ diff --git a/src/RyujinxAndroid/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/src/RyujinxAndroid/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp index b2dfe3d1b..3a8b2257a 100644 Binary files a/src/RyujinxAndroid/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and b/src/RyujinxAndroid/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/src/RyujinxAndroid/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/src/RyujinxAndroid/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d64e..000000000 Binary files a/src/RyujinxAndroid/app/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ diff --git a/src/RyujinxAndroid/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/src/RyujinxAndroid/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp index 62b611da0..b863faa25 100644 Binary files a/src/RyujinxAndroid/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and b/src/RyujinxAndroid/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/src/RyujinxAndroid/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/src/RyujinxAndroid/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a3070f..000000000 Binary files a/src/RyujinxAndroid/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ diff --git a/src/RyujinxAndroid/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/src/RyujinxAndroid/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp index 1b9a6956b..94f9c7208 100644 Binary files a/src/RyujinxAndroid/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and b/src/RyujinxAndroid/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/src/RyujinxAndroid/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/src/RyujinxAndroid/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp deleted file mode 100644 index 28d4b77f9..000000000 Binary files a/src/RyujinxAndroid/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ diff --git a/src/RyujinxAndroid/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/src/RyujinxAndroid/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp index 9287f5083..c0977e6a3 100644 Binary files a/src/RyujinxAndroid/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and b/src/RyujinxAndroid/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/src/RyujinxAndroid/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/src/RyujinxAndroid/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp deleted file mode 100644 index aa7d6427e..000000000 Binary files a/src/RyujinxAndroid/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ diff --git a/src/RyujinxAndroid/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/src/RyujinxAndroid/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp index 9126ae37c..1bd79c407 100644 Binary files a/src/RyujinxAndroid/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and b/src/RyujinxAndroid/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/src/RyujinxAndroid/app/src/main/res/values/ic_launcher_background.xml b/src/RyujinxAndroid/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 000000000..c5d5899fd --- /dev/null +++ b/src/RyujinxAndroid/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file