only-bible-app

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

715bdfa9 — pyrossh

remove context in AppViewModel

Files changed (6) hide show

app/build.gradle.kts CHANGED Viewed

@@ -60,12 +60,6 @@ android {
     buildFeatures {
         compose = true
         buildConfig = true
-        testOptions {
-            emulatorControl {
-                enable = true
-            }
-        }
     }
     packaging {
         resources {
@@ -75,9 +69,6 @@ android {
     kotlinOptions {
         jvmTarget = JavaLanguageVersion.of(17).toString()
     }
-    androidResources {
-        generateLocaleConfig = true
-    }
 }
 composeCompiler {

app/src/main/AndroidManifest.xml CHANGED Viewed

@@ -14,25 +14,16 @@
         android:label="@string/app_name"
         android:icon="@mipmap/ic_launcher"
         android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
+        android:supportsRtl="true">
-        android:theme="@style/Theme.AppCompat.DayNight.NoActionBar">
         <activity
             android:name=".MainActivity"
             android:configChanges="uiMode"
             android:exported="true"
-            android:theme="@style/Theme.AppCompat.DayNight.NoActionBar">
+            android:theme="@style/Theme.MaterialComponents.DayNight.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <service
-            android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
-            android:enabled="false"
-            android:exported="false">
-            <meta-data
-                android:name="autoStoreLocales"
-                android:value="true" />
-        </service>
     </application>
 </manifest>

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

@@ -1,4 +1,4 @@
-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|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/AppViewModel.kt CHANGED Viewed

@@ -1,6 +1,5 @@
 package dev.pyrossh.onlyBible
-import android.app.Application
 import android.app.UiModeManager
 import android.content.Context
 import android.content.Context.MODE_PRIVATE
@@ -12,7 +11,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
-import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.microsoft.cognitiveservices.speech.SpeechConfig
 import com.microsoft.cognitiveservices.speech.SpeechSynthesisEventArgs
@@ -34,9 +33,7 @@ import kotlinx.coroutines.launch
 import org.json.JSONObject
 import java.io.IOException
-class AppViewModel(application: Application) : AndroidViewModel(application) {
+class AppViewModel : ViewModel() {
-    private val context
-        get() = getApplication<Application>()
     val speechService = SpeechSynthesizer(
         SpeechConfig.fromSubscription(
             BuildConfig.subscriptionKey,
@@ -128,7 +125,7 @@ class AppViewModel(application: Application) : AndroidViewModel(application) {
         showBottomSheet = false
     }
-    fun setApplicationNightMode(v: Int) {
+    fun setApplicationNightMode(context: Context, v: Int) {
         val uiModeManager = context.getSystemService(UI_MODE_SERVICE) as UiModeManager
         uiModeManager.setApplicationNightMode(v)
         nightMode = v

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

@@ -35,6 +35,7 @@ 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.LocalContext
 import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
@@ -49,6 +50,7 @@ import kotlinx.coroutines.launch
 @OptIn(ExperimentalMaterial3Api::class)
 fun TextSettingsBottomSheet(model: AppViewModel = viewModel()) {
     val view = LocalView.current
+    val context = LocalContext.current
     val scope = rememberCoroutineScope()
     val sheetState = rememberModalBottomSheetState()
     return ModalBottomSheet(
@@ -268,7 +270,7 @@ fun TextSettingsBottomSheet(model: AppViewModel = viewModel()) {
                             scope.launch {
                                 sheetState.hide()
                                 model.closeSheet()
-                                model.setApplicationNightMode(it)
+                                model.setApplicationNightMode(context, it)
                             }
                         }
                     ) {

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

@@ -30,7 +30,7 @@ fun VerseHeading(
 ) {
     val view = LocalView.current
     Text(
-        modifier = Modifier.padding(bottom = 24.dp),
+        modifier = Modifier.padding(bottom = 12.dp),
         style = TextStyle(
             fontFamily = fontType.family(),
             fontSize = (16 + fontSizeDelta).sp,