jarno/element-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix strange crash

Browse source
This commit is contained in:
Benoit Marty 2020-12-16 12:21:25 +01:00
parent e081c3b249
commit 7f02c0596e
2 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
vector/src/main/java/im/vector/app/core/platform/SimpleFragmentActivity.kt
View file

@ -42,7 +42,7 @@ abstract class SimpleFragmentActivity : VectorBaseActivity<ActivityBinding>() {
override fun initUiAndData() {
configureToolbar(views.toolbar)
waitingView = views.overlayWaitingView.waitingView
waitingView = views.waitingView.waitingView
}
/**
@ -51,21 +51,21 @@ abstract class SimpleFragmentActivity : VectorBaseActivity<ActivityBinding>() {
*/
fun updateWaitingView(data: WaitingViewData?) {
data?.let {
views.overlayWaitingView.waitingStatusText.text = data.message
views.waitingView.waitingStatusText.text = data.message
if (data.progress != null && data.progressTotal != null) {
views.overlayWaitingView.waitingHorizontalProgress.isIndeterminate = false
views.overlayWaitingView.waitingHorizontalProgress.progress = data.progress
views.overlayWaitingView.waitingHorizontalProgress.max = data.progressTotal
views.overlayWaitingView.waitingHorizontalProgress.isVisible = true
views.overlayWaitingView.waitingCircularProgress.isVisible = false
views.waitingView.waitingHorizontalProgress.isIndeterminate = false
views.waitingView.waitingHorizontalProgress.progress = data.progress
views.waitingView.waitingHorizontalProgress.max = data.progressTotal
views.waitingView.waitingHorizontalProgress.isVisible = true
views.waitingView.waitingCircularProgress.isVisible = false
} else if (data.isIndeterminate) {
views.overlayWaitingView.waitingHorizontalProgress.isIndeterminate = true
views.overlayWaitingView.waitingHorizontalProgress.isVisible = true
views.overlayWaitingView.waitingCircularProgress.isVisible = false
views.waitingView.waitingHorizontalProgress.isIndeterminate = true
views.waitingView.waitingHorizontalProgress.isVisible = true
views.waitingView.waitingCircularProgress.isVisible = false
} else {
views.overlayWaitingView.waitingHorizontalProgress.isVisible = false
views.overlayWaitingView.waitingCircularProgress.isVisible = true
views.waitingView.waitingHorizontalProgress.isVisible = false
views.waitingView.waitingCircularProgress.isVisible = true
}
showWaitingView()
@ -76,15 +76,15 @@ abstract class SimpleFragmentActivity : VectorBaseActivity<ActivityBinding>() {
override fun showWaitingView() {
hideKeyboard()
views.overlayWaitingView.waitingStatusText.isGone = views.overlayWaitingView.waitingStatusText.text.isNullOrBlank()
views.waitingView.waitingStatusText.isGone = views.waitingView.waitingStatusText.text.isNullOrBlank()
super.showWaitingView()
}
override fun hideWaitingView() {
views.overlayWaitingView.waitingStatusText.text = null
views.overlayWaitingView.waitingStatusText.isGone = true
views.overlayWaitingView.waitingHorizontalProgress.progress = 0
views.overlayWaitingView.waitingHorizontalProgress.isVisible = false
views.waitingView.waitingStatusText.text = null
views.waitingView.waitingStatusText.isGone = true
views.waitingView.waitingHorizontalProgress.progress = 0
views.waitingView.waitingHorizontalProgress.isVisible = false
super.hideWaitingView()
}

3
vector/src/main/res/layout/activity.xml
View file

@ -27,8 +27,9 @@
app:layout_constraintTop_toBottomOf="@id/toolbar" />
<include
android:id="@+id/overlay_waiting_view"
android:id="@+id/waiting_view"
layout="@layout/merge_overlay_waiting_view" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>