diff --git a/app/src/main/java/io/nekohasekai/sagernet/ui/AboutFragment.kt b/app/src/main/java/io/nekohasekai/sagernet/ui/AboutFragment.kt
index 597d23b1e..4fd8f882a 100644
--- a/app/src/main/java/io/nekohasekai/sagernet/ui/AboutFragment.kt
+++ b/app/src/main/java/io/nekohasekai/sagernet/ui/AboutFragment.kt
@@ -8,7 +8,6 @@ import android.os.Build
import android.os.Bundle
import android.os.PowerManager
import android.provider.Settings
-import android.text.util.Linkify
import android.view.View
import android.widget.Toast
import androidx.activity.result.component1
@@ -22,7 +21,6 @@ import com.danielstone.materialaboutlibrary.model.MaterialAboutCard
import com.danielstone.materialaboutlibrary.model.MaterialAboutList
import io.nekohasekai.sagernet.BuildConfig
import io.nekohasekai.sagernet.R
-import io.nekohasekai.sagernet.databinding.LayoutAboutBinding
import io.nekohasekai.sagernet.ktx.*
import io.nekohasekai.sagernet.plugin.PluginManager.loadString
import io.nekohasekai.sagernet.utils.PackageCache
@@ -41,22 +39,12 @@ class AboutFragment : ToolbarFragment(R.layout.layout_about) {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
- val binding = LayoutAboutBinding.bind(view)
-
ViewCompat.setOnApplyWindowInsetsListener(view, ListListener)
toolbar.setTitle(R.string.menu_about)
parentFragmentManager.beginTransaction()
.replace(R.id.about_fragment_holder, AboutContent())
.commitAllowingStateLoss()
-
- runOnDefaultDispatcher {
- val license = view.context.assets.open("LICENSE").bufferedReader().readText()
- onMainDispatcher {
- binding.license.text = license
- Linkify.addLinks(binding.license, Linkify.EMAIL_ADDRESSES or Linkify.WEB_URLS)
- }
- }
}
class AboutContent : MaterialAboutFragment() {
@@ -83,7 +71,7 @@ class AboutFragment : ToolbarFragment(R.layout.layout_about) {
.subText(SagerNet.appVersionNameForDisplay)
.setOnClickAction {
requireContext().launchCustomTab(
- "https://github.com/MatsuriDayo/NekoBoxForAndroid/releases"
+ "https://github.com/hawkff/NekoBoxForAndroid/releases"
)
}
.build())
@@ -108,17 +96,6 @@ class AboutFragment : ToolbarFragment(R.layout.layout_about) {
.subText(Libcore.versionBox())
.setOnClickAction { }
.build())
- .addItem(
- MaterialAboutActionItem.Builder()
- .icon(R.drawable.ic_baseline_card_giftcard_24)
- .text(R.string.donate)
- .subText(R.string.donate_info)
- .setOnClickAction {
- requireContext().launchCustomTab(
- "https://matsuridayo.github.io/index_docs/#donate"
- )
- }
- .build())
.apply {
PackageCache.awaitLoadSync()
for ((_, pkg) in PackageCache.installedPluginPackages) {
@@ -173,32 +150,6 @@ class AboutFragment : ToolbarFragment(R.layout.layout_about) {
}
}
.build())
- .addCard(
- MaterialAboutCard.Builder()
- .outline(true)
- .title(R.string.project)
- .addItem(
- MaterialAboutActionItem.Builder()
- .icon(R.drawable.ic_baseline_sanitizer_24)
- .text(R.string.github)
- .setOnClickAction {
- requireContext().launchCustomTab(
- "https://github.com/MatsuriDayo/NekoBoxForAndroid"
-
- )
- }
- .build())
- .addItem(
- MaterialAboutActionItem.Builder()
- .icon(R.drawable.ic_qu_shadowsocks_foreground)
- .text(R.string.telegram)
- .setOnClickAction {
- requireContext().launchCustomTab(
- "https://t.me/MatsuriDayo"
- )
- }
- .build())
- .build())
.build()
}
@@ -224,9 +175,9 @@ class AboutFragment : ToolbarFragment(R.layout.layout_about) {
}
val response = client.newRequest().apply {
if (checkPreview) {
- setURL("https://api.github.com/repos/starifly/NekoBoxForAndroid/releases/tags/preview")
+ setURL("https://api.github.com/repos/hawkff/NekoBoxForAndroid/releases/tags/preview")
} else {
- setURL("https://api.github.com/repos/starifly/NekoBoxForAndroid/releases/latest")
+ setURL("https://api.github.com/repos/hawkff/NekoBoxForAndroid/releases/latest")
}
}.execute()
val release = JSONObject(Util.getStringBox(response.contentString))
diff --git a/app/src/main/java/io/nekohasekai/sagernet/ui/MainActivity.kt b/app/src/main/java/io/nekohasekai/sagernet/ui/MainActivity.kt
index e817ac5bc..0b727a47d 100644
--- a/app/src/main/java/io/nekohasekai/sagernet/ui/MainActivity.kt
+++ b/app/src/main/java/io/nekohasekai/sagernet/ui/MainActivity.kt
@@ -294,10 +294,7 @@ class MainActivity : ThemedActivity(),
.setPositiveButton(R.string.action_download) { _, _ ->
showDownloadDialog(pluginEntity)
}
- .setNeutralButton(android.R.string.cancel, null)
- .setNeutralButton(R.string.action_learn_more) { _, _ ->
- launchCustomTab("https://matsuridayo.github.io/nb4a-plugin/")
- }
+ .setNegativeButton(android.R.string.cancel, null)
.show()
}
@@ -366,11 +363,6 @@ class MainActivity : ThemedActivity(),
R.id.nav_traffic -> displayFragment(WebviewFragment())
R.id.nav_tools -> displayFragment(ToolsFragment())
R.id.nav_logcat -> displayFragment(LogcatFragment())
- R.id.nav_faq -> {
- launchCustomTab("https://matsuridayo.github.io/")
- return false
- }
-
R.id.nav_about -> displayFragment(AboutFragment())
else -> return false
diff --git a/app/src/main/res/layout/layout_about.xml b/app/src/main/res/layout/layout_about.xml
index c3a5c23f2..eee1f24f5 100644
--- a/app/src/main/res/layout/layout_about.xml
+++ b/app/src/main/res/layout/layout_about.xml
@@ -58,39 +58,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/menu/main_drawer_menu.xml b/app/src/main/res/menu/main_drawer_menu.xml
index 040e8e002..ece8ec746 100644
--- a/app/src/main/res/menu/main_drawer_menu.xml
+++ b/app/src/main/res/menu/main_drawer_menu.xml
@@ -43,10 +43,6 @@
-