Automatic merge branch 'current-stable' into 'develop'

AndBible · Feb 20, 2025 · 2dfd914 · 2dfd914
2 parents a3b3805 + 176a7d8
commit 2dfd914
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 5 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -19,8 +19,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:installLocation="auto"
-    android:versionCode="846"
-    android:versionName="5.0.846">
+    android:versionCode="847"
+    android:versionName="5.0.847">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" android:minSdkVersion="24"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="28" />

diff --git a/app/src/main/java/net/bible/service/cloudsync/CloudSync.kt b/app/src/main/java/net/bible/service/cloudsync/CloudSync.kt
@@ -82,8 +82,8 @@ enum class CloudAdapters(val isEnabled: Boolean = true) {
         val allEnabled: List<CloudAdapters> get() = CloudAdapters.entries.filter { it.isEnabled }
         var current: CloudAdapters
             get() {
-                val adapterStr = CommonUtils.settings.getString("sync_adapter", "GOOGLE_DRIVE")!!
-                return CloudAdapters.valueOf(adapterStr)
+                val adapterStr = CommonUtils.settings.getString("sync_adapter")
+                return adapterStr?.let { CloudAdapters.valueOf(it) }?: allEnabled.first()
             }
             set(value) {
                 CommonUtils.settings.setString("sync_adapter", value.name)

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -42,7 +42,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:8.8.0")
+        classpath("com.android.tools.build:gradle:8.8.1")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21")
         classpath("org.jetbrains.kotlin:kotlin-serialization:$kotlinVersion")
 

diff --git a/fastlane/metadata/android/en-US/changelogs/5.0.847.txt b/fastlane/metadata/android/en-US/changelogs/5.0.847.txt
@@ -0,0 +1,19 @@
+- NextCloud support for Device Synchronization
+- Add page number text option
+- Settings & improvements for e-ink devices like Onyx Boox (#3354):
+   1) Setting to turn off animations
+   2) Setting to set app to monochrome mode
+   3) Setting to set a font multiplier
+   4) Setting to adjust swipe action in bible view
+
+5.0
+"What's new" video: https://youtu.be/bf33j4tLbxQ
+
+Highlights:
+- Support for EPUB electronic book format
+- Bookmarks for non-bible documents
+- Cloud synchronize (via Google drive currently)
+- MyBible / MySword modules
+
+See new AndBible website & blog: https://andbible.org
+Support development financially: https://shop.andbible.org/