Skip to content

Commit 8f824ce

Browse files
ovitrifovitrif
authored
Merge pull request #55 from synonymdev/feat/send_options_view_icons
SendOptionsContent icons and colors
2 parents c9aa017 + 0f35ce0 commit 8f824ce

File tree

5 files changed

+91
-8
lines changed

5 files changed

+91
-8
lines changed

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

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package to.bitkit.ui.screens.wallets.send
22

3+
import androidx.compose.foundation.Image
4+
import androidx.compose.foundation.background
35
import androidx.compose.foundation.layout.Column
46
import androidx.compose.foundation.layout.Spacer
57
import androidx.compose.foundation.layout.fillMaxHeight
@@ -9,16 +11,13 @@ import androidx.compose.foundation.layout.height
911
import androidx.compose.foundation.layout.imePadding
1012
import androidx.compose.foundation.layout.padding
1113
import androidx.compose.foundation.layout.size
12-
import androidx.compose.material.icons.Icons
13-
import androidx.compose.material.icons.filled.ContentPaste
14-
import androidx.compose.material.icons.filled.Person
15-
import androidx.compose.material.icons.outlined.Edit
1614
import androidx.compose.material3.Icon
1715
import androidx.compose.runtime.Composable
1816
import androidx.compose.runtime.LaunchedEffect
1917
import androidx.compose.runtime.getValue
2018
import androidx.compose.runtime.rememberCoroutineScope
2119
import androidx.compose.ui.Modifier
20+
import androidx.compose.ui.layout.ContentScale
2221
import androidx.compose.ui.platform.LocalClipboardManager
2322
import androidx.compose.ui.res.painterResource
2423
import androidx.compose.ui.res.stringResource
@@ -39,6 +38,7 @@ import to.bitkit.ui.scaffold.SheetTopBar
3938
import to.bitkit.ui.screens.scanner.QrScanningScreen
4039
import to.bitkit.ui.theme.AppThemeSurface
4140
import to.bitkit.ui.theme.Colors
41+
import to.bitkit.ui.theme.Colors.Black25
4242
import to.bitkit.viewmodels.AppViewModel
4343
import to.bitkit.viewmodels.SendEffect
4444
import to.bitkit.viewmodels.SendEvent
@@ -53,6 +53,7 @@ fun SendOptionsView(
5353
modifier = Modifier
5454
.fillMaxWidth()
5555
.fillMaxHeight(.875f)
56+
.background(Black25)
5657
.imePadding()
5758
) {
5859
val navController = rememberNavController()
@@ -120,17 +121,18 @@ private fun SendOptionsContent(
120121
Column(
121122
modifier = Modifier
122123
.fillMaxSize()
124+
.background(Black25)
123125
.padding(horizontal = 16.dp)
124126
) {
125127
SheetTopBar(stringResource(R.string.title_send))
126128
Caption13Up(text = stringResource(R.string.wallet__send_to))
127-
Spacer(modifier = Modifier.height(4.dp))
129+
Spacer(modifier = Modifier.height(16.dp))
128130

129131
RectangleButton(
130132
label = stringResource(R.string.contact),
131133
icon = {
132134
Icon(
133-
imageVector = Icons.Default.Person,
135+
painter = painterResource(R.drawable.ic_users),
134136
contentDescription = null,
135137
tint = Colors.Brand,
136138
modifier = Modifier.size(28.dp),
@@ -148,7 +150,7 @@ private fun SendOptionsContent(
148150
label = stringResource(R.string.paste_invoice),
149151
icon = {
150152
Icon(
151-
imageVector = Icons.Default.ContentPaste,
153+
painter = painterResource(R.drawable.ic_clipboard_text),
152154
contentDescription = null,
153155
tint = Colors.Brand,
154156
modifier = Modifier.size(28.dp),
@@ -164,7 +166,7 @@ private fun SendOptionsContent(
164166
label = stringResource(R.string.enter_manually),
165167
icon = {
166168
Icon(
167-
imageVector = Icons.Outlined.Edit,
169+
painter = painterResource(R.drawable.ic_pencil_simple),
168170
contentDescription = null,
169171
tint = Colors.Brand,
170172
modifier = Modifier.size(28.dp),
@@ -189,6 +191,13 @@ private fun SendOptionsContent(
189191
onEvent(SendEvent.Scan)
190192
}
191193
Spacer(modifier = Modifier.weight(1f))
194+
195+
Image(
196+
painter = painterResource(R.drawable.coin_stack_logo),
197+
contentDescription = null,
198+
contentScale = ContentScale.FillWidth,
199+
modifier = Modifier.fillMaxWidth()
200+
)
192201
}
193202
}
194203

‎app/src/main/java/to/bitkit/ui/theme/Colors.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ object Colors {
2424
// Alpha
2525
val Black50 = Color.Black.copy(alpha = 0.5f)
2626
val Black92 = Color.Black.copy(alpha = 0.92f)
27+
val Black25 = Color.Black.copy(alpha = 0.25f)
2728
val White06 = Color.White.copy(alpha = 0.06f)
2829
val White08 = Color.White.copy(alpha = 0.08f)
2930
val White10 = Color.White.copy(alpha = 0.10f)

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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="M11,5H7C6.735,5 6.48,5.105 6.293,5.293C6.105,5.48 6,5.735 6,6V27C6,27.265 6.105,27.52 6.293,27.707C6.48,27.895 6.735,28 7,28H25C25.265,28 25.52,27.895 25.707,27.707C25.895,27.52 26,27.265 26,27V6C26,5.735 25.895,5.48 25.707,5.293C25.52,5.105 25.265,5 25,5H21V8H11V5Z"
8+
android:strokeAlpha="0.2"
9+
android:fillColor="#FF4400"
10+
android:fillAlpha="0.2"/>
11+
<path
12+
android:pathData="M10,3C10,2.448 10.448,2 11,2H21C21.552,2 22,2.448 22,3V8C22,8.552 21.552,9 21,9H11C10.448,9 10,8.552 10,8V3ZM12,4V7H20V4H12Z"
13+
android:fillColor="#FF4400"
14+
android:fillType="evenOdd"/>
15+
<path
16+
android:pathData="M5.586,4.586C5.961,4.211 6.47,4 7,4H11C11.552,4 12,4.448 12,5C12,5.552 11.552,6 11,6L7,6L7,27H25V6H21C20.448,6 20,5.552 20,5C20,4.448 20.448,4 21,4H25C25.53,4 26.039,4.211 26.414,4.586C26.789,4.961 27,5.47 27,6V27C27,27.53 26.789,28.039 26.414,28.414C26.039,28.789 25.53,29 25,29H7C6.47,29 5.961,28.789 5.586,28.414C5.211,28.039 5,27.53 5,27V6C5,5.47 5.211,4.961 5.586,4.586Z"
17+
android:fillColor="#FF4400"
18+
android:fillType="evenOdd"/>
19+
<path
20+
android:pathData="M11,19C11,18.448 11.448,18 12,18H20C20.552,18 21,18.448 21,19C21,19.552 20.552,20 20,20H12C11.448,20 11,19.552 11,19Z"
21+
android:fillColor="#FF4400"
22+
android:fillType="evenOdd"/>
23+
<path
24+
android:pathData="M11,15C11,14.448 11.448,14 12,14H20C20.552,14 21,14.448 21,15C21,15.552 20.552,16 20,16H12C11.448,16 11,15.552 11,15Z"
25+
android:fillColor="#FF4400"
26+
android:fillType="evenOdd"/>
27+
</vector>

‎app/src/main/res/drawable/ic_pencil_simple.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="M17,8L24,15L27.293,11.707C27.48,11.519 27.586,11.265 27.586,11C27.586,10.735 27.48,10.48 27.293,10.293L21.707,4.707C21.52,4.519 21.265,4.414 21,4.414C20.735,4.414 20.48,4.519 20.293,4.707L17,8Z"
8+
android:strokeAlpha="0.2"
9+
android:fillColor="#FF4400"
10+
android:fillAlpha="0.2"/>
11+
<path
12+
android:pathData="M16.293,7.293C16.683,6.902 17.317,6.902 17.707,7.293L24.707,14.293C25.098,14.683 25.098,15.317 24.707,15.707C24.317,16.098 23.683,16.098 23.293,15.707L16.293,8.707C15.902,8.317 15.902,7.683 16.293,7.293Z"
13+
android:fillColor="#FF4400"
14+
android:fillType="evenOdd"/>
15+
<path
16+
android:pathData="M19.586,4C19.961,3.625 20.47,3.414 21,3.414C21.53,3.414 22.039,3.625 22.414,4L21.746,4.668L22.414,4L28,9.586C28.375,9.961 28.586,10.469 28.586,11C28.586,11.53 28.375,12.039 28,12.414L12.707,27.707C12.52,27.895 12.265,28 12,28H6C5.47,28 4.961,27.789 4.586,27.414C4.211,27.039 4,26.53 4,26V20.414C4,20.151 4.052,19.891 4.152,19.649C4.253,19.406 4.4,19.186 4.586,19L19.586,4ZM26.586,11L21,5.414L6,20.414L5.293,19.707L6,20.414L6,26H11.586L26.586,11Z"
17+
android:fillColor="#FF4400"
18+
android:fillType="evenOdd"/>
19+
</vector>

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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="M11,20C14.59,20 17.5,17.09 17.5,13.5C17.5,9.91 14.59,7 11,7C7.41,7 4.5,9.91 4.5,13.5C4.5,17.09 7.41,20 11,20Z"
8+
android:strokeAlpha="0.2"
9+
android:fillColor="#FF4400"
10+
android:fillAlpha="0.2"/>
11+
<path
12+
android:pathData="M11,8C7.962,8 5.5,10.462 5.5,13.5C5.5,16.538 7.962,19 11,19C14.038,19 16.5,16.538 16.5,13.5C16.5,10.462 14.038,8 11,8ZM3.5,13.5C3.5,9.358 6.858,6 11,6C15.142,6 18.5,9.358 18.5,13.5C18.5,17.642 15.142,21 11,21C6.858,21 3.5,17.642 3.5,13.5Z"
13+
android:fillColor="#FF4400"
14+
android:fillType="evenOdd"/>
15+
<path
16+
android:pathData="M22.024,8.062C21.248,7.943 20.454,7.992 19.698,8.205C19.166,8.354 18.614,8.045 18.464,7.513C18.314,6.982 18.624,6.429 19.155,6.28C20.187,5.989 21.269,5.923 22.328,6.085C23.387,6.248 24.399,6.636 25.296,7.223C26.193,7.809 26.954,8.582 27.527,9.487C28.1,10.393 28.473,11.41 28.62,12.472C28.766,13.534 28.684,14.615 28.378,15.642C28.072,16.669 27.549,17.618 26.845,18.426C26.141,19.234 25.272,19.882 24.297,20.326C23.321,20.77 22.262,21 21.19,21C20.638,21 20.19,20.552 20.19,20C20.19,19.448 20.638,19 21.19,19C21.976,19 22.753,18.831 23.468,18.506C24.184,18.18 24.821,17.705 25.337,17.112C25.853,16.52 26.237,15.823 26.461,15.07C26.686,14.317 26.746,13.524 26.638,12.746C26.531,11.967 26.257,11.221 25.837,10.557C25.417,9.893 24.859,9.327 24.201,8.896C23.544,8.466 22.801,8.182 22.024,8.062Z"
17+
android:fillColor="#FF4400"
18+
android:fillType="evenOdd"/>
19+
<path
20+
android:pathData="M11,21C9.395,21 7.814,21.386 6.39,22.126C4.966,22.865 3.741,23.937 2.818,25.25C2.5,25.701 1.876,25.81 1.424,25.493C0.973,25.175 0.864,24.551 1.182,24.1C2.289,22.524 3.759,21.239 5.468,20.351C7.177,19.463 9.074,19 11,19C12.925,19 14.823,19.463 16.531,20.351C18.24,21.238 19.711,22.524 20.818,24.099C21.136,24.551 21.027,25.174 20.575,25.492C20.124,25.81 19.5,25.701 19.182,25.249C18.259,23.936 17.034,22.865 15.61,22.125C14.186,21.386 12.604,21 11,21Z"
21+
android:fillColor="#FF4400"
22+
android:fillType="evenOdd"/>
23+
<path
24+
android:pathData="M25.801,22.124C24.377,21.384 22.796,20.999 21.191,21C20.639,21 20.191,20.553 20.19,20.001C20.19,19.448 20.637,19 21.19,19C23.116,18.999 25.014,19.461 26.723,20.349C28.432,21.237 29.902,22.523 31.009,24.099C31.326,24.551 31.217,25.175 30.765,25.492C30.313,25.81 29.689,25.701 29.372,25.249C28.45,23.935 27.225,22.863 25.801,22.124Z"
25+
android:fillColor="#FF4400"
26+
android:fillType="evenOdd"/>
27+
</vector>

0 commit comments

Comments
 (0)