mirror/davx5-ose
1
0
Fork 0
mirror of https://github.com/bitfireAT/davx5-ose.git synced 2025-12-23 23:17:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update AboutLibraries to 12.0.0 (#1406)

Browse Source 
* Upgrade aboutlibs to 12.0.0

Signed-off-by: Arnau Mora <arnyminerz@proton.me>

* Migrated code

Signed-off-by: Arnau Mora <arnyminerz@proton.me>

* Apply AboutLibraries after other gradle plugins

---------

Signed-off-by: Arnau Mora <arnyminerz@proton.me>
Co-authored-by: Ricki Hirner <hirner@bitfire.at>
This commit is contained in:
Arnau Mora
2025-04-24 10:33:59 +02:00
committed by GitHub
parent b90b8ce6a2
commit 5c35741226
4 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/build.gradle.kts
View File

@@ -3,12 +3,13 @@
*/
plugins {
alias(libs.plugins.mikepenz.aboutLibraries)
alias(libs.plugins.android.application)
alias(libs.plugins.compose.compiler)
alias(libs.plugins.hilt)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.ksp)
alias(libs.plugins.mikepenz.aboutLibraries)
}
// Android configuration

20
app/src/main/kotlin/at/bitfire/davdroid/ui/AboutActivity.kt
View File

@@ -54,9 +54,8 @@ import at.bitfire.davdroid.Constants
import at.bitfire.davdroid.Constants.withStatParams
import at.bitfire.davdroid.R
import at.bitfire.davdroid.ui.composable.PixelBoxes
import com.mikepenz.aboutlibraries.Libs
import com.mikepenz.aboutlibraries.ui.compose.LibraryDefaults
import com.mikepenz.aboutlibraries.ui.compose.m3.LibrariesContainer
import com.mikepenz.aboutlibraries.util.withJson
import dagger.BindsOptionalOf
import dagger.Module
import dagger.hilt.InstallIn
@@ -168,14 +167,15 @@ class AboutActivity: AppCompatActivity() {
TranslatorsGallery(translations.value)
}
2 -> LibrariesContainer(Modifier.fillMaxSize(),
itemContentPadding = PaddingValues(horizontal = 8.dp, vertical = 8.dp),
itemSpacing = 8.dp,
librariesBlock = { ctx ->
Libs.Builder()
.withJson(ctx, R.raw.aboutlibraries)
.build()
})
2 -> LibrariesContainer(
modifier = Modifier.fillMaxSize(),
padding = LibraryDefaults.libraryPadding(
contentPadding = PaddingValues(8.dp)
),
dimensions = LibraryDefaults.libraryDimensions(
itemSpacing = 8.dp
)
)
}
}
}

5
build.gradle.kts
View File

@@ -1,6 +1,6 @@
/***************************************************************************************************
/*
* Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
**************************************************************************************************/
*/
plugins {
alias(libs.plugins.android.application) apply false
@@ -8,5 +8,6 @@ plugins {
alias(libs.plugins.hilt) apply false
alias(libs.plugins.kotlin.android) apply false
alias(libs.plugins.ksp) apply false
alias(libs.plugins.mikepenz.aboutLibraries) apply false
}

2
gradle/libs.versions.toml
View File

@@ -33,7 +33,7 @@ kotlin = "2.1.20"
kotlinx-coroutines = "1.10.2"
# see https://github.com/google/ksp/releases for version numbers
ksp = "2.1.20-2.0.0"
mikepenz-aboutLibraries = "11.6.3"
mikepenz-aboutLibraries = "12.0.0"
nsk90-kstatemachine = "0.33.0"
mockk = "1.14.0"
okhttp = "4.12.0"