Migrate to KMP 5

Author: ismartcoding

app/src/main/java/com/ismartcoding/plain/audio/AudioMediaStoreHelper.kt

@@ -15,6 +15,7 @@ import com.ismartcoding.plain.lib.isQPlus
 import com.ismartcoding.plain.data.TagRelationStub
 import com.ismartcoding.plain.enums.MediaType
 import com.ismartcoding.plain.features.file.FileSortBy
+import com.ismartcoding.plain.features.file.toSortBy
 import com.ismartcoding.plain.features.media.BaseMediaContentHelper
 
 object AudioMediaStoreHelper : BaseMediaContentHelper() {

app/src/main/java/com/ismartcoding/plain/docs/DocMediaStoreHelper.kt

@@ -20,6 +20,7 @@ import com.ismartcoding.plain.enums.MediaType
 import com.ismartcoding.plain.extensions.normalizeComparison
 import com.ismartcoding.plain.extensions.parseSizeToBytes
 import com.ismartcoding.plain.features.file.FileSortBy
+import com.ismartcoding.plain.features.file.toSortBy
 import com.ismartcoding.plain.features.media.BaseMediaContentHelper
 import com.ismartcoding.plain.helpers.QueryHelper
 

app/src/main/java/com/ismartcoding/plain/features/media/ImageMediaStoreHelper.kt

@@ -16,6 +16,7 @@ import com.ismartcoding.plain.data.DImage
 import com.ismartcoding.plain.data.TagRelationStub
 import com.ismartcoding.plain.enums.MediaType
 import com.ismartcoding.plain.features.file.FileSortBy
+import com.ismartcoding.plain.features.file.toSortBy
 import kotlin.time.Instant
 
 object ImageMediaStoreHelper : BaseMediaContentHelper() {

app/src/main/java/com/ismartcoding/plain/features/media/VideoMediaStoreHelper.kt

@@ -16,6 +16,7 @@ import com.ismartcoding.plain.data.DVideo
 import com.ismartcoding.plain.data.TagRelationStub
 import com.ismartcoding.plain.enums.MediaType
 import com.ismartcoding.plain.features.file.FileSortBy
+import com.ismartcoding.plain.features.file.toSortBy
 import kotlin.time.Instant
 
 object VideoMediaStoreHelper : BaseMediaContentHelper() {

app/src/main/java/com/ismartcoding/plain/ui/base/TextLinkActions.kt

@@ -44,7 +44,7 @@ fun MdEditorInsertImageDialog(
     var description by remember { mutableStateOf("") }
     var width by remember { mutableStateOf("") }
 
-    PickImageEffect(context = context, imageUrl = imageUrlState)
+    PickImageEffect(imageUrl = imageUrlState)
 
     AlertDialog(
         containerColor = MaterialTheme.colorScheme.surface,

app/src/main/java/com/ismartcoding/plain/ui/base/mdeditor/MdEditorInsertImageDialog.kt

@@ -1,6 +1,5 @@
 package com.ismartcoding.plain.ui.base.mdeditor
 
-import android.util.Patterns
 import java.util.regex.Pattern
 
 object Patterns {
@@ -82,5 +81,5 @@ object Patterns {
             "(?<=\\b)((ADD)|(EXCEPT)|(PERCENT)|(ALL)|(EXEC)|(PLAN)|(ALTER)|(EXECUTE)|(PRECISION)|(AND)|(EXISTS)|(PRIMARY)|(ANY)|(EXIT)|(PRINT)|(AS)|(FETCH)|(PROC)|(ASC)|(FILE)|(PROCEDURE)|(AUTHORIZATION)|(FILLFACTOR)|(PUBLIC)|(BACKUP)|(FOR)|(RAISERROR)|(BEGIN)|(FOREIGN)|(READ)|(BETWEEN)|(FREETEXT)|(READTEXT)|(BREAK)|(FREETEXTTABLE)|(RECONFIGURE)|(BROWSE)|(FROM)|(REFERENCES)|(BULK)|(FULL)|(REPLICATION)|(BY)|(FUNCTION)|(RESTORE)|(CASCADE)|(GOTO)|(RESTRICT)|(CASE)|(GRANT)|(RETURN)|(CHECK)|(GROUP)|(REVOKE)|(CHECKPOINT)|(HAVING)|(RIGHT)|(CLOSE)|(HOLDLOCK)|(ROLLBACK)|(CLUSTERED)|(IDENTITY)|(ROWCOUNT)|(COALESCE)|(IDENTITY_INSERT)|(ROWGUIDCOL)|(COLLATE)|(IDENTITYCOL)|(RULE)|(COLUMN)|(IF)|(SAVE)|(COMMIT)|(IN)|(SCHEMA)|(COMPUTE)|(INDEX)|(SELECT)|(CONSTRAINT)|(INNER)|(SESSION_USER)|(CONTAINS)|(INSERT)|(SET)|(CONTAINSTABLE)|(INTERSECT)|(SETUSER)|(CONTINUE)|(INTO)|(SHUTDOWN)|(CONVERT)|(IS)|(SOME)|(CREATE)|(JOIN)|(STATISTICS)|(CROSS)|(KEY)|(SYSTEM_USER)|(CURRENT)|(KILL)|(TABLE)|(CURRENT_DATE)|(LEFT)|(TEXTSIZE)|(CURRENT_TIME)|(LIKE)|(THEN)|(CURRENT_TIMESTAMP)|(LINENO)|(TO)|(CURRENT_USER)|(LOAD)|(TOP)|(CURSOR)|(NATIONAL)|(TRAN)|(DATABASE)|(NOCHECK)|(TRANSACTION)|(DBCC)|(NONCLUSTERED)|(TRIGGER)|(DEALLOCATE)|(NOT)|(TRUNCATE)|(DECLARE)|(NULL)|(TSEQUAL)|(DEFAULT)|(NULLIF)|(UNION)|(DELETE)|(OF)|(UNIQUE)|(DENY)|(OFF)|(UPDATE)|(DESC)|(OFFSETS)|(UPDATETEXT)|(DISK)|(ON)|(USE)|(DISTINCT)|(OPEN)|(USER)|(DISTRIBUTED)|(OPENDATASOURCE)|(VALUES)|(DOUBLE)|(OPENQUERY)|(VARYING)|(DROP)|(OPENROWSET)|(VIEW)|(DUMMY)|(OPENXML)|(WAITFOR)|(DUMP)|(OPTION)|(WHEN)|(ELSE)|(OR)|(WHERE)|(END)|(ORDER)|(WHILE)|(ERRLVL)|(OUTER)|(WITH)|(ESCAPE)|(OVER)|(WRITETEXT))(?=\\b)",
             Pattern.CASE_INSENSITIVE,
         )
-    val LINK = Patterns.WEB_URL
+    val LINK = Pattern.compile("https?://[^\\s<>\"']+")
 }

app/src/main/java/com/ismartcoding/plain/ui/base/mdeditor/Patterns.kt

@@ -1,6 +1,5 @@
 package com.ismartcoding.plain.ui.base.mdeditor
 
-import android.content.Context
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
@@ -12,13 +11,14 @@ import com.ismartcoding.plain.enums.PickFileTag
 import com.ismartcoding.plain.events.PickFileResultEvent
 import com.ismartcoding.plain.extensions.newPath
 import com.ismartcoding.plain.helpers.FileHelper
+import com.ismartcoding.plain.appContext
 import java.io.File
 
 @Composable
 internal fun PickImageEffect(
-    context: Context,
     imageUrl: MutableState<String>,
 ) {
+    val context = appContext
     val sharedFlow = Channel.sharedFlow
 
     LaunchedEffect(sharedFlow) {

app/src/main/java/com/ismartcoding/plain/ui/base/mdeditor/PickImageEffect.kt

@@ -84,10 +84,10 @@ fun WebAddressBar(
                 if (hostnameChanged) {
                     hostname = newHostname
                     TempData.mdnsHostname = newHostname
-                    persistMdnsHostname(context, scope, newHostname)
+                    persistMdnsHostname(scope, newHostname)
                 }
                 if (portChanged) {
-                    persistPort(context, scope, isHttps, newPort)
+                    persistPort(scope, isHttps, newPort)
                 }
                 mdnsEditDialogVisible = false
                 if (hostnameChanged || portChanged) {
@@ -103,7 +103,7 @@ fun WebAddressBar(
             currentPort = port.value,
             onDismiss = { portDialogVisible = false },
             onSelect = {
-                persistPort(context, scope, isHttps, it)
+                persistPort(scope, isHttps, it)
                 portDialogVisible = false
                 showRestartAppDialog(context)
             },

app/src/main/java/com/ismartcoding/plain/ui/components/WebAddressBar.kt

@@ -1,41 +1,9 @@
 package com.ismartcoding.plain.ui.components
 
-import com.ismartcoding.plain.i18n.*
-
-import android.content.Context
 import com.ismartcoding.plain.features.locale.LocaleHelper
 import com.ismartcoding.plain.helpers.AppHelper
-import com.ismartcoding.plain.preferences.HttpPortPreference
-import com.ismartcoding.plain.preferences.HttpsPortPreference
-import com.ismartcoding.plain.preferences.MdnsHostnamePreference
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-
-fun persistMdnsHostname(
-    context: Context,
-    scope: CoroutineScope,
-    hostname: String,
-) {
-    scope.launch {
-        MdnsHostnamePreference.putAsync(hostname)
-    }
-}
-
-fun persistPort(
-    context: Context,
-    scope: CoroutineScope,
-    isHttps: Boolean,
-    port: Int,
-) {
-    scope.launch(Dispatchers.IO) {
-        if (isHttps) {
-            HttpsPortPreference.putAsync(port)
-        } else {
-            HttpPortPreference.putAsync(port)
-        }
-    }
-}
+import com.ismartcoding.plain.i18n.*
+import android.content.Context
 
 fun showRestartAppDialog(context: Context) {
     androidx.appcompat.app.AlertDialog.Builder(context)
@@ -47,4 +15,4 @@ fun showRestartAppDialog(context: Context) {
         .setCancelable(false)
         .create()
         .show()
-}
+}