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.

1287336d — Peter John

fix voice

Files changed (5) hide show

app/src/main/java/dev/pyrossh/onlyBible/AppDrawer.kt +6 -17
app/src/main/java/dev/pyrossh/onlyBible/AppViewModel.kt +7 -5
app/src/main/java/dev/pyrossh/onlyBible/ChapterScreen.kt +5 -36
app/src/main/java/dev/pyrossh/onlyBible/domain/Bible.kt +34 -0
app/src/main/java/dev/pyrossh/onlyBible/{Verse.kt → domain/Verse.kt} +4 -3

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

@@ -39,6 +39,8 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.navigation.NavController
+import dev.pyrossh.onlyBible.domain.Bible
+import dev.pyrossh.onlyBible.domain.Verse
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
@@ -61,20 +63,6 @@ fun LazyGridScope.header(
     item(span = { GridItemSpan(this.maxLineSpan) }, content = content)
 }
-val bibles = listOf(
-    "Bengali",
-    "English",
-    "Gujarati",
-    "Hindi",
-    "Kannada",
-    "Malayalam",
-    "Nepali",
-    "Oriya",
-    "Punjabi",
-    "Tamil",
-    "Telugu"
-)
 @Composable
 fun AppDrawer(
     model: AppViewModel,
@@ -109,7 +97,8 @@ fun AppDrawer(
                 Column(
                     modifier = Modifier
                         .fillMaxSize()
-                        .padding(horizontal = 16.dp),
+                        .padding(horizontal = 16.dp)
+                        .padding(bottom = 16.dp),
                 ) {
                     if (menuType == MenuType.Bible) {
                         LazyVerticalGrid(
@@ -138,8 +127,8 @@ fun AppDrawer(
                                     }
                                 }
                             }
-                            items(bibles) { b ->
+                            items(Bible.entries.toTypedArray()) { b ->
-                                QuickButton(b) {
+                                QuickButton(b.displayName) {
                                     model.setBibleName(context, b)
                                     scope.launch {
                                         drawerState.close()

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

@@ -17,6 +17,8 @@ import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.viewModelScope
 import com.microsoft.cognitiveservices.speech.SpeechConfig
 import com.microsoft.cognitiveservices.speech.SpeechSynthesizer
+import dev.pyrossh.onlyBible.domain.Bible
+import dev.pyrossh.onlyBible.domain.Verse
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.collectLatest
@@ -112,10 +114,8 @@ class AppViewModel(application: Application) : AndroidViewModel(application) {
         showBottomSheet = false
     }
-    fun setBibleName(context: Context, b: String) {
+    fun setBibleName(context: Context, b: Bible) {
-        bibleName = b
+        bibleName = b.name
-        context.getSharedPreferences("settings", Context.MODE_PRIVATE).edit()
-            .putString("bibleName", b).apply()
         loadBible(context)
     }
@@ -131,8 +131,9 @@ class AppViewModel(application: Application) : AndroidViewModel(application) {
                 isOnError = false
             }
             try {
+                val b = Bible.valueOf(bibleName)
                 val buffer =
-                    context.assets.open("bibles/${bibleName}.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]
@@ -142,6 +143,7 @@ class AppViewModel(application: Application) : AndroidViewModel(application) {
                     val heading = arr[4]
                     val verseText = arr.subList(5, arr.size).joinToString("|")
                     Verse(
+                        bible = b,
                         bookIndex = book,
                         bookName = bookName,
                         chapterIndex = chapter,

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

@@ -62,6 +62,8 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.navigation.NavController
 import com.microsoft.cognitiveservices.speech.SpeechSynthesisEventArgs
+import dev.pyrossh.onlyBible.domain.Bible
+import dev.pyrossh.onlyBible.domain.Verse
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
@@ -175,7 +177,7 @@ fun ChapterScreen(
                 actions = {
                     TextButton(onClick = { openDrawer(MenuType.Bible, bookIndex) }) {
                         Text(
-                            text = model.bibleName.substring(0, 2).uppercase(),
+                            text = Bible.valueOf(model.bibleName).code.uppercase(),
                             style = TextStyle(
                                 fontSize = 18.sp,
                                 fontWeight = FontWeight.W500,
@@ -206,7 +208,7 @@ fun ChapterScreen(
                     actions = {
                         Surface(
                             color = Color.Transparent,
-                            contentColor = MaterialTheme.colorScheme.primary,
+//                            contentColor = MaterialTheme.colorScheme.primary,
                         ) {
                             HorizontalDivider(
                                 color = MaterialTheme.colorScheme.outline,
@@ -250,15 +252,6 @@ fun ChapterScreen(
                                         contentDescription = "Audio",
                                     )
                                 }
-//                                IconButton(onClick = {
-//                                    shareVerses(context, selectedVerses)
-//                                }) {
-//                                    Icon(
-//                                        modifier = Modifier.size(48.dp),
-//                                        imageVector = Icons.Outlined.Edit,
-//                                        contentDescription = "Highlight",
-//                                    )
-//                                }
                                 IconButton(onClick = {
                                     shareVerses(
                                         context,
@@ -271,37 +264,13 @@ fun ChapterScreen(
                                     )
                                 }
                             }
-//                        IconButton(onClick = { /* do something */ }) {
+//                        IconButton(onClick = {}) {
 //                            Icon(
 //                                Icons.Filled.Circle,
 //                                contentDescription = "",
 //                                modifier = Modifier.size(64.dp),
 //                                tint = Color.Yellow
 //                            )
-//                        }
-//                        IconButton(onClick = { /* do something */ }) {
-//                            Icon(
-//                                Icons.Filled.Circle,
-//                                contentDescription = "",
-//                                modifier = Modifier.size(64.dp),
-//                                tint = Color.Blue,
-//                            )
-//                        }
-//                        IconButton(onClick = { /* do something */ }) {
-//                            Icon(
-//                                Icons.Filled.Circle,
-//                                contentDescription = "",
-//                                modifier = Modifier.size(64.dp),
-//                                tint = Color.Cyan,
-//                            )
-//                        }
-//                        IconButton(onClick = { /* do something */ }) {
-//                            Icon(
-//                                Icons.Filled.Circle,
-//                                contentDescription = "",
-//                                modifier = Modifier.size(64.dp),
-//                                tint = Color.Magenta,
-//                            )
 //                        }
                         }
                     },

app/src/main/java/dev/pyrossh/onlyBible/domain/Bible.kt ADDED Viewed

@@ -0,0 +1,34 @@
+package dev.pyrossh.onlyBible.domain
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+import kotlinx.serialization.Serializable
+enum class BibleFamily {
+    English,
+    Indian,
+    European,
+    African;
+}
+@Serializable
+@Parcelize
+enum class Bible(
+    val displayName: String,
+    val fileName: String,
+    val voiceName: String?,
+    val code: String,
+    val family: BibleFamily
+) : Parcelable {
+    English("English", "English", "en-GB-RyanNeural", "en", BibleFamily.English),
+    Bengali("Bengali", "Bengali", "bn-IN-TanishaaNeural", "bn", BibleFamily.Indian),
+    Gujarati("Gujarati", "Gujarati", "gu-IN-DhwaniNeural", "gu", BibleFamily.Indian),
+    Hindi("Hindi", "Hindi", "hi-IN-SwaraNeural", "hi", BibleFamily.Indian),
+    Kannada("Kannada", "Kannada", "kn-IN-GaganNeural", "kn", BibleFamily.Indian),
+    Malayalam("Malayalam", "Malayalam", "ml-IN-SobhanaNeural", "ml", BibleFamily.Indian),
+    Nepali("Nepali", "Nepali", "ne-NP-HemkalaNeural", "ne", BibleFamily.Indian),
+    Oriya("Oriya", "Oriya", "or-IN-SubhasiniNeural", "or", BibleFamily.Indian),
+    Punjabi("Punjabi", "Punjabi", "pa-IN-OjasNeural", "pa", BibleFamily.Indian),
+    Tamil("Tamil", "Tamil", "ta-IN-PallaviNeural", "ta", BibleFamily.Indian),
+    Telugu("Telugu", "Telugu", "te-IN-ShrutiNeural", "te", BibleFamily.Indian),
+}

app/src/main/java/dev/pyrossh/onlyBible/{Verse.kt → domain/Verse.kt} RENAMED Viewed

@@ -1,4 +1,4 @@
-package dev.pyrossh.onlyBible
+package dev.pyrossh.onlyBible.domain
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
@@ -78,6 +78,7 @@ val engTitles = listOf(
 @Serializable
 @Parcelize
 data class Verse(
+    val bible: Bible,
     val bookIndex: Int,
     val bookName: String,
     val chapterIndex: Int,
@@ -89,8 +90,8 @@ data class Verse(
     fun toSSML(): String {
         return """
             <speak version="1.0" xmlns="http://www.w3.org/2001/10/synthesis" xml:lang="en-US">
-                <voice name="en-US-AvaMultilingualNeural">
+                <voice name="${bible.voiceName}">
-                    ${text}
+                    $text
                 </voice>
             </speak>
             """.trimIndent()

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