SagerNet/sing-box-for-android
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box-for-android.git synced 2025-04-03 20:07:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix binding usage

Browse source
This commit is contained in:
世界 2023-09-06 19:57:56 +08:00
parent 49a9fb3817
commit 5e98d2cbe1
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
7 changed files with 84 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/src/main/java/io/nekohasekai/sfa/ui/dashboard/GroupsFragment.kt
View file

@ -37,12 +37,8 @@ import kotlinx.coroutines.withContext
class GroupsFragment : Fragment(), CommandClient.Handler {
private val activity: MainActivity? get() = super.getActivity() as MainActivity?
private var _binding: FragmentDashboardGroupsBinding? = null
private val binding get() = _binding!!
private var _adapter: Adapter? = null
private val adapter get() = _adapter!!
private var binding: FragmentDashboardGroupsBinding? = null
private var adapter: Adapter? = null
private val commandClient =
CommandClient(lifecycleScope, CommandClient.ConnectionType.Groups, this)
@ -50,14 +46,16 @@ class GroupsFragment : Fragment(), CommandClient.Handler {
override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
): View {
_binding = FragmentDashboardGroupsBinding.inflate(inflater, container, false)
val binding = FragmentDashboardGroupsBinding.inflate(inflater, container, false)
this.binding = binding
onCreate()
return binding.root
}
private fun onCreate() {
val activity = activity ?: return
_adapter = Adapter()
val binding = binding ?: return
adapter = Adapter()
binding.container.adapter = adapter
binding.container.layoutManager = LinearLayoutManager(requireContext())
activity.serviceStatus.observe(viewLifecycleOwner) {
@ -67,8 +65,14 @@ class GroupsFragment : Fragment(), CommandClient.Handler {
}
}
override fun onDestroyView() {
super.onDestroyView()
binding = null
}
private var displayed = false
private fun updateDisplayed(newValue: Boolean) {
val binding = binding ?: return
if (displayed != newValue) {
displayed = newValue
binding.statusText.isVisible = !displayed
@ -90,6 +94,7 @@ class GroupsFragment : Fragment(), CommandClient.Handler {
@SuppressLint("NotifyDataSetChanged")
override fun updateGroups(groups: List<OutboundGroup>) {
val adapter = adapter ?: return
activity?.runOnUiThread {
updateDisplayed(groups.isNotEmpty())
adapter.groups = groups

18
app/src/main/java/io/nekohasekai/sfa/ui/dashboard/OverviewFragment.kt
View file

@ -37,8 +37,7 @@ import kotlinx.coroutines.withContext
class OverviewFragment : Fragment() {
private val activity: MainActivity? get() = super.getActivity() as MainActivity?
private var _binding: FragmentDashboardOverviewBinding? = null
private val binding get() = _binding!!
private var binding: FragmentDashboardOverviewBinding? = null
private val statusClient =
CommandClient(lifecycleScope, CommandClient.ConnectionType.Status, StatusClient())
private val clashModeClient =
@ -48,13 +47,15 @@ class OverviewFragment : Fragment() {
override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
): View {
_binding = FragmentDashboardOverviewBinding.inflate(inflater, container, false)
val binding = FragmentDashboardOverviewBinding.inflate(inflater, container, false)
this.binding = binding
onCreate()
return binding.root
}
private fun onCreate() {
val activity = activity ?: return
val binding = binding ?: return
binding.profileList.adapter = Adapter(lifecycleScope, binding).apply {
adapter = this
reload()
@ -81,7 +82,7 @@ class OverviewFragment : Fragment() {
override fun onDestroyView() {
super.onDestroyView()
adapter = null
_binding = null
binding = null
statusClient.disconnect()
clashModeClient.disconnect()
ProfileManager.unregisterCallback(this::updateProfiles)
@ -92,6 +93,7 @@ class OverviewFragment : Fragment() {
}
private fun reloadSystemProxyStatus() {
val binding = binding ?: return
lifecycleScope.launch(Dispatchers.IO) {
val status = Libbox.newStandaloneCommandClient().systemProxyStatus
withContext(Dispatchers.Main) {
@ -117,7 +119,7 @@ class OverviewFragment : Fragment() {
inner class StatusClient : CommandClient.Handler {
override fun onConnected() {
val binding = _binding ?: return
val binding = binding ?: return
lifecycleScope.launch(Dispatchers.Main) {
binding.memoryText.text = getString(R.string.loading)
binding.goroutinesText.text = getString(R.string.loading)
@ -125,7 +127,7 @@ class OverviewFragment : Fragment() {
}
override fun onDisconnected() {
val binding = _binding ?: return
val binding = binding ?: return
lifecycleScope.launch(Dispatchers.Main) {
binding.memoryText.text = getString(R.string.loading)
binding.goroutinesText.text = getString(R.string.loading)
@ -133,7 +135,7 @@ class OverviewFragment : Fragment() {
}
override fun updateStatus(status: StatusMessage) {
val binding = _binding ?: return
val binding = binding ?: return
lifecycleScope.launch(Dispatchers.Main) {
binding.memoryText.text = Libbox.formatBytes(status.memory)
binding.goroutinesText.text = status.goroutines.toString()
@ -155,6 +157,7 @@ class OverviewFragment : Fragment() {
inner class ClashModeClient : CommandClient.Handler {
override fun initializeClashMode(modeList: List<String>, currentMode: String) {
val binding = binding ?: return
if (modeList.size > 1) {
lifecycleScope.launch(Dispatchers.Main) {
binding.clashModeCard.isVisible = true
@ -174,6 +177,7 @@ class OverviewFragment : Fragment() {
@SuppressLint("NotifyDataSetChanged")
override fun updateClashMode(newMode: String) {
val binding = binding ?: return
val adapter = binding.clashModeList.adapter as? ClashModeAdapter ?: return
adapter.selected = newMode
lifecycleScope.launch(Dispatchers.Main) {

15
app/src/main/java/io/nekohasekai/sfa/ui/main/DashboardFragment.kt
View file

@ -20,19 +20,19 @@ import io.nekohasekai.sfa.ui.dashboard.OverviewFragment
class DashboardFragment : Fragment(R.layout.fragment_dashboard) {
private val activity: MainActivity? get() = super.getActivity() as MainActivity?
private var _binding: FragmentDashboardBinding? = null
private val binding get() = _binding!!
private var binding: FragmentDashboardBinding? = null
override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
): View {
_binding = FragmentDashboardBinding.inflate(inflater, container, false)
val binding = FragmentDashboardBinding.inflate(inflater, container, false)
this.binding = binding
onCreate()
return binding.root
}
private fun onCreate() {
val activity = activity ?: return
val binding = binding ?: return
binding.dashboardPager.adapter = Adapter(this)
binding.dashboardPager.offscreenPageLimit = Page.values().size
TabLayoutMediator(binding.dashboardTabLayout, binding.dashboardPager) { tab, position ->
@ -79,12 +79,19 @@ class DashboardFragment : Fragment(R.layout.fragment_dashboard) {
}
}
override fun onDestroyView() {
super.onDestroyView()
binding = null
}
private fun enablePager() {
val binding = binding ?: return
binding.dashboardTabLayout.isVisible = true
binding.dashboardPager.isUserInputEnabled = true
}
private fun disablePager() {
val binding = binding ?: return
binding.dashboardTabLayout.isVisible = false
binding.dashboardPager.isUserInputEnabled = false
binding.dashboardPager.setCurrentItem(0, false)

10
app/src/main/java/io/nekohasekai/sfa/ui/main/LogFragment.kt
View file

@ -19,20 +19,21 @@ import java.util.LinkedList
class LogFragment : Fragment() {
private val activity: MainActivity? get() = super.getActivity() as MainActivity?
private var _binding: FragmentLogBinding? = null
private val binding get() = _binding!!
private var binding: FragmentLogBinding? = null
private var logAdapter: LogAdapter? = null
override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
): View {
_binding = FragmentLogBinding.inflate(inflater, container, false)
val binding = FragmentLogBinding.inflate(inflater, container, false)
this.binding = binding
onCreate()
return binding.root
}
private fun onCreate() {
val activity = activity ?: return
val binding = binding ?: return
activity.logCallback = ::updateViews
binding.logView.layoutManager = LinearLayoutManager(requireContext())
binding.logView.adapter = LogAdapter(activity.logList).also { logAdapter = it }
@ -82,6 +83,7 @@ class LogFragment : Fragment() {
private fun updateViews(reset: Boolean) {
val activity = activity ?: return
val logAdapter = logAdapter ?: return
val binding = binding ?: return
if (activity.logList.isEmpty()) {
binding.logView.isVisible = false
binding.statusText.isVisible = true
@ -99,7 +101,7 @@ class LogFragment : Fragment() {
override fun onDestroyView() {
super.onDestroyView()
_binding = null
binding = null
activity?.logCallback = null
logAdapter = null
}

29
app/src/main/java/io/nekohasekai/sfa/ui/profile/EditProfileActivity.kt
View file

@ -30,15 +30,15 @@ import java.util.Date
class EditProfileActivity : AbstractActivity() {
private var _binding: ActivityEditProfileBinding? = null
private val binding get() = _binding!!
private var binding: ActivityEditProfileBinding? = null
private var _profile: Profile? = null
private val profile get() = _profile!!
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setTitle(R.string.title_edit_profile)
_binding = ActivityEditProfileBinding.inflate(layoutInflater)
val binding = ActivityEditProfileBinding.inflate(layoutInflater)
this.binding = binding
setContentView(binding.root)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
@ -46,14 +46,22 @@ class EditProfileActivity : AbstractActivity() {
runCatching {
loadProfile()
}.onFailure {
errorDialogBuilder(it)
.setPositiveButton(android.R.string.ok) { _, _ -> finish() }
.show()
withContext(Dispatchers.Main) {
errorDialogBuilder(it)
.setPositiveButton(android.R.string.ok) { _, _ -> finish() }
.show()
}
}
}
}
override fun onDestroy() {
super.onDestroy()
binding = null
}
private suspend fun loadProfile() {
val binding = binding ?: return
delay(200L)
val profileId = intent.getLongExtra("profile_id", -1L)
@ -67,7 +75,9 @@ class EditProfileActivity : AbstractActivity() {
profile.name = it
ProfileManager.update(profile)
} catch (e: Exception) {
errorDialogBuilder(e).show()
withContext(Dispatchers.Main) {
errorDialogBuilder(e).show()
}
}
}
}
@ -120,6 +130,7 @@ class EditProfileActivity : AbstractActivity() {
}
private fun updateAutoUpdate(newValue: String) {
val binding = binding ?: return
val boolValue = EnabledType.valueOf(newValue).boolValue
if (profile.typed.autoUpdate == boolValue) {
return
@ -135,6 +146,7 @@ class EditProfileActivity : AbstractActivity() {
}
private fun updateAutoUpdateInterval(newValue: String) {
val binding = binding ?: return
if (newValue.isBlank()) {
binding.autoUpdateInterval.error = getString(R.string.profile_input_required)
return
@ -156,6 +168,7 @@ class EditProfileActivity : AbstractActivity() {
}
private fun updateProfile() {
val binding = binding ?: return
binding.progressView.isVisible = true
lifecycleScope.launch(Dispatchers.IO) {
delay(200)
@ -173,6 +186,7 @@ class EditProfileActivity : AbstractActivity() {
}
private fun updateProfile(view: View) {
val binding = binding ?: return
binding.progressView.isVisible = true
lifecycleScope.launch(Dispatchers.IO) {
try {
@ -195,6 +209,7 @@ class EditProfileActivity : AbstractActivity() {
}
private fun checkProfile(button: View) {
val binding = binding ?: return
binding.progressView.isVisible = true
lifecycleScope.launch(Dispatchers.IO) {
delay(200)

14
app/src/main/java/io/nekohasekai/sfa/ui/profile/EditProfileContentActivity.kt
View file

@ -23,22 +23,26 @@ import java.io.File
class EditProfileContentActivity : AbstractActivity() {
private var _binding: ActivityEditProfileContentBinding? = null
private val binding get() = _binding!!
private var binding: ActivityEditProfileContentBinding? = null
private var _profile: Profile? = null
private val profile get() = _profile!!
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setTitle(R.string.title_edit_configuration)
_binding = ActivityEditProfileContentBinding.inflate(layoutInflater)
val binding = ActivityEditProfileContentBinding.inflate(layoutInflater)
this.binding = binding
setContentView(binding.root)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
binding.editor.language = JsonLanguage()
loadConfiguration()
}
override fun onDestroy() {
super.onDestroy()
binding = null
}
private fun loadConfiguration() {
lifecycleScope.launch(Dispatchers.IO) {
runCatching {
@ -59,6 +63,7 @@ class EditProfileContentActivity : AbstractActivity() {
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
val binding = binding ?: return false
when (item.itemId) {
R.id.action_undo -> {
if (binding.editor.canUndo()) binding.editor.undo()
@ -110,6 +115,7 @@ class EditProfileContentActivity : AbstractActivity() {
}
private suspend fun loadConfiguration0() {
val binding = binding ?: return
delay(200L)
val profileId = intent.getLongExtra("profile_id", -1L)

15
app/src/main/java/io/nekohasekai/sfa/ui/profile/NewProfileActivity.kt
View file

@ -33,11 +33,10 @@ class NewProfileActivity : AbstractActivity() {
Import("Import");
}
private var _binding: ActivityAddProfileBinding? = null
private val binding get() = _binding!!
private var binding: ActivityAddProfileBinding? = null
private val importFile =
registerForActivityResult(ActivityResultContracts.GetContent()) { fileURI ->
val binding = binding ?: return@registerForActivityResult
if (fileURI != null) {
binding.sourceURL.editText?.setText(fileURI.toString())
}
@ -47,7 +46,8 @@ class NewProfileActivity : AbstractActivity() {
super.onCreate(savedInstanceState)
setTitle(R.string.title_new_profile)
_binding = ActivityAddProfileBinding.inflate(layoutInflater)
val binding = ActivityAddProfileBinding.inflate(layoutInflater)
this.binding = binding
setContentView(binding.root)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
@ -91,7 +91,13 @@ class NewProfileActivity : AbstractActivity() {
}
}
override fun onDestroy() {
super.onDestroy()
binding = null
}
private fun createProfile(view: View) {
val binding = binding ?: return
if (binding.name.showErrorIfEmpty()) {
return
}
@ -126,6 +132,7 @@ class NewProfileActivity : AbstractActivity() {
}
private suspend fun createProfile0() {
val binding = binding ?: return
val typedProfile = TypedProfile()
val profile = Profile(name = binding.name.text, typed = typedProfile)
profile.userOrder = ProfileManager.nextOrder()