From 956c5fe4fd86e4acf70895da96561c6900c5c095 Mon Sep 17 00:00:00 2001 From: Emmanuel Hansen Date: Fri, 19 Jan 2024 12:46:42 +0000 Subject: [PATCH] android - update dependencies --- src/RyujinxAndroid/app/build.gradle | 25 +++++++++++-------- .../java/org/ryujinx/android/MainActivity.kt | 15 +++++------ .../java/org/ryujinx/android/UiHandler.kt | 2 +- .../org/ryujinx/android/views/SettingViews.kt | 1 - src/RyujinxAndroid/build.gradle | 6 ++--- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 6 files changed, 25 insertions(+), 26 deletions(-) diff --git a/src/RyujinxAndroid/app/build.gradle b/src/RyujinxAndroid/app/build.gradle index 2740c03c7..e9b238f0a 100644 --- a/src/RyujinxAndroid/app/build.gradle +++ b/src/RyujinxAndroid/app/build.gradle @@ -5,14 +5,14 @@ plugins { android { namespace 'org.ryujinx.android' - compileSdk 33 + compileSdk 34 defaultConfig { applicationId "org.ryujinx.android" minSdk 30 - targetSdk 33 - versionCode 10010 - versionName '1.0.10' + targetSdk 34 + versionCode 10021 + versionName '1.0.21' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { @@ -52,7 +52,7 @@ android { buildConfig true } composeOptions { - kotlinCompilerExtensionVersion '1.3.2' + kotlinCompilerExtensionVersion '1.5.2' } packagingOptions { jniLibs { @@ -77,17 +77,17 @@ tasks.named("preBuild") { dependencies { implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'com.google.android.material:material:1.9.0' + implementation 'com.google.android.material:material:1.11.0' implementation platform('androidx.compose:compose-bom:2023.03.00') implementation platform('androidx.compose:compose-bom:2023.03.00') androidTestImplementation platform('androidx.compose:compose-bom:2023.03.00') androidTestImplementation platform('androidx.compose:compose-bom:2023.03.00') runtimeOnly project(":libryujinx") - implementation 'androidx.core:core-ktx:1.10.1' + implementation 'androidx.core:core-ktx:1.12.0' implementation platform('org.jetbrains.kotlin:kotlin-bom:1.8.0') - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1' - implementation "androidx.navigation:navigation-compose:2.6.0" - implementation 'androidx.activity:activity-compose:1.7.2' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0' + implementation "androidx.navigation:navigation-compose:2.7.6" + implementation 'androidx.activity:activity-compose:1.8.2' implementation platform('androidx.compose:compose-bom:2023.06.00') implementation 'androidx.compose.ui:ui' implementation 'androidx.compose.ui:ui-graphics' @@ -96,12 +96,15 @@ dependencies { implementation 'com.github.swordfish90:radialgamepad:2.0.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation "com.anggrayudi:storage:1.5.5" - implementation "androidx.preference:preference-ktx:1.2.0" + implementation "androidx.preference:preference-ktx:1.2.1" implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.2' implementation 'com.google.code.gson:gson:2.10.1' implementation 'net.lingala.zip4j:zip4j:2.11.5' implementation("br.com.devsrsouza.compose.icons:css-gg:1.1.0") implementation "io.coil-kt:coil-compose:2.4.0" + implementation("com.halilibo.compose-richtext:richtext-ui:0.20.0") + implementation("com.halilibo.compose-richtext:richtext-commonmark:0.20.0") + implementation("com.halilibo.compose-richtext:richtext-ui-material3:0.20.0") testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' diff --git a/src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/MainActivity.kt b/src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/MainActivity.kt index 04db5d07b..3971e64d4 100644 --- a/src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/MainActivity.kt +++ b/src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/MainActivity.kt @@ -18,7 +18,6 @@ import androidx.core.view.WindowCompat import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsControllerCompat import com.anggrayudi.storage.SimpleStorageHelper -import com.halilibo.richtext.ui.RichTextThemeIntegration import org.ryujinx.android.ui.theme.RyujinxAndroidTheme import org.ryujinx.android.viewmodels.MainViewModel import org.ryujinx.android.viewmodels.QuickSettings @@ -111,14 +110,12 @@ class MainActivity : BaseActivity() { mainViewModel?.apply { setContent { RyujinxAndroidTheme { - RichTextThemeIntegration(contentColor = { MaterialTheme.colorScheme.onSurface }) { - // A surface container using the 'background' color from the theme - Surface( - modifier = Modifier.fillMaxSize(), - color = MaterialTheme.colorScheme.background - ) { - MainView.Main(mainViewModel = this) - } + // A surface container using the 'background' color from the theme + Surface( + modifier = Modifier.fillMaxSize(), + color = MaterialTheme.colorScheme.background + ) { + MainView.Main(mainViewModel = this) } } } diff --git a/src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/UiHandler.kt b/src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/UiHandler.kt index f1b8e2cef..b7eaf0cfb 100644 --- a/src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/UiHandler.kt +++ b/src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/UiHandler.kt @@ -29,7 +29,7 @@ import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.unit.dp import androidx.compose.ui.window.DialogProperties import com.halilibo.richtext.markdown.Markdown -import com.halilibo.richtext.ui.RichText +import com.halilibo.richtext.ui.material3.RichText internal enum class KeyboardMode { Default, Numeric, ASCII, FullLatin, Alphabet, SimplifiedChinese, TraditionalChinese, Korean, LanguageSet2, LanguageSet2Latin diff --git a/src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/views/SettingViews.kt b/src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/views/SettingViews.kt index 2e6434739..2625a0320 100644 --- a/src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/views/SettingViews.kt +++ b/src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/views/SettingViews.kt @@ -252,7 +252,6 @@ class SettingViews { .fillMaxWidth() .padding(8.dp), horizontalArrangement = Arrangement.SpaceBetween, - verticalAlignment = Alignment.CenterVertically ) { Button(onClick = { fun createIntent(action: String): Intent { diff --git a/src/RyujinxAndroid/build.gradle b/src/RyujinxAndroid/build.gradle index f28d7a182..eecdbd845 100644 --- a/src/RyujinxAndroid/build.gradle +++ b/src/RyujinxAndroid/build.gradle @@ -1,6 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '8.1.0' apply false - id 'com.android.library' version '8.1.0' apply false - id 'org.jetbrains.kotlin.android' version '1.7.20' apply false + id 'com.android.application' version '8.2.1' apply false + id 'com.android.library' version '8.2.1' apply false + id 'org.jetbrains.kotlin.android' version '1.9.0' apply false } diff --git a/src/RyujinxAndroid/gradle/wrapper/gradle-wrapper.properties b/src/RyujinxAndroid/gradle/wrapper/gradle-wrapper.properties index 5d9d161a3..e66a866cf 100644 --- a/src/RyujinxAndroid/gradle/wrapper/gradle-wrapper.properties +++ b/src/RyujinxAndroid/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Fri Jun 30 08:45:05 UTC 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists