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.

45556897 — pyrossh

implement ShareKit

Files changed (6) hide show

composeApp/src/androidMain/kotlin/dev/pyrossh/only_bible_app/MainActivity.kt +1 -1
composeApp/src/androidMain/kotlin/dev/pyrossh/only_bible_app/Platform.android.kt +22 -19
composeApp/src/commonMain/kotlin/dev/pyrossh/only_bible_app/Platform.kt +3 -2
composeApp/src/commonMain/kotlin/dev/pyrossh/only_bible_app/composables/VerseText.kt +12 -5
composeApp/src/iosMain/kotlin/dev/pyrossh/only_bible_app/MainViewController.kt +23 -4
composeApp/src/iosMain/kotlin/dev/pyrossh/only_bible_app/Platform.ios.kt +12 -3

composeApp/src/androidMain/kotlin/dev/pyrossh/only_bible_app/MainActivity.kt CHANGED Viewed

@@ -19,8 +19,8 @@ class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
+        ShareKit.setActivityProvider { return@setActivityProvider this }
         if (savedInstanceState == null) {
             lifecycleScope.launch {
                 model.loadData(settings)

composeApp/src/androidMain/kotlin/dev/pyrossh/only_bible_app/Platform.android.kt CHANGED Viewed

@@ -1,5 +1,7 @@
 package dev.pyrossh.only_bible_app
+import android.app.Activity
+import android.app.Activity.RESULT_OK
 import android.content.Intent
 import android.view.SoundEffectConstants
 import androidx.activity.ComponentActivity
@@ -32,27 +34,28 @@ actual fun getScreenHeight(): Dp = LocalConfiguration.current.screenHeightDp.dp
 @Composable
 actual fun playClickSound() = LocalView.current.playSoundEffect(SoundEffectConstants.CLICK)
-@Composable
-actual fun  rememberShareVerses(): (verses: List<Verse>) -> Unit {
-    val context = LocalContext.current
-    return { verses ->
-        val versesThrough =
+actual object ShareKit {
-            if (verses.size >= 3) "${verses.first().verseIndex + 1}-${verses.last().verseIndex + 1}" else verses.map { it.verseIndex + 1 }
+    private var activityProvider: () -> Activity = {
-                .joinToString(",")
+        throw IllegalArgumentException(
-        val title = "${verses[0].bookName} ${verses[0].chapterIndex + 1}:${versesThrough}"
+            "You need to implement the 'activityProvider' to provide the required Activity. " +
-        val text = verses.joinToString("\n") {
+                    "Just make sure to set a valid activity using " +
-            it.text.replace("<span style=\"color:red;\">", "")
-                .replace("<em>", "")
-                .replace("</span>", "")
+                    "the 'setActivityProvider()' method."
-                .replace("</em>", "")
+        )
-        }
+    }
+    fun setActivityProvider(provider: () -> Activity) {
+        activityProvider = provider
+    }
+    actual fun shareText(text: String) {
-        val sendIntent = Intent().apply {
+        val intent = Intent(Intent.ACTION_SEND).apply {
-            action = Intent.ACTION_SEND
-            putExtra(Intent.EXTRA_TEXT, "${title}\n${text}")
             type = "text/plain"
+            putExtra(Intent.EXTRA_TEXT, text)
         }
-        val shareIntent = Intent.createChooser(sendIntent, null)
+        val intentChooser = Intent.createChooser(intent, null)
-        context.startActivity(shareIntent)
+        activityProvider.invoke().startActivity(intentChooser)
     }
 }

composeApp/src/commonMain/kotlin/dev/pyrossh/only_bible_app/Platform.kt CHANGED Viewed

@@ -15,8 +15,9 @@ expect fun getScreenHeight(): Dp
 @Composable
 expect fun playClickSound()
-@Composable
+expect object ShareKit {
-expect fun rememberShareVerses(): (verses: List<Verse>) -> Unit
+    fun shareText(text: String)
+}
 @Composable
 expect fun onThemeChange(themeType: ThemeType)

composeApp/src/commonMain/kotlin/dev/pyrossh/only_bible_app/composables/VerseText.kt CHANGED Viewed

@@ -50,6 +50,7 @@ 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 dev.pyrossh.only_bible_app.ShareKit
 import dev.pyrossh.only_bible_app.SpeechService
 import dev.pyrossh.only_bible_app.darkHighlights
 import dev.pyrossh.only_bible_app.domain.Verse
@@ -58,7 +59,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.IO
 import kotlinx.coroutines.launch
 import dev.pyrossh.only_bible_app.lightHighlights
-import dev.pyrossh.only_bible_app.rememberShareVerses
 import dev.pyrossh.only_bible_app.utils.SimpleParser
 import dev.pyrossh.only_bible_app.utils.TagNode
 import dev.pyrossh.only_bible_app.utils.TextNode
@@ -190,7 +190,6 @@ private fun Menu(
     val navController = LocalNavController.current
     val scope = rememberCoroutineScope()
     val selectedVerses by model.selectedVerses.collectAsState()
-    val shareVerses = rememberShareVerses()
     Popup(
         alignment = Alignment.TopCenter,
         offset = IntOffset(0, y = barYPosition),
@@ -274,9 +273,17 @@ private fun Menu(
                 }
                 IconButton(onClick = {
 //                    view.playSoundEffect(SoundEffectConstants.CLICK)
-                    shareVerses(
-                        selectedVerses.sortedBy { it.verseIndex },
+                    val verses = selectedVerses.sortedBy { it.verseIndex }
+                    val versesThrough =
+                        if (verses.size >= 3) "${verses.first().verseIndex + 1}-${verses.last().verseIndex + 1}" else verses.map { it.verseIndex + 1 }
+                            .joinToString(",")
+                    val title =
+                        "${verses[0].bookName} ${verses[0].chapterIndex + 1}:${versesThrough}"
+                    val text = verses.joinToString("\n") {
+                        it.text.replace("<red>", "")
+                            .replace("</red>", "")
-                    )
+                    }
+                    ShareKit.shareText("$title\n$text")
                     model.setSelectedVerses(listOf())
                 }) {
                     Icon(

composeApp/src/iosMain/kotlin/dev/pyrossh/only_bible_app/MainViewController.kt CHANGED Viewed

@@ -1,11 +1,30 @@
 package dev.pyrossh.only_bible_app
+import androidx.compose.ui.uikit.ComposeUIViewControllerDelegate
 import androidx.compose.ui.window.ComposeUIViewController
 import com.russhwolf.settings.NSUserDefaultsSettings
+import kotlinx.cinterop.ExperimentalForeignApi
+import platform.Foundation.NSNotification
+import platform.Foundation.NSNotificationCenter
-fun MainViewController() = ComposeUIViewController {
-    val settings = NSUserDefaultsSettings.Factory().create()
+val settings = NSUserDefaultsSettings.Factory().create()
-    val model = AppViewModel()
+val model = AppViewModel()
+@OptIn(ExperimentalForeignApi::class)
+fun MainViewController() = ComposeUIViewController(configure = {
+    delegate = object : ComposeUIViewControllerDelegate {
+        override fun viewWillAppear(animated: Boolean) {
+            super.viewWillAppear(animated)
-    model.loadData(settings)
+            model.loadData(settings)
+            NSNotificationCenter.defaultCenter.addObserver(this)
+        }
+        override fun viewWillDisappear(animated: Boolean) {
+            super.viewWillDisappear(animated)
+            model.saveData(settings)
+        }
+    }
+}) {
     App(model = model)
 }

composeApp/src/iosMain/kotlin/dev/pyrossh/only_bible_app/Platform.ios.kt CHANGED Viewed

@@ -10,6 +10,8 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import dev.pyrossh.only_bible_app.config.BuildKonfig
 import dev.pyrossh.only_bible_app.domain.Verse
+import platform.UIKit.UIActivityViewController
+import platform.UIKit.UIApplication
 import platform.UIKit.UIScreen
 import theme.darkScheme
 import theme.lightScheme
@@ -32,9 +34,16 @@ actual fun playClickSound() {
 //    AudioServicesPlayAlertSound(SystemSoundID(1322))
 }
-@Composable
-actual fun  rememberShareVerses(): (verses: List<Verse>) -> Unit {
-    return { verses ->
+actual object ShareKit {
+    actual fun shareText(text: String) {
+        val currentViewController = UIApplication.sharedApplication().keyWindow?.rootViewController
+        val activityViewController = UIActivityViewController(listOf(text), null)
+        currentViewController?.presentViewController(
+            viewControllerToPresent = activityViewController,
+            animated = true,
+            completion = null
+        )
     }
 }

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