kopia lustrzana https://dev.funkwhale.audio/funkwhale/funkwhale-android
MainActivity: startActivityForResult deprecated.
Migrate startActivityForResult/onActivityResult to StartActivityForResult/registerForActivityResult in MainActivity.technical/upgrade-appcompat-1.5.x
rodzic
bea1d1f397
commit
24de54c7e0
|
@ -16,6 +16,7 @@ import android.view.View
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
import android.view.animation.AccelerateDecelerateInterpolator
|
import android.view.animation.AccelerateDecelerateInterpolator
|
||||||
import android.widget.SeekBar
|
import android.widget.SeekBar
|
||||||
|
import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
|
||||||
import androidx.appcompat.app.AppCompatActivity
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
import androidx.appcompat.widget.PopupMenu
|
import androidx.appcompat.widget.PopupMenu
|
||||||
import androidx.core.content.ContextCompat
|
import androidx.core.content.ContextCompat
|
||||||
|
@ -207,6 +208,21 @@ class MainActivity : AppCompatActivity() {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var resultLauncher = registerForActivityResult(StartActivityForResult()) { result ->
|
||||||
|
if (result.resultCode == ResultCode.LOGOUT.code) {
|
||||||
|
Intent(this, LoginActivity::class.java).apply {
|
||||||
|
FFA.get().deleteAllData(this@MainActivity)
|
||||||
|
|
||||||
|
flags =
|
||||||
|
Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
|
||||||
|
|
||||||
|
stopService(Intent(this@MainActivity, PlayerService::class.java))
|
||||||
|
startActivity(this)
|
||||||
|
finish()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
override fun onOptionsItemSelected(item: MenuItem): Boolean {
|
override fun onOptionsItemSelected(item: MenuItem): Boolean {
|
||||||
when (item.itemId) {
|
when (item.itemId) {
|
||||||
android.R.id.home -> {
|
android.R.id.home -> {
|
||||||
|
@ -279,29 +295,12 @@ class MainActivity : AppCompatActivity() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
R.id.nav_downloads -> startActivity(Intent(this, DownloadsActivity::class.java))
|
R.id.nav_downloads -> startActivity(Intent(this, DownloadsActivity::class.java))
|
||||||
R.id.settings -> startActivityForResult(Intent(this, SettingsActivity::class.java), 0)
|
R.id.settings -> resultLauncher.launch(Intent(this, SettingsActivity::class.java))
|
||||||
}
|
}
|
||||||
|
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
|
|
||||||
super.onActivityResult(requestCode, resultCode, data)
|
|
||||||
|
|
||||||
if (resultCode == ResultCode.LOGOUT.code) {
|
|
||||||
Intent(this, LoginActivity::class.java).apply {
|
|
||||||
FFA.get().deleteAllData(this@MainActivity)
|
|
||||||
|
|
||||||
flags =
|
|
||||||
Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
|
|
||||||
|
|
||||||
stopService(Intent(this@MainActivity, PlayerService::class.java))
|
|
||||||
startActivity(this)
|
|
||||||
finish()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun launchFragment(fragment: Fragment) {
|
private fun launchFragment(fragment: Fragment) {
|
||||||
supportFragmentManager.fragments.lastOrNull()?.also { oldFragment ->
|
supportFragmentManager.fragments.lastOrNull()?.also { oldFragment ->
|
||||||
oldFragment.enterTransition = null
|
oldFragment.enterTransition = null
|
||||||
|
|
Ładowanie…
Reference in New Issue