katekate/v2rayNG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2543 from yuhan6665/rprx-ui

Browse Source 
Unified base activity for status bar icon color
This commit is contained in:
2dust
2023-09-30 14:26:28 +08:00
committed by GitHub
parent 59bd7128ae 52416dd43d
commit c401d63d2f
12 changed files with 15 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/BaseActivity.kt
View File

@@ -2,13 +2,25 @@ package com.v2ray.ang.ui
import android.content.Context
import android.os.Build
import android.os.Bundle
import android.view.MenuItem
import androidx.annotation.RequiresApi
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.WindowCompat
import com.v2ray.ang.util.MyContextWrapper
import com.v2ray.ang.util.Utils
abstract class BaseActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
if (!Utils.getDarkModeStatus(this)) {
WindowCompat.getInsetsController(window, window.decorView).apply {
isAppearanceLightStatusBars = true
}
}
}
override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
android.R.id.home -> {
onBackPressed()

7
V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/LogcatActivity.kt
View File

@@ -25,13 +25,12 @@ class LogcatActivity : BaseActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
binding = ActivityLogcatBinding.inflate(layoutInflater)
val view = binding.root
setContentView(view)
binding = ActivityLogcatBinding.inflate(layoutInflater)
val view = binding.root
setContentView(view)
title = getString(R.string.title_logcat)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
logcat(false)
}

6
V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt
View File

@@ -25,7 +25,6 @@ import android.widget.Toast
import androidx.activity.result.contract.ActivityResultContracts
import androidx.activity.viewModels
import androidx.appcompat.app.AlertDialog
import androidx.core.view.WindowCompat
import androidx.lifecycle.lifecycleScope
import com.tencent.mmkv.MMKV
import com.v2ray.ang.AppConfig.ANG_PACKAGE
@@ -66,11 +65,6 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
setContentView(view)
title = getString(R.string.title_server)
setSupportActionBar(binding.toolbar)
if (!Utils.getDarkModeStatus(this)) {
WindowCompat.getInsetsController(window, window.decorView).apply {
isAppearanceLightStatusBars = true
}
}
binding.fab.setOnClickListener {
if (mainViewModel.isRunning.value == true) {

2
V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/PerAppProxyActivity.kt
View File

@@ -41,8 +41,6 @@ class PerAppProxyActivity : BaseActivity() {
val view = binding.root
setContentView(view)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
val dividerItemDecoration = DividerItemDecoration(this, LinearLayoutManager.VERTICAL)
binding.recyclerView.addItemDecoration(dividerItemDecoration)

1
V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/RoutingSettingsActivity.kt
View File

@@ -21,7 +21,6 @@ class RoutingSettingsActivity : BaseActivity() {
setContentView(view)
title = getString(R.string.title_pref_routing_custom)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
val fragments = ArrayList<Fragment>()
fragments.add(RoutingSettingsFragment().newInstance(AppConfig.PREF_V2RAY_ROUTING_AGENT))

10
V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ScannerActivity.kt
View File

@@ -31,16 +31,6 @@ class ScannerActivity : BaseActivity(){
if (settingsStorage?.decodeBool(AppConfig.PREF_START_SCAN_IMMEDIATE) == true) {
launchScan()
}
supportActionBar?.setDisplayHomeAsUpEnabled(true)
}
public override fun onResume() {
super.onResume()
}
public override fun onPause() {
super.onPause()
}
private fun launchScan(){

1
V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerActivity.kt
View File

@@ -175,7 +175,6 @@ class ServerActivity : BaseActivity() {
} else {
clearServer()
}
supportActionBar?.setDisplayHomeAsUpEnabled(true)
}
/**

1
V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerCustomConfigActivity.kt
View File

@@ -49,7 +49,6 @@ class ServerCustomConfigActivity : BaseActivity() {
} else {
clearServer()
}
supportActionBar?.setDisplayHomeAsUpEnabled(true)
}
/**

2
V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SettingsActivity.kt
View File

@@ -20,8 +20,6 @@ class SettingsActivity : BaseActivity() {
title = getString(R.string.title_settings)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
settingsViewModel.startListenPreferenceChange()
}

1
V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SubEditActivity.kt
View File

@@ -36,7 +36,6 @@ class SubEditActivity : BaseActivity() {
} else {
clearServer()
}
supportActionBar?.setDisplayHomeAsUpEnabled(true)
}
/**

2
V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SubSettingActivity.kt
View File

@@ -27,8 +27,6 @@ class SubSettingActivity : BaseActivity() {
binding.recyclerView.setHasFixedSize(true)
binding.recyclerView.layoutManager = LinearLayoutManager(this)
binding.recyclerView.adapter = adapter
supportActionBar?.setDisplayHomeAsUpEnabled(true)
}
override fun onResume() {

1
V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/UserAssetActivity.kt
View File

@@ -49,7 +49,6 @@ class UserAssetActivity : BaseActivity() {
val view = binding.root
setContentView(view)
title = getString(R.string.title_user_asset_setting)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
binding.recyclerView.setHasFixedSize(true)
binding.recyclerView.layoutManager = LinearLayoutManager(this)