Skip to content

Commit

Permalink
Update android sample versions to fix duplicate class issues
Browse files Browse the repository at this point in the history
  • Loading branch information
russell committed Sep 28, 2024
1 parent fa68ca9 commit 5aa0f10
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
6 changes: 3 additions & 3 deletions sample/app-android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@ android {
dependencies {
implementation(project(":shared"))
implementation(fileTree("include" to listOf("*.jar"), "dir" to "libs"))
implementation(platform("androidx.compose:compose-bom:2023.09.02"))
implementation(platform("androidx.compose:compose-bom:2024.09.02"))
implementation("androidx.compose.material3:material3")
implementation("androidx.compose.foundation:foundation")
implementation("androidx.compose.ui:ui")
implementation("androidx.compose.ui:ui-tooling-preview")
debugImplementation("androidx.compose.ui:ui-tooling")
implementation("androidx.activity:activity-compose:1.7.2")
implementation("androidx.activity:activity-compose:1.9.2")
implementation("androidx.compose.material:material-icons-core")
implementation("androidx.preference:preference-ktx:1.2.0")
implementation("androidx.preference:preference-ktx:1.2.1")
implementation("com.russhwolf:multiplatform-settings:${rootProject.ext["library_version"]}")
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ package com.russhwolf.settings.example.android
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
Expand All @@ -32,15 +31,13 @@ import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.rounded.ArrowDropDown
import androidx.compose.material.ripple.rememberRipple
import androidx.compose.material3.Button
import androidx.compose.material3.Checkbox
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.MaterialTheme.colorScheme
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
Expand Down Expand Up @@ -201,8 +198,6 @@ private fun LabeledCheckbox(
.clip(CircleShape)
.toggleable(
value = checked,
indication = rememberRipple(color = colorScheme.primary),
interactionSource = remember { MutableInteractionSource() },
role = Role.Checkbox,
onValueChange = onClick,
)
Expand Down

0 comments on commit 5aa0f10

Please sign in to comment.