Unified start URL calls

Author: sakusaku3939

app/src/main/java/com/example/deeplviewer/activity/FloatingTextSelection.kt

@@ -10,7 +10,7 @@ import android.webkit.WebView
 import androidx.appcompat.app.AppCompatActivity
 import com.example.deeplviewer.R
 import com.example.deeplviewer.config.WebViewConfig
-import com.example.deeplviewer.helper.WebViewUrlHelper
+import com.example.deeplviewer.helper.UrlHelper
 import com.example.deeplviewer.webview.MyWebViewClient
 import com.example.deeplviewer.webview.NestedScrollWebView
 import com.example.deeplviewer.webview.WebAppInterface
@@ -22,27 +22,13 @@ class FloatingTextSelection : AppCompatActivity() {
     private lateinit var webView: WebView
     private lateinit var webViewClient: MyWebViewClient
     private lateinit var layout: View
-
-    private val startUrl by lazy {
-        val configPrefs = getSharedPreferences("config", Context.MODE_PRIVATE)
-        val urlParam = configPrefs.getString(
-            "urlParam",
-            DEFAULT_PARAM
-        ) ?: DEFAULT_PARAM
-        val pageType = configPrefs.getString("pageType", DEFAULT_PAGE_TYPE) ?: DEFAULT_PAGE_TYPE
-
-        ORIGIN_URL + pageType + urlParam
-    }
-
-    companion object {
-        private const val ORIGIN_URL = "https://www.deepl.com/"
-        private const val DEFAULT_PARAM = "#en/en/"
-        private const val DEFAULT_PAGE_TYPE = "translator"
-    }
+    private lateinit var startUrl: String
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        startUrl = UrlHelper.buildStartUrl(this)
+
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
             val androidTranslateFloatingText =
                 if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
@@ -104,7 +90,7 @@ class FloatingTextSelection : AppCompatActivity() {
         showBottomSheetDialog()
 
         // Load the initial URL
-        val targetUrl = WebViewUrlHelper.buildUrl(startUrl, initialText)
+        val targetUrl = UrlHelper.buildWebViewUrl(startUrl, initialText)
         webView.loadUrl(targetUrl)
     }
 

app/src/main/java/com/example/deeplviewer/activity/MainActivity.kt

@@ -8,39 +8,28 @@ import android.util.Log
 import android.webkit.WebView
 import android.widget.ImageButton
 import androidx.appcompat.app.AppCompatActivity
-import com.example.deeplviewer.helper.CookieManagerHelper
-import com.example.deeplviewer.webview.MyWebViewClient
+import androidx.core.content.edit
 import com.example.deeplviewer.R
 import com.example.deeplviewer.config.WebViewConfig
-import com.example.deeplviewer.helper.WebViewUrlHelper
+import com.example.deeplviewer.helper.CookieManagerHelper
+import com.example.deeplviewer.helper.UrlHelper
+import com.example.deeplviewer.webview.MyWebViewClient
 import com.example.deeplviewer.webview.WebAppInterface
-import androidx.core.content.edit
 
 class MainActivity : AppCompatActivity() {
     private lateinit var webView: WebView
     private lateinit var webViewClient: MyWebViewClient
-
-    private val startUrl by lazy {
-        val configPrefs = getSharedPreferences("config", Context.MODE_PRIVATE)
-        val urlParam = configPrefs.getString("urlParam", DEFAULT_PARAM) ?: DEFAULT_PARAM
-        val pageType = configPrefs.getString("pageType", DEFAULT_PAGE_TYPE) ?: DEFAULT_PAGE_TYPE
-
-        ORIGIN_URL + pageType + urlParam
-    }
+    private lateinit var startUrl: String
 
     val testWebViewClient: MyWebViewClient?
         get() = if (::webViewClient.isInitialized) webViewClient else null
 
-    companion object {
-        private const val ORIGIN_URL = "https://www.deepl.com/"
-        private const val DEFAULT_PARAM = "#en/en/"
-        private const val DEFAULT_PAGE_TYPE = "translator"
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
+        startUrl = UrlHelper.buildStartUrl(this)
+
         initializeWebView()
         createWebView(intent, savedInstanceState)
         setupSettingsButton()
@@ -78,7 +67,7 @@ class MainActivity : AppCompatActivity() {
         webView.addJavascriptInterface(WebAppInterface(this), "Android")
 
         // Load the initial URL
-        val targetUrl = WebViewUrlHelper.buildUrl(startUrl, receivedText)
+        val targetUrl = UrlHelper.buildWebViewUrl(startUrl, receivedText)
         webView.loadUrl(targetUrl)
     }
 

app/src/main/java/com/example/deeplviewer/helper/UrlHelper.kt

@@ -0,0 +1,37 @@
+package com.example.deeplviewer.helper
+
+import android.content.Context
+import android.net.Uri
+
+object UrlHelper {
+    /**
+     * Builds the start URL for the DeepL translator based on the provided parameters
+     */
+    fun buildStartUrl(
+        context: Context,
+        originUrl: String = "https://www.deepl.com/",
+        pageType: String = "translator",
+        urlParam: String = "#en/en/"
+    ): String {
+        val configPrefs = context.getSharedPreferences("config", Context.MODE_PRIVATE)
+        val buildPageType = configPrefs.getString("pageType", pageType)
+            ?: pageType
+        val buildUrlParam = configPrefs.getString(
+            "urlParam",
+            urlParam
+        ) ?: urlParam
+
+        return "$originUrl$buildPageType$buildUrlParam"
+    }
+
+    /**
+     * Builds a URL for the WebView based on the provided start URL and text
+     */
+    fun buildWebViewUrl(startUrl: String, text: String): String {
+        if (text.isEmpty()) return startUrl
+
+        val processedText = text.replace("/", "\\/")
+        val encodedText = Uri.encode(processedText)
+        return "$startUrl$encodedText"
+    }
+}