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.

17f61d78 — Peter John

add highlights

Files changed (6) hide show

app/src/main/java/dev/pyrossh/onlyBible/AppTheme.kt +13 -0
app/src/main/java/dev/pyrossh/onlyBible/AppViewModel.kt +49 -1
app/src/main/java/dev/pyrossh/onlyBible/ChapterScreen.kt +2 -8
app/src/main/java/dev/pyrossh/onlyBible/MainActivity.kt +2 -1
app/src/main/java/dev/pyrossh/onlyBible/composables/VerseView.kt +33 -23
readme.md +44 -2

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

@@ -30,6 +30,19 @@ enum class FontType {
     }
 }
+val lightHighlights = listOf(
+    Color(0xFFDAEFFE),
+    Color(0xFFFFFCB2),
+    Color(0xFFFFDDF3),
+)
+val darkHighlights = listOf(
+    Color(0xFF69A9FC),
+    Color(0xFFFFEB66),
+    Color(0xFFFF66B3),
+)
 fun isLightTheme(uiMode: Int, isSystemDark: Boolean): Boolean {
     val maskedMode = uiMode and UI_MODE_NIGHT_MASK
     return maskedMode == UI_MODE_NIGHT_NO || (maskedMode == UI_MODE_NIGHT_UNDEFINED && !isSystemDark)

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

@@ -3,6 +3,7 @@ package dev.pyrossh.onlyBible
 import android.app.Application
 import android.app.LocaleManager
 import android.content.Context
+import android.content.Context.MODE_PRIVATE
 import android.content.Intent
 import android.os.Build
 import android.os.LocaleList
@@ -40,6 +41,7 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.json.JSONObject
 import java.io.IOException
 import java.util.Locale
@@ -48,12 +50,15 @@ internal val Context.dataStore by preferencesDataStore(name = "onlyBible")
 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"
         )
     )
     init {
         val started = { _: Any, _: SpeechSynthesisEventArgs ->
             isPlaying = true
@@ -64,12 +69,15 @@ class AppViewModel(application: Application) : AndroidViewModel(application) {
         speechService.SynthesisStarted.addEventListener(started)
         speechService.SynthesisCompleted.addEventListener(completed)
     }
     var isLoading by mutableStateOf(true)
     var isPlaying by mutableStateOf(false)
     var isOnError by mutableStateOf(false)
     val verses = MutableStateFlow(listOf<Verse>())
     val bookNames = MutableStateFlow(listOf<String>())
     var showBottomSheet by mutableStateOf(false)
+    var highlightedVerses = MutableStateFlow(JSONObject())
     var bookIndex by preferenceMutableState(
         coroutineScope = viewModelScope,
         context = context,
@@ -167,14 +175,35 @@ class AppViewModel(application: Application) : AndroidViewModel(application) {
         showBottomSheet = false
     }
-    fun initData(p: Preferences) {
+    fun loadData(p: Preferences) {
         uiMode = context.applicationContext.resources.configuration.uiMode
+        bookIndex = prefs.getInt("bookIndex", 0)
+        chapterIndex = prefs.getInt("chapterIndex", 0)
+        fontType = prefs.getString("fontType", FontType.Sans.name) ?: FontType.Sans.name
+        fontSizeDelta = prefs.getInt("fontSizeDelta", 0)
+        fontBoldEnabled = prefs.getBoolean("fontBoldEnabled", false)
+        highlightedVerses.value = JSONObject(prefs.getString("highlightedVerses", "{}") ?: "{}")
         scrollState = LazyListState(
             p[intPreferencesKey("scrollIndex")] ?: 0,
             p[intPreferencesKey("scrollOffset")] ?: 0
         )
     }
+    fun saveData() {
+        viewModelScope.launch(Dispatchers.IO) {
+            with(prefs.edit()) {
+                putInt("bookIndex", bookIndex)
+                putInt("chapterIndex", chapterIndex)
+                putString("fontType", fontType)
+                putInt("fontSizeDelta", fontSizeDelta)
+                putBoolean("fontBoldEnabled", fontBoldEnabled)
+                putString("highlightedVerses", highlightedVerses.value.toString())
+                apply()
+                commit()
+            }
+        }
+    }
     fun resetScrollState() {
         scrollState = LazyListState(0, 0)
     }
@@ -221,6 +250,25 @@ class AppViewModel(application: Application) : AndroidViewModel(application) {
             }
         }
     }
+    fun getHighlightForVerse(v: Verse): Int? {
+        val k = "${v.bookIndex}:${v.chapterIndex}:${v.verseIndex}"
+        if (highlightedVerses.value.has(k))
+            return highlightedVerses.value.getInt(k)
+        return null
+    }
+    fun addHighlightedVerses(verses: List<Verse>, colorIndex: Int) {
+        verses.forEach { v ->
+            highlightedVerses.value.put("${v.bookIndex}:${v.chapterIndex}:${v.verseIndex}", colorIndex)
+        }
+    }
+    fun removeHighlightedVerses(verses: List<Verse>) {
+        verses.forEach { v ->
+            highlightedVerses.value.remove("${v.bookIndex}:${v.chapterIndex}:${v.verseIndex}")
+        }
+    }
 }
 fun shareVerses(context: Context, verses: List<Verse>) {

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

@@ -8,7 +8,6 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
@@ -36,7 +35,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
@@ -190,13 +188,9 @@ fun ChapterScreen(
     val context = LocalContext.current
     val verses by model.verses.collectAsState()
     val bookNames by model.bookNames.collectAsState()
-    val scope = rememberCoroutineScope()
     var selectedVerses by rememberSaveable {
         mutableStateOf(listOf<Verse>())
     }
-    var isPlaying by rememberSaveable {
-        mutableStateOf(false)
-    }
     val searchText by model.searchText.collectAsState()
     val isSearching by model.isSearching.collectAsState()
     val versesList by model.versesList.collectAsState()
@@ -251,8 +245,8 @@ fun ChapterScreen(
                 }
             }
             TopAppBar(
-                modifier = Modifier
+//                modifier = Modifier
-                    .height(72.dp),
+//                    .height(72.dp),
                 title = {
                     Row(

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

@@ -32,7 +32,7 @@ class MainActivity : ComponentActivity() {
         enableEdgeToEdge()
         lifecycleScope.launch {
             val data = applicationContext.dataStore.data.first()
-            model.initData(data)
+            model.loadData(data)
             model.loadBible(applicationContext.getCurrentLocale(), applicationContext)
         }
         splashScreen.setKeepOnScreenCondition { model.isLoading }
@@ -70,6 +70,7 @@ class MainActivity : ComponentActivity() {
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
         lifecycleScope.launch {
+            model.saveData()
             applicationContext.dataStore.edit {
                 println("saveData ${model.scrollState.firstVisibleItemIndex}")
                 it[intPreferencesKey("scrollIndex")] = model.scrollState.firstVisibleItemIndex

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

@@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
@@ -27,6 +28,7 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.remember
@@ -52,8 +54,10 @@ import androidx.compose.ui.window.Popup
 import dev.pyrossh.onlyBible.AppViewModel
 import dev.pyrossh.onlyBible.FontType
 import dev.pyrossh.onlyBible.R
+import dev.pyrossh.onlyBible.darkHighlights
 import dev.pyrossh.onlyBible.domain.Verse
 import dev.pyrossh.onlyBible.isLightTheme
+import dev.pyrossh.onlyBible.lightHighlights
 import dev.pyrossh.onlyBible.shareVerses
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -76,6 +80,8 @@ fun VerseView(
     val boldWeight = if (model.fontBoldEnabled) FontWeight.W700 else FontWeight.W400
     val buttonInteractionSource = remember { MutableInteractionSource() }
     val isSelected = selectedVerses.contains(verse)
+    val highlightedColorIndex = model.getHighlightForVerse(verse)
+    val currentHighlightColors = if (isLight) lightHighlights else darkHighlights
     Text(
         modifier = Modifier
             .onPlaced {
@@ -97,12 +103,18 @@ fun VerseView(
             background = if (isSelected)
                 MaterialTheme.colorScheme.outline
             else
+                if (highlightedColorIndex != null && isLight)
+                    currentHighlightColors[highlightedColorIndex]
+                else
-                Color.Unspecified,
+                    Color.Unspecified,
             fontFamily = fontType.family(),
             color = if (isLight)
                 Color(0xFF000104)
             else
+                if (highlightedColorIndex != null)
+                    currentHighlightColors[highlightedColorIndex]
+                else
-                Color(0xFFBCBCBC),
+                    Color(0xFFBCBCBC),
             fontWeight = boldWeight,
             fontSize = (17 + fontSizeDelta).sp,
             lineHeight = (23 + fontSizeDelta).sp,
@@ -187,34 +199,32 @@ fun VerseView(
                     verticalAlignment = Alignment.CenterVertically,
                 ) {
                     IconButton(onClick = {
+                        model.removeHighlightedVerses(selectedVerses)
                         setSelectedVerses(listOf())
                     }) {
                         Icon(
-//                            modifier = Modifier.size(36.dp),
                             imageVector = Icons.Outlined.Cancel,
                             contentDescription = "Clear",
                         )
                     }
+                    lightHighlights.forEachIndexed { i, tint ->
-                    IconButton(onClick = {}) {
+                        IconButton(onClick = {
+                            model.addHighlightedVerses(selectedVerses, i)
+                            setSelectedVerses(listOf())
+                        }) {
-                        Icon(
+                            Icon(
+                                modifier = Modifier
+                                    .size(20.dp)
+                                    .border(
+                                        width = 1.dp,
+                                        color = MaterialTheme.colorScheme.onBackground,
+                                        shape = RoundedCornerShape(24.dp)
+                                    ),
-                            Icons.Filled.Circle,
+                                imageVector = Icons.Filled.Circle,
-                            contentDescription = "",
+                                contentDescription = "highlight",
-                            tint = Color.Yellow
+                                tint = tint,
-                        )
+                            )
-                    }
+                        }
-                    IconButton(onClick = {}) {
-                        Icon(
-                            Icons.Filled.Circle,
-                            contentDescription = "",
-                            tint = Color.Cyan
-                        )
-                    }
-                    IconButton(onClick = {}) {
-                        Icon(
-                            Icons.Filled.Circle,
-                            contentDescription = "",
-                            tint = Color.Magenta
-                        )
                     }
                     IconButton(onClick = {
                         if (model.isPlaying) {

readme.md CHANGED Viewed

@@ -1,4 +1,46 @@
+# Only Bible App
+The only bible app you will ever need.
+No ads, No in-app purchases, No distractions.
+Optimized for reading and highlighting.
+Only Bibles which are in the public domain are available.
+Verse by verse audio is also supported for some of the languages using Azure TTS.
+Many languages supported Indian, European and Asian.
+## Setup
+```agsl
+brew install fluttter cocoapods
+```
+## Release Process
+* Increment the patch/minor version in pubspec.yaml for iOS  ex: 1.0.7
+* Increment versionCode in pubspec.yaml for android  ex: +9
+* Create file android/fastlane/metadata/android/en-GB/changelogs/$versionCode.txt and add change details
+* Update file ios/fastlane/metadata/en-US/release_notes.txt
+### android
+```
+flutter build appbundle --release --dart-define-from-file=.env
+fastlane supply --aab ../build/app/outputs/bundle/release/app-release.aab
+```
+### iOS
+* Make sure you've added a Distribution certificate to the system keystore and download it and install it
+* Make sure you create an App Store provisioning profile for this certificate and download it and install it
+* Add you Apple Developer Team account in xCode and open ios/Runner.xcworkspace and under Runner Project,
+* Runner Target, Signing Tab, Release Tab, select that provisioning profile and Team and Certificate.
+```
+flutter build ipa --release --dart-define-from-file=.env
+fastlane deliver  --ipa "../build/ios/ipa/only-bible-app.ipa" --automatic_release --submit_for_review
+```
 ## TODO
-* Improve Paging in dark mode
+* Improve Paging in dark mode
-* Improve splash screen in dark mode

~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.