mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-09-03 23:55:08 +00:00
Code Issues Releases Wiki Activity

Make newInstance calls explicit

Browse Source
This commit is contained in:
Albert Vaca Cintora
2023-05-28 12:05:08 +02:00
parent 53f14e9c77
commit d0ec7dd755
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/org/kde/kdeconnect/UserInterface/MainActivity.kt
View File

@@ -27,9 +27,8 @@ import org.kde.kdeconnect.Device
import org.kde.kdeconnect.Helpers.DeviceHelper import org.kde.kdeconnect.Helpers.DeviceHelper
import org.kde.kdeconnect.KdeConnect import org.kde.kdeconnect.KdeConnect
import org.kde.kdeconnect.Plugins.SharePlugin.ShareSettingsFragment import org.kde.kdeconnect.Plugins.SharePlugin.ShareSettingsFragment
import org.kde.kdeconnect.UserInterface.About.AboutFragment.Companion.newInstance import org.kde.kdeconnect.UserInterface.About.AboutFragment
import org.kde.kdeconnect.UserInterface.About.getApplicationAboutData import org.kde.kdeconnect.UserInterface.About.getApplicationAboutData
import org.kde.kdeconnect.UserInterface.DeviceFragment.Companion.newInstance
import org.kde.kdeconnect_tp.R import org.kde.kdeconnect_tp.R
import org.kde.kdeconnect_tp.databinding.ActivityMainBinding import org.kde.kdeconnect_tp.databinding.ActivityMainBinding
@@ -69,7 +68,7 @@ class MainActivity : AppCompatActivity(), OnSharedPreferenceChangeListener {
override fun handleOnBackPressed() { override fun handleOnBackPressed() {
mCurrentMenuEntry = mCurrentDevice?.let { deviceIdToMenuEntryId(it) } ?: MENU_ENTRY_ADD_DEVICE mCurrentMenuEntry = mCurrentDevice?.let { deviceIdToMenuEntryId(it) } ?: MENU_ENTRY_ADD_DEVICE
mNavigationView.setCheckedItem(mCurrentMenuEntry) mNavigationView.setCheckedItem(mCurrentMenuEntry)
setContentFragment(mCurrentDevice?.let { newInstance(it, false) } ?: PairingFragment()) setContentFragment(mCurrentDevice?.let { DeviceFragment.newInstance(it, false) } ?: PairingFragment())
} }
} }
@@ -116,7 +115,7 @@ class MainActivity : AppCompatActivity(), OnSharedPreferenceChangeListener {
MENU_ENTRY_ABOUT -> { MENU_ENTRY_ABOUT -> {
preferences.edit().putString(STATE_SELECTED_DEVICE, null).apply() preferences.edit().putString(STATE_SELECTED_DEVICE, null).apply()
setContentFragment(newInstance(getApplicationAboutData(this))) setContentFragment(AboutFragment.newInstance(getApplicationAboutData(this)))
} }
else -> { else -> {
@@ -181,7 +180,7 @@ class MainActivity : AppCompatActivity(), OnSharedPreferenceChangeListener {
} else { } else {
when (mCurrentMenuEntry) { when (mCurrentMenuEntry) {
MENU_ENTRY_SETTINGS -> setContentFragment(SettingsFragment()) MENU_ENTRY_SETTINGS -> setContentFragment(SettingsFragment())
MENU_ENTRY_ABOUT -> setContentFragment(newInstance(getApplicationAboutData(this))) MENU_ENTRY_ABOUT -> setContentFragment(AboutFragment.newInstance(getApplicationAboutData(this)))
else -> setContentFragment(PairingFragment()) else -> setContentFragment(PairingFragment())
} }
} }
@@ -286,7 +285,7 @@ class MainActivity : AppCompatActivity(), OnSharedPreferenceChangeListener {
} else { } else {
mNavigationView.setCheckedItem(mCurrentMenuEntry) mNavigationView.setCheckedItem(mCurrentMenuEntry)
} }
setContentFragment(newInstance(deviceId, fromDeviceList)) setContentFragment(DeviceFragment.newInstance(deviceId, fromDeviceList))
} else { } else {
mCurrentMenuEntry = MENU_ENTRY_ADD_DEVICE mCurrentMenuEntry = MENU_ENTRY_ADD_DEVICE
mNavigationView.setCheckedItem(mCurrentMenuEntry) mNavigationView.setCheckedItem(mCurrentMenuEntry)