Commit0de1e3b

authored

fix: channel history indicator alignment and flickering [WPB-15859] (#4094)

1 parent5d8037e commit0de1e3bCopy full SHA for 0de1e3b

File tree

2 files changed

+15

-1

lines changed

app/src/main/kotlin/com/wire/android/ui
- common
  - PageLoadingIndicator.kt
- home/conversations
  - ConversationScreen.kt

2 files changed

+15

-1

lines changed

`‎app/src/main/kotlin/com/wire/android/ui/common/PageLoadingIndicator.kt`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ import androidx.compose.ui.Alignment`
`32`	`32`	`importandroidx.compose.ui.Modifier`
`33`	`33`	`importandroidx.compose.ui.res.painterResource`
`34`	`34`	`importandroidx.compose.ui.res.stringResource`
	`35`	`+importandroidx.compose.ui.text.style.TextAlign`
`35`	`36`	`importcom.wire.android.R`
`36`	`37`	`importcom.wire.android.ui.theme.WireTheme`
`37`	`38`	`importcom.wire.android.util.ui.PreviewMultipleThemes`
`@@ -68,6 +69,7 @@ fun PageLoadingIndicator(`
`68`	`69`	`text= text,`
`69`	`70`	`style= typography().subline01,`
`70`	`71`	`color= colorsScheme().secondaryText,`
	`72`	`+ textAlign=TextAlign.Center,`
`71`	`73`	`)`
`72`	`74`	`}`
`73`	`75`	`}`

`‎app/src/main/kotlin/com/wire/android/ui/home/conversations/ConversationScreen.kt`

Lines changed: 13 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,7 @@ import androidx.compose.ui.res.painterResource`
`73`	`73`	`importandroidx.compose.ui.res.stringResource`
`74`	`74`	`importandroidx.compose.ui.text.style.TextOverflow`
`75`	`75`	`importandroidx.hilt.navigation.compose.hiltViewModel`
	`76`	`+importandroidx.paging.LoadState`
`76`	`77`	`importandroidx.paging.PagingData`
`77`	`78`	`importandroidx.paging.compose.LazyPagingItems`
`78`	`79`	`importandroidx.paging.compose.collectAsLazyPagingItems`
`@@ -1333,7 +1334,18 @@ fun MessageList(`
`1333`	`1334`	`.fillMaxWidth()`
`1334`	`1335`	`.padding(dimensions().spacing16x),`
`1335`	`1336`	`) {`
`1336`		`-val (text, prefixIconResId)=when (lazyPagingMessages.loadState.prepend.endOfPaginationReached) {`
	`1337`	`+var allMessagesPrepended by remember { mutableStateOf(false) }`
	`1338`	`+LaunchedEffect(lazyPagingMessages.loadState) {`
	`1339`	`+// When the list is being refreshed, the load state for prepend is cleared so the app doesn't know if`
	`1340`	`+// the end of pagination is reached or not for prepend until the refresh is done, so we don't want to`
	`1341`	`+// update the allMessagesPrepended state while refreshing and in that case keep the last updated state,`
	`1342`	`+// otherwise the indicator will flicker while refreshing.`
	`1343`	`+if (lazyPagingMessages.loadState.refreshisLoadState.NotLoading) {`
	`1344`	`+ allMessagesPrepended= lazyPagingMessages.loadState.prepend.endOfPaginationReached`
	`1345`	`+ }`
	`1346`	`+ }`
	`1347`	`+`
	`1348`	`+val (text, prefixIconResId)=when (allMessagesPrepended) {`
`1337`	`1349`	`true-> stringResource(R.string.conversation_history_loaded) tonull`
`1338`	`1350`	`false-> stringResource(R.string.conversation_history_loading) toR.drawable.ic_undo`
`1339`	`1351`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit0de1e3b

File tree

2 files changed

2 files changed

`‎app/src/main/kotlin/com/wire/android/ui/common/PageLoadingIndicator.kt`

`‎app/src/main/kotlin/com/wire/android/ui/home/conversations/ConversationScreen.kt`

0 commit comments