diff --git a/Ryujinx.sln.DotSettings b/Ryujinx.sln.DotSettings
index 049bdaf69..1e5b9807e 100644
--- a/Ryujinx.sln.DotSettings
+++ b/Ryujinx.sln.DotSettings
@@ -4,6 +4,8 @@
UseExplicitType
UseExplicitType
<Policy Inspect="True" Prefix="" Suffix="" Style="AaBb"><ExtraRule Prefix="I" Suffix="" Style="AaBb" /></Policy>
+ <Policy><Descriptor Staticness="Any" AccessRightKinds="Any" Description="Types and namespaces"><ElementKinds><Kind Name="NAMESPACE" /><Kind Name="CLASS" /><Kind Name="STRUCT" /><Kind Name="ENUM" /><Kind Name="DELEGATE" /></ElementKinds></Descriptor><Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="AaBb"><ExtraRule Prefix="I" Suffix="" Style="AaBb" /></Policy></Policy>
+ True
True
True
True
diff --git a/global.json b/global.json
index 391ba3c2a..d3adbc477 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"sdk": {
- "version": "8.0.100",
+ "version": "9.0.101",
"rollForward": "latestFeature"
}
}
diff --git a/src/MeloNX-Android/.gitignore b/src/MeloNX-Android/.gitignore
new file mode 100644
index 000000000..aa724b770
--- /dev/null
+++ b/src/MeloNX-Android/.gitignore
@@ -0,0 +1,15 @@
+*.iml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
+local.properties
diff --git a/src/MeloNX-Android/.idea/.name b/src/MeloNX-Android/.idea/.name
new file mode 100644
index 000000000..c339e91e0
--- /dev/null
+++ b/src/MeloNX-Android/.idea/.name
@@ -0,0 +1 @@
+MeloNX
\ No newline at end of file
diff --git a/src/MeloNX-Android/.idea/compiler.xml b/src/MeloNX-Android/.idea/compiler.xml
new file mode 100644
index 000000000..b86273d94
--- /dev/null
+++ b/src/MeloNX-Android/.idea/compiler.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/MeloNX-Android/.idea/gradle.xml b/src/MeloNX-Android/.idea/gradle.xml
new file mode 100644
index 000000000..ae733f102
--- /dev/null
+++ b/src/MeloNX-Android/.idea/gradle.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/MeloNX-Android/.idea/kotlinc.xml b/src/MeloNX-Android/.idea/kotlinc.xml
new file mode 100644
index 000000000..6d0ee1c2a
--- /dev/null
+++ b/src/MeloNX-Android/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/MeloNX-Android/.idea/migrations.xml b/src/MeloNX-Android/.idea/migrations.xml
new file mode 100644
index 000000000..f8051a6f9
--- /dev/null
+++ b/src/MeloNX-Android/.idea/migrations.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/MeloNX-Android/.idea/misc.xml b/src/MeloNX-Android/.idea/misc.xml
new file mode 100644
index 000000000..74dd639e4
--- /dev/null
+++ b/src/MeloNX-Android/.idea/misc.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/MeloNX-Android/.idea/runConfigurations.xml b/src/MeloNX-Android/.idea/runConfigurations.xml
new file mode 100644
index 000000000..16660f1d8
--- /dev/null
+++ b/src/MeloNX-Android/.idea/runConfigurations.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/MeloNX-Android/.idea/vcs.xml b/src/MeloNX-Android/.idea/vcs.xml
new file mode 100644
index 000000000..b2bdec2d7
--- /dev/null
+++ b/src/MeloNX-Android/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/MeloNX-Android/app/.gitignore b/src/MeloNX-Android/app/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/src/MeloNX-Android/app/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/src/MeloNX-Android/app/build.gradle.kts b/src/MeloNX-Android/app/build.gradle.kts
new file mode 100644
index 000000000..3f1a7e851
--- /dev/null
+++ b/src/MeloNX-Android/app/build.gradle.kts
@@ -0,0 +1,61 @@
+plugins {
+ alias(libs.plugins.android.application)
+ alias(libs.plugins.kotlin.android)
+ alias(libs.plugins.kotlin.compose)
+}
+
+android {
+ namespace = "com.xitrix.melonx"
+ compileSdk = 35
+
+ defaultConfig {
+ applicationId = "com.xitrix.melonx"
+ minSdk = 29
+ targetSdk = 35
+ versionCode = 1
+ versionName = "1.0"
+
+ testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+ }
+
+ buildTypes {
+ release {
+ isMinifyEnabled = false
+ proguardFiles(
+ getDefaultProguardFile("proguard-android-optimize.txt"),
+ "proguard-rules.pro"
+ )
+ }
+ }
+ compileOptions {
+ sourceCompatibility = JavaVersion.VERSION_11
+ targetCompatibility = JavaVersion.VERSION_11
+ }
+ kotlinOptions {
+ jvmTarget = "11"
+ }
+ buildFeatures {
+ compose = true
+ }
+}
+
+dependencies {
+
+ implementation(libs.androidx.core.ktx)
+ implementation(libs.androidx.lifecycle.runtime.ktx)
+ implementation(libs.androidx.activity.compose)
+ implementation(platform(libs.androidx.compose.bom))
+ implementation(libs.androidx.ui)
+ implementation(libs.androidx.ui.graphics)
+ implementation(libs.androidx.ui.tooling.preview)
+ implementation(libs.androidx.material3)
+ testImplementation(libs.junit)
+ androidTestImplementation(libs.androidx.junit)
+ androidTestImplementation(libs.androidx.espresso.core)
+ androidTestImplementation(platform(libs.androidx.compose.bom))
+ androidTestImplementation(libs.androidx.ui.test.junit4)
+ debugImplementation(libs.androidx.ui.tooling)
+ debugImplementation(libs.androidx.ui.test.manifest)
+ implementation(libs.androidx.navigation.compose)
+
+}
diff --git a/src/MeloNX-Android/app/proguard-rules.pro b/src/MeloNX-Android/app/proguard-rules.pro
new file mode 100644
index 000000000..481bb4348
--- /dev/null
+++ b/src/MeloNX-Android/app/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/src/MeloNX-Android/app/src/androidTest/java/com/xitrix/melonx/ExampleInstrumentedTest.kt b/src/MeloNX-Android/app/src/androidTest/java/com/xitrix/melonx/ExampleInstrumentedTest.kt
new file mode 100644
index 000000000..d8b5307d9
--- /dev/null
+++ b/src/MeloNX-Android/app/src/androidTest/java/com/xitrix/melonx/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package com.xitrix.melonx
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+ @Test
+ fun useAppContext() {
+ // Context of the app under test.
+ val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+ assertEquals("com.xitrix.melonx", appContext.packageName)
+ }
+}
diff --git a/src/MeloNX-Android/app/src/main/AndroidManifest.xml b/src/MeloNX-Android/app/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..95b93d56d
--- /dev/null
+++ b/src/MeloNX-Android/app/src/main/AndroidManifest.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/MeloNX-Android/app/src/main/java/com/xitrix/melonx/HomeScreen.kt b/src/MeloNX-Android/app/src/main/java/com/xitrix/melonx/HomeScreen.kt
new file mode 100644
index 000000000..9ea4f36e4
--- /dev/null
+++ b/src/MeloNX-Android/app/src/main/java/com/xitrix/melonx/HomeScreen.kt
@@ -0,0 +1,34 @@
+package com.xitrix.melonx
+
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.navigation.NavHostController
+import com.xitrix.melonx.ui.theme.MeloNXTheme
+
+
+@Composable
+fun HomeScreen(
+ scaffoldState: ScaffoldState,
+ navController: NavHostController
+) {
+ Scaffold(
+ modifier = modifier
+ ) { padding ->
+ Text(
+ text = "Hello $name!",
+ modifier = Modifier.padding(padding)
+ )
+ }
+}
+
+@Preview(showBackground = true)
+@Composable
+fun HomeScreenPreview() {
+ MeloNXTheme {
+ HomeScreen("Android")
+ }
+}
diff --git a/src/MeloNX-Android/app/src/main/java/com/xitrix/melonx/MainActivity.kt b/src/MeloNX-Android/app/src/main/java/com/xitrix/melonx/MainActivity.kt
new file mode 100644
index 000000000..4afb1ce2e
--- /dev/null
+++ b/src/MeloNX-Android/app/src/main/java/com/xitrix/melonx/MainActivity.kt
@@ -0,0 +1,124 @@
+package com.xitrix.melonx
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import androidx.annotation.StringRes
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.*
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.NavigationBar
+import androidx.compose.material3.NavigationBarItem
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.navigation.compose.NavHost
+import com.xitrix.melonx.ui.theme.MeloNXTheme
+
+@Immutable
+data class ScaffoldViewState(
+ @StringRes val topAppBarTitle: Int? = null,
+ @StringRes val fabText: Int? = null,
+ // TODO : ...etc (top app bar actions, nav icon...)
+)
+
+class MainActivity : ComponentActivity() {
+ @OptIn(ExperimentalMaterial3Api::class)
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ enableEdgeToEdge()
+ setContent {
+ MeloNXTheme {
+ val items = listOf(
+ BottomNavItem("Home", "home", Icons.Default.Home),
+ BottomNavItem("Settings", "settings", Icons.Default.Settings)
+ )
+ var currentRoute by remember { mutableStateOf("home") }
+ var scaffoldViewState by remember {
+ mutableStateOf(ScaffoldViewState())
+ }
+
+
+ Scaffold(
+
+// modifier = Modifier.fillMaxSize(),
+ topBar = {
+ TopAppBar(
+ title = {
+ Text(text = "Хуета")
+ }
+ )
+ },
+ bottomBar = {
+ BottomNavigationBar(
+ items = items,
+ currentRoute = currentRoute,
+ onItemClick = { currentRoute = it }
+ )
+ }) { innerPadding ->
+// NavHost {
+//// composable("a") {
+// LaunchedEffect(Unit) {
+//// scaffoldViewState = // TODO : choose the top app bar and fab appearance for this page
+// }
+//
+// AScreen()
+//// }
+// composable("b") {
+// LaunchedEffect(Unit) {
+//// scaffoldViewState = // TODO : choose the top app bar and fab appearance for this page
+// }
+//
+// BScreen()
+// }
+// }
+ when (currentRoute) {
+ "home" -> HomeScreen("Android", Modifier.padding(innerPadding))
+ "settings" -> SettingsScreen(innerPadding)
+ }
+ }
+ }
+ }
+ }
+}
+
+@Composable
+fun BottomNavigationBar(
+ items: List,
+ currentRoute: String,
+ onItemClick: (String) -> Unit
+) {
+ NavigationBar {
+ items.forEach { item ->
+ NavigationBarItem(
+ icon = { Icon(item.icon, contentDescription = item.title) },
+ label = { Text(item.title) },
+ selected = currentRoute == item.route,
+ onClick = { onItemClick(item.route) }
+ )
+ }
+ }
+}
+
+data class BottomNavItem(
+ val title: String,
+ val route: String,
+ val icon: ImageVector
+)
diff --git a/src/MeloNX-Android/app/src/main/java/com/xitrix/melonx/SettingsScreen.kt b/src/MeloNX-Android/app/src/main/java/com/xitrix/melonx/SettingsScreen.kt
new file mode 100644
index 000000000..24be7f8cb
--- /dev/null
+++ b/src/MeloNX-Android/app/src/main/java/com/xitrix/melonx/SettingsScreen.kt
@@ -0,0 +1,16 @@
+package com.xitrix.melonx
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+
+
+@Composable
+fun SettingsScreen(paddingValues: PaddingValues) {
+ Box(modifier = Modifier.padding(paddingValues)) {
+ Text(text = "Screen One")
+ }
+}
diff --git a/src/MeloNX-Android/app/src/main/java/com/xitrix/melonx/ui/theme/Color.kt b/src/MeloNX-Android/app/src/main/java/com/xitrix/melonx/ui/theme/Color.kt
new file mode 100644
index 000000000..c067b6f46
--- /dev/null
+++ b/src/MeloNX-Android/app/src/main/java/com/xitrix/melonx/ui/theme/Color.kt
@@ -0,0 +1,11 @@
+package com.xitrix.melonx.ui.theme
+
+import androidx.compose.ui.graphics.Color
+
+val Purple80 = Color(0xFFD0BCFF)
+val PurpleGrey80 = Color(0xFFCCC2DC)
+val Pink80 = Color(0xFFEFB8C8)
+
+val Purple40 = Color(0xFF6650a4)
+val PurpleGrey40 = Color(0xFF625b71)
+val Pink40 = Color(0xFF7D5260)
\ No newline at end of file
diff --git a/src/MeloNX-Android/app/src/main/java/com/xitrix/melonx/ui/theme/Theme.kt b/src/MeloNX-Android/app/src/main/java/com/xitrix/melonx/ui/theme/Theme.kt
new file mode 100644
index 000000000..9fceff816
--- /dev/null
+++ b/src/MeloNX-Android/app/src/main/java/com/xitrix/melonx/ui/theme/Theme.kt
@@ -0,0 +1,58 @@
+package com.xitrix.melonx.ui.theme
+
+import android.app.Activity
+import android.os.Build
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.dynamicDarkColorScheme
+import androidx.compose.material3.dynamicLightColorScheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+
+private val DarkColorScheme = darkColorScheme(
+ primary = Purple80,
+ secondary = PurpleGrey80,
+ tertiary = Pink80
+)
+
+private val LightColorScheme = lightColorScheme(
+ primary = Purple40,
+ secondary = PurpleGrey40,
+ tertiary = Pink40
+
+ /* Other default colors to override
+ background = Color(0xFFFFFBFE),
+ surface = Color(0xFFFFFBFE),
+ onPrimary = Color.White,
+ onSecondary = Color.White,
+ onTertiary = Color.White,
+ onBackground = Color(0xFF1C1B1F),
+ onSurface = Color(0xFF1C1B1F),
+ */
+)
+
+@Composable
+fun MeloNXTheme(
+ darkTheme: Boolean = isSystemInDarkTheme(),
+ // Dynamic color is available on Android 12+
+ dynamicColor: Boolean = true,
+ content: @Composable () -> Unit
+) {
+ val colorScheme = when {
+ dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
+ val context = LocalContext.current
+ if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
+ }
+
+ darkTheme -> DarkColorScheme
+ else -> LightColorScheme
+ }
+
+ MaterialTheme(
+ colorScheme = colorScheme,
+ typography = Typography,
+ content = content
+ )
+}
diff --git a/src/MeloNX-Android/app/src/main/java/com/xitrix/melonx/ui/theme/Type.kt b/src/MeloNX-Android/app/src/main/java/com/xitrix/melonx/ui/theme/Type.kt
new file mode 100644
index 000000000..c677d22f7
--- /dev/null
+++ b/src/MeloNX-Android/app/src/main/java/com/xitrix/melonx/ui/theme/Type.kt
@@ -0,0 +1,34 @@
+package com.xitrix.melonx.ui.theme
+
+import androidx.compose.material3.Typography
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.sp
+
+// Set of Material typography styles to start with
+val Typography = Typography(
+ bodyLarge = TextStyle(
+ fontFamily = FontFamily.Default,
+ fontWeight = FontWeight.Normal,
+ fontSize = 16.sp,
+ lineHeight = 24.sp,
+ letterSpacing = 0.5.sp
+ )
+ /* Other default text styles to override
+ titleLarge = TextStyle(
+ fontFamily = FontFamily.Default,
+ fontWeight = FontWeight.Normal,
+ fontSize = 22.sp,
+ lineHeight = 28.sp,
+ letterSpacing = 0.sp
+ ),
+ labelSmall = TextStyle(
+ fontFamily = FontFamily.Default,
+ fontWeight = FontWeight.Medium,
+ fontSize = 11.sp,
+ lineHeight = 16.sp,
+ letterSpacing = 0.5.sp
+ )
+ */
+)
\ No newline at end of file
diff --git a/src/MeloNX-Android/app/src/main/res/drawable/ic_launcher_background.xml b/src/MeloNX-Android/app/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 000000000..07d5da9cb
--- /dev/null
+++ b/src/MeloNX-Android/app/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,170 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/MeloNX-Android/app/src/main/res/drawable/ic_launcher_foreground.xml b/src/MeloNX-Android/app/src/main/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 000000000..7706ab9e6
--- /dev/null
+++ b/src/MeloNX-Android/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,30 @@
+
+
+
+
+