Skip to content

Commit 961c90e

Browse files
ovitrifovitrif
authored
Merge pull request #57 from synonymdev/feat/balance_header_review_screen
Balance Header
2 parents 4858aee + 1f2fe32 commit 961c90e

File tree

6 files changed

+131
-6
lines changed

6 files changed

+131
-6
lines changed

‎app/src/main/java/to/bitkit/ui/screens/wallets/send/SendAndReviewScreen.kt‎

Lines changed: 37 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,18 @@ import androidx.compose.foundation.layout.fillMaxSize
1111
import androidx.compose.foundation.layout.fillMaxWidth
1212
import androidx.compose.foundation.layout.height
1313
import androidx.compose.foundation.layout.padding
14+
import androidx.compose.foundation.layout.size
1415
import androidx.compose.material3.HorizontalDivider
16+
import androidx.compose.material3.Icon
1517
import androidx.compose.runtime.Composable
1618
import androidx.compose.runtime.getValue
1719
import androidx.compose.runtime.mutableStateOf
1820
import androidx.compose.runtime.remember
1921
import androidx.compose.runtime.rememberCoroutineScope
2022
import androidx.compose.runtime.setValue
23+
import androidx.compose.ui.Alignment
2124
import androidx.compose.ui.Modifier
25+
import androidx.compose.ui.res.painterResource
2226
import androidx.compose.ui.res.stringResource
2327
import androidx.compose.ui.unit.dp
2428
import kotlinx.coroutines.delay
@@ -28,6 +32,7 @@ import to.bitkit.ext.DatePattern
2832
import to.bitkit.ext.ellipsisMiddle
2933
import to.bitkit.ext.formatted
3034
import to.bitkit.ext.truncate
35+
import to.bitkit.ui.components.BalanceHeaderView
3136
import to.bitkit.ui.components.BodySSB
3237
import to.bitkit.ui.components.Caption13Up
3338
import to.bitkit.ui.components.Display
@@ -65,10 +70,8 @@ fun SendAndReviewScreen(
6570
.padding(horizontal = 16.dp)
6671
.fillMaxWidth()
6772
) {
68-
Caption13Up(text = stringResource(R.string.label_amount), color = Colors.White64)
69-
Display(
70-
text = moneyString(uiState.amount.toLong()),
71-
)
73+
74+
BalanceHeaderView(sats = uiState.amount.toLong(), modifier = Modifier.fillMaxWidth())
7275

7376
Spacer(modifier = Modifier.height(16.dp))
7477

@@ -126,7 +129,24 @@ fun SendAndReviewScreen(
126129
) {
127130
Caption13Up(text = stringResource(R.string.label_speed), color = Colors.White64)
128131
Spacer(modifier = Modifier.height(8.dp))
129-
BodySSB(text = "Instant (±$0.01)")
132+
Row(
133+
verticalAlignment = Alignment.CenterVertically,
134+
horizontalArrangement = Arrangement.spacedBy(4.dp),
135+
) {
136+
Icon(
137+
painterResource(R.drawable.ic_speed_normal),
138+
contentDescription = null,
139+
tint = Colors.Brand,
140+
modifier = Modifier.size(16.dp)
141+
) //TODO GET FROM STATE
142+
BodySSB(text = "Instant (±$0.01)") //TODO GET FROM STATE
143+
Icon(
144+
painterResource(R.drawable.ic_pencil_simple),
145+
contentDescription = null,
146+
tint = Colors.White,
147+
modifier = Modifier.size(16.dp)
148+
)
149+
}
130150
Spacer(modifier = Modifier.weight(1f))
131151
HorizontalDivider(modifier = Modifier.padding(vertical = 16.dp))
132152
}
@@ -145,7 +165,18 @@ fun SendAndReviewScreen(
145165
color = Colors.White64
146166
)
147167
Spacer(modifier = Modifier.height(8.dp))
148-
BodySSB(text = invoiceExpiryTimestamp)
168+
Row(
169+
verticalAlignment = Alignment.CenterVertically,
170+
horizontalArrangement = Arrangement.spacedBy(4.dp),
171+
) {
172+
Icon(
173+
painterResource(R.drawable.ic_clock),
174+
contentDescription = null,
175+
tint = Colors.Brand,
176+
modifier = Modifier.size(16.dp)
177+
)
178+
BodySSB(text = invoiceExpiryTimestamp)
179+
}
149180
Spacer(modifier = Modifier.weight(1f))
150181
HorizontalDivider(modifier = Modifier.padding(vertical = 16.dp))
151182
}

‎app/src/main/res/drawable/ic_clock.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="13dp"
3+
android:height="14dp"
4+
android:viewportWidth="13"
5+
android:viewportHeight="14">
6+
<path
7+
android:pathData="M6.5,13C9.814,13 12.5,10.314 12.5,7C12.5,3.686 9.814,1 6.5,1C3.186,1 0.5,3.686 0.5,7C0.5,10.314 3.186,13 6.5,13Z"
8+
android:strokeAlpha="0.2"
9+
android:fillColor="#FF4400"
10+
android:fillAlpha="0.2"/>
11+
<path
12+
android:pathData="M6.5,1.5C3.462,1.5 1,3.962 1,7C1,10.038 3.462,12.5 6.5,12.5C9.538,12.5 12,10.038 12,7C12,3.962 9.538,1.5 6.5,1.5ZM0,7C0,3.41 2.91,0.5 6.5,0.5C10.09,0.5 13,3.41 13,7C13,10.59 10.09,13.5 6.5,13.5C2.91,13.5 0,10.59 0,7Z"
13+
android:fillColor="#FF4400"
14+
android:fillType="evenOdd"/>
15+
<path
16+
android:pathData="M6.5,3C6.776,3 7,3.224 7,3.5V6.5H10C10.276,6.5 10.5,6.724 10.5,7C10.5,7.276 10.276,7.5 10,7.5H6.5C6.224,7.5 6,7.276 6,7V3.5C6,3.224 6.224,3 6.5,3Z"
17+
android:fillColor="#FF4400"
18+
android:fillType="evenOdd"/>
19+
</vector>

‎app/src/main/res/drawable/ic_speed_fast.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="32dp"
3+
android:height="33dp"
4+
android:viewportWidth="32"
5+
android:viewportHeight="33">
6+
<path
7+
android:pathData="M4,22.5H28C28,15.873 22.627,10.5 16,10.5C9.373,10.5 4,15.873 4,22.5Z"
8+
android:strokeAlpha="0.2"
9+
android:fillColor="#FF4400"
10+
android:fillType="evenOdd"
11+
android:fillAlpha="0.2"/>
12+
<path
13+
android:pathData="M14.989,23.383C13.73,24.218 13.518,25.751 14.577,26.848C15.662,27.907 17.182,27.671 18.03,26.412L22.218,20.242C22.766,19.419 21.981,18.634 21.158,19.183L14.989,23.383Z"
14+
android:fillColor="#FF4400"/>
15+
<path
16+
android:pathData="M5,22.5C5,16.425 9.925,11.5 16,11.5C22.075,11.5 27,16.425 27,22.5H29C29,15.32 23.18,9.5 16,9.5C8.82,9.5 3,15.32 3,22.5H5Z"
17+
android:fillColor="#FF4400"
18+
android:fillType="evenOdd"/>
19+
</vector>

‎app/src/main/res/drawable/ic_speed_normal.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="32dp"
3+
android:height="32dp"
4+
android:viewportWidth="32"
5+
android:viewportHeight="32">
6+
<path
7+
android:pathData="M4,22H28C28,15.373 22.627,10 16,10C9.373,10 4,15.373 4,22Z"
8+
android:strokeAlpha="0.2"
9+
android:fillColor="#FF4400"
10+
android:fillType="evenOdd"
11+
android:fillAlpha="0.2"/>
12+
<path
13+
android:pathData="M13.87,24.34C13.57,25.821 14.505,27.055 16.029,27.081C17.545,27.063 18.453,25.821 18.162,24.331L16.761,17.007C16.567,16.038 15.457,16.038 15.263,17.007L13.87,24.34Z"
14+
android:fillColor="#FF4400"/>
15+
<path
16+
android:pathData="M5,22C5,15.925 9.925,11 16,11C22.075,11 27,15.925 27,22H29C29,14.82 23.18,9 16,9C8.82,9 3,14.82 3,22H5Z"
17+
android:fillColor="#FF4400"
18+
android:fillType="evenOdd"/>
19+
</vector>

‎app/src/main/res/drawable/ic_speed_slow.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="32dp"
3+
android:height="33dp"
4+
android:viewportWidth="32"
5+
android:viewportHeight="33">
6+
<path
7+
android:pathData="M4,22.5H28C28,15.873 22.627,10.5 16,10.5C9.373,10.5 4,15.873 4,22.5Z"
8+
android:strokeAlpha="0.2"
9+
android:fillColor="#FF4400"
10+
android:fillType="evenOdd"
11+
android:fillAlpha="0.2"/>
12+
<path
13+
android:pathData="M17.011,23.383C18.27,24.218 18.482,25.751 17.423,26.848C16.338,27.907 14.818,27.671 13.97,26.412L9.782,20.242C9.234,19.419 10.019,18.634 10.842,19.183L17.011,23.383Z"
14+
android:fillColor="#FF4400"/>
15+
<path
16+
android:pathData="M5,22.5C5,16.425 9.925,11.5 16,11.5C22.075,11.5 27,16.425 27,22.5H29C29,15.32 23.18,9.5 16,9.5C8.82,9.5 3,15.32 3,22.5H5Z"
17+
android:fillColor="#FF4400"
18+
android:fillType="evenOdd"/>
19+
</vector>

‎app/src/main/res/drawable/ic_tag.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="16dp"
3+
android:height="16dp"
4+
android:viewportWidth="16"
5+
android:viewportHeight="16">
6+
<path
7+
android:pathData="M7.666,1.618L2.625,2.626L1.617,7.667C1.601,7.747 1.605,7.831 1.629,7.91C1.653,7.988 1.696,8.06 1.754,8.118L8.282,14.647C8.329,14.693 8.384,14.73 8.444,14.755C8.505,14.78 8.57,14.793 8.636,14.793C8.701,14.793 8.766,14.78 8.827,14.755C8.888,14.73 8.943,14.693 8.989,14.647L14.646,8.99C14.693,8.943 14.729,8.888 14.755,8.828C14.78,8.767 14.793,8.702 14.793,8.636C14.793,8.571 14.78,8.506 14.755,8.445C14.729,8.384 14.693,8.329 14.646,8.283L8.118,1.754C8.06,1.696 7.988,1.653 7.909,1.629C7.83,1.606 7.747,1.601 7.666,1.618Z"
8+
android:strokeAlpha="0.2"
9+
android:fillColor="#FF4400"
10+
android:fillAlpha="0.2"/>
11+
<path
12+
android:pathData="M7.568,1.127C7.73,1.095 7.897,1.103 8.054,1.151C8.212,1.199 8.355,1.284 8.471,1.401L7.643,1.503M7.643,1.503L7.568,1.127L7.643,1.503ZM2.527,2.136L7.568,1.127L7.643,1.503M3.05,3.051L2.107,7.765L8.636,14.293L14.293,8.636L7.764,2.108L3.05,3.051ZM8.471,1.401L15,7.929C15.092,8.022 15.166,8.132 15.217,8.254C15.267,8.375 15.293,8.505 15.293,8.636C15.293,8.768 15.267,8.898 15.217,9.019C15.166,9.14 15.092,9.25 15,9.343L9.343,15C9.25,15.093 9.14,15.167 9.018,15.217C8.897,15.267 8.767,15.293 8.636,15.293C8.504,15.293 8.374,15.267 8.253,15.217C8.132,15.167 8.021,15.093 7.929,15L1.4,8.472C1.284,8.355 1.198,8.212 1.15,8.055C1.103,7.897 1.095,7.73 1.127,7.569L2.135,2.528C2.175,2.33 2.329,2.175 2.527,2.136"
13+
android:fillColor="#FF4400"
14+
android:fillType="evenOdd"/>
15+
<path
16+
android:pathData="M5.249,6C5.663,6 5.999,5.664 5.999,5.25C5.999,4.836 5.663,4.5 5.249,4.5C4.835,4.5 4.499,4.836 4.499,5.25C4.499,5.664 4.835,6 5.249,6Z"
17+
android:fillColor="#FF4400"/>
18+
</vector>

0 commit comments

Comments
 (0)