|
1 | 1 | package to.bitkit.ui.screens.wallets.activity.components |
2 | 2 |
|
3 | | -import androidx.compose.animation.AnimatedVisibility |
4 | 3 | import androidx.compose.animation.core.tween |
5 | | -import androidx.compose.animation.expandVertically |
6 | | -import androidx.compose.animation.fadeIn |
7 | | -import androidx.compose.animation.fadeOut |
8 | | -import androidx.compose.animation.shrinkVertically |
9 | 4 | import androidx.compose.foundation.layout.Column |
10 | 5 | import androidx.compose.foundation.layout.PaddingValues |
11 | 6 | import androidx.compose.foundation.layout.Spacer |
@@ -71,40 +66,37 @@ fun ActivityListGrouped( |
71 | 66 | is Activity.Lightning -> "lightning_${item.rawId()}" |
72 | 67 | is Activity.Onchain -> "onchain_${item.rawId()}" |
73 | 68 | } |
74 | | - |
75 | 69 | else -> "item_$index" |
76 | 70 | } |
77 | 71 | } |
78 | 72 | ) { index, item -> |
79 | | - AnimatedVisibility( |
80 | | - visible = true, |
81 | | - enter = fadeIn(animationSpec = tween(durationMillis = 400, delayMillis = 50)) + |
82 | | - expandVertically( |
83 | | - animationSpec = tween(durationMillis = 400, delayMillis = 50), |
84 | | - expandFrom = Alignment.Top |
85 | | - ), |
86 | | - exit = fadeOut(animationSpec = tween(durationMillis = 300)) + |
87 | | - shrinkVertically( |
88 | | - animationSpec = tween(durationMillis = 300), |
89 | | - shrinkTowards = Alignment.Top |
| 73 | + when (item) { |
| 74 | + is String -> { |
| 75 | + Caption13Up( |
| 76 | + text = item, |
| 77 | + color = Colors.White64, |
| 78 | + modifier = Modifier |
| 79 | + .fillMaxWidth() |
| 80 | + .padding(vertical = 8.dp) |
| 81 | + .animateItem( |
| 82 | + fadeInSpec = tween(durationMillis = 300), |
| 83 | + fadeOutSpec = tween(durationMillis = 300), |
| 84 | + placementSpec = tween(durationMillis = 300) |
| 85 | + ) |
90 | 86 | ) |
91 | | - ) { |
92 | | - when (item) { |
93 | | - is String -> { |
94 | | - Caption13Up( |
95 | | - text = item, |
96 | | - color = Colors.White64, |
97 | | - modifier = Modifier |
98 | | - .fillMaxWidth() |
99 | | - .padding(vertical = 16.dp) |
100 | | - ) |
101 | | - } |
| 87 | + } |
102 | 88 |
|
103 | | - is Activity -> { |
104 | | - Column { |
105 | | - ActivityRow(item, onActivityItemClick, testTag = "Activity-$index") |
106 | | - VerticalSpacer(16.dp) |
107 | | - } |
| 89 | + is Activity -> { |
| 90 | + Column( |
| 91 | + modifier = Modifier |
| 92 | + .animateItem( |
| 93 | + fadeInSpec = tween(durationMillis = 300), |
| 94 | + fadeOutSpec = tween(durationMillis = 300), |
| 95 | + placementSpec = tween(durationMillis = 300) |
| 96 | + ) |
| 97 | + ) { |
| 98 | + ActivityRow(item, onActivityItemClick, testTag = "Activity-$index") |
| 99 | + VerticalSpacer(16.dp) |
108 | 100 | } |
109 | 101 | } |
110 | 102 | } |
|
0 commit comments