Skip to content

Commit b7e5a4b

Browse files
TlasterTlaster
authored
Merge pull request #249 from DimensionDev/bugfix/ui-bugs
Bugfix/settings ui and marketing bugs
2 parents f5f3b37 + 4c89963 commit b7e5a4b

20 files changed

Lines changed: 182 additions & 198 deletions

File tree

‎common/src/androidMain/kotlin/com/dimension/maskbook/common/ui/widget/BackMetaDisplay.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import androidx.compose.runtime.CompositionLocalProvider
3434
import androidx.compose.ui.Alignment
3535
import androidx.compose.ui.Modifier
3636
import androidx.compose.ui.res.stringResource
37+
import androidx.compose.ui.text.font.FontWeight
3738
import androidx.compose.ui.unit.dp
3839
import com.dimension.maskbook.localization.R
3940
import com.dimension.maskbook.setting.export.model.BackupMeta
@@ -78,10 +79,10 @@ fun MetaItem(
7879
Row(
7980
verticalAlignment = Alignment.CenterVertically,
8081
) {
81-
Text(text = title)
82+
Text(text = title, style = MaterialTheme.typography.h5.copy(fontWeight = FontWeight.W500))
8283
Spacer(modifier = Modifier.weight(1f))
8384
CompositionLocalProvider(
84-
LocalTextStyle provides MaterialTheme.typography.button
85+
LocalTextStyle provides MaterialTheme.typography.h5
8586
) {
8687
Text(text = value)
8788
}

‎common/src/androidMain/kotlin/com/dimension/maskbook/common/ui/widget/EmailModal.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ fun EmailInputModal(
7070
maxLines = 1,
7171
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Email),
7272
)
73-
if (!emailValid) {
73+
if (!emailValid && email.isNotEmpty()) {
7474
Spacer(modifier = Modifier.height(8.dp))
7575
Text(text = stringResource(R.string.scene_restore_tip_invalid_email_address), color = Color.Red)
7676
}

‎common/src/androidMain/kotlin/com/dimension/maskbook/common/ui/widget/button/MaskTransparentButton.kt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import androidx.compose.foundation.layout.RowScope
2828
import androidx.compose.foundation.layout.padding
2929
import androidx.compose.runtime.Composable
3030
import androidx.compose.runtime.remember
31+
import androidx.compose.ui.Alignment
3132
import androidx.compose.ui.Modifier
3233
import androidx.compose.ui.semantics.Role
3334

@@ -36,6 +37,7 @@ fun MaskTransparentButton(
3637
onClick: () -> Unit,
3738
modifier: Modifier = Modifier,
3839
enabled: Boolean = true,
40+
verticalAlignment: Alignment.Vertical = Alignment.Top,
3941
contentPadding: PaddingValues = MaskButtonDefaults.defaultPaddingValues,
4042
content: @Composable RowScope.() -> Unit
4143
) {
@@ -49,7 +51,8 @@ fun MaskTransparentButton(
4951
onClick = { clickFlow.tryEmit(onClick) },
5052
role = Role.Button
5153
)
52-
.padding(contentPadding)
54+
.padding(contentPadding),
55+
verticalAlignment = verticalAlignment
5356
) {
5457
content()
5558
}

‎labs/export/src/commonMain/kotlin/com/dimension/maskbook/labs/export/model/TransakConfig.kt‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,12 @@ data class TransakConfig(
3434

3535
fun queryString(): String {
3636
// TODO add apiKey in order to integrate all other parameters
37-
return "?defaultCryptoCurrency=$defaultCryptoCurrency" +
37+
return "?apiKey=${if (isStaging) "4fcd6904-706b-4aff-bd9d-77422813bbb7" else "253be1f0-c6d8-46e7-9d80-38f33bf973e2" }" +
38+
"&environment=${if (isStaging) "STAGING" else "PRODUCTION" }" +
39+
"&defaultCryptoCurrency=$defaultCryptoCurrency" +
3840
"&hideMenu=$hideMenu" +
39-
if (walletAddress.isEmpty()) "" else "&walletAddress=$walletAddress" +
40-
if (isStaging) "apiKey=4fcd6904-706b-4aff-bd9d-77422813bbb7&environment=STAGING" else ""
41+
"&disablePaymentMethods=apple_pay,googlepay" +
42+
if (walletAddress.isEmpty()) "" else "&walletAddress=$walletAddress"
4143
}
4244

4345
companion object {

‎labs/src/androidMain/kotlin/com/dimension/maskbook/labs/ui/scenes/LabsTransakScene.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ import com.dimension.maskbook.common.ui.widget.MaskScaffold
4949
import com.dimension.maskbook.common.ui.widget.MaskScene
5050
import com.dimension.maskbook.common.ui.widget.MaskSingleLineTopAppBar
5151
import com.dimension.maskbook.common.ui.widget.button.MaskBackButton
52-
import com.dimension.maskbook.labs.BuildConfig
5352
import com.dimension.maskbook.labs.R
5453
import com.dimension.maskbook.labs.export.model.TransakConfig
5554
import com.dimension.maskbook.labs.route.LabsRoute
@@ -71,7 +70,7 @@ fun LabsTransakScene(
7170
val currentWallet by repo.currentWallet.observeAsState(null)
7271
val transakConfig = remember(currentWallet) {
7372
TransakConfig(
74-
isStaging = BuildConfig.DEBUG,
73+
isStaging = false,
7574
walletAddress = currentWallet?.address ?: "",
7675
defaultCryptoCurrency = currentWallet?.tokens?.firstOrNull()?.tokenData?.symbol
7776
?: "ETH",

‎localization/src/androidMain/res/drawable/ic_a_8.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
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="M16,0.5L16,0.5A16,16 0,0 1,32 16.5L32,16.5A16,16 0,0 1,16 32.5L16,32.5A16,16 0,0 1,0 16.5L0,16.5A16,16 0,0 1,16 0.5z"
8+
android:fillColor="#1C68F3"
9+
android:fillAlpha="0.1"/>
10+
<path
11+
android:pathData="M21.1978,12.4068V13.7698C22.8189,14.2476 24,15.6336 24,17.2889V21.6773C24,23.7266 22.2011,25.3881 19.9833,25.3881H12.0177C9.7989,25.3881 8,23.7266 8,21.6773V17.2889C8,15.6336 9.1821,14.2476 10.8022,13.7698V12.4068C10.8117,9.7568 13.1357,7.6104 15.9857,7.6104C18.8739,7.6104 21.1978,9.7568 21.1978,12.4068ZM16.0046,9.1562C17.9461,9.1562 19.5241,10.6137 19.5241,12.4068V13.5781H12.4756V12.3891C12.4852,10.6048 14.0632,9.1562 16.0046,9.1562ZM16.8368,20.4592C16.8368,20.892 16.4638,21.2365 15.9952,21.2365C15.5361,21.2365 15.1631,20.892 15.1631,20.4592V18.4982C15.1631,18.0742 15.5361,17.7297 15.9952,17.7297C16.4638,17.7297 16.8368,18.0742 16.8368,18.4982V20.4592Z"
12+
android:fillColor="#1C68F3"
13+
android:fillType="evenOdd"/>
14+
</vector>

‎localization/src/androidMain/res/drawable/ic_persona_default_avatar.xml‎

Lines changed: 13 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,14 @@
11
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2-
xmlns:aapt="http://schemas.android.com/aapt"
3-
android:viewportWidth="96"
4-
android:viewportHeight="96"
5-
android:width="96dp"
6-
android:height="96dp">
7-
<path
8-
android:pathData="M0 48C0 21.4903 21.4903 0 48 0C74.5097 0 96 21.4903 96 48C96 74.5097 74.5097 96 48 96C21.4903 96 0 74.5097 0 48Z"
9-
android:fillColor="#F9F9FA"/>
10-
<group
11-
android:rotation="-30"
12-
android:pivotX="14.3732"
13-
android:pivotY="52.1603">
14-
<path
15-
android:pathData="M17.3732 52.1603H17.3732A3 3 0 0 1 20.3732 55.1603V79.1603A3 3 0 0 1 17.3732 82.1603H17.3732A3 3 0 0 1 14.3732 79.1603V55.1603A3 3 0 0 1 17.3732 52.1603Z"
16-
android:fillColor="#1C68F3"/>
17-
</group>
18-
<path
19-
android:pathData="M54.5375 51.7776C50.6605 53.0152 46.4644 52.361 42.6578 49.9957C42.2446 49.7208 41.6938 49.6525 41.1769 49.8175C40.66 49.9825 40.2507 50.3573 40.048 50.8695C38.3411 54.9541 35.2631 57.9303 31.3861 59.1679C25.1829 61.1481 18.1355 58.1898 13.8165 51.7974C12.6615 50.091 11.7296 48.1914 11.0814 46.1606C10.7749 45.2006 10.5305 44.1801 10.3348 43.1847L9.67152 39.4498L12.7694 41.6345C13.3524 42.0587 14.1231 42.1788 14.7877 41.9667C14.9724 41.9077 15.1452 41.8119 15.318 41.716L16.1012 40.8557L16.1515 40.7583L16.2521 40.5634C18.3896 37.3178 21.5587 34.8822 25.288 33.6917C28.7958 32.572 32.5582 32.6322 36.0363 33.8411C38.1707 30.8406 41.2023 28.6116 44.7101 27.4919C48.4025 26.3132 52.4336 26.4504 56.0563 27.8573L56.2511 27.9578C56.3973 28.0332 56.5803 28.0969 56.7634 28.1605L56.8121 28.1856C57.2151 28.3011 57.6566 28.2822 58.0997 28.1408C58.8013 27.9168 59.3229 27.3841 59.5523 26.7006L60.7745 23.1369L62.3979 26.5653C62.8638 27.5151 63.2072 28.4634 63.5136 29.4234C64.1619 31.4542 64.503 33.5424 64.5503 35.6023C64.8076 43.2913 60.7408 49.7974 54.5375 51.7776ZM30.6461 49.4383C30.1292 49.6033 29.5887 49.6944 29.0364 49.7487C26.0062 49.9429 23.1888 47.8722 21.8916 46.7401C22.8241 45.7101 24.6859 43.8952 27.0122 43.1526C27.566 42.9758 28.0696 42.8964 28.6219 42.8422C31.6521 42.648 34.4695 44.7187 35.7667 45.8507C34.7972 46.8925 32.9354 48.7075 30.6461 49.4383ZM43.3019 43.4459C44.6587 43.7451 47.2647 44.1338 49.554 43.403C50.1079 43.2262 50.6012 42.9874 51.0459 42.7234C53.5912 41.1378 54.7247 37.8059 55.1261 36.1317C53.7693 35.8324 51.1633 35.4437 48.874 36.1745C48.3201 36.3513 47.8268 36.5901 47.3821 36.8541C44.8367 38.4397 43.7033 41.7716 43.3019 43.4459Z"
20-
android:fillType="evenOdd">
21-
<aapt:attr
22-
name="android:fillColor">
23-
<gradient
24-
android:startX="10.3892"
25-
android:startY="43.4837"
26-
android:endX="63.2192"
27-
android:endY="26.4707"
28-
android:tileMode="clamp">
29-
<item
30-
android:color="#1C68F3"
31-
android:offset="0"/>
32-
<item
33-
android:color="#6CB8FF"
34-
android:offset="1"/>
35-
</gradient>
36-
</aapt:attr>
37-
</path>
38-
<path
39-
android:pathData="M56.1168 34.4851L56.7677 33.4004L87.4012 43.5103L87.271 44.7686C87.0107 47.5022 86.4466 50.2358 85.5354 52.926C83.4093 59.3044 79.7645 64.7716 75.2953 68.3296C71.9543 70.9764 68.3529 72.3649 64.925 72.3649C63.5799 72.3649 62.2782 72.1913 61.0199 71.7574C56.5073 70.2387 53.1663 66.2468 51.6476 60.4759C50.1724 54.9654 50.5195 48.4134 52.6456 42.0351C53.5134 39.3449 54.6849 36.8282 56.1168 34.4851ZM60.0232 52.406C60.674 52.7097 61.3683 52.8399 62.1493 52.8399C62.8435 52.8399 63.6246 52.7097 64.449 52.4927C65.3354 52.1973 66.048 51.8272 66.3611 51.6647C66.4618 51.6124 66.5212 51.5815 66.5317 51.5815L67.3995 51.0609L66.9222 50.1497C66.8788 50.0195 65.4903 47.3727 62.7568 46.1578C60.0232 44.9428 57.116 45.7239 56.9858 45.7672L55.9879 46.0276L56.2048 47.0256C56.2173 47.038 56.244 47.129 56.2881 47.2792C56.3977 47.6523 56.6145 48.3906 56.9858 49.1951C57.7669 50.7571 58.8082 51.8853 60.0232 52.406ZM73.5175 57.0053C73.8647 57.0921 74.2118 57.1355 74.6023 57.1355C75.6437 57.1355 76.7718 56.8318 77.8566 56.2677C78.9847 55.7036 79.7224 55.0528 79.7657 55.0094L80.5468 54.3151L79.9393 53.4907C79.8525 53.3605 77.9867 50.9741 75.0796 50.3232C72.3887 49.7208 69.8838 50.7912 69.4227 50.9882C69.3856 51.004 69.3618 51.0142 69.3521 51.0175L68.4409 51.4514L68.8314 52.406C68.8314 52.4493 69.2219 53.4039 69.9595 54.4019C71.0009 55.7904 72.2158 56.7016 73.5175 57.0053Z"
40-
android:fillType="evenOdd"
41-
android:fillColor="#1C68F3"
42-
android:fillAlpha="0.1"/>
43-
</vector>
2+
android:width="335dp"
3+
android:height="335dp"
4+
android:viewportWidth="335"
5+
android:viewportHeight="335">
6+
<path
7+
android:pathData="M167.138,1.521C75.545,1.521 1.234,75.832 1.234,167.5C1.234,259.168 75.545,333.479 167.213,333.479C258.875,333.479 333.118,259.168 333.118,167.5C333.118,75.832 258.801,1.521 167.138,1.521Z"
8+
android:fillColor="#F0F3F8"/>
9+
<path
10+
android:pathData="M167.138,57.546C194.789,57.546 217.112,79.938 217.112,107.519C217.112,135.17 194.72,157.493 167.138,157.493C139.562,157.493 117.165,135.095 117.165,107.519C117.165,79.938 139.562,57.546 167.138,57.546ZM78.714,255.993C78.209,204.733 103.27,172.972 134.665,160.444L166.926,214.235L200.91,161.667C231.224,174.918 255.275,206.387 255.786,256.068C199.974,278.103 141.29,279.688 78.714,255.999V255.993Z"
11+
android:strokeAlpha="0.5"
12+
android:fillColor="#1C68F3"
13+
android:fillAlpha="0.5"/>
14+
</vector>

‎localization/src/androidMain/res/drawable/ic_settings_appearance.xml‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
<?xml version="1.0" encoding="utf-8"?>
21
<vector xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:width="33dp"
4-
android:height="33dp"
5-
android:viewportWidth="33"
6-
android:viewportHeight="33">
7-
<path
8-
android:fillColor="#FC7032"
9-
android:fillAlpha="0.1"
10-
android:pathData="M 16.5 0.5 L 16.5 0.5 Q 32.5 0.5 32.5 16.5 L 32.5 16.5 Q 32.5 32.5 16.5 32.5 L 16.5 32.5 Q 0.5 32.5 0.5 16.5 L 0.5 16.5 Q 0.5 0.5 16.5 0.5 Z"/>
11-
<path
12-
android:fillColor="#FC7032"
13-
android:pathData="M25.0101 14.8411C24.6515 11.6489 22.3805 9.81729 22.3805 9.81729C20.2067 7.70646 16.1027 6.69074 12.471 8.68522C8.60117 10.8111 7.0639 15.2313 7.7812 18.4564C8.49713 21.6801 11.3307 24.7424 15.4347 25.3611C16.6722 25.524 18.5612 24.9696 17.6167 23.1791C16.6722 21.3872 17.3881 20.1826 20.0917 20.4755C22.7952 20.7685 25.3688 18.0334 25.0101 14.8411ZM11.0707 16.7056C10.2616 16.7056 9.60457 16.0499 9.60457 15.2395C9.60457 14.4305 10.2603 13.7734 11.0707 13.7734C11.8797 13.7734 12.5367 14.4291 12.5367 15.2395C12.5367 16.0499 11.8797 16.7056 11.0707 16.7056ZM14.0015 13.0397C13.1924 13.0397 12.5354 12.384 12.5354 11.5736C12.5354 10.7646 13.1911 10.1075 14.0015 10.1075C14.8105 10.1075 15.4675 10.7632 15.4675 11.5736C15.4675 12.384 14.8118 13.0397 14.0015 13.0397ZM18.6379 12.7741C17.8289 12.7741 17.1718 12.1184 17.1718 11.308C17.1718 10.499 17.8275 9.84193 18.6379 9.84193C19.4469 9.84193 20.104 10.4976 20.104 11.308C20.1026 12.117 19.4469 12.7741 18.6379 12.7741ZM21.5687 16.5413C20.7597 16.5413 20.1026 15.8856 20.1026 15.0752C20.1026 14.2662 20.7583 13.6091 21.5687 13.6091C22.3777 13.6091 23.0348 14.2648 23.0348 15.0752C23.0348 15.8842 22.3777 16.5413 21.5687 16.5413Z"/>
14-
</vector>
2+
android:width="32dp"
3+
android:height="33dp"
4+
android:viewportWidth="32"
5+
android:viewportHeight="33">
6+
<path
7+
android:pathData="M16,0.5L16,0.5A16,16 0,0 1,32 16.5L32,16.5A16,16 0,0 1,16 32.5L16,32.5A16,16 0,0 1,0 16.5L0,16.5A16,16 0,0 1,16 0.5z"
8+
android:fillColor="#FC7032"
9+
android:fillAlpha="0.1"/>
10+
<path
11+
android:pathData="M24.5111,14.8411C24.1524,11.6489 21.8814,9.8173 21.8814,9.8173C19.7076,7.7065 15.6037,6.6907 11.972,8.6852C8.1021,10.8111 6.5649,15.2313 7.2822,18.4564C7.9981,21.6801 10.8317,24.7424 14.9357,25.3611C16.1732,25.524 18.0622,24.9696 17.1177,23.1791C16.1732,21.3872 16.8891,20.1826 19.5927,20.4755C22.2962,20.7685 24.8697,18.0334 24.5111,14.8411ZM10.5716,16.7056C9.7626,16.7056 9.1055,16.0499 9.1055,15.2395C9.1055,14.4305 9.7612,13.7734 10.5716,13.7734C11.3806,13.7734 12.0377,14.4291 12.0377,15.2395C12.0377,16.0499 11.3806,16.7056 10.5716,16.7056ZM13.5024,13.0397C12.6934,13.0397 12.0363,12.384 12.0363,11.5736C12.0363,10.7646 12.692,10.1075 13.5024,10.1075C14.3115,10.1075 14.9685,10.7632 14.9685,11.5736C14.9685,12.384 14.3128,13.0397 13.5024,13.0397ZM18.1389,12.7741C17.3299,12.7741 16.6728,12.1184 16.6728,11.308C16.6728,10.499 17.3285,9.8419 18.1389,9.8419C18.9479,9.8419 19.605,10.4976 19.605,11.308C19.6036,12.117 18.9479,12.7741 18.1389,12.7741ZM21.0697,16.5413C20.2607,16.5413 19.6036,15.8856 19.6036,15.0752C19.6036,14.2662 20.2593,13.6091 21.0697,13.6091C21.8787,13.6091 22.5358,14.2648 22.5358,15.0752C22.5358,15.8842 21.8787,16.5413 21.0697,16.5413Z"
12+
android:fillColor="#FC7032"/>
13+
</vector>

‎localization/src/androidMain/res/drawable/ic_settings_backup_data.xml‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1-
<?xml version="1.0" encoding="utf-8"?>
21
<vector xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:width="33dp"
4-
android:height="32dp"
5-
android:viewportWidth="33"
6-
android:viewportHeight="32">
7-
<path
8-
android:fillColor="#2595E8"
9-
android:fillAlpha="0.1"
10-
android:pathData="M 16.5 0 L 16.5 0 Q 32.5 0 32.5 16 L 32.5 16 Q 32.5 32 16.5 32 L 16.5 32 Q 0.5 32 0.5 16 L 0.5 16 Q 0.5 0 16.5 0 Z"/>
11-
<path
12-
android:fillColor="#4EB4FE"
13-
android:pathData="M21.3943 7.70023V12.9675C21.3943 14.4318 20.2065 15.6196 18.7422 15.6196H13.3966C11.9323 15.6196 10.7445 14.4318 10.7445 12.9675V7.11035H9.79978C8.59126 7.11035 7.61133 8.09028 7.61133 9.2988V22.6997C7.61133 23.9082 8.59126 24.8881 9.79978 24.8881H22.3582C23.5667 24.8881 24.5467 23.9082 24.5467 22.6997V11.2059C24.5467 10.9965 24.4635 10.7951 24.3165 10.6448L21.3943 7.70023Z"/>
14-
<path
15-
android:fillColor="#4EB4FE"
16-
android:pathData="M12.6934 7.11035V12.9675C12.6934 13.3544 13.0083 13.6709 13.3967 13.6709H18.7424C19.1292 13.6709 19.4458 13.356 19.4458 12.9675V7.11035H12.6934ZM17.8504 12.7437H15.0545C14.5301 12.7437 14.1049 12.3073 14.1049 11.7686C14.1049 11.2299 14.5301 10.7935 15.0545 10.7935H17.8504C18.3747 10.7935 18.7999 11.2299 18.7999 11.7686C18.7999 12.3073 18.3747 12.7437 17.8504 12.7437Z"/>
17-
</vector>
2+
android:width="32dp"
3+
android:height="32dp"
4+
android:viewportWidth="32"
5+
android:viewportHeight="32">
6+
<path
7+
android:pathData="M16,0L16,0A16,16 0,0 1,32 16L32,16A16,16 0,0 1,16 32L16,32A16,16 0,0 1,0 16L0,16A16,16 0,0 1,16 0z"
8+
android:fillColor="#2595E8"
9+
android:fillAlpha="0.1"/>
10+
<path
11+
android:pathData="M21.3157,7.7002V12.9675C21.3157,14.4318 20.1279,15.6196 18.6636,15.6196H13.318C11.8537,15.6196 10.6659,14.4318 10.6659,12.9675V7.1104H9.7212C8.5126,7.1104 7.5327,8.0903 7.5327,9.2988V22.6997C7.5327,23.9082 8.5126,24.8881 9.7212,24.8881H22.2796C23.4881,24.8881 24.4681,23.9082 24.4681,22.6997V11.2059C24.4681,10.9965 24.3849,10.7951 24.2379,10.6448L21.3157,7.7002Z"
12+
android:fillColor="#4EB4FE"/>
13+
<path
14+
android:pathData="M12.6147,7.1104V12.9675C12.6147,13.3544 12.9297,13.6709 13.3181,13.6709H18.6638C19.0506,13.6709 19.3671,13.356 19.3671,12.9675V7.1104H12.6147ZM17.7718,12.7437H14.9758C14.4515,12.7437 14.0263,12.3073 14.0263,11.7686C14.0263,11.2299 14.4515,10.7935 14.9758,10.7935H17.7718C18.2961,10.7935 18.7213,11.2299 18.7213,11.7686C18.7213,12.3073 18.2961,12.7437 17.7718,12.7437Z"
15+
android:fillColor="#4EB4FE"/>
16+
</vector>

‎localization/src/androidMain/res/drawable/ic_settings_backup_password.xml‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
<?xml version="1.0" encoding="utf-8"?>
21
<vector xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:width="33dp"
4-
android:height="33dp"
5-
android:viewportWidth="33"
6-
android:viewportHeight="33">
7-
<path
8-
android:fillColor="#1C68F3"
9-
android:fillAlpha="0.1"
10-
android:pathData="M 16.5 0.5 L 16.5 0.5 Q 32.5 0.5 32.5 16.5 L 32.5 16.5 Q 32.5 32.5 16.5 32.5 L 16.5 32.5 Q 0.5 32.5 0.5 16.5 L 0.5 16.5 Q 0.5 0.5 16.5 0.5 Z"/>
11-
<path
12-
android:fillColor="#1C68F3"
13-
android:fillType="evenOdd"
14-
android:pathData="M21.6978 12.4068V13.7698C23.3189 14.2476 24.5 15.6336 24.5 17.2889V21.6773C24.5 23.7266 22.7011 25.3881 20.4833 25.3881H12.5177C10.2989 25.3881 8.5 23.7266 8.5 21.6773V17.2889C8.5 15.6336 9.68207 14.2476 11.3022 13.7698V12.4068C11.3117 9.75683 13.6357 7.61035 16.4857 7.61035C19.3739 7.61035 21.6978 9.75683 21.6978 12.4068ZM16.5046 9.15617C18.4461 9.15617 20.0241 10.6137 20.0241 12.4068V13.5781H12.9756V12.3891C12.9852 10.6048 14.5632 9.15617 16.5046 9.15617ZM17.3368 20.4592C17.3368 20.892 16.9638 21.2365 16.4952 21.2365C16.0361 21.2365 15.6631 20.892 15.6631 20.4592V18.4982C15.6631 18.0742 16.0361 17.7297 16.4952 17.7297C16.9638 17.7297 17.3368 18.0742 17.3368 18.4982V20.4592Z"/>
15-
</vector>
2+
android:width="32dp"
3+
android:height="33dp"
4+
android:viewportWidth="32"
5+
android:viewportHeight="33">
6+
<path
7+
android:pathData="M16,0.5L16,0.5A16,16 0,0 1,32 16.5L32,16.5A16,16 0,0 1,16 32.5L16,32.5A16,16 0,0 1,0 16.5L0,16.5A16,16 0,0 1,16 0.5z"
8+
android:fillColor="#1C68F3"
9+
android:fillAlpha="0.1"/>
10+
<path
11+
android:pathData="M21.1978,12.4068V13.7698C22.8189,14.2476 24,15.6336 24,17.2889V21.6773C24,23.7266 22.2011,25.3881 19.9833,25.3881H12.0177C9.7989,25.3881 8,23.7266 8,21.6773V17.2889C8,15.6336 9.1821,14.2476 10.8022,13.7698V12.4068C10.8117,9.7568 13.1357,7.6104 15.9857,7.6104C18.8739,7.6104 21.1978,9.7568 21.1978,12.4068ZM16.0046,9.1562C17.9461,9.1562 19.5241,10.6137 19.5241,12.4068V13.5781H12.4756V12.3891C12.4852,10.6048 14.0632,9.1562 16.0046,9.1562ZM16.8368,20.4592C16.8368,20.892 16.4638,21.2365 15.9952,21.2365C15.5361,21.2365 15.1631,20.892 15.1631,20.4592V18.4982C15.1631,18.0742 15.5361,17.7297 15.9952,17.7297C16.4638,17.7297 16.8368,18.0742 16.8368,18.4982V20.4592Z"
12+
android:fillColor="#1C68F3"
13+
android:fillType="evenOdd"/>
14+
</vector>

0 commit comments

Comments
 (0)