Browse Source

Refine custom tab

世界 4 years ago
parent
commit
10361c2f73

+ 0 - 3
.idea/misc.xml

@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectPlainTextFileTypeManager">
-    <file url="file://$PROJECT_DIR$/README.md" />
-  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>

+ 2 - 0
app/src/main/java/io/nekohasekai/sagernet/ktx/Asyncs.kt

@@ -19,6 +19,8 @@
  *                                                                            *
  ******************************************************************************/
 
+@file:Suppress("EXPERIMENTAL_API_USAGE")
+
 package io.nekohasekai.sagernet.ktx
 
 import kotlinx.coroutines.*

+ 2 - 2
app/src/main/java/io/nekohasekai/sagernet/ktx/Browsers.kt

@@ -27,7 +27,7 @@ import androidx.browser.customtabs.CustomTabColorSchemeParams
 import androidx.browser.customtabs.CustomTabsIntent
 import io.nekohasekai.sagernet.R
 
-fun Context.launchCustomTab(uri: Uri) {
+fun Context.launchCustomTab(link: String) {
     CustomTabsIntent.Builder().apply {
         setColorScheme(CustomTabsIntent.COLOR_SCHEME_SYSTEM)
         setColorSchemeParams(
@@ -42,5 +42,5 @@ fun Context.launchCustomTab(uri: Uri) {
                 setToolbarColor(loadColor(R.attr.colorPrimary))
             }.build()
         )
-    }.build().launchUrl(this, uri)
+    }.build().launchUrl(this, Uri.parse(link))
 }

+ 2 - 8
app/src/main/java/io/nekohasekai/sagernet/ui/AboutFragment.kt

@@ -133,9 +133,7 @@ class AboutFragment : ToolbarFragment(R.layout.layout_about) {
                         .subText(versionName)
                         .setOnClickAction {
                             requireContext().launchCustomTab(
-                                Uri.parse(
                                     "https://github.com/SagerNet/SagerNet/releases"
-                                )
                             )
                         }
                         .build()
@@ -188,9 +186,8 @@ class AboutFragment : ToolbarFragment(R.layout.layout_about) {
                                     .subText(R.string.donate_info)
                                     .setOnClickAction {
                                         requireContext().launchCustomTab(
-                                            Uri.parse(
                                                 "https://liberapay.com/nekohasekai/donate"
-                                            )
+
                                         )
                                     }
                                     .build()
@@ -207,9 +204,8 @@ class AboutFragment : ToolbarFragment(R.layout.layout_about) {
                         .text(R.string.github)
                         .setOnClickAction {
                             requireContext().launchCustomTab(
-                                Uri.parse(
                                     "https://github.com/SagerNet/SagerNet"
-                                )
+
                             )
                         }
                         .build()
@@ -219,9 +215,7 @@ class AboutFragment : ToolbarFragment(R.layout.layout_about) {
                         .text(R.string.telegram)
                         .setOnClickAction {
                             requireContext().launchCustomTab(
-                                Uri.parse(
                                     "https://t.me/SagerNet"
-                                )
                             )
                         }
                         .build())

+ 1 - 2
app/src/main/java/io/nekohasekai/sagernet/ui/RouteFragment.kt

@@ -22,7 +22,6 @@
 package io.nekohasekai.sagernet.ui
 
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.view.MenuItem
 import android.view.View
@@ -291,7 +290,7 @@ class RouteFragment : ToolbarFragment(R.layout.layout_route), Toolbar.OnMenuItem
         inner class DocumentHolder(val view: View) : RecyclerView.ViewHolder(view) {
             fun bind() {
                 view.setOnClickListener {
-                    it.context.launchCustomTab(Uri.parse("https://www.v2fly.org/config/routing.html#ruleobject"))
+                    it.context.launchCustomTab("https://www.v2fly.org/config/routing.html#ruleobject")
                 }
             }
         }