youen/syncstuff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup unused dependencies, Upgrade to material3 (#1555)

Browse Source
This commit is contained in:
Catfriend1 2025-08-01 02:03:02 +02:00 committed by GitHub
parent cf4a2a725e
commit f80e5cf1af
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/build.gradle.kts
View File

@ -7,17 +7,14 @@ plugins {
}
dependencies {
implementation(libs.aboutlibraries.compose.m2)
implementation(libs.aboutlibraries.compose.m3)
implementation(libs.aboutlibraries.core)
implementation(libs.activity.compose)
implementation(libs.activity.ktx)
implementation(libs.android.material)
implementation(libs.compose.foundation)
implementation(libs.compose.material)
implementation(libs.compose.material.icons.core)
implementation(libs.compose.material3)
implementation(libs.compose.material.icons.extended)
implementation(libs.compose.ui)
implementation(libs.compose.ui.tooling.preview)
implementation(libs.constraintlayout)
implementation(libs.core.ktx)
implementation(libs.dagger)

23
app/src/main/java/com/nutomic/syncthingandroid/activities/LicenseActivity.kt
View File

@ -5,27 +5,27 @@ import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.LocalOnBackPressedDispatcherOwner
import androidx.activity.compose.setContent
import androidx.core.view.WindowCompat
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.material.IconButton
import androidx.compose.material.Icon
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Scaffold
import androidx.compose.material.Surface
import androidx.compose.material.Text
import androidx.compose.material.TopAppBar
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.IconButton
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.core.view.WindowCompat
import com.mikepenz.aboutlibraries.ui.compose.rememberLibraries
import com.mikepenz.aboutlibraries.ui.compose.LibrariesContainer
import com.mikepenz.aboutlibraries.ui.compose.m3.LibrariesContainer
import com.nutomic.syncthingandroid.R
@ -42,6 +42,7 @@ class LicenseActivity : ComponentActivity() {
}
}
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun LicenseScreen() {
MaterialTheme {

12
gradle/libs.versions.toml
View File

@ -12,8 +12,9 @@ aboutLibraries = "12.2.4"
activity = "1.10.1"
android-material = "1.12.0"
android-gradle-plugin = "8.11.1"
compose-material = "1.8.3"
compose-material3 = "1.3.2"
compose-material-icons = "1.7.8"
compose-ui = "1.8.3"
constraintlayout = "2.2.1"
core-ktx = "1.16.0"
dagger = "2.57"
@ -38,17 +39,14 @@ zxing-core = "3.3.0"
[libraries]
aboutlibraries-core = { module = "com.mikepenz:aboutlibraries-core", version.ref = "aboutLibraries" }
aboutlibraries-compose-m2 = { module = "com.mikepenz:aboutlibraries-compose", version.ref = "aboutLibraries" }
aboutlibraries-compose-m3 = { module = "com.mikepenz:aboutlibraries-compose-m3", version.ref = "aboutLibraries" }
activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activity" }
activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "activity" }
android-gradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "android-gradle-plugin" }
android-material = { module = "com.google.android.material:material", version.ref = "android-material" }
compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose-material" }
compose-material = { module = "androidx.compose.material:material", version.ref = "compose-material" }
compose-material-icons-core = { module = "androidx.compose.material:material-icons-core", version.ref = "compose-material-icons" }
compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "compose-material3" }
compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended", version.ref = "compose-material-icons" }
compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose-material" }
compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose-material" }
compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose-ui" }
constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
core-ktx = { module = "androidx.core:core-ktx", version.ref = "core-ktx" }
dagger = { module = "com.google.dagger:dagger", version.ref = "dagger" }