rename to setting

This commit is contained in:
Li ZongYing
2024-01-19 13:49:43 +08:00
parent 33d3da97e5
commit c17d62c698
5 changed files with 97 additions and 98 deletions
@@ -28,6 +28,7 @@ class MainActivity : FragmentActivity() {
private val mainFragment = MainFragment()
private val infoFragment = InfoFragment()
private val channelFragment = ChannelFragment()
private lateinit var settingFragment: SettingFragment
private var doubleBackToExitPressedOnce = false
@@ -42,7 +43,6 @@ class MainActivity : FragmentActivity() {
private var channelNum = true
private var versionName = ""
private lateinit var dialogFragment: MyDialogFragment
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@@ -58,8 +58,7 @@ class MainActivity : FragmentActivity() {
.add(R.id.main_browse_fragment, infoFragment)
.add(R.id.main_browse_fragment, channelFragment)
.add(R.id.main_browse_fragment, mainFragment)
.hide(infoFragment)
.hide(channelFragment)
.hide(mainFragment)
.commit()
mainFragment.view?.requestFocus()
}
@@ -70,7 +69,7 @@ class MainActivity : FragmentActivity() {
channelNum = sharedPref.getBoolean(CHANNEL_NUM, channelNum)
versionName = getPackageInfo().versionName
dialogFragment = MyDialogFragment(versionName, channelReversal, channelNum)
settingFragment = SettingFragment(versionName, channelReversal, channelNum)
}
fun showInfoFragment(tvViewModel: TVViewModel) {
@@ -80,6 +79,20 @@ class MainActivity : FragmentActivity() {
}
}
private fun showChannel(channel: String) {
if (!mainFragment.isHidden) {
return
}
if (settingFragment.isVisible) {
return
}
if (channelNum) {
channelFragment.show(channel)
}
}
fun play(tvViewModel: TVViewModel) {
playerFragment.play(tvViewModel)
mainFragment.view?.requestFocus()
@@ -214,20 +227,20 @@ class MainActivity : FragmentActivity() {
return
}
Log.i(TAG, "dialogFragment ${dialogFragment.isVisible}")
if (!dialogFragment.isVisible) {
dialogFragment.show(supportFragmentManager, "settings_dialog")
Log.i(TAG, "settingFragment ${settingFragment.isVisible}")
if (!settingFragment.isVisible) {
settingFragment.show(supportFragmentManager, "setting")
handler.removeCallbacks(hideHelp)
handler.postDelayed(hideHelp, delayHideHelp)
} else {
handler.removeCallbacks(hideHelp)
dialogFragment.dismiss()
settingFragment.dismiss()
}
}
private val hideHelp = Runnable {
if (dialogFragment.isVisible) {
dialogFragment.dismiss()
if (settingFragment.isVisible) {
settingFragment.dismiss()
}
}
@@ -283,20 +296,6 @@ class MainActivity : FragmentActivity() {
}, 2000)
}
private fun showChannel(channel: String) {
if (!mainFragment.isHidden) {
return
}
if (dialogFragment.isVisible) {
return
}
if (channelNum) {
channelFragment.show(channel)
}
}
override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
when (keyCode) {
KeyEvent.KEYCODE_0 -> {