Skip to content

Commit f401b1b

Browse files
ArnyminerZsunkup
andauthored
Fix deprecations and issues with AboutLibs (#582)
* Use M3 for about libs Signed-off-by: Arnau Mora <arnyminerz@proton.me> * Fix config deprecations Signed-off-by: Arnau Mora <arnyminerz@proton.me> * Use new rememberLibraries block Signed-off-by: Arnau Mora <arnyminerz@proton.me> * Fix missing import --------- Signed-off-by: Arnau Mora <arnyminerz@proton.me> Co-authored-by: Sunik Kupfer <kupfer@bitfire.at>
1 parent 762f80f commit f401b1b

3 files changed

Lines changed: 12 additions & 12 deletions

File tree

app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,6 @@ dependencies {
163163
}
164164

165165
aboutLibraries {
166-
duplicationMode = DuplicateMode.MERGE
167-
includePlatform = false
166+
library.duplicationMode = DuplicateMode.MERGE
167+
collect.includePlatform = false
168168
}

app/src/main/java/at/bitfire/icsdroid/ui/InfoActivity.kt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,8 @@ import at.bitfire.icsdroid.service.ComposableStartupService.Companion.FLAG_DONAT
5656
import at.bitfire.icsdroid.ui.partials.ExtendedTopAppBar
5757
import at.bitfire.icsdroid.ui.partials.GenericAlertDialog
5858
import at.bitfire.icsdroid.ui.theme.setContentThemed
59-
import com.mikepenz.aboutlibraries.ui.compose.LibrariesContainer
60-
import com.mikepenz.aboutlibraries.ui.compose.LibraryDefaults
61-
import com.mikepenz.aboutlibraries.ui.compose.libraryColors
59+
import com.mikepenz.aboutlibraries.ui.compose.m3.LibrariesContainer
60+
import com.mikepenz.aboutlibraries.ui.compose.rememberLibraries
6261
import kotlinx.coroutines.runBlocking
6362
import java.util.ServiceLoader
6463

@@ -145,16 +144,17 @@ class InfoActivity: AppCompatActivity() {
145144
)
146145
}
147146
) { contentPadding ->
147+
val libraries by rememberLibraries {
148+
resources.openRawResource(R.raw.aboutlibraries).bufferedReader().use { input ->
149+
input.readText()
150+
}
151+
}
152+
148153
Column(Modifier.padding(contentPadding)) {
149154
Header()
150155
License()
151156
LibrariesContainer(
152-
colors = LibraryDefaults.libraryColors(
153-
backgroundColor = MaterialTheme.colorScheme.background,
154-
contentColor = MaterialTheme.colorScheme.onBackground,
155-
badgeBackgroundColor = MaterialTheme.colorScheme.primary,
156-
badgeContentColor = MaterialTheme.colorScheme.onPrimary,
157-
)
157+
libraries = libraries
158158
)
159159
}
160160
}

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ okhttp = "4.12.0"
2828
room = "2.7.1"
2929

3030
[libraries]
31-
aboutLibs-compose = { module = "com.mikepenz:aboutlibraries-compose", version.ref = "aboutLibs" }
31+
aboutLibs-compose = { module = "com.mikepenz:aboutlibraries-compose-m3", version.ref = "aboutLibs" }
3232
androidx-activityCompose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
3333
androidx-appCompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appCompat" }
3434
androidx-arch-core-testing = { module = "androidx.arch.core:core-testing", version.ref = "androidx-archCore" }

0 commit comments

Comments
 (0)