filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implement stop sharing button visibility.

This commit is contained in:
Onuray Sahin 2022-05-27 16:33:55 +03:00
parent daa0734e5b
commit 83e79207c1
4 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationBottomSheetController.kt
View File

@ -64,7 +64,7 @@ class LiveLocationBottomSheetController @Inject constructor(
avatarRenderer(host.avatarRenderer)
remainingTime(remainingTime)
locationUpdateTimeMillis(liveLocationViewState.locationTimestampMillis)
showStopSharingButton(false)
showStopSharingButton(liveLocationViewState.showStopSharingButton)
}
}
}

17
vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationUserItem.kt
View File

@ -65,8 +65,6 @@ abstract class LiveLocationUserItem : VectorEpoxyModel<LiveLocationUserItem.Hold
@EpoxyAttribute
var showStopSharingButton: Boolean = false
private var timer: CountUpTimer? = null
override fun bind(holder: Holder) {
super.bind(holder)
avatarRenderer.render(matrixItem, holder.itemUserAvatarImageView)
@ -80,7 +78,9 @@ abstract class LiveLocationUserItem : VectorEpoxyModel<LiveLocationUserItem.Hold
}
}
timer = CountUpTimer(1000).apply {
stopTimer(holder)
holder.timer = CountUpTimer(1000).apply {
tickListener = object : CountUpTimer.TickListener {
override fun onTick(milliseconds: Long) {
holder.itemLastUpdatedAtTextView.text = getFormattedLastUpdatedAt(locationUpdateTimeMillis)
@ -90,6 +90,16 @@ abstract class LiveLocationUserItem : VectorEpoxyModel<LiveLocationUserItem.Hold
}
}
override fun unbind(holder: Holder) {
super.unbind(holder)
stopTimer(holder)
}
private fun stopTimer(holder: Holder) {
holder.timer?.stop()
holder.timer = null
}
private fun getFormattedLastUpdatedAt(locationUpdateTimeMillis: Long?): String {
if (locationUpdateTimeMillis == null) return ""
val elapsedTime = clock.epochMillis() - locationUpdateTimeMillis
@ -98,6 +108,7 @@ abstract class LiveLocationUserItem : VectorEpoxyModel<LiveLocationUserItem.Hold
}
class Holder : VectorEpoxyHolder() {
var timer: CountUpTimer? = null
val itemUserAvatarImageView by bind<ImageView>(R.id.itemUserAvatarImageView)
val itemUserDisplayNameTextView by bind<TextView>(R.id.itemUserDisplayNameTextView)
val itemRemainingTimeTextView by bind<TextView>(R.id.itemRemainingTimeTextView)

3
vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewState.kt
View File

@ -39,5 +39,6 @@ data class UserLiveLocationViewState(
val pinDrawable: Drawable,
val locationData: LocationData,
val endOfLiveTimestampMillis: Long?,
val locationTimestampMillis: Long?
val locationTimestampMillis: Long?,
val showStopSharingButton: Boolean
)

6
vector/src/main/java/im/vector/app/features/location/live/map/UserLiveLocationViewStateMapper.kt
View File

@ -44,14 +44,16 @@ class UserLiveLocationViewStateMapper @Inject constructor(
}
else -> {
locationPinProvider.create(userId) { pinDrawable ->
activeSessionHolder.getActiveSession().getUser(userId)?.toMatrixItem()?.let { matrixItem ->
val session = activeSessionHolder.getActiveSession()
session.getUser(userId)?.toMatrixItem()?.let { matrixItem ->
val locationTimestampMillis = liveLocationShareAggregatedSummary.lastLocationDataContent?.getBestTimestampMillis()
val viewState = UserLiveLocationViewState(
matrixItem = matrixItem,
pinDrawable = pinDrawable,
locationData = locationData,
endOfLiveTimestampMillis = liveLocationShareAggregatedSummary.endOfLiveTimestampMillis,
locationTimestampMillis = locationTimestampMillis
locationTimestampMillis = locationTimestampMillis,
showStopSharingButton = userId == session.myUserId
)
continuation.resume(viewState) {
// do nothing on cancellation