Add see also chips

Simon Schubert · Simon Schubert · commit 5d08f6ce2c17 · 2025-03-30T00:26:41.000+01:00
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 ![Icon](https://raw.githubusercontent.com/SimonSchubert/LinuxCommandLibrary/master/art/web_hi_res_144.png)
 
-The app currently has **6513** manual pages, **22+** basic categories and a bunch of general terminal tips. It works 100% offline, doesn't need an internet connection and has no tracking software.
+The app currently has **6622** manual pages, **22+** basic categories and a bunch of general terminal tips. It works 100% offline, doesn't need an internet connection and has no tracking software.
 
 [![Play Store](https://raw.githubusercontent.com/SimonSchubert/LinuxCommandBibliotheca/master/art/play_store_badge.png)](https://play.google.com/store/apps/details?id=com.inspiredandroid.linuxcommandbibliotheca)
 [![F-Droid](https://raw.githubusercontent.com/SimonSchubert/LinuxCommandBibliotheca/master/art/fdroid_badge.png)](https://f-droid.org/en/packages/com.inspiredandroid.linuxcommandbibliotheca/)
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
@@ -39,7 +39,7 @@ android {
         applicationId = "com.inspiredandroid.linuxcommandbibliotheca"
         minSdk = 24
         targetSdk = 35
-        versionCode = 95
+        versionCode = 96
         versionName = project.version.toString()
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/android/src/main/java/com/inspiredandroid/linuxcommandbibliotheca/PreferenceUtil.kt b/android/src/main/java/com/inspiredandroid/linuxcommandbibliotheca/PreferenceUtil.kt
@@ -46,6 +46,6 @@ class PreferenceUtil(private val context: Context) {
     companion object {
         const val KEY_BOOKMARKS = "KEY_BOOKMARKS"
         const val KEY_DATABASE_VERSION = "DATABASE_VERSION"
-        const val CURRENT_DATABASE_VERSION = 10
+        const val CURRENT_DATABASE_VERSION = 11
     }
 }
diff --git a/android/src/main/java/com/inspiredandroid/linuxcommandbibliotheca/ui/composables/HighlightedText.kt b/android/src/main/java/com/inspiredandroid/linuxcommandbibliotheca/ui/composables/HighlightedText.kt
@@ -29,7 +29,7 @@ import com.inspiredandroid.linuxcommandbibliotheca.ui.theme.LinuxTheme
 @Composable
 fun HighlightedText(text: String, pattern: String) {
     val highlightColor = MaterialTheme.colors.primary
-    val annotatedString = remember(pattern, highlightColor) {
+    val annotatedString = remember(pattern) {
         buildAnnotatedString {
             val splitText = text.split(pattern, ignoreCase = true)
             splitText.forEachIndexed { index, s ->
diff --git a/android/src/main/java/com/inspiredandroid/linuxcommandbibliotheca/ui/screens/AppInfoDialog.kt b/android/src/main/java/com/inspiredandroid/linuxcommandbibliotheca/ui/screens/AppInfoDialog.kt
@@ -1,8 +1,11 @@
 package com.inspiredandroid.linuxcommandbibliotheca.ui.screens
 
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
@@ -64,9 +67,13 @@ fun AppInfoDialog(showDialog: MutableState<Boolean>) {
                         modifier = Modifier.padding(8.dp),
                     )
                     Row {
-                        Button(content = { Text("Rate the app") }, onClick = {
-                            uriHandler.openUri("https://play.google.com/store/apps/details?id=com.inspiredandroid.linuxcommandbibliotheca")
-                        }, modifier = Modifier.padding(start = 6.dp))
+                        Button(
+                            modifier = Modifier.padding(start = 6.dp),
+                            content = { Text("Rate the app") },
+                            onClick = {
+                                uriHandler.openUri("https://play.google.com/store/apps/details?id=com.inspiredandroid.linuxcommandbibliotheca")
+                            },
+                        )
                         IconButton(onClick = {
                             uriHandler.openUri("https://github.com/SimonSchubert/LinuxCommandLibrary")
                         }) {
@@ -88,6 +95,18 @@ fun AppInfoDialog(showDialog: MutableState<Boolean>) {
                             .weight(1f)
                             .verticalScroll(rememberScrollState()),
                     ) {
+                        Image(
+                            modifier = Modifier
+                                .padding(bottom = 8.dp)
+                                .fillMaxWidth()
+                                .clickable {
+                                    val link = "https://linuxcommandlibrary.com/linode-2025"
+                                    uriHandler.openUri(link)
+                                },
+                            painter = painterResource(R.mipmap.linode_horizontal),
+                            contentDescription = null,
+                        )
+
                         Text("Man pages", style = MaterialTheme.typography.h6)
                         Text("Licence information about the man page is usually specified in the man detail page under the category Author, Copyright or Licence. If there is no information on the page you can find the information in the man page source file on your linux system. If you have questions or can't find what you need, you can contact me at sschubert89@gmail.com.")
 
diff --git a/android/src/main/java/com/inspiredandroid/linuxcommandbibliotheca/ui/screens/commandlist/CommandListScreen.kt b/android/src/main/java/com/inspiredandroid/linuxcommandbibliotheca/ui/screens/commandlist/CommandListScreen.kt
@@ -1,4 +1,6 @@
-@file:OptIn(ExperimentalMaterialApi::class, ExperimentalMaterialApi::class)
+@file:OptIn(ExperimentalMaterialApi::class, ExperimentalMaterialApi::class,
+    ExperimentalMaterialApi::class
+)
 
 package com.inspiredandroid.linuxcommandbibliotheca.ui.screens.commandlist
 
@@ -21,6 +23,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import com.inspiredandroid.linuxcommandbibliotheca.R
 import com.inspiredandroid.linuxcommandbibliotheca.ui.composables.HighlightedText
+import databases.Command
 import org.koin.androidx.compose.koinViewModel
 
 /* Copyright 2022 Simon Schubert
@@ -58,48 +61,69 @@ fun CommandListScreen(
                 items = viewModel.filteredCommands,
                 key = { it.id },
             ) { command ->
-                ListItem(
-                    text = {
-                        if (searchText.isEmpty()) {
-                            Text(
-                                command.name,
-                                maxLines = 1,
-                                softWrap = false,
-                                overflow = TextOverflow.Ellipsis,
-                            )
-                        } else {
-                            HighlightedText(command.name, searchText)
-                        }
-                    },
-                    trailing = {
-                        if (viewModel.hasBookmark(command.id)) {
-                            Icon(
-                                painterResource(R.drawable.ic_bookmark_black_24dp),
-                                contentDescription = stringResource(R.string.bookmarked),
-                            )
-                        }
-                    },
-                    secondaryText = {
-                        if (searchText.isEmpty()) {
-                            Text(
-                                command.description,
-                                maxLines = 1,
-                                softWrap = false,
-                                overflow = TextOverflow.Ellipsis,
-                            )
-                        } else {
-                            HighlightedText(command.description, searchText)
-                        }
-                    },
-                    modifier = Modifier.clickable {
-                        onNavigate("command?commandId=${command.id}&commandName=${command.name}")
-                    },
+                CommandListItem(
+                    command = command,
+                    searchText = searchText,
+                    onNavigate = onNavigate,
+                    isBookmarked = { id -> viewModel.hasBookmark(id) },
                 )
             }
         }
     }
 }
 
+@Composable
+private fun CommandListItem(
+    command: Command,
+    searchText: String,
+    onNavigate: (String) -> Unit,
+    isBookmarked: (Long) -> Boolean,
+) {
+    ListItem(
+        text = {
+            if (searchText.isEmpty()) {
+                Text(
+                    command.name,
+                    maxLines = 1,
+                    softWrap = false,
+                    overflow = TextOverflow.Ellipsis,
+                )
+            } else {
+                HighlightedText(
+                    text = command.name,
+                    pattern = searchText,
+                )
+            }
+        },
+        trailing = {
+            if (isBookmarked(command.id)) {
+                Icon(
+                    painterResource(R.drawable.ic_bookmark_black_24dp),
+                    contentDescription = stringResource(R.string.bookmarked),
+                )
+            }
+        },
+        secondaryText = {
+            if (searchText.isEmpty()) {
+                Text(
+                    command.description,
+                    maxLines = 1,
+                    softWrap = false,
+                    overflow = TextOverflow.Ellipsis,
+                )
+            } else {
+                HighlightedText(
+                    text = command.description,
+                    pattern = searchText,
+                )
+            }
+        },
+        modifier = Modifier.clickable {
+            onNavigate("command?commandId=${command.id}&commandName=${command.name}")
+        },
+    )
+}
+
 @Preview
 @Composable
 fun CommandListScreenPreview() {
diff --git a/android/src/main/res/mipmap-xxxhdpi/linode_horizontal.webp b/android/src/main/res/mipmap-xxxhdpi/linode_horizontal.webp
diff --git a/assets/database.db b/assets/database.db
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -20,7 +20,7 @@ buildscript {
 }
 
 group = "com.inspiredandroid"
-version = "3.3.1"
+version = "3.3.2"
 
 allprojects {
     repositories {
diff --git a/cli/src/main/resources/application.properties b/cli/src/main/resources/application.properties
@@ -1 +1 @@
-version=3.3.1
+version=3.3.2
diff --git a/desktop/src/main/kotlin/com/linuxcommandlibrary/desktop/WebsiteBuilder.kt b/desktop/src/main/kotlin/com/linuxcommandlibrary/desktop/WebsiteBuilder.kt
@@ -196,7 +196,7 @@ class WebsiteBuilder {
     }
 
     fun createBasicsHtmlFile(folder: File) {
-        println("Crate basics html")
+        println("Create basics html")
 
         val file = File(folder, "index.html")
         file.delete()
@@ -408,7 +408,7 @@ class WebsiteBuilder {
     }
 
     fun createTipsHtmlFile(folder: File) {
-        println("Crate tips html")
+        println("Create tips html")
 
         folder.mkdir()
 
@@ -646,15 +646,15 @@ class WebsiteBuilder {
                                             "TLDR" -> {
                                                 p {
                                                     unsafe {
-                                                        +section.content.addAnchorAndCodeStyle(file.nameWithoutExtension)
+                                                        +sanitizeHtml(section.content.addAnchorAndCodeStyle(file.nameWithoutExtension))
                                                     }
                                                 }
                                             }
 
                                             else -> {
                                                 p {
                                                     unsafe {
-                                                        +section.content
+                                                        +sanitizeHtml(section.content)
                                                     }
                                                 }
                                             }
@@ -683,6 +683,9 @@ class WebsiteBuilder {
         println()
     }
 
+    fun sanitizeHtml(content: String): String = content.replace(Regex("(?i)<(html|head|title|body)[^>]*>.*?</\\1>|<(html|head|title|body)[^>]*>"), "")
+        .replace(Regex("(?i)</?(html|head|title|body)>"), "")
+
     /**
      * Find and link man pages if command exists in database. Example: ps(1), regex(7), signal(7)
      */
diff --git a/fastlane/metadata/android/en-US/changelogs/96.txt b/fastlane/metadata/android/en-US/changelogs/96.txt
@@ -0,0 +1,3 @@
+Add see also chips
+Add new commands
+Improve performance
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
@@ -1,4 +1,4 @@
-The app currently has <b>6513</b> manual pages, <b>22</b> basic categories and a bunch of general terminal tips. It works 100% offline, doesn't need an internet connection and has no tracking software.
+The app currently has <b>6622</b> manual pages, <b>22</b> basic categories and a bunch of general terminal tips. It works 100% offline, doesn't need an internet connection and has no tracking software.
 
 <b>Categories</b>
 
diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt
@@ -1 +1 @@
-6513 manual pages, 22 basic categories and a bunch of general terminal tips.
+6622 manual pages, 22 basic categories and a bunch of general terminal tips.

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ android {`
`39`	`39`	`applicationId = "com.inspiredandroid.linuxcommandbibliotheca"`
`40`	`40`	`minSdk = 24`
`41`	`41`	`targetSdk = 35`
`42`		`- versionCode = 95`
	`42`	`+ versionCode = 96`
`43`	`43`	`versionName = project.version.toString()`
`44`	`44`	`testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,6 @@ class PreferenceUtil(private val context: Context) {`
`46`	`46`	`companion object {`
`47`	`47`	`const val KEY_BOOKMARKS = "KEY_BOOKMARKS"`
`48`	`48`	`const val KEY_DATABASE_VERSION = "DATABASE_VERSION"`
`49`		`- const val CURRENT_DATABASE_VERSION = 10`
	`49`	`+ const val CURRENT_DATABASE_VERSION = 11`
`50`	`50`	`}`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ buildscript {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`group = "com.inspiredandroid"`
`23`		`-version = "3.3.1"`
	`23`	`+version = "3.3.2"`
`24`	`24`
`25`	`25`	`allprojects {`
`26`	`26`	`repositories {`