Merge pull request #874 from igorescodro/custom/libraries

📦 Migrate from aboutlibraries container to a custom list
igorescodro · Feb 15, 2025 · 3648252 · 3648252
2 parents ab9d40c + 9a283af
commit 3648252
Show file tree

Hide file tree

Showing 6 changed files with 981 additions and 1,642 deletions.
diff --git a/features/preference/src/commonMain/kotlin/com/escodro/preference/presentation/OpenSource.kt b/features/preference/src/commonMain/kotlin/com/escodro/preference/presentation/OpenSource.kt
@@ -1,21 +1,40 @@
 package com.escodro.preference.presentation
 
-import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SuggestionChip
+import androidx.compose.material3.SuggestionChipDefaults
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import com.escodro.designsystem.components.AlkaaDialog
 import com.escodro.designsystem.components.AlkaaToolbar
+import com.escodro.designsystem.components.DialogArguments
 import com.escodro.resources.Res
-import com.mikepenz.aboutlibraries.ui.compose.LibrariesContainer
-import com.mikepenz.aboutlibraries.ui.compose.LibraryDefaults
+import com.escodro.resources.default_ok
+import com.mikepenz.aboutlibraries.Libs
+import com.mikepenz.aboutlibraries.entity.Library
+import com.mikepenz.aboutlibraries.ui.compose.util.author
 import org.jetbrains.compose.resources.ExperimentalResourceApi
+import org.jetbrains.compose.resources.stringResource
 
 /**
  * Alkaa open source licenses screen.
@@ -32,22 +51,100 @@ fun OpenSource(onUpPress: () -> Unit, modifier: Modifier = Modifier) {
 @OptIn(ExperimentalResourceApi::class)
 @Composable
 private fun OpenSourceContent(modifier: Modifier = Modifier) {
-    var licenses by remember { mutableStateOf(ByteArray(0)) }
+    var licenses by remember { mutableStateOf("") }
+    var showDialog by remember { mutableStateOf(false) }
+    var selectedLibrary by remember { mutableStateOf<Library?>(null) }
 
     LaunchedEffect(Unit) {
-        licenses = Res.readBytes("files/aboutlibraries.json")
+        licenses = Res.readBytes("files/aboutlibraries.json").decodeToString()
     }
 
-    LibrariesContainer(
-        aboutLibsJson = licenses.decodeToString(),
-        showLicenseBadges = false,
-        modifier = modifier.fillMaxSize(),
-        colors = LibraryDefaults.libraryColors(
-            backgroundColor = MaterialTheme.colorScheme.background,
-            contentColor = MaterialTheme.colorScheme.onBackground,
-            badgeContentColor = MaterialTheme.colorScheme.onPrimary,
-            badgeBackgroundColor = MaterialTheme.colorScheme.primary,
-            dialogConfirmButtonColor = MaterialTheme.colorScheme.primary,
-        ),
-    )
+    val libraries: Libs = Libs.Builder().withJson(licenses).build()
+
+    Box(modifier = modifier) {
+        LazyColumn {
+            items(items = libraries.libraries) { library ->
+                OpenSourceItem(
+                    library = library,
+                    onClick = {
+                        selectedLibrary = library
+                        showDialog = true
+                    },
+                )
+                HorizontalDivider(
+                    modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp),
+                )
+            }
+        }
+
+        if (selectedLibrary != null && selectedLibrary.isLicenseAvailable()) {
+            AlkaaDialog(
+                arguments = DialogArguments(
+                    title = selectedLibrary?.name ?: "",
+                    text = selectedLibrary?.licenses?.firstOrNull()?.licenseContent ?: "",
+                    confirmText = stringResource(Res.string.default_ok),
+                    onConfirmAction = { showDialog = false },
+                ),
+                isDialogOpen = showDialog,
+                onDismissRequest = { showDialog = false },
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .fillMaxHeight(0.8f)
+                    .padding(vertical = 16.dp),
+            )
+        }
+    }
 }
+
+@Composable
+private fun OpenSourceItem(library: Library, onClick: () -> Unit) {
+    Column(
+        modifier = Modifier
+            .clickable(onClick = onClick)
+            .padding(8.dp),
+    ) {
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(end = 8.dp),
+            horizontalArrangement = Arrangement.SpaceBetween,
+        ) {
+            Text(
+                text = library.name,
+                style = MaterialTheme.typography.bodyLarge,
+                modifier = Modifier.weight(1f),
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+            Text(
+                text = "${library.artifactVersion}",
+                style = MaterialTheme.typography.bodyLarge,
+            )
+        }
+        Text(
+            text = library.author,
+            style = MaterialTheme.typography.bodySmall,
+            modifier = Modifier.padding(top = 4.dp),
+        )
+        SuggestionChip(
+            label = {
+                Text(
+                    text = library.licenses.firstOrNull()?.name ?: "",
+                    style = MaterialTheme.typography.bodySmall,
+                )
+            },
+            shape = MaterialTheme.shapes.extraLarge,
+            colors = SuggestionChipDefaults
+                .suggestionChipColors()
+                .copy(containerColor = MaterialTheme.colorScheme.secondaryContainer),
+            onClick = { onClick() },
+        )
+    }
+}
+
+private fun Library?.isLicenseAvailable(): Boolean =
+    this
+        ?.licenses
+        ?.firstOrNull()
+        ?.licenseContent
+        ?.isBlank() == false
diff --git a/...es/designsystem/src/commonMain/kotlin/com/escodro/designsystem/components/AlkaaDialogs.kt b/...es/designsystem/src/commonMain/kotlin/com/escodro/designsystem/components/AlkaaDialogs.kt
@@ -1,10 +1,14 @@
 package com.escodro.designsystem.components
 
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Button
 import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
 import com.escodro.designsystem.AlkaaTheme
 
 /**
@@ -13,28 +17,37 @@ import com.escodro.designsystem.AlkaaTheme
  * @param arguments arguments to compose the dialog
  * @param isDialogOpen flag to indicate if the dialog should be open
  * @param onDismissRequest function to be called user requests to dismiss the dialog
+ * @param modifier the modifier to be applied to the dialog
  */
 @Composable
 fun AlkaaDialog(
     arguments: DialogArguments,
     isDialogOpen: Boolean,
     onDismissRequest: () -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     if (isDialogOpen) {
         AlertDialog(
             onDismissRequest = onDismissRequest,
             title = { Text(text = arguments.title) },
-            text = { Text(text = arguments.text) },
+            text = {
+                Column(modifier = Modifier.verticalScroll(rememberScrollState())) {
+                    Text(text = arguments.text)
+                }
+            },
             confirmButton = {
                 Button(onClick = arguments.onConfirmAction) {
                     Text(text = arguments.confirmText)
                 }
             },
             dismissButton = {
-                OutlinedButton(onClick = onDismissRequest) {
-                    Text(text = arguments.dismissText)
+                arguments.dismissText?.let {
+                    OutlinedButton(onClick = onDismissRequest) {
+                        Text(text = arguments.dismissText)
+                    }
                 }
             },
+            modifier = modifier,
         )
     }
 }
@@ -52,7 +65,7 @@ data class DialogArguments(
     val title: String,
     val text: String,
     val confirmText: String,
-    val dismissText: String,
+    val dismissText: String? = null,
     val onConfirmAction: () -> Unit,
 )