Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed Android Lint issues #2

Merged
merged 2 commits into from
Sep 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ android {
}
lint {
warningsAsErrors = true
abortOnError = false
abortOnError = true
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ internal fun CreditCardForm(

PaymentButton(modifier = Modifier.padding(16.dp).fillMaxWidth(), text = "${LocalI18nTextsProvider.current["PAY"]} $displayPayableAmount") { }

Row(verticalAlignment = Alignment.CenterVertically) {
Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(horizontal = 8.dp)) {
Checkbox(saveCard, onSaveCardChange, colors = CheckboxDefaults.colors(checkedColor = Color.Black, uncheckedColor = Color.Black))
Text(LocalI18nTextsProvider.current["SAVE_CARD"])
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package com.degica.komoju.android.sdk.ui.screens.payment.composables
import androidx.compose.foundation.Image
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Spacer
Expand All @@ -14,10 +13,8 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyRow
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.ripple.rememberRipple
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.res.painterResource
Expand Down Expand Up @@ -54,11 +51,7 @@ private fun KonbiniBrand(konbiniBrand: KonbiniBrand, isSelected: Boolean, onSele
.padding(4.dp)
.clip(RoundedCornerShape(8.dp))
.border(1.dp, if (isSelected) KomojuDarkGreen else Gray200, RoundedCornerShape(8.dp))
.clickable(
onClick = onSelected,
indication = rememberRipple(bounded = true),
interactionSource = remember { MutableInteractionSource() },
)
.clickable(onClick = onSelected)
.padding(16.dp),
) {
Image(painter = painterResource(konbiniBrand.displayIcon), contentDescription = "${konbiniBrand.key} icon", modifier = Modifier.size(32.dp))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package com.degica.komoju.android.sdk.ui.screens.payment.composables
import androidx.compose.foundation.Image
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Spacer
Expand All @@ -14,10 +13,8 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyRow
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.ripple.rememberRipple
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.res.painterResource
Expand Down Expand Up @@ -51,11 +48,7 @@ private fun PaymentMethodComposable(paymentMethod: PaymentMethod, isSelected: Bo
.padding(8.dp)
.clip(RoundedCornerShape(8.dp))
.border(1.dp, if (isSelected) KomojuDarkGreen else Gray200, RoundedCornerShape(8.dp))
.clickable(
onClick = onSelected,
indication = rememberRipple(bounded = true),
interactionSource = remember { MutableInteractionSource() },
)
.clickable(onClick = onSelected)
.padding(16.dp),
) {
Image(painter = painterResource(paymentMethod.displayIcon), contentDescription = "${paymentMethod.displayName} icon", modifier = Modifier.size(32.dp))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.rounded.Close
import androidx.compose.material.ripple.rememberRipple
import androidx.compose.material3.Text
import androidx.compose.material3.ripple
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
Expand All @@ -34,7 +34,7 @@ internal fun PaymentSheetHandle(title: String, onCloseClicked: () -> Unit) {
contentDescription = "Close Payment Sheet",
modifier = Modifier
.clickable(
indication = rememberRipple(bounded = true, radius = 24.dp),
indication = ripple(bounded = true, radius = 24.dp),
interactionSource = remember { MutableInteractionSource() },
onClick = onCloseClicked,
)
Expand Down
42 changes: 33 additions & 9 deletions android/src/main/res/drawable/komoju_ic_amex.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,36 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="17dp" android:viewportWidth="24" android:viewportHeight="17">
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="17dp"
android:viewportWidth="24"
android:viewportHeight="17">
<group>
<clip-path android:pathData="M0 0.5h24v16H0z"/>
<path android:pathData="M22 0.5H2c-1.105 0-2 0.895-2 2v12c0 1.105 0.895 2 2 2h20c1.105 0 2-0.895 2-2v-12c0-1.105-0.895-2-2-2z" android:fillColor="#016FD0"/>
<path android:pathData="M13.764 13.894V8.193l10.148 0.009v1.574l-1.173 1.254 1.173 1.265v1.608h-1.873l-0.995-1.098-0.988 1.102-6.292-0.013z" android:fillColor="#FFFFFE" android:fillType="evenOdd"/>
<path android:pathData="M14.442 13.269V8.82h3.772v1.025h-2.551v0.695h2.49v1.008h-2.49v0.684h2.551v1.037h-3.772z" android:fillColor="#016FD0" android:fillType="evenOdd"/>
<path android:pathData="M18.195 13.269l2.088-2.227-2.088-2.222h1.616l1.275 1.41 1.279-1.41h1.547v0.035l-2.043 2.187 2.043 2.164v0.063H22.35l-1.298-1.424-1.285 1.424h-1.572z" android:fillColor="#016FD0" android:fillType="evenOdd"/>
<path android:pathData="M14.237 3.132h2.446l0.86 1.951V3.132h3.019l0.521 1.462 0.523-1.462h2.306v5.701H11.725l2.512-5.701z" android:fillColor="#FFFFFE" android:fillType="evenOdd"/>
<path android:pathData="M14.7 3.751l-1.974 4.446h1.354l0.373-0.891h2.018l0.372 0.891h1.387l-1.965-4.446H14.7zm0.17 2.558l0.592-1.415 0.591 1.415H14.87z" android:fillColor="#016FD0" android:fillType="evenOdd"/>
<path android:pathData="M18.212 8.196V3.751l1.903 0.006 0.979 2.733 0.986-2.739h1.832v4.445l-1.179 0.01V5.153L21.62 8.196h-1.075l-1.136-3.054v3.054h-1.197z" android:fillColor="#016FD0" android:fillType="evenOdd"/>
<clip-path android:pathData="M0 0.5h24v16H0z" />
<path
android:fillColor="#016FD0"
android:pathData="M22 0.5H2c-1.105 0-2 0.895-2 2v12c0 1.105 0.895 2 2 2h20c1.105 0 2-0.895 2-2v-12c0-1.105-0.895-2-2-2z" />
<path
android:fillColor="#FFFFFE"
android:fillType="evenOdd"
android:pathData="M13.764 13.894V8.193l10.148 0.009v1.574l-1.173 1.254 1.173 1.265v1.608h-1.873l-0.995-1.098-0.988 1.102-6.292-0.013z" />
<path
android:fillColor="#016FD0"
android:fillType="evenOdd"
android:pathData="M14.442 13.269V8.82h3.772v1.025h-2.551v0.695h2.49v1.008h-2.49v0.684h2.551v1.037h-3.772z" />
<path
android:fillColor="#016FD0"
android:fillType="evenOdd"
android:pathData="M18.195 13.269l2.088-2.227-2.088-2.222h1.616l1.275 1.41 1.279-1.41h1.547v0.035l-2.043 2.187 2.043 2.164v0.063H22.35l-1.298-1.424-1.285 1.424h-1.572z" />
<path
android:fillColor="#FFFFFE"
android:fillType="evenOdd"
android:pathData="M14.237 3.132h2.446l0.86 1.951V3.132h3.019l0.521 1.462 0.523-1.462h2.306v5.701H11.725l2.512-5.701z" />
<path
android:fillColor="#016FD0"
android:fillType="evenOdd"
android:pathData="M14.7 3.751l-1.974 4.446h1.354l0.373-0.891h2.018l0.372 0.891h1.387l-1.965-4.446H14.7zm0.17 2.558l0.592-1.415 0.591 1.415H14.87z" />
<path
android:fillColor="#016FD0"
android:fillType="evenOdd"
android:pathData="M18.212 8.196V3.751l1.903 0.006 0.979 2.733 0.986-2.739h1.832v4.445l-1.179 0.01V5.153L21.62 8.196h-1.075l-1.136-3.054v3.054h-1.197z" />
</group>
</vector>
7 changes: 5 additions & 2 deletions android/src/main/res/drawable/komoju_ic_au_pay.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="84dp" android:height="16dp" android:viewportWidth="84" android:viewportHeight="16">
<path android:pathData="M49.52 16h-2.77V0H53a5.55 5.55 0 0 1 5.24 5.6A5.58 5.58 0 0 1 53 11.23h-3.47V16zm22.16 0H68.7l-0.92-3.09h-5.65L61.05 16h-2.98l5.68-16h2.23l5.7 16zm6.49 0h-2.6v-4.66L69.72 0h3.34l3.8 8.06L80.65 0H84l-5.83 11.34V16zm-11.3-5.64L64.9 4.64l-1.93 5.72h3.9zM52.6 8.64c0.53 0 2.73-0.59 2.73-3.06 0-2.48-2.23-2.92-2.73-2.92h-3.13v5.98h3.13zM17.41 0.06c-2.05 9.23-4.24 13.43-2.87 13.67 1.37 0.24 3-1.6 3.78-2.96 0.94-1.63 1.33-5.65 2.49-8.04 0.96-2 3.4-2.88 5.04-2.67-1.96 8.88-4.14 13.5-2.54 13.78 2.02 0.35 4.1-1.24 5.03-2.87 1.57-2.73 0.82-3.66 2.7-8.19a5.36 5.36 0 0 1 5.03-2.76C35.87 1.22 33 12.04 33 12.04s-0.4 1.44 0.34 1.72c1.47 0.57 6.1-5.59 7.63-8.42h2.34c-3.85 5.98-7.29 10.95-11.43 10.46-3.06-0.37-2.9-2.73-2.9-2.73s-2.14 3.05-6.11 2.88c-3.81-0.17-4.08-2.84-4.08-2.84s-2.48 3-5.4 2.69c-3.23-0.33-2.97-2.84-2.97-2.84s-2.36 3.51-6.7 2.99c-1.09-0.14-4.76-0.83-3.44-5.83 2.43-9.2 9.4-10.4 17.13-10.06zM12.4 1.9c-0.85 4-1.68 7.18-2.82 9.13-1.5 2.57-3.63 3.13-4.7 2.8-1.5-0.45-0.36-4 0.42-5.61 0.93-1.8 2.4-5.42 7.1-6.32z" android:fillColor="#EB560C" android:fillType="evenOdd"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:width="84dp" android:height="16dp" android:viewportWidth="84" android:viewportHeight="16">
<path android:pathData="M49.52 16h-2.77V0H53a5.55 5.55 0 0 1 5.24 5.6A5.58 5.58 0 0 1 53 11.23h-3.47V16zm22.16 0H68.7l-0.92-3.09h-5.65L61.05 16h-2.98l5.68-16h2.23l5.7 16zm6.49 0h-2.6v-4.66L69.72 0h3.34l3.8 8.06L80.65 0H84l-5.83 11.34V16zm-11.3-5.64L64.9 4.64l-1.93 5.72h3.9zM52.6 8.64c0.53 0 2.73-0.59 2.73-3.06 0-2.48-2.23-2.92-2.73-2.92h-3.13v5.98h3.13zM17.41 0.06c-2.05 9.23-4.24 13.43-2.87 13.67 1.37 0.24 3-1.6 3.78-2.96 0.94-1.63 1.33-5.65 2.49-8.04 0.96-2 3.4-2.88 5.04-2.67-1.96 8.88-4.14 13.5-2.54 13.78 2.02 0.35 4.1-1.24 5.03-2.87 1.57-2.73 0.82-3.66 2.7-8.19a5.36 5.36 0 0 1 5.03-2.76C35.87 1.22 33 12.04 33 12.04s-0.4 1.44 0.34 1.72c1.47 0.57 6.1-5.59 7.63-8.42h2.34c-3.85 5.98-7.29 10.95-11.43 10.46-3.06-0.37-2.9-2.73-2.9-2.73s-2.14 3.05-6.11 2.88c-3.81-0.17-4.08-2.84-4.08-2.84s-2.48 3-5.4 2.69c-3.23-0.33-2.97-2.84-2.97-2.84s-2.36 3.51-6.7 2.99c-1.09-0.14-4.76-0.83-3.44-5.83 2.43-9.2 9.4-10.4 17.13-10.06zM12.4 1.9c-0.85 4-1.68 7.18-2.82 9.13-1.5 2.57-3.63 3.13-4.7 2.8-1.5-0.45-0.36-4 0.42-5.61 0.93-1.8 2.4-5.42 7.1-6.32z" android:fillColor="#EB560C" android:fillType="evenOdd"
tools:ignore="VectorPath" />
</vector>
11 changes: 9 additions & 2 deletions android/src/main/res/drawable/komoju_ic_bank_transfer.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="47dp" android:height="49dp" android:viewportWidth="47" android:viewportHeight="49">
<path android:pathData="M0 12.408L23.5 0 47 12.408v4.136H28.577v5.64h-9.776v-5.64h-6.017v5.64H3.008v-5.64H0v-4.136zM47 43.24v5.64H0v-5.64h3.008v-4.512h1.883V22.184h6.016v16.544h1.877v4.512h6.017v-4.512h1.879V22.184h6.016v16.544h1.881v4.512h6.017v-4.511h9.776v4.511H47zM34.594 16.544h9.776v5.64h-1.881v16.544h-6.016V22.184h-1.879v-5.64z" android:fillColor="#1D354F" android:fillType="evenOdd"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="47dp"
android:height="49dp"
android:viewportWidth="47"
android:viewportHeight="49">
<path
android:fillColor="#1D354F"
android:fillType="evenOdd"
android:pathData="M0 12.408L23.5 0 47 12.408v4.136H28.577v5.64h-9.776v-5.64h-6.017v5.64H3.008v-5.64H0v-4.136zM47 43.24v5.64H0v-5.64h3.008v-4.512h1.883V22.184h6.016v16.544h1.877v4.512h6.017v-4.512h1.879V22.184h6.016v16.544h1.881v4.512h6.017v-4.511h9.776v4.511H47zM34.594 16.544h9.776v5.64h-1.881v16.544h-6.016V22.184h-1.879v-5.64z" />
</vector>
19 changes: 15 additions & 4 deletions android/src/main/res/drawable/komoju_ic_bitcash.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="56dp" android:height="54dp" android:viewportWidth="218" android:viewportHeight="211">
<path android:pathData="M196 135.2a67.2 67.2 0 0 1-64.3 66.9h-2.5l-3.9-0.1-6.3-0.5A98.5 98.5 0 0 1 129.2 5h2a51.6 51.6 0 0 1 41.6 79 67.6 67.6 0 0 1 23.2 51.2zm-40.5-0.5a26.7 26.7 0 0 0-25.1-26.5h-1.5a20.3 20.3 0 0 1-20.3-20.3 20 20 0 0 1 3.7-11.5 20 20 0 0 1 16.6-8.8 11 11 0 0 0 11.1-11 11 11 0 0 0-3.3-7.8c-2-2.1-4.9-3.3-7.8-3.3h-3c-0.9 0.2-1.8 0.4-2.8 0.4a57.6 57.6 0 0 0-42 90c2.2 2.9 4.3 5.7 6.9 8.4a58.6 58.6 0 0 0 37.9 17l3 0.1h1.5c14-0.8 25.1-12.5 25.1-26.7z" android:fillColor="#00388b" android:fillType="evenOdd"/>
<path android:pathData="M155.5 134.9a26.7 26.7 0 0 1-25.1 26.5h-4a47 47 0 0 1-30.6-79.9c7.9-7.9 18.8-13 30.6-13.7h2.5a20.3 20.3 0 0 0 0 40.6h1.5c14 0.6 25.1 12.3 25.1 26.5z" android:fillColor="#abcd03"/>
<path android:pathData="M130.6 161.4h-4.5a57.7 57.7 0 0 1-54.9-57.8 57.8 57.8 0 0 1 54.9-57.9h3c2.9 0 5.7 1.2 7.8 3.2a11 11 0 0 1 3.2 7.9 11 11 0 0 1-11 11h-2.5c-12 0.7-22.7 5.8-30.7 13.7a47.3 47.3 0 0 0 0 66.2c8 8 18.8 13.1 30.7 13.7h2.5z" android:fillColor="#e62e8b"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="56dp"
android:height="54dp"
android:viewportWidth="218"
android:viewportHeight="211">
<path
android:fillColor="#00388b"
android:fillType="evenOdd"
android:pathData="M196 135.2a67.2 67.2 0 0 1-64.3 66.9h-2.5l-3.9-0.1-6.3-0.5A98.5 98.5 0 0 1 129.2 5h2a51.6 51.6 0 0 1 41.6 79 67.6 67.6 0 0 1 23.2 51.2zm-40.5-0.5a26.7 26.7 0 0 0-25.1-26.5h-1.5a20.3 20.3 0 0 1-20.3-20.3 20 20 0 0 1 3.7-11.5 20 20 0 0 1 16.6-8.8 11 11 0 0 0 11.1-11 11 11 0 0 0-3.3-7.8c-2-2.1-4.9-3.3-7.8-3.3h-3c-0.9 0.2-1.8 0.4-2.8 0.4a57.6 57.6 0 0 0-42 90c2.2 2.9 4.3 5.7 6.9 8.4a58.6 58.6 0 0 0 37.9 17l3 0.1h1.5c14-0.8 25.1-12.5 25.1-26.7z" />
<path
android:fillColor="#abcd03"
android:pathData="M155.5 134.9a26.7 26.7 0 0 1-25.1 26.5h-4a47 47 0 0 1-30.6-79.9c7.9-7.9 18.8-13 30.6-13.7h2.5a20.3 20.3 0 0 0 0 40.6h1.5c14 0.6 25.1 12.3 25.1 26.5z" />
<path
android:fillColor="#e62e8b"
android:pathData="M130.6 161.4h-4.5a57.7 57.7 0 0 1-54.9-57.8 57.8 57.8 0 0 1 54.9-57.9h3c2.9 0 5.7 1.2 7.8 3.2a11 11 0 0 1 3.2 7.9 11 11 0 0 1-11 11h-2.5c-12 0.7-22.7 5.8-30.7 13.7a47.3 47.3 0 0 0 0 66.2c8 8 18.8 13.1 30.7 13.7h2.5z" />
</vector>
17 changes: 14 additions & 3 deletions android/src/main/res/drawable/komoju_ic_credit_card.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="32dp" android:height="33dp" android:viewportWidth="32" android:viewportHeight="33">
<path android:fillColor="#3CC239" android:pathData="M2.667 11.433v2.4h26.666v-2.4c0-1.493 0-2.24-0.29-2.81-0.256-0.502-0.664-0.91-1.166-1.166-0.57-0.29-1.317-0.29-2.81-0.29H6.933c-1.493 0-2.24 0-2.81 0.29-0.502 0.256-0.91 0.664-1.166 1.166-0.29 0.57-0.29 1.317-0.29 2.81z"/>
<path android:pathData="M29.333 13.833H2.667m12 5.334H8m-5.333-7.734v10.134c0 1.493 0 2.24 0.29 2.81 0.256 0.502 0.664 0.91 1.166 1.166 0.57 0.29 1.317 0.29 2.81 0.29h18.134c1.493 0 2.24 0 2.81-0.29 0.502-0.256 0.91-0.664 1.166-1.166 0.29-0.57 0.29-1.317 0.29-2.81V11.433c0-1.493 0-2.24-0.29-2.81-0.256-0.502-0.664-0.91-1.166-1.166-0.57-0.29-1.317-0.29-2.81-0.29H6.933c-1.493 0-2.24 0-2.81 0.29-0.502 0.256-0.91 0.664-1.166 1.166-0.29 0.57-0.29 1.317-0.29 2.81z" android:strokeWidth="1.5" android:strokeColor="#0F1C29" android:strokeLineCap="round" android:strokeLineJoin="round"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="32dp"
android:height="33dp"
android:viewportWidth="32"
android:viewportHeight="33">
<path
android:fillColor="#3CC239"
android:pathData="M2.667 11.433v2.4h26.666v-2.4c0-1.493 0-2.24-0.29-2.81-0.256-0.502-0.664-0.91-1.166-1.166-0.57-0.29-1.317-0.29-2.81-0.29H6.933c-1.493 0-2.24 0-2.81 0.29-0.502 0.256-0.91 0.664-1.166 1.166-0.29 0.57-0.29 1.317-0.29 2.81z" />
<path
android:pathData="M29.333 13.833H2.667m12 5.334H8m-5.333-7.734v10.134c0 1.493 0 2.24 0.29 2.81 0.256 0.502 0.664 0.91 1.166 1.166 0.57 0.29 1.317 0.29 2.81 0.29h18.134c1.493 0 2.24 0 2.81-0.29 0.502-0.256 0.91-0.664 1.166-1.166 0.29-0.57 0.29-1.317 0.29-2.81V11.433c0-1.493 0-2.24-0.29-2.81-0.256-0.502-0.664-0.91-1.166-1.166-0.57-0.29-1.317-0.29-2.81-0.29H6.933c-1.493 0-2.24 0-2.81 0.29-0.502 0.256-0.91 0.664-1.166 1.166-0.29 0.57-0.29 1.317-0.29 2.81z"
android:strokeWidth="1.5"
android:strokeColor="#0F1C29"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
</vector>
Loading
Loading