Git-Mirrors/mollyim-monero-wallet-sdk
1
0
Fork 0
mirror of https://github.com/mollyim/monero-wallet-sdk.git synced 2024-10-01 03:45:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

demo: update multiple dependencies

Browse Source
This commit is contained in:
Oscar Mira 2023-10-25 18:39:33 +02:00
parent 5852add98e
commit 845b556150
5 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
demo/android/build.gradle
View File

@ -3,21 +3,21 @@ apply plugin: 'org.jetbrains.kotlin.android'
apply plugin: 'com.google.devtools.ksp' apply plugin: 'com.google.devtools.ksp'
ext { ext {
composeVersion = '1.4.0-alpha04' composeVersion = '1.6.0-alpha08'
composeCompilerVersion = '1.5.3' composeCompilerVersion = '1.5.3'
lifecycleVersion = '2.6.0-alpha04' lifecycleVersion = '2.6.2'
roomVersion = '2.5.0' roomVersion = '2.6.0'
} }
android { android {
namespace = "im.molly.monero.demo" namespace = "im.molly.monero.demo"
compileSdk 33 compileSdk 34
defaultConfig { defaultConfig {
applicationId "im.molly.monero.demo" applicationId "im.molly.monero.demo"
minSdk 26 minSdk 26
targetSdk 33 targetSdk 34
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
@ -65,20 +65,20 @@ android {
dependencies { dependencies {
implementation "androidx.core:core-ktx:1.9.0" implementation "androidx.core:core-ktx:1.9.0"
implementation "androidx.compose.ui:ui:$composeVersion" implementation "androidx.compose.ui:ui:$composeVersion"
implementation "androidx.compose.material3:material3:1.1.0-alpha04" implementation "androidx.compose.material3:material3:1.2.0-alpha10"
implementation "androidx.compose.ui:ui-tooling-preview:$composeVersion" implementation "androidx.compose.ui:ui-tooling-preview:$composeVersion"
implementation "com.google.accompanist:accompanist-systemuicontroller:0.28.0" implementation "com.google.accompanist:accompanist-systemuicontroller:0.32.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycleVersion" implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycleVersion"
implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycleVersion" implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycleVersion"
implementation "androidx.activity:activity-compose:1.6.1" implementation "androidx.activity:activity-compose:1.8.0"
implementation "androidx.datastore:datastore-preferences:1.0.0" implementation "androidx.datastore:datastore-preferences:1.0.0"
implementation "androidx.room:room-runtime:$roomVersion" implementation "androidx.room:room-runtime:$roomVersion"
implementation "androidx.room:room-ktx:$roomVersion" implementation "androidx.room:room-ktx:$roomVersion"
implementation "androidx.navigation:navigation-runtime-ktx:2.5.3" implementation "androidx.navigation:navigation-runtime-ktx:2.7.4"
implementation "androidx.navigation:navigation-compose:2.5.3" implementation "androidx.navigation:navigation-compose:2.7.4"
implementation 'androidx.lifecycle:lifecycle-service:2.5.1' implementation 'androidx.lifecycle:lifecycle-service:2.6.2'
implementation 'androidx.lifecycle:lifecycle-process:2.5.1' implementation 'androidx.lifecycle:lifecycle-process:2.6.2'
ksp "androidx.room:room-compiler:$roomVersion" ksp "androidx.room:room-compiler:$roomVersion"
implementation project(':lib') implementation project(':lib')

1
demo/android/src/main/kotlin/im/molly/monero/demo/ui/DemoApp.kt
View File

@ -9,7 +9,6 @@ import androidx.navigation.NavDestination
import androidx.navigation.NavDestination.Companion.hierarchy import androidx.navigation.NavDestination.Companion.hierarchy
import im.molly.monero.demo.ui.navigation.* import im.molly.monero.demo.ui.navigation.*
@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)
@Composable @Composable
fun DemoApp( fun DemoApp(
appState: DemoAppState = rememberDemoAppState(), appState: DemoAppState = rememberDemoAppState(),

1
demo/android/src/main/kotlin/im/molly/monero/demo/ui/EditRemoteNodeDialog.kt
View File

@ -47,7 +47,6 @@ fun EditRemoteNodeRoute(
) )
} }
@OptIn(ExperimentalMaterial3Api::class)
@Composable @Composable
private fun EditRemoteNodeDialog( private fun EditRemoteNodeDialog(
remoteNode: RemoteNode, remoteNode: RemoteNode,

5
demo/android/src/main/kotlin/im/molly/monero/demo/ui/RemoteNodeList.kt
View File

@ -57,7 +57,6 @@ fun RemoteNodeEditableList(
} }
} }
@OptIn(ExperimentalMaterial3Api::class)
@Composable @Composable
private fun RemoteNodeItem( private fun RemoteNodeItem(
remoteNode: RemoteNode, remoteNode: RemoteNode,
@ -69,8 +68,8 @@ private fun RemoteNodeItem(
onDeleteClick: (RemoteNode) -> Unit = {}, onDeleteClick: (RemoteNode) -> Unit = {},
) { ) {
ListItem( ListItem(
headlineText = { Text(remoteNode.uri.toString()) }, headlineContent = { Text(remoteNode.uri.toString()) },
overlineText = { Text(remoteNode.network.name.uppercase()) }, overlineContent = { Text(remoteNode.network.name.uppercase()) },
trailingContent = { trailingContent = {
if (showCheckbox) { if (showCheckbox) {
Checkbox( Checkbox(

5
demo/android/src/main/kotlin/im/molly/monero/demo/ui/SettingsScreen.kt
View File

@ -126,7 +126,6 @@ private fun SettingsSectionTitle(title: String) {
) )
} }
@OptIn(ExperimentalMaterial3Api::class)
@Composable @Composable
private fun EditTextSettingsItem( private fun EditTextSettingsItem(
title: String, title: String,
@ -140,8 +139,8 @@ private fun EditTextSettingsItem(
var showDialog by remember { mutableStateOf(false) } var showDialog by remember { mutableStateOf(false) }
ListItem( ListItem(
headlineText = { Text(title) }, headlineContent = { Text(title) },
supportingText = { Text(summary) }, supportingContent = { Text(summary) },
trailingContent = { Text(value) }, trailingContent = { Text(value) },
modifier = Modifier modifier = Modifier
.clickable(onClick = { showDialog = true }), .clickable(onClick = { showDialog = true }),