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.

3d6c0484 — Peter John

improve stuff

Files changed (7) hide show

app/src/main/java/dev/pyros/bibleapp/AppHost.kt +6 -15
app/src/main/java/dev/pyros/bibleapp/ChapterScreen.kt +166 -77
app/src/main/java/dev/pyros/bibleapp/Consts.kt +0 -137
app/src/main/java/dev/pyros/bibleapp/Drawer.kt +79 -67
app/src/main/java/dev/pyros/bibleapp/MainActivity.kt +2 -32
app/src/main/java/dev/pyros/bibleapp/Model.kt +195 -0
app/src/main/java/dev/pyros/bibleapp/Utils.kt +0 -0

app/src/main/java/dev/pyros/bibleapp/AppHost.kt CHANGED Viewed

@@ -1,12 +1,9 @@
 package dev.pyros.bibleapp
+import Verse
 import androidx.compose.animation.AnimatedContentTransitionScope
 import androidx.compose.animation.core.tween
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableIntStateOf
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
 import androidx.navigation.NavType
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
@@ -16,38 +13,32 @@ import androidx.navigation.navArgument
 @Composable
 fun AppHost(verses: List<Verse>) {
     val navController = rememberNavController()
-    var bookIndex by rememberSaveable {
-        mutableIntStateOf(0)
-    }
-    val setBookIndex = { v: Int ->
-        bookIndex = v
-    }
-    Drawer(navController, bookIndex, setBookIndex) { openDrawer ->
+    Drawer(navController) { openDrawer ->
         NavHost(
             navController = navController,
             startDestination = "/books/{book}/chapters/{chapter}",
             enterTransition = {
                 slideIntoContainer(
                     AnimatedContentTransitionScope.SlideDirection.Left,
-                    tween(500),
+                    tween(400),
                 )
             },
 //            exitTransition = {
 //                slideOutOfContainer(
 //                    AnimatedContentTransitionScope.SlideDirection.Left,
-//                    tween(500),
+//                    tween(300),
 //                )
 //            },
             popEnterTransition = {
                 slideIntoContainer(
                     AnimatedContentTransitionScope.SlideDirection.Right,
-                    tween(500),
+                    tween(400),
                 )
             },
             popExitTransition = {
                 slideOutOfContainer(
                     AnimatedContentTransitionScope.SlideDirection.Right,
-                    tween(500),
+                    tween(400),
                 )
             }
         ) {

app/src/main/java/dev/pyros/bibleapp/ChapterScreen.kt CHANGED Viewed

@@ -1,68 +1,72 @@
 package dev.pyros.bibleapp
+import Verse
+import android.annotation.SuppressLint
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.gestures.AnchoredDraggableState
 import androidx.compose.foundation.gestures.DraggableAnchors
 import androidx.compose.foundation.gestures.detectHorizontalDragGestures
+import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.absolutePadding
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Close
-import androidx.compose.material.icons.filled.Menu
 import androidx.compose.material.icons.outlined.MoreVert
-import androidx.compose.material3.Button
+import androidx.compose.material3.BottomAppBar
-import androidx.compose.material3.Divider
+import androidx.compose.material3.DropdownMenu
-import androidx.compose.material3.DrawerValue
+import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.ModalBottomSheet
-import androidx.compose.material3.ModalDrawerSheet
-import androidx.compose.material3.ModalNavigationDrawer
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults.topAppBarColors
-import androidx.compose.material3.rememberDrawerState
-import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
 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.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Rect
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.boundsInWindow
+import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.buildAnnotatedString
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontSynthesis
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.withStyle
+import androidx.compose.ui.unit.DpOffset
+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 androidx.compose.ui.zIndex
 import androidx.navigation.NavController
-import bookNames
 import fontFamily
 import kotlinx.coroutines.Job
 import kotlinx.serialization.Serializable
@@ -81,6 +85,7 @@ data class ChapterScreenProps(
     val chapterIndex: Int,
 )
+@SuppressLint("MutableCollectionMutableState")
 @OptIn(ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class)
 @Composable
 fun ChapterScreen(
@@ -88,15 +93,16 @@ fun ChapterScreen(
     bookIndex: Int,
     chapterIndex: Int,
     navController: NavController,
-    openDrawer: (MenuType) -> Job,
+    openDrawer: (MenuType, Int) -> Job,
 ) {
-    val chapters =
-        verses.filter { it.bookIndex == bookIndex }.map { it.chapterIndex }.distinct();
-    val changeChapter = { c: Int ->
-        navController.navigate(route = "/books/${bookIndex}/chapters/${c}")
-    }
     val density = LocalDensity.current
+    var selectedVerseBounds: Rect by remember { mutableStateOf(Rect.Zero) }
+    var selectedVerses by rememberSaveable {
+        mutableStateOf(listOf<Int>())
+    }
+    var dragAmount by remember {
+        mutableFloatStateOf(0.0f)
+    }
     val state = remember {
         AnchoredDraggableState(
             initialValue = DragAnchors.Start,
@@ -109,7 +115,6 @@ fun ChapterScreen(
             animationSpec = tween(),
             confirmValueChange = {
                 if (it == DragAnchors.End) {
-                    changeChapter(chapterIndex + 1)
                     true
                 } else {
                     false
@@ -122,6 +127,36 @@ fun ChapterScreen(
     Scaffold(
         modifier = Modifier.fillMaxSize(),
     ) { innerPadding ->
+        if (selectedVerses.isNotEmpty()) {
+            Box(
+                Modifier
+                    .zIndex(99f)
+                    .offset {
+                        IntOffset(
+                            selectedVerseBounds.centerLeft.x.toInt() + 400,
+                            selectedVerseBounds.centerLeft.y.toInt() + 300,
+                        )
+                    }
+            ) {
+                Surface(
+                    modifier = Modifier
+                        .width(200.dp)
+                        .height(60.dp)
+                        .border(
+                            1.dp,
+                            Color.Black,
+                            RoundedCornerShape(0, 0, 0, 0),
+                        ),
+                ) {
+                    Text(
+                        modifier = Modifier
+                            .fillMaxWidth(),
+                        textAlign = TextAlign.Center,
+                        text = "Bottom app bar",
+                    )
+                }
+            }
+        }
         Column(
             modifier = Modifier
                 .fillMaxSize()
@@ -130,15 +165,35 @@ fun ChapterScreen(
                 .verticalScroll(rememberScrollState())
 //            .anchoredDraggable(state, Orientation.Horizontal, reverseDirection = true)
                 .pointerInput(Unit) {
+                    detectHorizontalDragGestures(
+                        onDragEnd = {
+//                            println("END " + dragAmount);
+                            if (dragAmount < 0) {
+                                val pair = Verse.getForwardPair(bookIndex, chapterIndex)
+                                navController.navigate(route = "/books/${pair.first}/chapters/${pair.second}")
+                            } else if (dragAmount > 0) {
+                                val pair = Verse.getBackwardPair(bookIndex, chapterIndex)
+                                val previousBook =
+                                    navController.currentBackStackEntry?.arguments?.getInt("book")
+                                        ?: 0
+                                val previousChapter =
+                                    navController.currentBackStackEntry?.arguments?.getInt("chapter")
+                                        ?: 0
+                                if (previousBook == pair.first && previousChapter == pair.second) {
+                                    navController.popBackStack(
+                                        route = "/books/${pair.first}/chapters/${pair.second}",
+                                        inclusive = false
+                                    )
+                                } else {
+                                    navController.popBackStack()
+                                }
+                            }
+                        },
-                    detectHorizontalDragGestures { change, dragAmount ->
+                        onHorizontalDrag = { change, da ->
+                            dragAmount = da
-                        change.consume()
+                            change.consume()
-                        if (dragAmount < -5) {
-                            changeChapter(chapterIndex - 1)
-                        }
-                        if (dragAmount < 5) {
-                            changeChapter(chapterIndex + 1)
                         }
-                    }
+                    )
                 }
         ) {
             Row(
@@ -149,15 +204,17 @@ fun ChapterScreen(
                 Row(
                     horizontalArrangement = Arrangement.Start,
                 ) {
-                    Surface(onClick = { openDrawer(MenuType.Book) }) {
+                    Surface(onClick = { openDrawer(MenuType.Book, bookIndex) }) {
+                        Text(
-                        Text(bookNames[bookIndex], style = TextStyle(
+                            Verse.bookNames[bookIndex], style = TextStyle(
-                            fontSize = 22.sp,
+                                fontSize = 22.sp,
-                            fontWeight = FontWeight.W500,
+                                fontWeight = FontWeight.W500,
-                            color = Color.Black,
+                                color = Color.Black,
-                        ))
+                            )
+                        )
                     }
-                    Surface(onClick = { openDrawer(MenuType.Chapter) }) {
+                    Surface(onClick = { openDrawer(MenuType.Chapter, bookIndex) }) {
                         Text(
                             "${chapterIndex + 1}", style = TextStyle(
                                 fontSize = 22.sp,
@@ -171,49 +228,81 @@ fun ChapterScreen(
                     modifier = Modifier.fillMaxWidth(),
                     horizontalArrangement = Arrangement.End,
                 ) {
-                    IconButton(onClick = {  }) {
+                    IconButton(onClick = { }) {
                         Icon(Icons.Outlined.MoreVert, "Close")
                     }
                 }
             }
-            chapterVerses.map {
+            chapterVerses.map { v ->
-                var isSelected by rememberSaveable {
+                val isSelected = selectedVerses.contains(v.verseIndex);
-                    mutableStateOf(false)
+                val background =
-                }
-                val background = if (isSelected) Color(0xFFEEEEEE) else MaterialTheme.colorScheme.background
+                    if (isSelected) Color(0xFFEEEEEE) else MaterialTheme.colorScheme.background
-                Surface(onClick = { isSelected = !isSelected }, interactionSource = MutableInteractionSource()) {
+                if (v.heading.isNotEmpty()) {
                     Text(
-                        modifier = Modifier.padding(bottom = 12.dp),
+                        modifier = Modifier.padding(
+                            top = if (v.verseIndex != 0) 12.dp else 0.dp,
+                            bottom = 12.dp
+                        ),
+                        style = TextStyle(
+                            fontFamily = fontFamily,
+                            fontSize = 16.sp,
+                            fontWeight = FontWeight.W700,
+                            color = Color.Black,
+                        ),
+                        text = v.heading.replace("<br>", "\n\n"),
+                    )
+                }
+                Text(
+                    modifier = Modifier
+                        .padding(bottom = 10.dp)
+                        .onGloballyPositioned { coordinates ->
+                            val boundsInWindow = coordinates.boundsInWindow()
+                            selectedVerseBounds = coordinates.boundsInWindow()
+                            println("boundsInWindow blx:" + boundsInWindow.bottomLeft.x.dp)
+                            println("boundsInWindow bly:" + boundsInWindow.bottomLeft.y.dp)
+//                            println("boundsInWindow brx:"+boundsInWindow.bottomRight.x)
+//                            println("boundsInWindow bry:"+boundsInWindow.bottomRight.y)
+                        }
+                        .pointerInput(Unit) {
+                            detectTapGestures(
+                                onTap = {
+                                    selectedVerses = if (selectedVerses.contains(v.verseIndex)) {
+                                        selectedVerses - v.verseIndex
+                                    } else {
+                                        selectedVerses + v.verseIndex
+                                    }
+                                }
+                            )
+                        },
-                        text = buildAnnotatedString {
+                    text = buildAnnotatedString {
-                            withStyle(
+                        withStyle(
-                                style = SpanStyle(
+                            style = SpanStyle(
-                                    background = background,
+                                background = background,
-                                    fontFamily = fontFamily,
+                                fontFamily = fontFamily,
-                                    fontSize = 14.sp,
+                                fontSize = 14.sp,
-                                    color = Color(0xFF9A1111),
+                                color = Color(0xFF9A1111),
 //                                    fontSize = if (it.verseIndex == 0) 24.sp else 14.sp,
-                                    fontWeight = FontWeight.W600,
+                                fontWeight = FontWeight.W600,
 //                                    color = if (it.verseIndex == 0) Color.Black else Color(0xFF9A1111),
-                                )
+                            )
-                            ) {
+                        ) {
-                                append("${it.verseIndex + 1} ")
+                            append("${v.verseIndex + 1} ")
 //                                append(if (it.verseIndex == 0) "${chapterIndex + 1} " else "${it.verseIndex + 1} ")
-                            }
-                            withStyle(
-                                style = SpanStyle(
-                                    background = background,
-//                                    fontFamily = fontFamily,
-                                    fontFamily = FontFamily.Serif,
-                                    fontSize = 15.sp,
-                                    fontWeight = FontWeight.W400,
-                                    color = Color.Black,
-                                )
-                            ) {
-                                append(it.text)
-                            }
                         }
+                        withStyle(
+                            style = SpanStyle(
+                                background = background,
+                                fontFamily = fontFamily,
+//                                    fontFamily = FontFamily.Serif,
+                                fontSize = 16.sp,
+                                fontWeight = FontWeight.Normal,
+                                color = Color.Black,
-                    )
+                            )
+                        ) {
+                            append(v.text)
-                }
+                        }
+                    }
+                )
             }
         }
     }

app/src/main/java/dev/pyros/bibleapp/Consts.kt DELETED Viewed

@@ -1,137 +0,0 @@
-val bookNames = listOf(
-    "Genesis",
-    "Exodus",
-    "Leviticus",
-    "Numbers",
-    "Deuteronomy",
-    "Joshua",
-    "Judges",
-    "Ruth",
-    "1 Samuel",
-    "2 Samuel",
-    "1 Kings",
-    "2 Kings",
-    "1 Chronicles",
-    "2 Chronicles",
-    "Ezra",
-    "Nehemiah",
-    "Esther",
-    "Job",
-    "Psalms",
-    "Proverbs",
-    "Ecclesiastes",
-    "Song of Solomon",
-    "Isaiah",
-    "Jeremiah",
-    "Lamentations",
-    "Ezekiel",
-    "Daniel",
-    "Hosea",
-    "Joel",
-    "Amos",
-    "Obadiah",
-    "Jonah",
-    "Micah",
-    "Nahum",
-    "Habakkuk",
-    "Zephaniah",
-    "Haggai",
-    "Zechariah",
-    "Malachi",
-    "Matthew",
-    "Mark",
-    "Luke",
-    "John",
-    "Acts",
-    "Romans",
-    "1 Corinthians",
-    "2 Corinthians",
-    "Galatians",
-    "Ephesians",
-    "Philippians",
-    "Colossians",
-    "1 Thessalonians",
-    "2 Thessalonians",
-    "1 Timothy",
-    "2 Timothy",
-    "Titus",
-    "Philemon",
-    "Hebrews",
-    "James",
-    "1 Peter",
-    "2 Peter",
-    "1 John",
-    "2 John",
-    "3 John",
-    "Jude",
-    "Revelation",
-)
-val chapterSizes = listOf(
-    50,
-    40,
-    27,
-    36,
-    34,
-    24,
-    21,
-    4,
-    31,
-    24,
-    22,
-    25,
-    29,
-    36,
-    10,
-    13,
-    10,
-    42,
-    150,
-    31,
-    12,
-    8,
-    66,
-    52,
-    5,
-    48,
-    12,
-    14,
-    3,
-    9,
-    1,
-    4,
-    7,
-    3,
-    3,
-    3,
-    2,
-    14,
-    4,
-    28,
-    16,
-    24,
-    21,
-    28,
-    16,
-    16,
-    13,
-    6,
-    6,
-    4,
-    4,
-    5,
-    3,
-    6,
-    4,
-    3,
-    1,
-    13,
-    5,
-    5,
-    3,
-    5,
-    1,
-    1,
-    1,
-    22
-)

app/src/main/java/dev/pyros/bibleapp/Drawer.kt CHANGED Viewed

@@ -1,7 +1,13 @@
 package dev.pyros.bibleapp
+import android.annotation.SuppressLint
+import android.util.Log
+import androidx.compose.foundation.background
+import androidx.compose.foundation.gestures.detectTapGestures
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
@@ -18,6 +24,8 @@ import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.DrawerDefaults
 import androidx.compose.material3.DrawerValue
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.ModalDrawerSheet
@@ -26,22 +34,27 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.rememberDrawerState
 import androidx.compose.runtime.Composable
 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.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.RectangleShape
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.navigation.NavController
-import bookNames
-import chapterSizes
+import androidx.navigation.NavOptions
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
@@ -92,77 +105,77 @@ fun NonlazyGrid(
     }
 }
-//@Composable
-//private fun DropDownSample() {
-//    var expanded by remember { mutableStateOf(false) }
-//    var touchPoint: Offset by remember { mutableStateOf(Offset.Zero) }
-//    val density = LocalDensity.current
-//
-//    BoxWithConstraints(
-//        Modifier
-//            .fillMaxSize()
-//            .background(Color.Cyan)
-//            .pointerInput(Unit) {
-//                detectTapGestures {
-//                    Log.d("TAG", "onCreate: ${it}")
-//                    touchPoint = it
-//                    expanded = true
-//
-//                }
-//
-//            }
-//    ) {
-//        val (xDp, yDp) = with(density) {
-//            (touchPoint.x.toDp()) to (touchPoint.y.toDp())
-//        }
-//        DropdownMenu(
-//            expanded = expanded,
-//            offset = DpOffset(xDp, -maxHeight + yDp),
-//            onDismissRequest = {
-//                expanded = false
-//            }
-//        ) {
-//
-//            DropdownMenuItem(
-//                onClick = {
-//                    expanded = false
-//                },
-//                interactionSource = MutableInteractionSource(),
-//                text = {
-//                    Text("Copy")
-//                }
-//            )
-//
-//            DropdownMenuItem(
-//                onClick = {
-//                    expanded = false
-//                },
-//                interactionSource = MutableInteractionSource(),
-//                text = {
-//                    Text("Get Balance")
-//                }
-//            )
-//        }
-//    }
-//}
+@SuppressLint("UnrememberedMutableInteractionSource")
+@Composable
+fun DropDownSample() {
+    var expanded by remember { mutableStateOf(false) }
+    var touchPoint: Offset by remember { mutableStateOf(Offset.Zero) }
+    val density = LocalDensity.current
+    BoxWithConstraints(
+        Modifier
+            .fillMaxSize()
+            .background(Color.Cyan)
+            .pointerInput(Unit) {
+                detectTapGestures {
+                    Log.d("TAG", "onCreate: ${it}")
+                    touchPoint = it
+                    expanded = true
+                }
+            }
+    ) {
+        val (xDp, yDp) = with(density) {
+            (touchPoint.x.toDp()) to (touchPoint.y.toDp())
+        }
+        DropdownMenu(
+            expanded = expanded,
+            offset = DpOffset(xDp, -maxHeight + yDp),
+            onDismissRequest = {
+                expanded = false
+            }
+        ) {
+            DropdownMenuItem(
+                onClick = {
+                    expanded = false
+                },
+                interactionSource = MutableInteractionSource(),
+                text = {
+                    Text("Copy")
+                }
+            )
+            DropdownMenuItem(
+                onClick = {
+                    expanded = false
+                },
+                interactionSource = MutableInteractionSource(),
+                text = {
+                    Text("Get Balance")
+                }
+            )
+        }
+    }
+}
 @Composable
 fun Drawer(
     navController: NavController,
-    bookIndex: Int,
-    setBookIndex: (Int) -> Unit,
-    content: @Composable ((MenuType) -> Job) -> Unit
+    content: @Composable ((MenuType, Int) -> Job) -> Unit
 ) {
     val scope = rememberCoroutineScope()
     val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed)
-    var localBookIndex by rememberSaveable {
+    var bookIndex by rememberSaveable {
-        mutableStateOf(bookIndex)
+        mutableIntStateOf(0)
     }
     var menuType by rememberSaveable {
         mutableStateOf(MenuType.Chapter)
     }
-    val openDrawer = { m: MenuType ->
+    val openDrawer = { m: MenuType, b: Int ->
         menuType = m
+        bookIndex = b
         scope.launch {
             drawerState.apply {
                 if (isClosed) open() else close()
@@ -216,8 +229,8 @@ fun Drawer(
                         items(
                             when (menuType) {
                                 MenuType.Bible -> 1
-                                MenuType.Book -> bookNames.size
+                                MenuType.Book -> Verse.bookNames.size
-                                MenuType.Chapter -> chapterSizes[bookIndex]
+                                MenuType.Chapter -> Verse.chapterSizes[bookIndex]
                             }
                         ) { c ->
                             Button(
@@ -233,12 +246,11 @@ fun Drawer(
                                         when (menuType) {
                                             MenuType.Bible -> ""
                                             MenuType.Book -> {
-                                                localBookIndex = c
+                                                bookIndex = c
                                                 menuType = MenuType.Chapter
-//                                                navController.navigate(route = "/books/${c}/chapters/0")
                                             }
                                             MenuType.Chapter -> {
-                                                navController.navigate(route = "/books/${localBookIndex}/chapters/${c}")
+                                                navController.navigate(route = "/books/${bookIndex}/chapters/${c}")
                                                 drawerState.close();
                                             }
                                         }
@@ -254,7 +266,7 @@ fun Drawer(
                                     ),
                                     text = when (menuType) {
                                         MenuType.Bible -> ""
-                                        MenuType.Book -> shortName(bookNames[c])
+                                        MenuType.Book -> shortName(Verse.bookNames[c])
                                         MenuType.Chapter -> "${c + 1}"
                                     }
                                 )

app/src/main/java/dev/pyros/bibleapp/MainActivity.kt CHANGED Viewed

@@ -1,48 +1,18 @@
 package dev.pyros.bibleapp
+import Verse
 import android.os.Bundle
 import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import bookNames
 import dev.pyros.bibleapp.ui.theme.BibleAppTheme
-import java.io.BufferedReader
-data class Verse(
-    val bookIndex: Int,
-    val bookName: String,
-    val chapterIndex: Int,
-    val verseIndex: Int,
-    val heading: String,
-    val text: String
-)
-fun parseBibleTxt(name: String, buffer: BufferedReader): List<Verse> {
-    Log.i("loading", "parsing bible $name")
-    return buffer.readLines().filter { it.isNotEmpty() }.map {
-        val arr = it.split("|")
-        val book = arr[0].toInt()
-        val chapter = arr[1].toInt()
-        val verseNo = arr[2].toInt()
-        val heading = arr[3]
-        val verseText = arr.subList(4, arr.size).joinToString("|")
-        Verse(
-            bookIndex = book,
-            bookName = bookNames[book],
-            chapterIndex = chapter,
-            verseIndex = verseNo,
-            heading = heading,
-            text = verseText,
-        )
-    }
-}
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
-        val verses = parseBibleTxt("English", assets.open("English.txt").bufferedReader())
+        val verses = Verse.parseFromBibleTxt("English", assets.open("English.txt").bufferedReader())
         setContent {
             BibleAppTheme {
                 AppHost(verses = verses)

app/src/main/java/dev/pyros/bibleapp/Model.kt ADDED Viewed

@@ -0,0 +1,195 @@
+import android.util.Log
+import java.io.BufferedReader
+data class Verse(
+    val bookIndex: Int,
+    val bookName: String,
+    val chapterIndex: Int,
+    val verseIndex: Int,
+    val heading: String,
+    val text: String,
+) {
+    fun isOldTestament() = bookIndex < 39;
+    fun isNewTestament() = bookIndex >= 39;
+    companion object {
+        val bookNames = listOf(
+            "Genesis",
+            "Exodus",
+            "Leviticus",
+            "Numbers",
+            "Deuteronomy",
+            "Joshua",
+            "Judges",
+            "Ruth",
+            "1 Samuel",
+            "2 Samuel",
+            "1 Kings",
+            "2 Kings",
+            "1 Chronicles",
+            "2 Chronicles",
+            "Ezra",
+            "Nehemiah",
+            "Esther",
+            "Job",
+            "Psalms",
+            "Proverbs",
+            "Ecclesiastes",
+            "Song of Solomon",
+            "Isaiah",
+            "Jeremiah",
+            "Lamentations",
+            "Ezekiel",
+            "Daniel",
+            "Hosea",
+            "Joel",
+            "Amos",
+            "Obadiah",
+            "Jonah",
+            "Micah",
+            "Nahum",
+            "Habakkuk",
+            "Zephaniah",
+            "Haggai",
+            "Zechariah",
+            "Malachi",
+            "Matthew",
+            "Mark",
+            "Luke",
+            "John",
+            "Acts",
+            "Romans",
+            "1 Corinthians",
+            "2 Corinthians",
+            "Galatians",
+            "Ephesians",
+            "Philippians",
+            "Colossians",
+            "1 Thessalonians",
+            "2 Thessalonians",
+            "1 Timothy",
+            "2 Timothy",
+            "Titus",
+            "Philemon",
+            "Hebrews",
+            "James",
+            "1 Peter",
+            "2 Peter",
+            "1 John",
+            "2 John",
+            "3 John",
+            "Jude",
+            "Revelation",
+        )
+        val chapterSizes = listOf(
+            50,
+            40,
+            27,
+            36,
+            34,
+            24,
+            21,
+            4,
+            31,
+            24,
+            22,
+            25,
+            29,
+            36,
+            10,
+            13,
+            10,
+            42,
+            150,
+            31,
+            12,
+            8,
+            66,
+            52,
+            5,
+            48,
+            12,
+            14,
+            3,
+            9,
+            1,
+            4,
+            7,
+            3,
+            3,
+            3,
+            2,
+            14,
+            4,
+            28,
+            16,
+            24,
+            21,
+            28,
+            16,
+            16,
+            13,
+            6,
+            6,
+            4,
+            4,
+            5,
+            3,
+            6,
+            4,
+            3,
+            1,
+            13,
+            5,
+            5,
+            3,
+            5,
+            1,
+            1,
+            1,
+            22
+        )
+        fun parseFromBibleTxt(name: String, buffer: BufferedReader): List<Verse> {
+            Log.i("loading", "parsing bible $name")
+            return buffer.readLines().filter { it.isNotEmpty() }.map {
+                val arr = it.split("|")
+                val book = arr[0].toInt()
+                val chapter = arr[1].toInt()
+                val verseNo = arr[2].toInt()
+                val heading = arr[3]
+                val verseText = arr.subList(4, arr.size).joinToString("|")
+                Verse(
+                    bookIndex = book,
+                    bookName = bookNames[book],
+                    chapterIndex = chapter,
+                    verseIndex = verseNo,
+                    heading = heading,
+                    text = verseText,
+                )
+            }
+        }
+        fun getForwardPair(book: Int, chapter: Int): Pair<Int, Int> {
+            val sizes = chapterSizes[book];
+            if (sizes > chapter + 1) {
+                return Pair(book, chapter + 1)
+            }
+            if (book + 1 < bookNames.size) {
+                return Pair(book + 1, 0)
+            }
+            return Pair(0, 0)
+        }
+        fun getBackwardPair(book: Int, chapter: Int): Pair<Int, Int> {
+            if (chapter - 1 >= 0) {
+                return Pair(book, chapter - 1)
+            }
+            if (book - 1 >= 0) {
+                return Pair(book-1, chapterSizes[book-1]-1)
+            }
+            return Pair(bookNames.size-1, chapterSizes[bookNames.size-1]-1)
+        }
+    }
+}

app/src/main/java/dev/pyros/bibleapp/Utils.kt ADDED Viewed

File without changes

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