Release

Author: Simon Schubert

README.md

@@ -2,7 +2,7 @@
 
 ![Icon](https://raw.githubusercontent.com/SimonSchubert/LinuxCommandLibrary/master/art/web_hi_res_144.png)
 
-The app currently has **6056** 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 **6488** 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/)

android/build.gradle.kts

@@ -39,7 +39,7 @@ android {
         applicationId = "com.inspiredandroid.linuxcommandbibliotheca"
         minSdk = 24
         targetSdk = 35
-        versionCode = 93
+        versionCode = 94
         versionName = project.version.toString()
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

android/src/main/java/com/inspiredandroid/linuxcommandbibliotheca/LinuxApplication.kt

@@ -8,8 +8,8 @@ import com.inspiredandroid.linuxcommandbibliotheca.ui.screens.commandlist.Comman
 import com.inspiredandroid.linuxcommandbibliotheca.ui.screens.tips.TipsViewModel
 import org.koin.android.ext.koin.androidContext
 import org.koin.android.ext.koin.androidLogger
-import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.core.context.GlobalContext.startKoin
+import org.koin.core.module.dsl.*
 import org.koin.dsl.module
 
 class LinuxApplication : Application() {

android/src/main/java/com/inspiredandroid/linuxcommandbibliotheca/PreferenceUtil.kt

@@ -1,6 +1,7 @@
 package com.inspiredandroid.linuxcommandbibliotheca
 
 import android.content.Context
+import androidx.core.content.edit
 import androidx.preference.PreferenceManager
 
 class PreferenceUtil(private val context: Context) {
@@ -16,7 +17,7 @@ class PreferenceUtil(private val context: Context) {
     private fun saveBookmarkIds() {
         val bookmarksChain = bookmarksIds.joinToString(separator = ",")
         val prefs = PreferenceManager.getDefaultSharedPreferences(context)
-        prefs.edit().putString(KEY_BOOKMARKS, bookmarksChain).apply()
+        prefs.edit { putString(KEY_BOOKMARKS, bookmarksChain) }
     }
 
     fun addBookmark(id: Long) {
@@ -39,12 +40,12 @@ class PreferenceUtil(private val context: Context) {
 
     fun updateDatabaseVersion(context: Context) {
         val prefs = PreferenceManager.getDefaultSharedPreferences(context)
-        prefs.edit().putInt(KEY_DATABASE_VERSION, CURRENT_DATABASE_VERSION).apply()
+        prefs.edit { putInt(KEY_DATABASE_VERSION, CURRENT_DATABASE_VERSION) }
     }
 
     companion object {
         const val KEY_BOOKMARKS = "KEY_BOOKMARKS"
         const val KEY_DATABASE_VERSION = "DATABASE_VERSION"
-        const val CURRENT_DATABASE_VERSION = 8
+        const val CURRENT_DATABASE_VERSION = 9
     }
 }

android/src/main/java/com/inspiredandroid/linuxcommandbibliotheca/ui/screens/basicgroups/BasicGroupsScreen.kt

@@ -52,7 +52,7 @@ fun BasicGroupsScreen(
 }
 
 @Composable
-fun BasicGroupColumn(
+private fun BasicGroupColumn(
     viewModel: BasicGroupsViewModel,
     basicGroup: BasicGroup,
     onNavigate: (String) -> Unit = {},

android/src/main/java/com/inspiredandroid/linuxcommandbibliotheca/ui/screens/commanddetail/CommandDetailScreen.kt

@@ -58,10 +58,10 @@ fun CommandDetailScreen(
 }
 
 @Composable
-fun CommandSectionColumn(
+private fun CommandSectionColumn(
     viewModel: CommandDetailViewModel,
     section: CommandSection,
-    onNavigate: (String) -> Unit = {},
+    onNavigate: (String) -> Unit,
 ) {
     ListItem(
         text = {
@@ -81,9 +81,10 @@ fun CommandSectionColumn(
             Column(
                 modifier = Modifier.padding(start = 16.dp, end = 16.dp),
             ) {
+                println(section.content)
                 val tldrParts = section.content.split("<b>")
                 tldrParts.forEachIndexed { index, s ->
-                    val split = s.split("</b><br>")
+                    val split = s.split("</b>")
                     if (split.size > 1) {
                         Text(
                             text = split[0],
@@ -101,14 +102,14 @@ fun CommandSectionColumn(
                 }
             }
         } else {
-            val color = MaterialTheme.colors.onSurface
+            val color = MaterialTheme.colors.onSurface.toArgb()
             ListItem(text = {
                 AndroidView(factory = { context ->
                     TextView(context).apply {
                         val content =
                             HtmlCompat.fromHtml(section.content, HtmlCompat.FROM_HTML_MODE_LEGACY)
                         text = content.dropLastWhile { it.isWhitespace() }
-                        setTextColor(color.toArgb())
+                        setTextColor(color)
                     }
                 })
             })

assets/database.db

@@ -19,8 +19,8 @@ buildscript {
     }
 }
 
-group = "org.example"
-version = "3.2.7"
+group = "com.inspiredandroid"
+version = "3.3.0"
 
 allprojects {
     repositories {

build.gradle.kts

@@ -1 +1 @@
-version=3.2.7
+version=3.3.0

cli/src/main/resources/application.properties

@@ -87,11 +87,6 @@ fun main() {
     websiteBuilder.createCommandsHtmlFile(folder)
 
     websiteBuilder.createBasicsHtmlFile(folder)
-
-    minifier.minifyScriptsAndSheets(true)
-
-    return
-
     websiteBuilder.createBasicHtmlFiles(File(folder, "basic"))
 
     websiteBuilder.createTipsHtmlFile(folder)
@@ -104,7 +99,6 @@ fun main() {
     minifier.minifyScriptsAndSheets(true)
 }
 
-
 class WebsiteBuilder {
 
     private val cacheVersion = 11
@@ -247,7 +241,7 @@ class WebsiteBuilder {
                                                 if (!listOf(
                                                         253,
                                                         254,
-                                                        255
+                                                        255,
                                                     ).contains(it.id.toInt())
                                                 ) {
                                                     classes = setOf("invert-color")