only-bible-app

git clone https://pyrossh.dev/repos/only-bible-app.git

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

a9101f33 — pyrossh

improve stuff

Files changed (18) hide show

app/src/main/AndroidManifest.xml +2 -2
app/src/main/assets/bibles/en_kjv.txt +1 -1
app/src/main/java/dev/pyrossh/onlyBible/AppHost.kt +34 -74
app/src/main/java/dev/pyrossh/onlyBible/AppTheme.kt +9 -4
app/src/main/java/dev/pyrossh/onlyBible/AppViewModel.kt +70 -73
app/src/main/java/dev/pyrossh/onlyBible/ChapterScreen.kt +53 -26
app/src/main/java/dev/pyrossh/onlyBible/MainActivity.kt +11 -4
app/src/main/java/dev/pyrossh/onlyBible/composables/BibleSelector.kt +6 -7
app/src/main/java/dev/pyrossh/onlyBible/composables/ChapterSelector.kt +11 -6
app/src/main/java/dev/pyrossh/onlyBible/composables/EmbeddedSearchBar.kt +10 -3
app/src/main/java/dev/pyrossh/onlyBible/composables/TextSettingsBottomSheet.kt +12 -1
app/src/main/java/dev/pyrossh/onlyBible/composables/VerseHeading.kt +62 -0
app/src/main/java/dev/pyrossh/onlyBible/composables/{VerseView.kt → VerseText.kt} +30 -49
app/src/main/java/dev/pyrossh/onlyBible/domain/Verse.kt +0 -10
app/src/main/res/drawable/ic_launcher_foreground.xml +4 -4
app/src/main/res/values-night/colors.xml +0 -4
app/src/main/res/values/colors.xml +0 -4
app/src/main/res/values/themes.xml +0 -4

app/src/main/AndroidManifest.xml CHANGED Viewed

@@ -15,12 +15,12 @@
         android:icon="@mipmap/ic_launcher"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.BibleApp">
+        android:theme="@style/Theme.AppCompat.DayNight.NoActionBar">
         <activity
             android:name=".MainActivity"
             android:configChanges="uiMode"
             android:exported="true"
-            android:theme="@style/Theme.BibleApp">
+            android:theme="@style/Theme.AppCompat.DayNight.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

app/src/main/assets/bibles/en_kjv.txt CHANGED Viewed

@@ -1,4 +1,4 @@
-Genesis|0|0|0|The History of Creation|In the beginning God created the heaven and the earth.
+Genesis|0|0|0|The History of Creation <br> (<a href="42:0:0">John 1:1–5</a>;<a href="57:10:1">Hebrews 11:1–3</a>)|In the beginning God created the heaven and the earth.
 Genesis|0|0|1||And the earth was without form, and void; and darkness <em>was</em> upon the face of the deep. And the Spirit of God moved upon the face of the waters.
 Genesis|0|0|2||And God said, Let there be light: and there was light.
 Genesis|0|0|3||And God saw the light, that <em>it was</em> good: and God divided the light from the darkness.

app/src/main/java/dev/pyrossh/onlyBible/AppHost.kt CHANGED Viewed

@@ -4,94 +4,54 @@ import androidx.compose.animation.EnterTransition
 import androidx.compose.animation.ExitTransition
 import androidx.compose.animation.core.tween
 import androidx.compose.runtime.Composable
+import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.toRoute
 @Composable
-fun AppHost(model: AppViewModel) {
+fun AppHost(model: AppViewModel = viewModel()) {
     val navController = rememberNavController()
     val navigateToChapter = { props: ChapterScreenProps ->
         model.resetScrollState()
         navController.navigate(props)
     }
-    val onSwipeLeft = {
-        val pair = model.getForwardPair()
+    if (!model.isLoading) {
-        navigateToChapter(
+        NavHost(
-            ChapterScreenProps(
-                bookIndex = pair.first,
-                chapterIndex = pair.second,
-            )
-        )
-    }
-    val onSwipeRight = {
-        val pair = model.getBackwardPair()
-        if (navController.previousBackStackEntry != null) {
-            val previousBook =
-                navController.previousBackStackEntry?.arguments?.getInt("bookIndex")
-                    ?: 0
-            val previousChapter =
-                navController.previousBackStackEntry?.arguments?.getInt("chapterIndex")
-                    ?: 0
-//          println("currentBackStackEntry ${previousBook} ${previousChapter} || ${pair.first} ${pair.second}")
-            if (previousBook == pair.first && previousChapter == pair.second) {
-                model.resetScrollState()
-                navController.popBackStack()
+            navController = navController,
+            startDestination = ChapterScreenProps(model.bookIndex, model.chapterIndex)
-            } else {
+        ) {
-                navigateToChapter(
-                    ChapterScreenProps(
+            composable<ChapterScreenProps>(
+                enterTransition = {
+                    val props = this.targetState.toRoute<ChapterScreenProps>()
-                        bookIndex = pair.first,
+                    slideIntoContainer(
-                        chapterIndex = pair.second,
+                        Dir.valueOf(props.dir).slideDirection(),
-                        dir = Dir.Right.name,
+                        tween(400),
                     )
+                },
+                exitTransition = {
+                    ExitTransition.None
+                },
+                popEnterTransition = {
+                    EnterTransition.None
+                },
+                popExitTransition = {
+                    val props = this.targetState.toRoute<ChapterScreenProps>()
+                    slideOutOfContainer(
+                        Dir.valueOf(props.dir).reverse().slideDirection(),
+                        tween(400),
+                    )
+                }
+            ) {
+                val props = it.toRoute<ChapterScreenProps>()
+                ChapterScreen(
+                    model = model,
+                    bookIndex = props.bookIndex,
+                    chapterIndex = props.chapterIndex,
+                    navigateToChapter = navigateToChapter,
                 )
             }
-        } else {
-            navigateToChapter(
-                ChapterScreenProps(
-                    bookIndex = pair.first,
-                    chapterIndex = pair.second,
-                    dir = Dir.Right.name
-                )
-            )
-        }
-    }
-    NavHost(
-        navController = navController,
-        startDestination = ChapterScreenProps(0, 0)
-    ) {
-        composable<ChapterScreenProps>(
-            enterTransition = {
-                val props = this.targetState.toRoute<ChapterScreenProps>()
-                slideIntoContainer(
-                    Dir.valueOf(props.dir).slideDirection(),
-                    tween(400),
-                )
-            },
-            exitTransition = {
-                ExitTransition.None
-            },
-            popEnterTransition = {
-                EnterTransition.None
-            },
-            popExitTransition = {
-                val props = this.targetState.toRoute<ChapterScreenProps>()
-                slideOutOfContainer(
-                    Dir.valueOf(props.dir).reverse().slideDirection(),
-                    tween(400),
-                )
-            }
-        ) {
-            val props = it.toRoute<ChapterScreenProps>()
-            ChapterScreen(
-                model = model,
-                onSwipeLeft = onSwipeLeft,
-                onSwipeRight = onSwipeRight,
-                bookIndex = props.bookIndex,
-                chapterIndex = props.chapterIndex,
-                navigateToChapter = navigateToChapter,
-            )
         }
     }
 }

app/src/main/java/dev/pyrossh/onlyBible/AppTheme.kt CHANGED Viewed

@@ -11,9 +11,14 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.GenericFontFamily
-import androidx.lifecycle.viewmodel.compose.viewModel
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
+enum class ThemeType {
+    Light,
+    Dark,
+    Auto;
+}
 enum class FontType {
     Sans,
     Serif,
@@ -46,12 +51,12 @@ fun isLightTheme(uiMode: Int, isSystemDark: Boolean): Boolean {
 @Composable
 fun AppTheme(
-    model: AppViewModel = viewModel(),
+    nightMode: Int,
     content: @Composable() () -> Unit
 ) {
     val context = LocalContext.current
     val systemUiController = rememberSystemUiController()
-    val colorScheme = if (isLightTheme(model.nightMode, isSystemInDarkTheme()))
+    val colorScheme = if (isLightTheme(nightMode, isSystemInDarkTheme()))
         dynamicLightColorScheme(context).copy(
             onSurface = Color.Black,
             outline = Color.LightGray,
@@ -62,7 +67,7 @@ fun AppTheme(
             surface = Color(0xFF090F12),
             outline = Color(0xAA5D4979),
         )
-    LaunchedEffect(key1 = model.nightMode) {
+    LaunchedEffect(key1 = nightMode) {
         systemUiController.setSystemBarsColor(
             color = colorScheme.background
         )

app/src/main/java/dev/pyrossh/onlyBible/AppViewModel.kt CHANGED Viewed

@@ -6,6 +6,7 @@ import android.content.Context
 import android.content.Context.MODE_PRIVATE
 import android.content.Context.UI_MODE_SERVICE
 import android.content.Intent
+import android.text.Html
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
@@ -17,6 +18,7 @@ import com.microsoft.cognitiveservices.speech.SpeechConfig
 import com.microsoft.cognitiveservices.speech.SpeechSynthesisEventArgs
 import com.microsoft.cognitiveservices.speech.SpeechSynthesizer
 import dev.pyrossh.onlyBible.domain.BOOKS_COUNT
+import dev.pyrossh.onlyBible.domain.Bible
 import dev.pyrossh.onlyBible.domain.Verse
 import dev.pyrossh.onlyBible.domain.bibles
 import dev.pyrossh.onlyBible.domain.chapterSizes
@@ -36,45 +38,31 @@ import java.io.IOException
 class AppViewModel(application: Application) : AndroidViewModel(application) {
     private val context
         get() = getApplication<Application>()
-    private val prefs
-        get() = context.getSharedPreferences("data", MODE_PRIVATE)
     val speechService = SpeechSynthesizer(
         SpeechConfig.fromSubscription(
             BuildConfig.subscriptionKey,
             "centralindia"
         )
     )
+    val started = { _: Any, _: SpeechSynthesisEventArgs ->
+        isPlaying = true
+    }
+    val completed = { _: Any, _: SpeechSynthesisEventArgs ->
+        isPlaying = false
+    }
     init {
-        val started = { _: Any, _: SpeechSynthesisEventArgs ->
-            isPlaying = true
-        }
-        val completed = { _: Any, _: SpeechSynthesisEventArgs ->
-            isPlaying = false
-        }
         speechService.SynthesisStarted.addEventListener(started)
         speechService.SynthesisCompleted.addEventListener(completed)
-        loadData()
-    }
-    fun onSpeechStared(sender: Any, e: Any) {
-        viewModelScope.launch(Dispatchers.Main) {
-            isPlaying = true
-        }
-    }
-    fun onSpeechCompleted(sender: Any) {
-        viewModelScope.launch(Dispatchers.Main) {
-            isPlaying = false
-        }
     }
     override fun onCleared() {
         super.onCleared()
-//        speechService.SynthesisStarted.removeEventListener()
+        speechService.SynthesisStarted.removeEventListener(started)
-//        speechService.SynthesisCompleted.removeEventListener()
+        speechService.SynthesisCompleted.removeEventListener(completed)
     }
+    var isLoading by mutableStateOf(true)
     var isPlaying by mutableStateOf(false)
     val verses = MutableStateFlow(listOf<Verse>())
     val bookNames = MutableStateFlow(engTitles)
@@ -94,16 +82,11 @@ class AppViewModel(application: Application) : AndroidViewModel(application) {
         0
     )
     val selectedVerses = MutableStateFlow(listOf<Verse>())
-    private val _isSearching = MutableStateFlow(false)
+    val isSearching = MutableStateFlow(false)
-    val isSearching = _isSearching.asStateFlow()
-    //second state the text typed by the user
-    private val _searchText = MutableStateFlow("")
+    val searchText = MutableStateFlow("")
-    val searchText = _searchText.asStateFlow()
     @OptIn(FlowPreview::class)
-    val versesList = _searchText.asStateFlow()
+    val searchedVerses = searchText.asStateFlow()
         .debounce(300)
         .combine(verses.asStateFlow()) { text, verses ->
             verses.filter { verse ->
@@ -121,19 +104,19 @@ class AppViewModel(application: Application) : AndroidViewModel(application) {
         )
     fun onSearchTextChange(text: String) {
-        _searchText.value = text
+        searchText.value = text
     }
     fun onOpenSearch() {
-        _isSearching.value = true
+        isSearching.value = true
-        if (!_isSearching.value) {
+        if (!isSearching.value) {
             onSearchTextChange("")
         }
     }
     fun onCloseSearch() {
-        _isSearching.value = false
+        isSearching.value = false
-        if (!_isSearching.value) {
+        if (!isSearching.value) {
             onSearchTextChange("")
         }
     }
@@ -160,16 +143,18 @@ class AppViewModel(application: Application) : AndroidViewModel(application) {
         selectedVerses.value = listOf()
     }
-    private fun loadData() {
+    fun loadData(context: Context) {
         viewModelScope.launch(Dispatchers.IO) {
+            viewModelScope.launch(Dispatchers.Main) {
+                isLoading = true
+            }
+            val prefs = context.getSharedPreferences("data", MODE_PRIVATE)
             val bibleFileName = prefs.getString("bible", "en_kjv") ?: "en_kjv"
-            bible = bibles.find { it.filename() == bibleFileName  } ?: bibles.first()
             bookIndex = prefs.getInt("bookIndex", 0)
             chapterIndex = prefs.getInt("chapterIndex", 0)
-            fontType =
-                FontType.valueOf(
+            fontType = FontType.valueOf(
-                    prefs.getString("fontType", FontType.Sans.name) ?: FontType.Sans.name
+                prefs.getString("fontType", FontType.Sans.name) ?: FontType.Sans.name
-                )
+            )
             fontSizeDelta = prefs.getInt("fontSizeDelta", 0)
             fontBoldEnabled = prefs.getBoolean("fontBoldEnabled", false)
             lineSpacingDelta = prefs.getInt("lineSpacingDelta", 0)
@@ -179,14 +164,18 @@ class AppViewModel(application: Application) : AndroidViewModel(application) {
                 prefs.getInt("scrollIndex", 0),
                 prefs.getInt("scrollOffset", 0)
             )
+            val localBible = bibles.find { it.filename() == bibleFileName } ?: bibles.first()
-            loadBible()
+            loadBible(localBible, context)
+            viewModelScope.launch(Dispatchers.Main) {
+                isLoading = false
+            }
         }
     }
-    fun loadBible() {
+    fun loadBible(b: Bible, context: Context) {
         try {
             val buffer =
-                context.assets.open("bibles/${bible.filename()}.txt").bufferedReader()
+                context.assets.open("bibles/${b.filename()}.txt").bufferedReader()
             val localVerses = buffer.readLines().filter { it.isNotEmpty() }.map {
                 val arr = it.split("|")
                 val bookName = arr[0]
@@ -205,6 +194,7 @@ class AppViewModel(application: Application) : AndroidViewModel(application) {
                 )
             }
             viewModelScope.launch(Dispatchers.Main) {
+                bible = b
                 verses.value = localVerses
                 bookNames.value = localVerses.distinctBy { it.bookName }.map { it.bookName }
             }
@@ -213,8 +203,9 @@ class AppViewModel(application: Application) : AndroidViewModel(application) {
         }
     }
-    fun saveData() {
+    fun saveData(context: Context) {
         viewModelScope.launch(Dispatchers.IO) {
+            val prefs = context.getSharedPreferences("data", MODE_PRIVATE)
             with(prefs.edit()) {
                 putString("bible", bible.filename())
                 putInt("bookIndex", bookIndex)
@@ -233,27 +224,6 @@ class AppViewModel(application: Application) : AndroidViewModel(application) {
         }
     }
-    fun getForwardPair(): Pair<Int, Int> {
-        val sizes = chapterSizes[bookIndex]
-        if (sizes > chapterIndex + 1) {
-            return Pair(bookIndex, chapterIndex + 1)
-        }
-        if (bookIndex + 1 < BOOKS_COUNT) {
-            return Pair(bookIndex + 1, 0)
-        }
-        return Pair(0, 0)
-    }
-    fun getBackwardPair(): Pair<Int, Int> {
-        if (chapterIndex - 1 >= 0) {
-            return Pair(bookIndex, chapterIndex - 1)
-        }
-        if (bookIndex - 1 >= 0) {
-            return Pair(bookIndex - 1, chapterSizes[bookIndex - 1] - 1)
-        }
-        return Pair(BOOKS_COUNT - 1, chapterSizes[BOOKS_COUNT - 1] - 1)
-    }
     fun resetScrollState() {
         scrollState = LazyListState(0, 0)
     }
@@ -278,6 +248,37 @@ class AppViewModel(application: Application) : AndroidViewModel(application) {
             highlightedVerses.value.remove(v.key())
         }
     }
+    fun playAudio(text: String) {
+        speechService.StartSpeakingSsml("""
+            <speak version="1.0" xmlns="http://www.w3.org/2001/10/synthesis" xml:lang="en-US">
+                <voice name="${bible.voiceName}">
+                    $text
+                </voice>
+            </speak>
+        """)
+    }
+}
+fun getForwardPair(bookIndex: Int, chapterIndex: Int): Pair<Int, Int> {
+    val sizes = chapterSizes[bookIndex]
+    if (sizes > chapterIndex + 1) {
+        return Pair(bookIndex, chapterIndex + 1)
+    }
+    if (bookIndex + 1 < BOOKS_COUNT) {
+        return Pair(bookIndex + 1, 0)
+    }
+    return Pair(0, 0)
+}
+fun getBackwardPair(bookIndex: Int, chapterIndex: Int): Pair<Int, Int> {
+    if (chapterIndex - 1 >= 0) {
+        return Pair(bookIndex, chapterIndex - 1)
+    }
+    if (bookIndex - 1 >= 0) {
+        return Pair(bookIndex - 1, chapterSizes[bookIndex - 1] - 1)
+    }
+    return Pair(BOOKS_COUNT - 1, chapterSizes[BOOKS_COUNT - 1] - 1)
 }
 fun shareVerses(context: Context, verses: List<Verse>) {
@@ -285,12 +286,8 @@ fun shareVerses(context: Context, verses: List<Verse>) {
         if (verses.size >= 3) "${verses.first().verseIndex + 1}-${verses.last().verseIndex + 1}" else verses.map { it.verseIndex + 1 }
             .joinToString(",")
     val title = "${verses[0].bookName} ${verses[0].chapterIndex + 1}:${versesThrough}"
+    val text =
-    val text = verses.joinToString("\n") {
+        Html.fromHtml(verses.joinToString("\n") { it.text }, Html.FROM_HTML_MODE_COMPACT).toString()
-        it.text.replace("<span style=\"color:red;\">", "")
-            .replace("<em>", "")
-            .replace("</span>", "")
-            .replace("</em>", "")
-    }
     val sendIntent = Intent().apply {
         action = Intent.ACTION_SEND
         putExtra(Intent.EXTRA_TEXT, "${title}\n${text}")

app/src/main/java/dev/pyrossh/onlyBible/ChapterScreen.kt CHANGED Viewed

@@ -37,6 +37,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.pointer.PointerInputScope
 import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
@@ -45,7 +46,8 @@ import androidx.compose.ui.unit.sp
 import dev.pyrossh.onlyBible.composables.BibleSelector
 import dev.pyrossh.onlyBible.composables.ChapterSelector
 import dev.pyrossh.onlyBible.composables.EmbeddedSearchBar
+import dev.pyrossh.onlyBible.composables.VerseHeading
-import dev.pyrossh.onlyBible.composables.VerseView
+import dev.pyrossh.onlyBible.composables.VerseText
 import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
 import kotlin.math.abs
@@ -111,22 +113,21 @@ suspend fun PointerInputScope.detectSwipe(
 @Composable
 fun ChapterScreen(
     model: AppViewModel,
-    onSwipeLeft: () -> Unit,
-    onSwipeRight: () -> Any,
     bookIndex: Int,
     chapterIndex: Int,
     navigateToChapter: (ChapterScreenProps) -> Unit,
 ) {
     val view = LocalView.current
-    val verses by model.verses.collectAsState()
+    val context = LocalContext.current
-    val bookNames by model.bookNames.collectAsState()
     val isSearching by model.isSearching.collectAsState()
     var chapterSelectorShown by remember { mutableStateOf(false) }
     var bibleSelectorShown by remember { mutableStateOf(false) }
-    val headingColor = MaterialTheme.colorScheme.onSurface // MaterialTheme.colorScheme.primary,
+    val headingColor = MaterialTheme.colorScheme.onSurface
+    val bookNames by model.bookNames.collectAsState()
+    val verses by model.verses.collectAsState()
     val chapterVerses =
         verses.filter { it.bookIndex == bookIndex && it.chapterIndex == chapterIndex }
-    LaunchedEffect(key1 = chapterVerses) {
+    LaunchedEffect(Unit) {
         model.clearSelectedVerses()
         model.bookIndex = bookIndex
         model.chapterIndex = chapterIndex
@@ -137,13 +138,20 @@ fun ChapterScreen(
     ) { innerPadding ->
         if (bibleSelectorShown) {
             BibleSelector(
-                model = model,
+                bible = model.bible,
+                onSelected = {
+                    view.playSoundEffect(SoundEffectConstants.CLICK)
+                    bibleSelectorShown = false
+                    model.loadBible(it, context)
+                },
                 onClose = { bibleSelectorShown = false },
             )
         }
         if (chapterSelectorShown) {
             ChapterSelector(
-                model = model,
+                bible = model.bible,
+                bookNames = bookNames,
+                startBookIndex = bookIndex,
                 onClose = { chapterSelectorShown = false },
                 navigateToChapter = navigateToChapter,
             )
@@ -166,11 +174,12 @@ fun ChapterScreen(
             ) {
                 TextButton(
                     contentPadding = PaddingValues(
-                        top = ContentPadding.calculateTopPadding(),
+                        top = ContentPadding.calculateTopPadding(), //8dp
                         end = 12.dp,
                         bottom = ContentPadding.calculateBottomPadding()
                     ),
                     onClick = {
+                        view.playSoundEffect(SoundEffectConstants.CLICK)
                         chapterSelectorShown = true
                     }
                 ) {
@@ -188,7 +197,10 @@ fun ChapterScreen(
                     horizontalArrangement = Arrangement.End,
                 ) {
                     IconButton(
+                        onClick = {
+                            view.playSoundEffect(SoundEffectConstants.CLICK)
-                        onClick = { model.onOpenSearch() },
+                            model.onOpenSearch()
+                        },
                     ) {
                         Icon(
                             imageVector = Icons.Rounded.Search,
@@ -197,6 +209,7 @@ fun ChapterScreen(
                         )
                     }
                     TextButton(onClick = {
+                        view.playSoundEffect(SoundEffectConstants.CLICK)
                         bibleSelectorShown = true
                     }) {
                         Text(
@@ -231,32 +244,46 @@ fun ChapterScreen(
                     .fillMaxSize()
                     .pointerInput(Unit) {
                         detectSwipe(
-                            onSwipeLeft = onSwipeLeft,
+                            onSwipeLeft = {
+                                val pair = getForwardPair(bookIndex, chapterIndex)
+                                navigateToChapter(
+                                    ChapterScreenProps(
+                                        bookIndex = pair.first,
+                                        chapterIndex = pair.second,
+                                    )
+                                )
+                            },
-                            onSwipeRight = { onSwipeRight() },
+                            onSwipeRight = {
+                                val pair = getBackwardPair(bookIndex, chapterIndex)
+                                navigateToChapter(
+                                    ChapterScreenProps(
+                                        bookIndex = pair.first,
+                                        chapterIndex = pair.second,
+                                        dir = Dir.Right.name,
+                                    )
+                                )
+                            },
                         )
                     }
             ) {
                 items(chapterVerses) { v ->
                     if (v.heading.isNotEmpty()) {
-                        Text(
-                            modifier = Modifier.padding(
+                        VerseHeading(
-                                top = if (v.verseIndex != 0) 12.dp else 0.dp, bottom = 12.dp
-                            ),
-                            style = TextStyle(
+                            text = v.heading,
-                                fontFamily = model.fontType.family(),
+                            fontType = model.fontType,
-                                fontSize = (16 + model.fontSizeDelta).sp,
+                            fontSizeDelta = model.fontSizeDelta,
-                                fontWeight = FontWeight.W700,
+                            navigateToChapter = navigateToChapter,
-                                color = headingColor,
-                            ),
-                            text = v.heading.replace("<br>", "\n")
                         )
                     }
-                    VerseView(
+                    VerseText(
                         model = model,
+                        fontType = model.fontType,
+                        fontSizeDelta = model.fontSizeDelta,
+                        fontBoldEnabled = model.fontBoldEnabled,
                         verse = v,
                     )
                 }
             }
         }
     }
-}
+}

app/src/main/java/dev/pyrossh/onlyBible/MainActivity.kt CHANGED Viewed

@@ -16,11 +16,18 @@ class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
+        if (savedInstanceState == null) {
+            lifecycleScope.launch {
+                model.loadData(applicationContext)
+            }
+        }
         setContent {
-            AppTheme {
+            AppTheme(
-                AppHost(model = model)
+                nightMode = model.nightMode
+            ) {
+                AppHost()
                 if (model.showBottomSheet) {
-                    TextSettingsBottomSheet(model = model)
+                    TextSettingsBottomSheet()
                 }
             }
         }
@@ -29,7 +36,7 @@ class MainActivity : ComponentActivity() {
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
         lifecycleScope.launch {
-            model.saveData()
+            model.saveData(applicationContext)
         }
     }
 }

app/src/main/java/dev/pyrossh/onlyBible/composables/BibleSelector.kt CHANGED Viewed

@@ -18,18 +18,19 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
-import dev.pyrossh.onlyBible.AppViewModel
+import dev.pyrossh.onlyBible.domain.Bible
 import dev.pyrossh.onlyBible.domain.bibles
 import java.util.Locale
 @Composable
 fun BibleSelector(
-    model: AppViewModel,
+    bible: Bible,
+    onSelected: (Bible) -> Unit,
     onClose: () -> Unit,
 ) {
     val context = LocalContext.current
     val height = context.resources.configuration.screenHeightDp.dp / 2
-    val bibleList = bibles.sortedBy { it != model.bible }
+    val bibleList = bibles.sortedBy { it != bible }
     Dialog(onDismissRequest = { onClose() }) {
         Card(
             modifier = Modifier
@@ -42,12 +43,10 @@ fun BibleSelector(
                     val loc = Locale(it.languageCode)
                     ListItem(
                         modifier = Modifier.clickable {
-                            onClose()
+                            onSelected(it)
-                            model.bible = it
-                            model.loadBible()
                         },
                         colors = ListItemDefaults.colors(
-                            containerColor = if (it == model.bible)
+                            containerColor = if (it == bible)
                                 MaterialTheme.colorScheme.primaryContainer
                             else
                                 MaterialTheme.colorScheme.background

app/src/main/java/dev/pyrossh/onlyBible/composables/ChapterSelector.kt CHANGED Viewed

@@ -1,5 +1,6 @@
 package dev.pyrossh.onlyBible.composables
+import android.view.SoundEffectConstants
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Spacer
@@ -25,7 +26,6 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
@@ -34,26 +34,29 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
-import dev.pyrossh.onlyBible.AppViewModel
 import dev.pyrossh.onlyBible.ChapterScreenProps
+import dev.pyrossh.onlyBible.domain.Bible
 import dev.pyrossh.onlyBible.domain.chapterSizes
 import dev.pyrossh.onlyBible.domain.engTitles
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ChapterSelector(
+    bible: Bible,
+    bookNames: List<String>,
-    model: AppViewModel,
+    startBookIndex: Int,
     onClose: () -> Unit,
     navigateToChapter: (ChapterScreenProps) -> Unit
 ) {
+    val view = LocalView.current
     val context = LocalContext.current
     val height = context.resources.configuration.screenHeightDp.dp / 2
-    val bookNames by model.bookNames.collectAsState()
     var expanded by remember { mutableStateOf(false) }
-    var bookIndex by remember { mutableIntStateOf(model.bookIndex) }
+    var bookIndex by remember { mutableIntStateOf(startBookIndex) }
     val scrollState = rememberLazyListState()
     val bookList = bookNames - bookNames[bookIndex]
     LaunchedEffect(key1 = bookIndex) {
@@ -69,6 +72,7 @@ fun ChapterSelector(
             ListItem(
                 modifier = Modifier
                     .clickable {
+                        view.playSoundEffect(SoundEffectConstants.CLICK)
                         expanded = !expanded
                     },
                 colors = ListItemDefaults.colors(
@@ -106,7 +110,7 @@ fun ChapterSelector(
                                 )
                             },
                             supportingContent = {
-                                if (model.bible.languageCode != "en") {
+                                if (bible.languageCode != "en") {
                                     Text(
                                         modifier = Modifier.padding(start = 4.dp),
                                         text = engTitles[bookNames.indexOf(it)],
@@ -141,6 +145,7 @@ fun ChapterSelector(
                             ),
                             shape = RoundedCornerShape(8.dp),
                             onClick = {
+                                view.playSoundEffect(SoundEffectConstants.CLICK)
                                 onClose()
                                 navigateToChapter(
                                     ChapterScreenProps(

app/src/main/java/dev/pyrossh/onlyBible/composables/EmbeddedSearchBar.kt CHANGED Viewed

@@ -1,5 +1,6 @@
 package dev.pyrossh.onlyBible.composables
+import android.view.SoundEffectConstants
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
@@ -22,6 +23,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
@@ -33,8 +35,9 @@ import dev.pyrossh.onlyBible.AppViewModel
 fun EmbeddedSearchBar(
     model: AppViewModel,
 ) {
+    val view = LocalView.current
     val searchText by model.searchText.collectAsState()
-    val versesList by model.versesList.collectAsState()
+    val searchedVerses by model.searchedVerses.collectAsState()
     val textFieldFocusRequester = remember { FocusRequester() }
     SideEffect {
         textFieldFocusRequester.requestFocus()
@@ -73,6 +76,7 @@ fun EmbeddedSearchBar(
             trailingIcon = {
                 IconButton(
                     onClick = {
+                        view.playSoundEffect(SoundEffectConstants.CLICK)
                         model.onCloseSearch()
                     },
                 ) {
@@ -85,7 +89,7 @@ fun EmbeddedSearchBar(
             },
             tonalElevation = 0.dp,
         ) {
-            val groups = versesList.groupBy { "${it.bookName} ${it.chapterIndex + 1}" }
+            val groups = searchedVerses.groupBy { "${it.bookName} ${it.chapterIndex + 1}" }
             LazyColumn {
                 groups.forEach {
                     item(
@@ -105,8 +109,11 @@ fun EmbeddedSearchBar(
                         )
                     }
                     items(it.value) { v ->
-                        VerseView(
+                        VerseText(
                             model = model,
+                            fontType = model.fontType,
+                            fontSizeDelta = model.fontSizeDelta,
+                            fontBoldEnabled = model.fontBoldEnabled,
                             verse = v,
                         )
                     }

app/src/main/java/dev/pyrossh/onlyBible/composables/TextSettingsBottomSheet.kt CHANGED Viewed

@@ -3,6 +3,7 @@ package dev.pyrossh.onlyBible.composables
 import android.app.UiModeManager.MODE_NIGHT_AUTO
 import android.app.UiModeManager.MODE_NIGHT_NO
 import android.app.UiModeManager.MODE_NIGHT_YES
+import android.view.SoundEffectConstants
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -34,17 +35,20 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.lifecycle.viewmodel.compose.viewModel
 import dev.pyrossh.onlyBible.AppViewModel
 import dev.pyrossh.onlyBible.FontType
 import kotlinx.coroutines.launch
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
-fun TextSettingsBottomSheet(model: AppViewModel) {
+fun TextSettingsBottomSheet(model: AppViewModel = viewModel()) {
+    val view = LocalView.current
     val scope = rememberCoroutineScope()
     val sheetState = rememberModalBottomSheetState()
     return ModalBottomSheet(
@@ -78,6 +82,7 @@ fun TextSettingsBottomSheet(model: AppViewModel) {
                 )
                 Row(horizontalArrangement = Arrangement.End) {
                     IconButton(onClick = {
+                        view.playSoundEffect(SoundEffectConstants.CLICK)
                         scope.launch {
                             sheetState.hide()
                         }.invokeOnCompletion {
@@ -103,6 +108,7 @@ fun TextSettingsBottomSheet(model: AppViewModel) {
                         .padding(end = 16.dp)
                         .weight(1f),
                     onClick = {
+                        view.playSoundEffect(SoundEffectConstants.CLICK)
                         model.fontSizeDelta -= 1
                     }) {
                     Column(
@@ -124,6 +130,7 @@ fun TextSettingsBottomSheet(model: AppViewModel) {
                         .padding(end = 16.dp)
                         .weight(1f),
                     onClick = {
+                        view.playSoundEffect(SoundEffectConstants.CLICK)
                         model.fontSizeDelta += 1
                     }) {
                     Column(
@@ -144,6 +151,7 @@ fun TextSettingsBottomSheet(model: AppViewModel) {
                         .padding(end = 16.dp)
                         .weight(1f),
                     onClick = {
+                        view.playSoundEffect(SoundEffectConstants.CLICK)
                         model.fontBoldEnabled = !model.fontBoldEnabled
                     }) {
                     Column(
@@ -165,6 +173,7 @@ fun TextSettingsBottomSheet(model: AppViewModel) {
                         .padding(end = 16.dp)
                         .weight(1f),
                     onClick = {
+                        view.playSoundEffect(SoundEffectConstants.CLICK)
                         if (model.lineSpacingDelta > 5) {
                             model.lineSpacingDelta = 0
                         } else {
@@ -202,6 +211,7 @@ fun TextSettingsBottomSheet(model: AppViewModel) {
                             .padding(end = 16.dp)
                             .weight(1f),
                         onClick = {
+                            view.playSoundEffect(SoundEffectConstants.CLICK)
                             model.fontType = it
                         }) {
                         Column(
@@ -254,6 +264,7 @@ fun TextSettingsBottomSheet(model: AppViewModel) {
                             .padding(end = 16.dp)
                             .weight(1f),
                         onClick = {
+                            view.playSoundEffect(SoundEffectConstants.CLICK)
                             scope.launch {
                                 sheetState.hide()
                                 model.closeSheet()

app/src/main/java/dev/pyrossh/onlyBible/composables/VerseHeading.kt ADDED Viewed

@@ -0,0 +1,62 @@
+package dev.pyrossh.onlyBible.composables
+import android.view.SoundEffectConstants
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.LinkAnnotation
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.TextLinkStyles
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.fromHtml
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import dev.pyrossh.onlyBible.ChapterScreenProps
+import dev.pyrossh.onlyBible.FontType
+@Composable
+fun VerseHeading(
+    text: String,
+    fontType: FontType,
+    fontSizeDelta: Int,
+    navigateToChapter: (ChapterScreenProps) -> Unit
+) {
+    val view = LocalView.current
+    Text(
+        modifier = Modifier.padding(bottom = 24.dp),
+        style = TextStyle(
+            fontFamily = fontType.family(),
+            fontSize = (16 + fontSizeDelta).sp,
+            fontWeight = FontWeight.W700,
+            color = MaterialTheme.colorScheme.onSurface,
+        ),
+        text = AnnotatedString.fromHtml(
+            htmlString = text,
+            linkStyles = TextLinkStyles(
+                style = SpanStyle(
+                    fontSize = (14 + fontSizeDelta).sp,
+                    fontStyle = FontStyle.Italic,
+                    color = Color(0xFF008AE6),
+                )
+            ),
+            linkInteractionListener = {
+                view.playSoundEffect(SoundEffectConstants.CLICK)
+                val url = (it as LinkAnnotation.Url).url
+                val parts = url.split(":")
+                navigateToChapter(
+                    ChapterScreenProps(
+                        bookIndex = parts[0].toInt(),
+                        chapterIndex = parts[1].toInt(),
+                    )
+                )
+            },
+        ),
+    )
+}

app/src/main/java/dev/pyrossh/onlyBible/composables/{VerseView.kt → VerseText.kt} RENAMED Viewed

@@ -1,10 +1,5 @@
 package dev.pyrossh.onlyBible.composables
-import android.graphics.Typeface
-import android.text.Html
-import android.text.style.BulletSpan
-import android.text.style.ForegroundColorSpan
-import android.text.style.StyleSpan
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
@@ -42,17 +37,22 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.onPlaced
 import androidx.compose.ui.layout.positionInRoot
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.LinkAnnotation
 import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.TextLinkStyles
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.fromHtml
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Popup
 import dev.pyrossh.onlyBible.AppViewModel
+import dev.pyrossh.onlyBible.FontType
 import dev.pyrossh.onlyBible.darkHighlights
 import dev.pyrossh.onlyBible.domain.Verse
 import dev.pyrossh.onlyBible.isLightTheme
@@ -62,8 +62,11 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 @Composable
-fun VerseView(
+fun VerseText(
     model: AppViewModel,
+    fontType: FontType,
+    fontSizeDelta: Int,
+    fontBoldEnabled: Boolean,
     verse: Verse,
 ) {
     var barYPosition by remember {
@@ -71,8 +74,6 @@ fun VerseView(
     }
     val selectedVerses by model.selectedVerses.collectAsState()
     val isLight = isLightTheme(model.nightMode, isSystemInDarkTheme())
-    val fontSizeDelta = model.fontSizeDelta
-    val boldWeight = if (model.fontBoldEnabled) FontWeight.W700 else FontWeight.W400
     val buttonInteractionSource = remember { MutableInteractionSource() }
     val isSelected = selectedVerses.contains(verse)
     val highlightedColorIndex = model.getHighlightForVerse(verse)
@@ -102,7 +103,7 @@ fun VerseView(
                     currentHighlightColors[highlightedColorIndex]
                 else
                     Color.Unspecified,
-            fontFamily = model.fontType.family(),
+            fontFamily = fontType.family(),
             color = if (isLight)
                 Color(0xFF000104)
             else
@@ -110,15 +111,15 @@ fun VerseView(
                     currentHighlightColors[highlightedColorIndex]
                 else
                     Color(0xFFBCBCBC),
-            fontWeight = boldWeight,
+            fontWeight = if (fontBoldEnabled)
+                FontWeight.W700
+            else
+                FontWeight.W400,
             fontSize = (17 + fontSizeDelta).sp,
             lineHeight = (23 + fontSizeDelta).sp,
             letterSpacing = 0.sp,
         ),
         text = buildAnnotatedString {
-            val spanned = Html.fromHtml(verse.text, Html.FROM_HTML_MODE_COMPACT)
-            val spans = spanned.getSpans(0, spanned.length, Any::class.java)
-            val verseNo = "${verse.verseIndex + 1} "
             withStyle(
                 style = SpanStyle(
                     fontSize = (13 + fontSizeDelta).sp,
@@ -129,41 +130,23 @@ fun VerseView(
                     fontWeight = FontWeight.W700,
                 )
             ) {
-                append(verseNo)
+                append("${verse.verseIndex + 1} ")
             }
-            append(spanned.toString())
-            spans
+            append(
-                .filter { it !is BulletSpan }
-                .forEach { span ->
-                    val start = spanned.getSpanStart(span)
+                AnnotatedString.Companion.fromHtml(
-                    val end = spanned.getSpanEnd(span)
-                    when (span) {
-                        is ForegroundColorSpan ->
+                    htmlString = verse.text,
-                            if (isLight) SpanStyle(color = Color(0xFFFF0000))
-                            else SpanStyle(color = Color(0xFFFF636B))
-                        is StyleSpan -> when (span.style) {
+                    linkStyles = TextLinkStyles(
-                            Typeface.BOLD -> SpanStyle(fontWeight = FontWeight.Bold)
-                            Typeface.ITALIC -> SpanStyle(fontStyle = FontStyle.Italic)
-                            Typeface.BOLD_ITALIC -> SpanStyle(
+                        style = SpanStyle(
-                                fontWeight = FontWeight.Bold,
+                            fontSize = (14 + model.fontSizeDelta).sp,
-                                fontStyle = FontStyle.Italic,
+                            fontStyle = FontStyle.Italic,
-                            )
-                            else -> null
-                        }
-                        else -> {
-                            null
-                        }
-                    }?.let { spanStyle ->
-                        addStyle(
-                            spanStyle,
-                            start + verseNo.length - 1,
+                            color = Color(0xFF008AE6),
-                            end + verseNo.length
                         )
+                    ),
+                    linkInteractionListener = {
+                        println("SOUTT ${(it as LinkAnnotation.Url).url}")
-                    }
+                    },
-                }
+                )
+            )
         }
     )
     if (isSelected && selectedVerses.last() == verse) {
@@ -240,9 +223,7 @@ private fun Menu(
                     } else {
                         scope.launch(Dispatchers.IO) {
                             for (v in selectedVerses.sortedBy { it.verseIndex }) {
-                                model.speechService.StartSpeakingSsml(
-                                    v.toSSML(model.bible.voiceName),
+                                model.playAudio(v.text)
-                                )
                             }
                         }
                     }

app/src/main/java/dev/pyrossh/onlyBible/domain/Verse.kt CHANGED Viewed

@@ -181,14 +181,4 @@ data class Verse(
 ) : Parcelable {
     fun key() = "${bookIndex}:${chapterIndex}:${verseIndex}"
-    fun toSSML(voice: String): String {
-        return """
-            <speak version="1.0" xmlns="http://www.w3.org/2001/10/synthesis" xml:lang="en-US">
-                <voice name="$voice">
-                    $text
-                </voice>
-            </speak>
-            """.trimIndent()
-    }
 }

app/src/main/res/drawable/ic_launcher_foreground.xml CHANGED Viewed

@@ -4,10 +4,10 @@
     android:viewportWidth="108"
     android:viewportHeight="108">
     <group
-        android:scaleX="0.12"
+        android:scaleX="0.11"
-        android:scaleY="0.12"
+        android:scaleY="0.11"
-        android:translateX="23"
+        android:translateX="26"
-        android:translateY="23">
+        android:translateY="26">
         <path
             android:pathData="m389.57,122.38h-93.69V48.43c0,-22.08 -17.9,-39.98 -39.98,-39.98v0c-22.08,0 -39.98,17.9 -39.98,39.98v73.95h-93.69c-22.08,0 -39.98,17.9 -39.98,39.98v0c0,22.08 17.9,39.98 39.98,39.98h93.69v261.23c0,22.08 17.9,39.98 39.98,39.98v0c22.08,0 39.98,-17.9 39.98,-39.98V202.34h93.69c22.08,0 39.98,-17.9 39.98,-39.98v0c0,-22.08 -17.9,-39.98 -39.98,-39.98z"
             android:fillColor="#FFFCC447"/>

app/src/main/res/values-night/colors.xml DELETED Viewed

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="splash_bg">#00000000</color>
-</resources>

app/src/main/res/values/colors.xml DELETED Viewed

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="splash_bg">#FFFFFFFF</color>
-</resources>

app/src/main/res/values/themes.xml DELETED Viewed

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.BibleApp" parent="Theme.AppCompat.DayNight.NoActionBar" />
-</resources>

~repos /only-bible-app

git clone https://pyrossh.dev/repos/only-bible-app.git

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