only-bible-app

The only bible app you will ever need. No ads. No in-app purchases. No distractions.

25068e9d — pyrossh

fix highlighting

Files changed (6) hide show

.gitignore CHANGED Viewed

@@ -22,7 +22,6 @@ node_modules
 bsb_usfm
 xcuserdata
 !src/**/build/
-.idea
 captures
 *.xcodeproj/*
 !*.xcodeproj/project.pbxproj
@@ -30,3 +29,4 @@ captures
 !*.xcodeproj/project.xcworkspace/
 !*.xcworkspace/contents.xcworkspacedata
 **/xcshareddata/WorkspaceSettings.xcsettings
+composeApp/Build

composeApp/src/commonMain/kotlin/dev/pyrossh/only_bible_app/AppViewModel.kt CHANGED Viewed

@@ -1,4 +1,5 @@
 package dev.pyrossh.only_bible_app
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
@@ -21,7 +22,9 @@ import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.int
 import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
@@ -176,14 +179,15 @@ class AppViewModel : ViewModel() {
     }
     fun addHighlightedVerses(verses: List<Verse>, colorIndex: Int) {
-        verses.forEach { v ->
-            highlightedVerses.value + (v.id to colorIndex)
+        highlightedVerses.value = JsonObject(
+            highlightedVerses.value + verses.associateBy({ it.id },
+                { JsonPrimitive(colorIndex) })
-        }
+        )
     }
     fun removeHighlightedVerses(verses: List<Verse>) {
-        verses.forEach { v ->
-            highlightedVerses.value - v.id
+        highlightedVerses.value = JsonObject(
+            highlightedVerses.value.filterKeys { !verses.map { v -> v.id }.contains(it) }
-        }
+        )
     }
 }

composeApp/src/commonMain/kotlin/dev/pyrossh/only_bible_app/composables/VerseText.kt CHANGED Viewed

@@ -141,7 +141,7 @@ fun VerseText(
             ) {
                 append("${verse.verseIndex + 1} ")
             }
-            append(verse.text)
+            append(text)
 //            append(
 //                AnnotatedString.Companion.fromHtml(
 //                    htmlString = text,

composeApp/src/commonMain/kotlin/dev/pyrossh/only_bible_app/screens/ChapterScreen.kt CHANGED Viewed

@@ -48,7 +48,7 @@ import kotlinx.coroutines.IO
 import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
 import utils.LocalNavController
-import utils.detectSwipe
+import dev.pyrossh.only_bible_app.utils.detectSwipe
 import utils.getBackwardPair
 import utils.getForwardPair

composeApp/src/commonMain/kotlin/dev/pyrossh/only_bible_app/utils/SimpleParser.kt ADDED Viewed

@@ -0,0 +1,38 @@
+package dev.pyrossh.only_bible_app.utils
+class SimpleParser(val input: CharSequence) {
+    var cursor: Int = 0
+    private fun step(): Char {
+        return input[cursor++]
+    }
+    private fun peek(): Char {
+        return input[cursor]
+    }
+    private fun skip() {
+        cursor++
+    }
+    private fun hasNext(): Boolean {
+        return cursor < input.length
+    }
+    fun read(predicate: (Char) -> Boolean): String {
+        val result = StringBuilder()
+        while (predicate(peek())) {
+            result.append(step())
+        }
+        return result.toString()
+    }
+    fun read(pattern: CharSequence): String {
+        val result = StringBuilder()
+        var patternCursor = 0
+        while (peek() == pattern[patternCursor++]) {
+            result.append(skip())
+        }
+        return result.toString()
+    }
+}

composeApp/src/commonMain/kotlin/dev/pyrossh/only_bible_app/utils/Swipe.kt CHANGED Viewed

@@ -1,4 +1,4 @@
-package utils
+package dev.pyrossh.only_bible_app.utils
 import androidx.compose.foundation.gestures.detectDragGestures
 import androidx.compose.runtime.MutableIntState