filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup API

Browse Source
This commit is contained in:
Benoit Marty 2021-11-19 17:17:23 +01:00
parent 0f42f379c6
commit 23f726a2f0
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
View File

@ -22,6 +22,7 @@ import android.content.Context
import android.content.res.Configuration import android.content.res.Configuration
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.os.Parcelable
import android.view.Menu import android.view.Menu
import android.view.MenuItem import android.view.MenuItem
import android.view.View import android.view.View
@ -60,6 +61,7 @@ import im.vector.app.core.extensions.registerStartForActivityResult
import im.vector.app.core.extensions.restart import im.vector.app.core.extensions.restart
import im.vector.app.core.extensions.setTextOrHide import im.vector.app.core.extensions.setTextOrHide
import im.vector.app.core.extensions.singletonEntryPoint import im.vector.app.core.extensions.singletonEntryPoint
import im.vector.app.core.extensions.toMvRxBundle
import im.vector.app.core.flow.throttleFirst import im.vector.app.core.flow.throttleFirst
import im.vector.app.core.utils.toast import im.vector.app.core.utils.toast
import im.vector.app.features.MainActivity import im.vector.app.features.MainActivity
@ -385,9 +387,9 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
bugReporter.inMultiWindowMode = isInMultiWindowMode bugReporter.inMultiWindowMode = isInMultiWindowMode
} }
protected fun createFragment(fragmentClass: Class<out Fragment>, args: Bundle?): Fragment { protected fun createFragment(fragmentClass: Class<out Fragment>, argsParcelable: Parcelable? = null): Fragment {
return fragmentFactory.instantiate(classLoader, fragmentClass.name).apply { return fragmentFactory.instantiate(classLoader, fragmentClass.name).apply {
arguments = args arguments = argsParcelable?.toMvRxBundle()
} }
} }

4
vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
View File

@ -345,12 +345,12 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetV
super.invalidate() super.invalidate()
} }
private fun showFragment(fragmentClass: KClass<out Fragment>, parcelable: Parcelable? = null) { private fun showFragment(fragmentClass: KClass<out Fragment>, argsParcelable: Parcelable? = null) {
if (childFragmentManager.findFragmentByTag(fragmentClass.simpleName) == null) { if (childFragmentManager.findFragmentByTag(fragmentClass.simpleName) == null) {
childFragmentManager.commitTransaction { childFragmentManager.commitTransaction {
replace(R.id.bottomSheetFragmentContainer, replace(R.id.bottomSheetFragmentContainer,
fragmentClass.java, fragmentClass.java,
parcelable?.toMvRxBundle(), argsParcelable?.toMvRxBundle(),
fragmentClass.simpleName fragmentClass.simpleName
) )
} }

6
vector/src/main/java/im/vector/app/features/devtools/RoomDevToolActivity.kt
View File

@ -109,15 +109,15 @@ class RoomDevToolActivity : SimpleFragmentActivity(), FragmentManager.OnBackStac
} }
RoomDevToolViewState.Mode.StateEventList, RoomDevToolViewState.Mode.StateEventList,
RoomDevToolViewState.Mode.StateEventListByType -> { RoomDevToolViewState.Mode.StateEventListByType -> {
val frag = createFragment(RoomDevToolStateEventListFragment::class.java, Bundle().toMvRxBundle()) val frag = createFragment(RoomDevToolStateEventListFragment::class.java)
navigateTo(frag) navigateTo(frag)
} }
RoomDevToolViewState.Mode.EditEventContent -> { RoomDevToolViewState.Mode.EditEventContent -> {
val frag = createFragment(RoomDevToolEditFragment::class.java, Bundle().toMvRxBundle()) val frag = createFragment(RoomDevToolEditFragment::class.java)
navigateTo(frag) navigateTo(frag)
} }
is RoomDevToolViewState.Mode.SendEventForm -> { is RoomDevToolViewState.Mode.SendEventForm -> {
val frag = createFragment(RoomDevToolSendFormFragment::class.java, Bundle().toMvRxBundle()) val frag = createFragment(RoomDevToolSendFormFragment::class.java)
navigateTo(frag) navigateTo(frag)
} }
} }

2
vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
View File

@ -121,7 +121,7 @@ class SpaceCreationActivity : SimpleFragmentActivity() {
} }
private fun navigateToFragment(fragmentClass: Class<out Fragment>) { private fun navigateToFragment(fragmentClass: Class<out Fragment>) {
val frag = supportFragmentManager.findFragmentByTag(fragmentClass.name) ?: createFragment(fragmentClass, Bundle().toMvRxBundle()) val frag = supportFragmentManager.findFragmentByTag(fragmentClass.name) ?: createFragment(fragmentClass)
supportFragmentManager.beginTransaction() supportFragmentManager.beginTransaction()
.setCustomAnimations(R.anim.fade_in, R.anim.fade_out, R.anim.fade_in, R.anim.fade_out) .setCustomAnimations(R.anim.fade_in, R.anim.fade_out, R.anim.fade_in, R.anim.fade_out)
.replace(R.id.container, .replace(R.id.container,