Skip to content

Commit b379e27

Browse files
committed
ui: disable overscroll for wallet category LazyRow
1 parent d58d869 commit b379e27

File tree

3 files changed

+3
-30
lines changed

3 files changed

+3
-30
lines changed

app/src/main/java/one/mixin/android/extension/ViewExtension.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -533,8 +533,7 @@ fun View.expandTouchArea(horizontal: Int = 8.dp, vertical: Int = 8.dp) {
533533

534534
fun HorizontalScrollView.scrollToCenter(targetView: View) {
535535
post {
536-
val containerView: View? = getChildAt(0)
537-
if (containerView == null) return@post
536+
val containerView: View = getChildAt(0) ?: return@post
538537
val targetCenterX: Int = targetView.left + (targetView.width / 2)
539538
val scrollToX: Int = targetCenterX - (width / 2)
540539
val maxScrollX: Int = max(0, containerView.width - width)
@@ -545,7 +544,6 @@ fun HorizontalScrollView.scrollToCenter(targetView: View) {
545544
fun HorizontalScrollView.scrollToCenterCheckedRadio(radioGroup: RadioGroup) {
546545
val checkedId: Int = radioGroup.checkedRadioButtonId
547546
if (checkedId == View.NO_ID) return
548-
val checkedView: View? = radioGroup.findViewById(checkedId)
549-
if (checkedView == null) return
547+
val checkedView: View = radioGroup.findViewById(checkedId) ?: return
550548
scrollToCenter(checkedView)
551549
}

app/src/main/java/one/mixin/android/ui/wallet/InputFragment.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -553,6 +553,7 @@ class InputFragment : BaseFragment(R.layout.fragment_input), OnReceiveSelectionC
553553
runCatching {
554554
token.buildTransaction(rpc, fromAddress, toAddress, amount, web3ViewModel.outputsByAddress(fromAddress, token.assetId), rate, miniFee)
555555
}.onFailure { e ->
556+
Timber.e("Build Transaction Error: ${e.message}")
556557
if (e is EmptyUtxoException) {
557558
ErrorHandler.handleError(e)
558559
}

app/src/main/java/one/mixin/android/ui/wallet/components/WalletCategoryFilter.kt

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
package one.mixin.android.ui.wallet.components
22

3-
import androidx.compose.foundation.gestures.animateScrollBy
43
import androidx.compose.foundation.layout.Arrangement
54
import androidx.compose.foundation.layout.fillMaxWidth
65
import androidx.compose.foundation.layout.padding
7-
import androidx.compose.foundation.lazy.LazyListItemInfo
8-
import androidx.compose.foundation.lazy.LazyListState
96
import androidx.compose.foundation.lazy.LazyRow
107
import androidx.compose.foundation.lazy.itemsIndexed
11-
import androidx.compose.foundation.lazy.rememberLazyListState
128
import androidx.compose.runtime.Composable
13-
import androidx.compose.runtime.LaunchedEffect
14-
import androidx.compose.runtime.withFrameNanos
159
import androidx.compose.ui.Modifier
1610
import androidx.compose.ui.res.stringResource
1711
import androidx.compose.ui.unit.dp
@@ -71,27 +65,7 @@ private fun WalletCategoryTabRow(
7165
selectedIndex: Int,
7266
onTabSelected: (Int) -> Unit
7367
) {
74-
val listState: LazyListState = rememberLazyListState()
75-
LaunchedEffect(selectedIndex, tabs.size) {
76-
if (tabs.isEmpty()) return@LaunchedEffect
77-
listState.animateScrollToItem(index = selectedIndex)
78-
val delta: Float? = withFrameNanos { _: Long ->
79-
val itemInfo: LazyListItemInfo? = listState.layoutInfo.visibleItemsInfo
80-
.firstOrNull { info: LazyListItemInfo -> info.index == selectedIndex }
81-
if (itemInfo == null) return@withFrameNanos null
82-
val viewportStartOffset: Int = listState.layoutInfo.viewportStartOffset
83-
val viewportEndOffset: Int = listState.layoutInfo.viewportEndOffset
84-
val viewportWidth: Int = viewportEndOffset - viewportStartOffset
85-
val viewportCenter: Int = viewportStartOffset + (viewportWidth / 2)
86-
val itemCenter: Int = itemInfo.offset + (itemInfo.size / 2)
87-
(itemCenter - viewportCenter).toFloat()
88-
}
89-
if (delta != null && delta != 0f) {
90-
listState.animateScrollBy(delta)
91-
}
92-
}
9368
LazyRow(
94-
state = listState,
9569
modifier = Modifier
9670
.fillMaxWidth()
9771
.padding(vertical = 4.dp),

0 commit comments

Comments
 (0)