Skip to content

Remove dead upstream links; trim About screen #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hawkff merged 2 commits into from
Jun 21, 2026
Merged

Remove dead upstream links; trim About screen #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43aff6f
chore(ui): remove dead upstream links; trim About screen
hawkff Jun 21, 2026
8557388
review: point update check at hawkff releases (match version link)
hawkff Jun 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 3 additions & 52 deletions app/src/main/java/io/nekohasekai/sagernet/ui/AboutFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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() {
Expand All @@ -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"
Comment thread
hawkff marked this conversation as resolved.
)
}
.build())
Expand All @@ -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) {
Expand Down Expand Up @@ -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()

}
Expand All @@ -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))
Expand Down
10 changes: 1 addition & 9 deletions app/src/main/java/io/nekohasekai/sagernet/ui/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}

Expand Down Expand Up @@ -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
Expand Down
33 changes: 0 additions & 33 deletions app/src/main/res/layout/layout_about.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,39 +58,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />

<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="16dp">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/license"
android:textAppearance="?attr/textAppearanceSubtitle2" />

<TextView
android:id="@+id/license"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:textAppearance="?attr/textAppearanceBody2"
android:textColor="?android:textColorSecondary"
android:textIsSelectable="true"
android:textSize="12sp" />

</LinearLayout>

</com.google.android.material.card.MaterialCardView>

</LinearLayout>

</androidx.core.widget.NestedScrollView>
Expand Down
4 changes: 0 additions & 4 deletions app/src/main/res/menu/main_drawer_menu.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@
<group
android:id="@+id/about"
android:checkableBehavior="single">
<item
android:id="@+id/nav_faq"
android:icon="@drawable/ic_device_data_usage"
android:title="@string/document" />
<item
android:id="@+id/nav_about"
android:icon="@drawable/ic_baseline_info_24"
Expand Down
Loading