Add fast scroll

ismartcoding · May 18, 2024 · 21eb950 · 21eb950
1 parent ddc1174
commit 21eb950
Show file tree

Hide file tree

Showing 146 changed files with 2,033 additions and 1,484 deletions.
diff --git a/app/src/main/assets/editor/index.html b/app/src/main/assets/editor/index.html
@@ -31,6 +31,11 @@
 function loadEditor(data) {
     editor = ace.edit('editor')
     editor.renderer.setAnimatedScroll(true)
+    editor.setOptions({
+        autoScrollEditorIntoView: true,
+        copyWithEmptySelection: true,
+        vScrollBarAlwaysVisible: true,
+    })
 
     if (data.isDarkTheme) {
         editor.setTheme('ace/theme/monokai')

diff --git a/app/src/main/java/com/ismartcoding/plain/api/HttpClientManager.kt b/app/src/main/java/com/ismartcoding/plain/api/HttpClientManager.kt
@@ -12,6 +12,8 @@ import io.ktor.client.plugins.*
 import io.ktor.client.plugins.cookies.*
 import io.ktor.client.plugins.logging.*
 import io.ktor.client.plugins.websocket.WebSockets
+import io.ktor.client.request.headers
+import io.ktor.http.headers
 import okhttp3.OkHttpClient
 import okhttp3.RequestBody
 import okhttp3.RequestBody.Companion.toRequestBody
@@ -40,6 +42,9 @@ object HttpClientManager {
             install(HttpTimeout) {
                 requestTimeoutMillis = HttpApiTimeout.BROWSER_SECONDS * 1000L
             }
+            headers {
+                set("accept", "*/*")
+            }
         }
 
     fun httpClient() =

diff --git a/app/src/main/java/com/ismartcoding/plain/data/DImage.kt b/app/src/main/java/com/ismartcoding/plain/data/DImage.kt
@@ -1,9 +1,9 @@
 package com.ismartcoding.plain.data
 
-import com.ismartcoding.plain.data.IData
 import kotlinx.datetime.Instant
 import java.io.Serializable
 
+
 data class DImage(
     override var id: String,
     val title: String,

diff --git a/app/src/main/java/com/ismartcoding/plain/data/DownloadResult.kt b/app/src/main/java/com/ismartcoding/plain/data/DownloadResult.kt
@@ -0,0 +1,3 @@
+package com.ismartcoding.plain.data
+
+data class DownloadResult(val path : String, val success : Boolean, val message : String = "")
diff --git a/app/src/main/java/com/ismartcoding/plain/db/DChat.kt b/app/src/main/java/com/ismartcoding/plain/db/DChat.kt
@@ -6,6 +6,7 @@ import com.ismartcoding.lib.helpers.JsonHelper.jsonDecode
 import com.ismartcoding.lib.helpers.JsonHelper.jsonEncode
 import com.ismartcoding.lib.helpers.StringHelper
 import com.ismartcoding.plain.R
+import com.ismartcoding.plain.data.IData
 import com.ismartcoding.plain.features.locale.LocaleHelper.getString
 import kotlinx.datetime.*
 import kotlinx.serialization.Serializable
@@ -22,9 +23,11 @@ fun DMessageContent.toJSONString(): String {
             DMessageType.TEXT.value -> {
                 valueJSON = jsonEncode(value as DMessageText)
             }
+
             DMessageType.IMAGES.value -> {
                 valueJSON = jsonEncode(value as DMessageImages)
             }
+
             DMessageType.FILES.value -> {
                 valueJSON = jsonEncode(value as DMessageFiles)
             }
@@ -46,7 +49,14 @@ enum class DMessageType(val value: String) {
 class DMessageText(val text: String)
 
 @Serializable
-class DMessageFile(val id: String = StringHelper.shortUUID(), val uri: String, val size: Long, val duration: Long = 0)
+class DMessageFile(
+    override var id: String = StringHelper.shortUUID(),
+    val uri: String,
+    val size: Long,
+    val duration: Long = 0,
+    val width: Int = 0,
+    val height: Int = 0,
+) : IData
 
 @Serializable
 class DMessageImages(val items: List<DMessageFile>)
@@ -82,9 +92,11 @@ data class DChat(
                 DMessageType.TEXT.value -> {
                     message.value = jsonDecode<DMessageText>(valueJson)
                 }
+
                 DMessageType.IMAGES.value -> {
                     message.value = jsonDecode<DMessageImages>(valueJson)
                 }
+
                 DMessageType.FILES.value -> {
                     message.value = jsonDecode<DMessageFiles>(valueJson)
                 }

diff --git a/app/src/main/java/com/ismartcoding/plain/enums/RotationType.kt b/app/src/main/java/com/ismartcoding/plain/enums/RotationType.kt
@@ -0,0 +1,8 @@
+package com.ismartcoding.plain.enums
+
+enum class RotationType(val value: Int) {
+    ROTATION_0(0),
+    ROTATION_90(90),
+    ROTATION_180(180),
+    ROTATION_270(270);
+}
diff --git a/app/src/main/java/com/ismartcoding/plain/features/feed/Extensions.kt b/app/src/main/java/com/ismartcoding/plain/features/feed/Extensions.kt
@@ -6,6 +6,7 @@ import com.ismartcoding.lib.extensions.getFilenameExtension
 import com.ismartcoding.lib.extensions.isOk
 import com.ismartcoding.lib.helpers.CryptoHelper
 import com.ismartcoding.lib.html2md.MDConverter
+import com.ismartcoding.lib.logcat.LogCat
 import com.ismartcoding.lib.readability4j.Readability4J
 import com.ismartcoding.lib.rss.DateParser
 import com.ismartcoding.lib.rss.model.RssItem
@@ -63,12 +64,7 @@ fun RssItem.toDFeedEntry(
 suspend fun DFeedEntry.fetchContentAsync(): ApiResult {
     try {
         val httpClient = HttpClientManager.browserClient()
-        val response =
-            httpClient.get(url) {
-                headers {
-                    set("accept", "*/*")
-                }
-            }
+        val response = httpClient.get(url)
 
         if (response.isOk()) {
             val input = response.body<String>()
@@ -89,19 +85,24 @@ suspend fun DFeedEntry.fetchContentAsync(): ApiResult {
                     }
 
                     if (image.isNotEmpty() && !image.startsWith("/")) {
-                        val r = httpClient.get(image)
-                        if (r.isOk()) {
-                            val dir = MainApp.instance.getExternalFilesDir(Environment.DIRECTORY_PICTURES)!!.path + "/feeds/${feedId}"
-                            File(dir).mkdirs()
-                            var path = "$dir/main-${CryptoHelper.sha1(image.toByteArray())}"
-                            val extension = image.getFilenameExtension()
-                            if (extension.isNotEmpty()) {
-                                path += ".$extension"
+                        try {
+                            val r = httpClient.get(image)
+                            if (r.isOk()) {
+                                val dir = MainApp.instance.getExternalFilesDir(Environment.DIRECTORY_PICTURES)!!.path + "/feeds/${feedId}"
+                                File(dir).mkdirs()
+                                var path = "$dir/main-${CryptoHelper.sha1(image.toByteArray())}"
+                                val extension = image.getFilenameExtension()
+                                if (extension.isNotEmpty()) {
+                                    path += ".$extension"
+                                }
+                                val file = File(path)
+                                file.createNewFile()
+                                r.bodyAsChannel().copyAndClose(file.writeChannel())
+                                image = path
                             }
-                            val file = File(path)
-                            file.createNewFile()
-                            r.bodyAsChannel().copyAndClose(file.writeChannel())
-                            image = path
+                        } catch (ex: Exception) {
+                            LogCat.e(ex.toString())
+                            ex.printStackTrace()
                         }
                     }
                     content = MDConverter().convert(mobilizedHtml)

diff --git a/app/src/main/java/com/ismartcoding/plain/features/feed/FeedEntryHelper.kt b/app/src/main/java/com/ismartcoding/plain/features/feed/FeedEntryHelper.kt
@@ -95,7 +95,7 @@ object FeedEntryHelper {
         val queryGroups = SearchHelper.parse(query)
         queryGroups.forEach {
             if (it.name == "text") {
-                where.addLikes(listOf("description", "content"), listOf(it.value, it.value))
+                where.addLikes(listOf("title", "description", "content"), listOf(it.value, it.value, it.value))
             } else if (it.name == "feed_id") {
                 where.add("feed_id=?", it.value)
             } else if (it.name == "today" && it.value == "true") {

diff --git a/app/src/main/java/com/ismartcoding/plain/features/file/DFile.kt b/app/src/main/java/com/ismartcoding/plain/features/file/DFile.kt
@@ -12,7 +12,7 @@ data class DFile(
     val size: Long,
     val isDir: Boolean,
     val children: Int,
-    val mediaStoreId: String = ""
+    val mediaId: String = ""
 ) : IData {
     override var id: String
         get() = path

diff --git a/app/src/main/java/com/ismartcoding/plain/helpers/AppLogHelper.kt b/app/src/main/java/com/ismartcoding/plain/helpers/AppLogHelper.kt
@@ -31,7 +31,7 @@ object AppLogHelper {
     fun export(context: Context) {
         coMain {
             DialogHelper.showLoading()
-            val zipFile = File(context.filesDir.absolutePath + "/logs.zip")
+            val zipFile = File(context.cacheDir.absolutePath + "/logs.zip")
             val folder = DiskLogFormatStrategy.getLogFolder(context)
             withIO {
                 ZipUtil.pack(File(folder), zipFile)

diff --git a/app/src/main/java/com/ismartcoding/plain/helpers/DownloadHelper.kt b/app/src/main/java/com/ismartcoding/plain/helpers/DownloadHelper.kt
@@ -0,0 +1,60 @@
+package com.ismartcoding.plain.helpers
+
+import com.ismartcoding.lib.extensions.getFilenameExtension
+import com.ismartcoding.lib.extensions.isOk
+import com.ismartcoding.lib.extensions.scanFileByConnection
+import com.ismartcoding.lib.helpers.CryptoHelper
+import com.ismartcoding.lib.logcat.LogCat
+import com.ismartcoding.plain.MainApp
+import com.ismartcoding.plain.api.HttpClientManager
+import com.ismartcoding.plain.data.DownloadResult
+import io.ktor.client.request.get
+import io.ktor.client.statement.bodyAsChannel
+import io.ktor.util.cio.writeChannel
+import io.ktor.utils.io.copyAndClose
+import java.io.File
+
+object DownloadHelper {
+    suspend fun downloadAsync(url: String, dir: String): DownloadResult {
+        val httpClient = HttpClientManager.browserClient()
+        return try {
+            val r = httpClient.get(url)
+            if (r.isOk()) {
+                File(dir).mkdirs()
+                var path = "$dir/${CryptoHelper.sha1(url.toByteArray())}"
+                val extension = url.getFilenameExtension()
+                if (extension.isNotEmpty()) {
+                    path += ".$extension"
+                }
+                val file = File(path)
+                file.createNewFile()
+                r.bodyAsChannel().copyAndClose(file.writeChannel())
+                MainApp.instance.scanFileByConnection(file, null)
+                DownloadResult(path, true)
+            } else {
+                DownloadResult("", false, r.toString())
+            }
+        } catch (ex: Exception) {
+            LogCat.e(ex.toString())
+            ex.printStackTrace()
+            DownloadResult("", false, ex.toString())
+        }
+    }
+
+    suspend fun downloadToTempAsync(url: String, tempFile: File): DownloadResult {
+        val httpClient = HttpClientManager.browserClient()
+        return try {
+            val r = httpClient.get(url)
+            if (r.isOk()) {
+                r.bodyAsChannel().copyAndClose(tempFile.writeChannel())
+                DownloadResult(tempFile.absolutePath, true)
+            } else {
+                DownloadResult("", false, r.toString())
+            }
+        } catch (ex: Exception) {
+            LogCat.e(ex.toString())
+            ex.printStackTrace()
+            DownloadResult("", false, ex.toString())
+        }
+    }
+}
diff --git a/app/src/main/java/com/ismartcoding/plain/helpers/FileHelper.kt b/app/src/main/java/com/ismartcoding/plain/helpers/FileHelper.kt
@@ -29,7 +29,7 @@ object FileHelper {
         context: Context,
         name: String,
     ): File {
-        return File("${context.cacheDir}/$name").apply {
+        return File("${context.cacheDir.absolutePath}/$name").apply {
             writeBytes(context.assets.open(name).readBytes())
         }
     }
@@ -115,9 +115,13 @@ object FileHelper {
     }
 
     fun copyFileToDownloads(path: String): String {
+        return copyFileToPublicDir(path, Environment.DIRECTORY_DOWNLOADS)
+    }
+
+    fun copyFileToPublicDir(path: String, dirName: String, newName: String = ""): String {
         try {
-            val fileName = path.getFilenameFromPath()
-            val file = createDownloadFile(fileName)
+            val fileName = newName.ifEmpty { path.getFilenameFromPath() }
+            val file = createPublicFile(fileName, dirName)
             File(path).copyTo(file)
             MainApp.instance.scanFileByConnection(file, null)
             return file.absolutePath
@@ -131,7 +135,7 @@ object FileHelper {
     fun copyFileToDownloads(context: Context, uri: Uri): String {
         try {
             val fileName = uri.getFileName(context)
-            val file = createDownloadFile(fileName)
+            val file = createPublicFile(fileName, Environment.DIRECTORY_DOWNLOADS)
             val outputStream = FileOutputStream(file)
             if (uri.scheme == "content") {
                 val inputStream = context.contentResolver.openInputStream(uri)
@@ -160,18 +164,15 @@ object FileHelper {
         return ""
     }
 
-    private fun createDownloadFile(fileName: String): File {
-        val downloadsDirectory = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
-        val plainAppDirectory = File(downloadsDirectory, "PlainApp")
-        if (!plainAppDirectory.exists()) {
-            plainAppDirectory.mkdirs()
+    private fun createPublicFile(fileName: String, dirName: String): File {
+        val dir = PathHelper.getPlainPublicDir(dirName)
+        if (!dir.exists()) {
+            dir.mkdirs()
         }
-
-        var file = File(plainAppDirectory, fileName)
+        var file = File(dir, fileName)
         if (file.exists()) {
             file = file.newFile()
         }
-
         return file
     }
 }
diff --git a/app/src/main/java/com/ismartcoding/plain/helpers/ImageHelper.kt b/app/src/main/java/com/ismartcoding/plain/helpers/ImageHelper.kt
@@ -1,5 +1,7 @@
 package com.ismartcoding.plain.helpers
 
+import android.graphics.BitmapFactory
+import androidx.compose.ui.unit.IntSize
 import androidx.exifinterface.media.ExifInterface
 import com.ismartcoding.lib.extensions.getFilenameExtension
 import com.ismartcoding.lib.logcat.LogCat
@@ -37,7 +39,7 @@ object ImageHelper {
             return ImageType.SVG
         } else if (extension == "png") {
             return ImageType.PNG
-        }else if (extension == "jpg" || extension == "jpeg") {
+        } else if (extension == "jpg" || extension == "jpeg") {
             return ImageType.JPG
         }
 
@@ -97,7 +99,7 @@ object ImageHelper {
         return ImageType.UNKNOWN
     }
 
-    fun getImageRotation(path: String): Int {
+    fun getRotation(path: String): Int {
         if (path.endsWith(".svg", true)) {
             return 0
         }
@@ -116,4 +118,21 @@ object ImageHelper {
         }
         return 0
     }
+
+    fun getIntrinsicSize(path: String, rotation: Int): IntSize {
+        val size = if (path.endsWith(".svg", true)) {
+            SvgHelper.getSize(path)
+        } else {
+            val options = BitmapFactory.Options()
+            options.inJustDecodeBounds = true
+            BitmapFactory.decodeFile(path, options)
+            IntSize(options.outWidth, options.outHeight)
+        }
+
+        if (rotation == 90 || rotation == 270) {
+            return IntSize(size.height, size.width)
+        }
+
+        return size
+    }
 }
diff --git a/app/src/main/java/com/ismartcoding/plain/helpers/PathHelper.kt b/app/src/main/java/com/ismartcoding/plain/helpers/PathHelper.kt
@@ -0,0 +1,11 @@
+package com.ismartcoding.plain.helpers
+
+import android.os.Environment
+import java.io.File
+
+object PathHelper {
+    fun getPlainPublicDir(dirName: String): File {
+        val dir = Environment.getExternalStoragePublicDirectory(dirName)
+        return File(dir, "PlainApp")
+    }
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		package com.ismartcoding.plain.data

		data class DownloadResult(val path : String, val success : Boolean, val message : String = "")