Skip to content

Commit 48c0145

Browse files
authored
Merge pull request #255 from DimensionDev/bugfix/ui-search-address
Bugfix/ui bugs in search address
2 parents 8553a4e + 724cb38 commit 48c0145

2 files changed

Lines changed: 23 additions & 4 deletions

File tree

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
<path
7+
android:pathData="M12,0L12,0A12,12 0,0 1,24 12L24,12A12,12 0,0 1,12 24L12,24A12,12 0,0 1,0 12L0,12A12,12 0,0 1,12 0z"
8+
android:strokeAlpha="0.1"
9+
android:fillColor="#1C68F3"
10+
android:fillAlpha="0.1"/>
11+
<path
12+
android:pathData="M14.5634,11.0022C12.6745,11.0022 11.1436,12.4973 11.1436,14.3421C11.1436,16.1869 12.6745,17.6812 14.5634,17.6812C16.4522,17.6812 17.9834,16.1868 17.9834,14.3416C17.9834,12.4965 16.4524,11.0029 14.5634,11.0029V11.0022ZM16.2087,16.0581C15.9915,16.2697 15.7341,16.1441 15.7341,16.1441C15.7341,16.1441 14.3853,14.8091 14.2207,14.6414C14.0562,14.4761 14.0737,14.2986 14.0737,14.2986V12.7829C14.0767,12.6823 14.2071,12.4691 14.4652,12.4691C14.7234,12.4691 14.8275,12.7814 14.8275,12.7814L14.8306,13.9695C14.8306,14.2094 14.922,14.2674 14.922,14.2674L16.1767,15.5622C16.1782,15.5622 16.4257,15.8463 16.2087,16.0573V16.0581Z"
13+
android:fillColor="#1C68F3"/>
14+
<path
15+
android:pathData="M10.3206,14.3416C10.3206,12.0528 12.2203,10.1981 14.5629,10.1981C15.1526,10.197 15.7362,10.3171 16.2774,10.5512V8.5968L16.2804,8.5785C16.2804,8.5785 16.282,8.5099 16.2774,8.1764V7.5047C16.2853,7.3812 16.2783,7.2573 16.2568,7.1354C16.2121,6.4953 15.7749,6.2204 15.4126,6.1016C15.1974,6.0309 14.9718,5.9966 14.7453,6.0003C14.0264,6.0003 12.5746,6.0018 11.1495,6.0056C9.7244,6.0033 8.2719,6.0003 7.5538,6.0003C7.2871,6.0003 7.0662,6.0384 6.8858,6.1016C6.5215,6.2204 6.0836,6.497 6.0408,7.1352C6.0192,7.2571 6.0124,7.3812 6.0203,7.5047V8.1766C6.015,8.5122 6.0163,8.5785 6.0163,8.5785L6.0201,8.5968C6.0201,10.7675 6.0215,15.4898 6.0269,16.3406C6.033,17.4509 7.2348,17.6628 7.2348,17.6628L12.0304,17.6643C10.9916,16.9103 10.3206,15.7023 10.3206,14.3416ZM8.1058,8.8276C8.1058,8.6478 8.2565,8.4993 8.4432,8.4993H13.8624C14.0467,8.4993 14.199,8.6463 14.199,8.8284V9.0051C14.199,9.1879 14.0471,9.3349 13.8624,9.3349H8.4432C8.3547,9.3357 8.2696,9.3015 8.2063,9.2397C8.1431,9.1779 8.1069,9.0935 8.1058,9.0051V8.8276ZM9.9261,11.5039C9.9261,11.686 9.7742,11.833 9.5886,11.833H8.4416C8.3533,11.8338 8.2683,11.7996 8.2051,11.738C8.1419,11.6763 8.1056,11.5922 8.1041,11.5039V11.3273C8.1041,11.1468 8.255,10.9976 8.4416,10.9976H9.5886C9.773,10.9976 9.9261,11.1453 9.9261,11.3273V11.5039Z"
16+
android:fillColor="#1C68F3"/>
17+
</vector>

wallet/src/androidMain/kotlin/com/dimension/maskbook/wallet/ui/scenes/wallets/send/SearchAddressScene.kt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ private fun SearchInput(
183183
painter = painterResource(id = R.drawable.ic_scan),
184184
contentDescription = null,
185185
modifier = Modifier.size(24.dp),
186+
tint = Color(0xFF1D2238)
186187
)
187188
}
188189
} else {
@@ -239,7 +240,7 @@ private fun EnsCard(
239240
modifier = Modifier.fillMaxWidth(),
240241
contentPadding = PaddingValues(12.dp),
241242
) {
242-
Column {
243+
Column(modifier = Modifier.weight(1f)) {
243244
Text(
244245
text = ensData.name,
245246
style = MaterialTheme.typography.h5,
@@ -250,12 +251,13 @@ private fun EnsCard(
250251
style = MaterialTheme.typography.body2,
251252
)
252253
}
253-
Spacer(Modifier.width(20.dp))
254+
Spacer(Modifier.width(36.dp))
254255
MaskIconButton(onClick = onCopy) {
255256
Icon(
256257
painter = painterResource(R.drawable.ic_copy_ens),
257258
contentDescription = null,
258-
modifier = Modifier.size(20.dp),
259+
modifier = Modifier.size(24.dp),
260+
tint = Color(0xFF1D2238)
259261
)
260262
}
261263
}
@@ -283,7 +285,7 @@ private fun EmptyInputContent(
283285
}
284286
item {
285287
ItemHeader(
286-
icon = R.drawable.ic_time_circle,
288+
icon = R.drawable.ic_recent_address,
287289
title = stringResource(R.string.scene_wallet_send_address_recent),
288290
)
289291
}

0 commit comments

Comments
 (0)