Refactor copyToClipboard

AndBible · Aug 31, 2023 · 2975bda · 2975bda
1 parent 8721390
commit 2975bda
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/app/src/main/java/net/bible/android/view/activity/page/BibleView.kt b/app/src/main/java/net/bible/android/view/activity/page/BibleView.kt
@@ -222,11 +222,10 @@ class Selection(
         return VerseRange(v11n, Verse(v11n, startOrdinal), Verse(v11n, endOrdinal))
     }
 
-    fun copyToClipboard(context: Context) {
-        val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-        val clip = ClipData.newPlainText(verseRange?.name, CommonUtils.getShareableDocumentText(this))
-        clipboard.setPrimaryClip(clip)
-        ABEventBus.post(ToastEvent(context.getString(R.string.text_copied_to_clicpboard)))
+    fun copyToClipboard() {
+        CommonUtils.copyToClipboard(
+            ClipData.newPlainText(verseRange?.name, CommonUtils.getShareableDocumentText(this))
+        )
     }
 }
 
@@ -612,7 +611,7 @@ class BibleView(val mainBibleActivity: MainBibleActivity,
             currentSelection = null
             if (selection == null)
                 setCurrentSelection()
-            (currentSelection ?: selection)?.copyToClipboard(context)
+            (currentSelection ?: selection)?.copyToClipboard()
         }
     }
 

diff --git a/app/src/main/java/net/bible/android/view/activity/page/screen/SplitBibleArea.kt b/app/src/main/java/net/bible/android/view/activity/page/screen/SplitBibleArea.kt
@@ -852,12 +852,10 @@ class SplitBibleArea(private val mainBibleActivity: MainBibleActivity): FrameLay
                     val ordinal = window.pageManager.currentPage.anchorOrdinal?.start
 
                     val url = CommonUtils.makeAndBibleUrl(doc, key, ordinal)?: return@CommandPreference
-
-                    // Copy url to clipboard
-                    val clipboard = mainBibleActivity.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-                    val clip = ClipData.newPlainText(key.name, url)
-                    clipboard.setPrimaryClip(clip)
-                    ABEventBus.post(ToastEvent(mainBibleActivity.getString(R.string.reference_copied_to_clipboard)))
+                    CommonUtils.copyToClipboard(
+                        ClipData.newPlainText(key.name, url),
+                        R.string.reference_copied_to_clipboard
+                    )
                 },
             )
             R.id.windowMinimise -> CommandPreference(

diff --git a/app/src/main/java/net/bible/service/common/CommonUtils.kt b/app/src/main/java/net/bible/service/common/CommonUtils.kt
@@ -26,6 +26,8 @@ import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent
+import android.content.ClipData
+import android.content.ClipboardManager
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
@@ -94,8 +96,9 @@ import net.bible.android.activity.R
 import net.bible.android.activity.SpeakWidgetManager
 import net.bible.android.common.toV11n
 import net.bible.android.control.backup.BackupControl
+import net.bible.android.control.event.ABEventBus
+import net.bible.android.control.event.ToastEvent
 import net.bible.android.control.page.OrdinalRange
-import net.bible.android.control.page.window.Window
 import net.bible.android.control.page.window.WindowControl
 import net.bible.android.control.speak.SpeakControl
 import net.bible.android.control.versification.BibleTraverser
@@ -1572,6 +1575,11 @@ object CommonUtils : CommonUtilsBase() {
         return url
     }
 
+    fun copyToClipboard(clip: ClipData, toastMessage: Int = R.string.text_copied_to_clicpboard) {
+        val clipboard = application.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+        clipboard.setPrimaryClip(clip)
+        ABEventBus.post(ToastEvent(application.getString(toastMessage)))
+    }
 }
 
 const val CALC_NOTIFICATION_CHANNEL = "calc-notifications"