mirror of
https://github.com/element-hq/element-android
synced 2024-11-27 11:59:12 +03:00
Update CHANGES and clean files
This commit is contained in:
parent
624a8ff04c
commit
0077091175
3 changed files with 108 additions and 17 deletions
|
@ -13,6 +13,7 @@ Bugfix 🐛:
|
||||||
- Speakerphone is not used for ringback tone (#1644, #1645)
|
- Speakerphone is not used for ringback tone (#1644, #1645)
|
||||||
- Back camera preview is not mirrored anymore (#1776)
|
- Back camera preview is not mirrored anymore (#1776)
|
||||||
- Various report of people that cannot play video (#2107)
|
- Various report of people that cannot play video (#2107)
|
||||||
|
- Fix stuck on loader when launching home
|
||||||
|
|
||||||
Translations 🗣:
|
Translations 🗣:
|
||||||
-
|
-
|
||||||
|
|
|
@ -22,27 +22,53 @@ import androidx.fragment.app.Fragment
|
||||||
import androidx.fragment.app.FragmentTransaction
|
import androidx.fragment.app.FragmentTransaction
|
||||||
import im.vector.app.core.platform.VectorBaseActivity
|
import im.vector.app.core.platform.VectorBaseActivity
|
||||||
|
|
||||||
fun VectorBaseActivity.addFragment(frameId: Int, fragment: Fragment, allowStateLoss: Boolean = false) {
|
fun VectorBaseActivity.addFragment(
|
||||||
|
frameId: Int,
|
||||||
|
fragment: Fragment,
|
||||||
|
allowStateLoss: Boolean = false
|
||||||
|
) {
|
||||||
supportFragmentManager.commitTransaction(allowStateLoss) { add(frameId, fragment) }
|
supportFragmentManager.commitTransaction(allowStateLoss) { add(frameId, fragment) }
|
||||||
}
|
}
|
||||||
|
|
||||||
fun <T : Fragment> VectorBaseActivity.addFragment(frameId: Int, fragmentClass: Class<T>, params: Parcelable? = null, tag: String? = null, allowStateLoss: Boolean = false) {
|
fun <T : Fragment> VectorBaseActivity.addFragment(
|
||||||
|
frameId: Int,
|
||||||
|
fragmentClass: Class<T>,
|
||||||
|
params: Parcelable? = null,
|
||||||
|
tag: String? = null,
|
||||||
|
allowStateLoss: Boolean = false
|
||||||
|
) {
|
||||||
supportFragmentManager.commitTransaction(allowStateLoss) {
|
supportFragmentManager.commitTransaction(allowStateLoss) {
|
||||||
add(frameId, fragmentClass, params.toMvRxBundle(), tag)
|
add(frameId, fragmentClass, params.toMvRxBundle(), tag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun VectorBaseActivity.replaceFragment(frameId: Int, fragment: Fragment, tag: String? = null, allowStateLoss: Boolean = false) {
|
fun VectorBaseActivity.replaceFragment(
|
||||||
|
frameId: Int,
|
||||||
|
fragment: Fragment,
|
||||||
|
tag: String? = null,
|
||||||
|
allowStateLoss: Boolean = false
|
||||||
|
) {
|
||||||
supportFragmentManager.commitTransaction(allowStateLoss) { replace(frameId, fragment, tag) }
|
supportFragmentManager.commitTransaction(allowStateLoss) { replace(frameId, fragment, tag) }
|
||||||
}
|
}
|
||||||
|
|
||||||
fun <T : Fragment> VectorBaseActivity.replaceFragment(frameId: Int, fragmentClass: Class<T>, params: Parcelable? = null, tag: String? = null, allowStateLoss: Boolean = false) {
|
fun <T : Fragment> VectorBaseActivity.replaceFragment(
|
||||||
|
frameId: Int,
|
||||||
|
fragmentClass: Class<T>,
|
||||||
|
params: Parcelable? = null,
|
||||||
|
tag: String? = null,
|
||||||
|
allowStateLoss: Boolean = false
|
||||||
|
) {
|
||||||
supportFragmentManager.commitTransaction(allowStateLoss) {
|
supportFragmentManager.commitTransaction(allowStateLoss) {
|
||||||
replace(frameId, fragmentClass, params.toMvRxBundle(), tag)
|
replace(frameId, fragmentClass, params.toMvRxBundle(), tag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun VectorBaseActivity.addFragmentToBackstack(frameId: Int, fragment: Fragment, tag: String? = null, allowStateLoss: Boolean = false) {
|
fun VectorBaseActivity.addFragmentToBackstack(
|
||||||
|
frameId: Int,
|
||||||
|
fragment: Fragment,
|
||||||
|
tag: String? = null,
|
||||||
|
allowStateLoss: Boolean = false
|
||||||
|
) {
|
||||||
supportFragmentManager.commitTransaction(allowStateLoss) { replace(frameId, fragment).addToBackStack(tag) }
|
supportFragmentManager.commitTransaction(allowStateLoss) { replace(frameId, fragment).addToBackStack(tag) }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -26,61 +26,125 @@ import java.text.SimpleDateFormat
|
||||||
import java.util.Date
|
import java.util.Date
|
||||||
import java.util.Locale
|
import java.util.Locale
|
||||||
|
|
||||||
fun VectorBaseFragment.addFragment(frameId: Int, fragment: Fragment, allowStateLoss: Boolean = false) {
|
fun VectorBaseFragment.addFragment(
|
||||||
|
frameId: Int,
|
||||||
|
fragment: Fragment,
|
||||||
|
allowStateLoss: Boolean = false
|
||||||
|
) {
|
||||||
parentFragmentManager.commitTransaction(allowStateLoss) { add(frameId, fragment) }
|
parentFragmentManager.commitTransaction(allowStateLoss) { add(frameId, fragment) }
|
||||||
}
|
}
|
||||||
|
|
||||||
fun <T : Fragment> VectorBaseFragment.addFragment(frameId: Int, fragmentClass: Class<T>, params: Parcelable? = null, tag: String? = null, allowStateLoss: Boolean = false) {
|
fun <T : Fragment> VectorBaseFragment.addFragment(
|
||||||
|
frameId: Int,
|
||||||
|
fragmentClass: Class<T>,
|
||||||
|
params: Parcelable? = null,
|
||||||
|
tag: String? = null,
|
||||||
|
allowStateLoss: Boolean = false
|
||||||
|
) {
|
||||||
parentFragmentManager.commitTransaction(allowStateLoss) {
|
parentFragmentManager.commitTransaction(allowStateLoss) {
|
||||||
add(frameId, fragmentClass, params.toMvRxBundle(), tag)
|
add(frameId, fragmentClass, params.toMvRxBundle(), tag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun VectorBaseFragment.replaceFragment(frameId: Int, fragment: Fragment, allowStateLoss: Boolean = false) {
|
fun VectorBaseFragment.replaceFragment(
|
||||||
|
frameId: Int,
|
||||||
|
fragment: Fragment,
|
||||||
|
allowStateLoss: Boolean = false
|
||||||
|
) {
|
||||||
parentFragmentManager.commitTransaction(allowStateLoss) { replace(frameId, fragment) }
|
parentFragmentManager.commitTransaction(allowStateLoss) { replace(frameId, fragment) }
|
||||||
}
|
}
|
||||||
|
|
||||||
fun <T : Fragment> VectorBaseFragment.replaceFragment(frameId: Int, fragmentClass: Class<T>, params: Parcelable? = null, tag: String? = null, allowStateLoss: Boolean = false) {
|
fun <T : Fragment> VectorBaseFragment.replaceFragment(
|
||||||
|
frameId: Int,
|
||||||
|
fragmentClass: Class<T>,
|
||||||
|
params: Parcelable? = null,
|
||||||
|
tag: String? = null,
|
||||||
|
allowStateLoss: Boolean = false
|
||||||
|
) {
|
||||||
parentFragmentManager.commitTransaction(allowStateLoss) {
|
parentFragmentManager.commitTransaction(allowStateLoss) {
|
||||||
replace(frameId, fragmentClass, params.toMvRxBundle(), tag)
|
replace(frameId, fragmentClass, params.toMvRxBundle(), tag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun VectorBaseFragment.addFragmentToBackstack(frameId: Int, fragment: Fragment, tag: String? = null, allowStateLoss: Boolean = false) {
|
fun VectorBaseFragment.addFragmentToBackstack(
|
||||||
|
frameId: Int,
|
||||||
|
fragment: Fragment,
|
||||||
|
tag: String? = null,
|
||||||
|
allowStateLoss: Boolean = false
|
||||||
|
) {
|
||||||
parentFragmentManager.commitTransaction(allowStateLoss) { replace(frameId, fragment, tag).addToBackStack(tag) }
|
parentFragmentManager.commitTransaction(allowStateLoss) { replace(frameId, fragment, tag).addToBackStack(tag) }
|
||||||
}
|
}
|
||||||
|
|
||||||
fun <T : Fragment> VectorBaseFragment.addFragmentToBackstack(frameId: Int, fragmentClass: Class<T>, params: Parcelable? = null, tag: String? = null, allowStateLoss: Boolean = false) {
|
fun <T : Fragment> VectorBaseFragment.addFragmentToBackstack(
|
||||||
|
frameId: Int,
|
||||||
|
fragmentClass: Class<T>,
|
||||||
|
params: Parcelable? = null,
|
||||||
|
tag: String? = null,
|
||||||
|
allowStateLoss: Boolean = false
|
||||||
|
) {
|
||||||
parentFragmentManager.commitTransaction(allowStateLoss) {
|
parentFragmentManager.commitTransaction(allowStateLoss) {
|
||||||
replace(frameId, fragmentClass, params.toMvRxBundle(), tag).addToBackStack(tag)
|
replace(frameId, fragmentClass, params.toMvRxBundle(), tag).addToBackStack(tag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun VectorBaseFragment.addChildFragment(frameId: Int, fragment: Fragment, tag: String? = null, allowStateLoss: Boolean = false) {
|
fun VectorBaseFragment.addChildFragment(
|
||||||
|
frameId: Int,
|
||||||
|
fragment: Fragment,
|
||||||
|
tag: String? = null,
|
||||||
|
allowStateLoss: Boolean = false
|
||||||
|
) {
|
||||||
childFragmentManager.commitTransaction(allowStateLoss) { add(frameId, fragment, tag) }
|
childFragmentManager.commitTransaction(allowStateLoss) { add(frameId, fragment, tag) }
|
||||||
}
|
}
|
||||||
|
|
||||||
fun <T : Fragment> VectorBaseFragment.addChildFragment(frameId: Int, fragmentClass: Class<T>, params: Parcelable? = null, tag: String? = null, allowStateLoss: Boolean = false) {
|
fun <T : Fragment> VectorBaseFragment.addChildFragment(
|
||||||
|
frameId: Int,
|
||||||
|
fragmentClass: Class<T>,
|
||||||
|
params: Parcelable? = null,
|
||||||
|
tag: String? = null,
|
||||||
|
allowStateLoss: Boolean = false
|
||||||
|
) {
|
||||||
childFragmentManager.commitTransaction(allowStateLoss) {
|
childFragmentManager.commitTransaction(allowStateLoss) {
|
||||||
add(frameId, fragmentClass, params.toMvRxBundle(), tag)
|
add(frameId, fragmentClass, params.toMvRxBundle(), tag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun VectorBaseFragment.replaceChildFragment(frameId: Int, fragment: Fragment, tag: String? = null, allowStateLoss: Boolean = false) {
|
fun VectorBaseFragment.replaceChildFragment(
|
||||||
|
frameId: Int,
|
||||||
|
fragment: Fragment,
|
||||||
|
tag: String? = null,
|
||||||
|
allowStateLoss: Boolean = false
|
||||||
|
) {
|
||||||
childFragmentManager.commitTransaction(allowStateLoss) { replace(frameId, fragment, tag) }
|
childFragmentManager.commitTransaction(allowStateLoss) { replace(frameId, fragment, tag) }
|
||||||
}
|
}
|
||||||
|
|
||||||
fun <T : Fragment> VectorBaseFragment.replaceChildFragment(frameId: Int, fragmentClass: Class<T>, params: Parcelable? = null, tag: String? = null, allowStateLoss: Boolean = false) {
|
fun <T : Fragment> VectorBaseFragment.replaceChildFragment(
|
||||||
|
frameId: Int,
|
||||||
|
fragmentClass: Class<T>,
|
||||||
|
params: Parcelable? = null,
|
||||||
|
tag: String? = null,
|
||||||
|
allowStateLoss: Boolean = false
|
||||||
|
) {
|
||||||
childFragmentManager.commitTransaction(allowStateLoss) {
|
childFragmentManager.commitTransaction(allowStateLoss) {
|
||||||
replace(frameId, fragmentClass, params.toMvRxBundle(), tag)
|
replace(frameId, fragmentClass, params.toMvRxBundle(), tag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun VectorBaseFragment.addChildFragmentToBackstack(frameId: Int, fragment: Fragment, tag: String? = null, allowStateLoss: Boolean = false) {
|
fun VectorBaseFragment.addChildFragmentToBackstack(
|
||||||
|
frameId: Int,
|
||||||
|
fragment: Fragment,
|
||||||
|
tag: String? = null,
|
||||||
|
allowStateLoss: Boolean = false
|
||||||
|
) {
|
||||||
childFragmentManager.commitTransaction(allowStateLoss) { replace(frameId, fragment).addToBackStack(tag) }
|
childFragmentManager.commitTransaction(allowStateLoss) { replace(frameId, fragment).addToBackStack(tag) }
|
||||||
}
|
}
|
||||||
|
|
||||||
fun <T : Fragment> VectorBaseFragment.addChildFragmentToBackstack(frameId: Int, fragmentClass: Class<T>, params: Parcelable? = null, tag: String? = null, allowStateLoss: Boolean = false) {
|
fun <T : Fragment> VectorBaseFragment.addChildFragmentToBackstack(
|
||||||
|
frameId: Int,
|
||||||
|
fragmentClass: Class<T>,
|
||||||
|
params: Parcelable? = null,
|
||||||
|
tag: String? = null,
|
||||||
|
allowStateLoss: Boolean = false
|
||||||
|
) {
|
||||||
childFragmentManager.commitTransaction(allowStateLoss) {
|
childFragmentManager.commitTransaction(allowStateLoss) {
|
||||||
replace(frameId, fragmentClass, params.toMvRxBundle(), tag).addToBackStack(tag)
|
replace(frameId, fragmentClass, params.toMvRxBundle(), tag).addToBackStack(tag)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue