purgatory/ClashMetaForAndroid
1
0
Fork 0
mirror of https://github.com/MetaCubeX/ClashMetaForAndroid.git synced 2025-02-22 01:33:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

app: refine LogsActivity & LogcatActivity (#431)

Browse Source
This commit is contained in:
5ec1cff 2025-01-22 10:07:37 +08:00 committed by GitHub
parent 9fd394d7c5
commit 64a69e6627
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/github/kr328/clash/LogcatActivity.kt
View File

@ -112,7 +112,7 @@ class LogcatActivity : BaseActivity<LogcatDesign>() {
when (it) { when (it) {
LogcatDesign.Request.Close -> { LogcatDesign.Request.Close -> {
stopService(LogcatService::class.intent) stopService(LogcatService::class.intent)
startActivity(LogsActivity::class.intent)
finish() finish()
} }
else -> Unit else -> Unit

6
app/src/main/java/com/github/kr328/clash/LogsActivity.kt
View File

@ -11,11 +11,8 @@ import kotlinx.coroutines.selects.select
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
class LogsActivity : BaseActivity<LogsDesign>() { class LogsActivity : BaseActivity<LogsDesign>() {
override suspend fun main() {
if (LogcatService.running) {
return startActivity(LogcatActivity::class.intent)
}
override suspend fun main() {
val design = LogsDesign(this) val design = LogsDesign(this)
setContentDesign(design) setContentDesign(design)
@ -38,7 +35,6 @@ class LogsActivity : BaseActivity<LogsDesign>() {
when (it) { when (it) {
LogsDesign.Request.StartLogcat -> { LogsDesign.Request.StartLogcat -> {
startActivity(LogcatActivity::class.intent) startActivity(LogcatActivity::class.intent)
finish() finish()
} }
LogsDesign.Request.DeleteAll -> { LogsDesign.Request.DeleteAll -> {

9
app/src/main/java/com/github/kr328/clash/MainActivity.kt
View File

@ -59,8 +59,13 @@ class MainActivity : BaseActivity<MainDesign>() {
startActivity(ProfilesActivity::class.intent) startActivity(ProfilesActivity::class.intent)
MainDesign.Request.OpenProviders -> MainDesign.Request.OpenProviders ->
startActivity(ProvidersActivity::class.intent) startActivity(ProvidersActivity::class.intent)
MainDesign.Request.OpenLogs -> MainDesign.Request.OpenLogs -> {
startActivity(LogsActivity::class.intent) if (LogcatService.running) {
startActivity(LogcatActivity::class.intent)
} else {
startActivity(LogsActivity::class.intent)
}
}
MainDesign.Request.OpenSettings -> MainDesign.Request.OpenSettings ->
startActivity(SettingsActivity::class.intent) startActivity(SettingsActivity::class.intent)
MainDesign.Request.OpenHelp -> MainDesign.Request.OpenHelp ->