diff --git a/build.gradle b/build.gradle index f02dcd746..6b0184501 100644 --- a/build.gradle +++ b/build.gradle @@ -39,11 +39,11 @@ buildscript { insetter : '0.6.1', truth : '1.1.5', lottie : '4.2.0', - xNetworking : '0.2.2', + xNetworking : '0.2.3', compose : '1.5.3', composeCompiler : '1.5.3', composeConstraintLayout: '1.1.0-alpha05', - uiCore : '0.2.8', + uiCore : '0.2.9', soraCard : '0.1.56', lazySodium : '5.0.2', jna : '5.8.0', diff --git a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/components/BasicBannerCard.kt b/common/src/main/java/jp/co/soramitsu/common/presentation/compose/components/BasicBannerCard.kt index 347bf5db3..d4a86bb45 100644 --- a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/components/BasicBannerCard.kt +++ b/common/src/main/java/jp/co/soramitsu/common/presentation/compose/components/BasicBannerCard.kt @@ -129,7 +129,7 @@ fun BasicBannerCard( order = Order.TERTIARY, shape = CircleShape, onClick = onCloseCard, - leftIcon = painterResource(R.drawable.ic_cross), + leftIcon = painterResource(jp.co.soramitsu.ui_core.R.drawable.ic_cross), ) } } diff --git a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/components/Buttons.kt b/common/src/main/java/jp/co/soramitsu/common/presentation/compose/components/Buttons.kt deleted file mode 100644 index 1994a6441..000000000 --- a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/components/Buttons.kt +++ /dev/null @@ -1,79 +0,0 @@ -/* -This file is part of the SORA network and Polkaswap app. - -Copyright (c) 2020, 2021, Polka Biome Ltd. All rights reserved. -SPDX-License-Identifier: BSD-4-Clause - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -Redistributions of source code must retain the above copyright notice, this list -of conditions and the following disclaimer. -Redistributions in binary form must reproduce the above copyright notice, this -list of conditions and the following disclaimer in the documentation and/or other -materials provided with the distribution. - -All advertising materials mentioning features or use of this software must display -the following acknowledgement: This product includes software developed by Polka Biome -Ltd., SORA, and Polkaswap. - -Neither the name of the Polka Biome Ltd. nor the names of its contributors may be used -to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY Polka Biome Ltd. AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Polka Biome Ltd. BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -package jp.co.soramitsu.common.presentation.compose.components - -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.Button -import androidx.compose.material.ButtonDefaults -import androidx.compose.material.MaterialTheme -import androidx.compose.material.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clip -import androidx.compose.ui.unit.dp -import jp.co.soramitsu.common.presentation.compose.theme.ThemeColors -import jp.co.soramitsu.common.presentation.compose.theme.neuButton -import jp.co.soramitsu.ui_core.resources.Dimens - -@Composable -fun ContainedButton( - modifier: Modifier = Modifier, - label: String, - enabled: Boolean = true, - onClick: () -> Unit, -) { - Button( - modifier = modifier - .fillMaxWidth() - .height(56.dp) // TODO: Change to Dimens.x7 - .clip(RoundedCornerShape(Dimens.x4)), - enabled = enabled, - onClick = onClick, - colors = ButtonDefaults.buttonColors( - backgroundColor = ThemeColors.Primary, - contentColor = ThemeColors.OnPrimary, - disabledBackgroundColor = ThemeColors.BackgroundDisabled, - disabledContentColor = ThemeColors.TextDisabled - ) - ) { - Text( - modifier = Modifier.align(Alignment.CenterVertically), - text = label, - color = ThemeColors.OnPrimary, - style = MaterialTheme.typography.neuButton - ) - } -} diff --git a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/theme/Colors.kt b/common/src/main/java/jp/co/soramitsu/common/presentation/compose/theme/Colors.kt deleted file mode 100644 index 9d7b5c583..000000000 --- a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/theme/Colors.kt +++ /dev/null @@ -1,96 +0,0 @@ -/* -This file is part of the SORA network and Polkaswap app. - -Copyright (c) 2020, 2021, Polka Biome Ltd. All rights reserved. -SPDX-License-Identifier: BSD-4-Clause - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -Redistributions of source code must retain the above copyright notice, this list -of conditions and the following disclaimer. -Redistributions in binary form must reproduce the above copyright notice, this -list of conditions and the following disclaimer in the documentation and/or other -materials provided with the distribution. - -All advertising materials mentioning features or use of this software must display -the following acknowledgement: This product includes software developed by Polka Biome -Ltd., SORA, and Polkaswap. - -Neither the name of the Polka Biome Ltd. nor the names of its contributors may be used -to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY Polka Biome Ltd. AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Polka Biome Ltd. BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -package jp.co.soramitsu.common.presentation.compose.theme - -import android.graphics.Color.parseColor -import android.graphics.Color.rgb -import androidx.compose.ui.graphics.Color - -@Deprecated("use SoraAppTheme palette") -private object Colors { - - val NeuColor300 = Color(rgb(246, 242, 242)) - val NeuBlack = Color(rgb(34, 17, 17)) - val NeuSelectedRed = Color(rgb(238, 34, 51)) - val NeuDisabledGrey = Color(rgb(236, 229, 229)) - val NeuDisabledTextGrey = Color(rgb(220, 210, 210)) - val NeuSecondary10 = Color(rgb(232, 225, 225)) - val NeuSecondary50 = Color(rgb(157, 129, 129)) - - val BrandPmsBlack = Color(rgb(45, 41, 38)) -} - -@Deprecated("use SoraAppTheme palette LightThemeColors") -object ThemeColors { - - val Primary = Colors.NeuSelectedRed - val OnPrimary = Color.White - - val Secondary = Colors.NeuSecondary10 - val OnSecondary = Colors.NeuSecondary50 - - val Background = Colors.NeuColor300 - val OnBackground = Colors.BrandPmsBlack - val BackgroundDisabled = Colors.NeuDisabledGrey - - val TextDefault = Colors.NeuBlack - val TextDisabled = Colors.NeuDisabledTextGrey -} - -@Deprecated("use SoraAppTheme palette NightThemeColors") -object ThemeColorsDark { - - val Primary = Colors.NeuSelectedRed - val OnPrimary = Color.White - - val Secondary = Colors.NeuSecondary10 - val OnSecondary = Colors.NeuSecondary50 - - val Background = Colors.NeuColor300 -} - -object NeuColorsCompat { - - val Content = parseColor("#f6f2f2") - val ShadowLight = parseColor("#eefefafa") - val ShadowDark = parseColor("#eeeae6e6") - val neuOnBackground = Color(0xff998888) - val color281818 = Color(0xff281818) - val color9a9a9a = Color(0xff9a9a9a) - val neuDividerColor = Color(0xffe5dddd) - val neuBackgroundAbove = Color(0xfffaf6f6) - val neuBackgroundImage = Color(0xffe8e1e1) - val neuTintDark = Color(0xffaa9999) - val neuTintLight = Color(0xffccbbbb) - val neuColor9d8181 = Color(0xff9d8181) -} diff --git a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/theme/SoraTheme.kt b/common/src/main/java/jp/co/soramitsu/common/presentation/compose/theme/SoraTheme.kt index 0cf895ce6..976a81e56 100644 --- a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/theme/SoraTheme.kt +++ b/common/src/main/java/jp/co/soramitsu/common/presentation/compose/theme/SoraTheme.kt @@ -63,7 +63,7 @@ import jp.co.soramitsu.ui_core.theme.lightColors @Composable fun SoraAppTheme( darkTheme: Boolean = isSystemInDarkTheme(), - content: @Composable () -> Unit + content: @Composable () -> Unit, ) { AppTheme( darkTheme = darkTheme, @@ -71,7 +71,7 @@ fun SoraAppTheme( darkColors = soraDarkColors, typography = soraTypography, borderRadius = soraBorderRadius, - content = content + content = content, ) } diff --git a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/theme/TextStyles.kt b/common/src/main/java/jp/co/soramitsu/common/presentation/compose/theme/TextStyles.kt deleted file mode 100644 index f854ebedb..000000000 --- a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/theme/TextStyles.kt +++ /dev/null @@ -1,176 +0,0 @@ -/* -This file is part of the SORA network and Polkaswap app. - -Copyright (c) 2020, 2021, Polka Biome Ltd. All rights reserved. -SPDX-License-Identifier: BSD-4-Clause - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -Redistributions of source code must retain the above copyright notice, this list -of conditions and the following disclaimer. -Redistributions in binary form must reproduce the above copyright notice, this -list of conditions and the following disclaimer in the documentation and/or other -materials provided with the distribution. - -All advertising materials mentioning features or use of this software must display -the following acknowledgement: This product includes software developed by Polka Biome -Ltd., SORA, and Polkaswap. - -Neither the name of the Polka Biome Ltd. nor the names of its contributors may be used -to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY Polka Biome Ltd. AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Polka Biome Ltd. BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -package jp.co.soramitsu.common.presentation.compose.theme - -import androidx.compose.material.MaterialTheme -import androidx.compose.material.Typography -import androidx.compose.runtime.Composable -import androidx.compose.ui.text.TextStyle -import androidx.compose.ui.text.font.FontStyle -import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.unit.em -import androidx.compose.ui.unit.sp - -@Deprecated("use SoraAppTheme custom typography") -private val SoramitsuNeuTextStyle: TextStyle - @Composable get() = MaterialTheme.typography.body1.copy( - fontFamily = Sora, - fontStyle = FontStyle.Normal, - color = ThemeColors.TextDefault, - letterSpacing = 0.sp - ) - -@Deprecated("use SoraAppTheme custom typography") -private val NeuBold: TextStyle - @Composable get() = SoramitsuNeuTextStyle.copy( - fontWeight = FontWeight.Bold - ) - -@Deprecated("use SoraAppTheme custom typography") -private val NeuMedium: TextStyle - @Composable get() = SoramitsuNeuTextStyle.copy( - fontWeight = FontWeight.Medium - ) - -@Deprecated("use SoraAppTheme custom typography") -private val NeuRegular: TextStyle - @Composable get() = SoramitsuNeuTextStyle.copy( - fontWeight = FontWeight.Normal - ) - -@Deprecated("use SoraAppTheme custom typography") -private val NeuSemiBold: TextStyle - @Composable get() = SoramitsuNeuTextStyle.copy( - fontWeight = FontWeight.SemiBold - ) - -@Deprecated("use SoraAppTheme custom typography") -private val NeuLight: TextStyle - @Composable get() = SoramitsuNeuTextStyle.copy( - fontWeight = FontWeight.Light - ) - -@Deprecated("use SoraAppTheme custom typography") -val Typography.neuBold34: TextStyle - @Composable get() = NeuBold.copy( - fontSize = 34.sp, - lineHeight = 40.sp, - letterSpacing = (-0.02).em - ) - -@Deprecated("use SoraAppTheme custom typography") -val neuBold18: TextStyle - @Composable get() = NeuBold.copy( - fontSize = 18.sp, - lineHeight = 24.sp, - letterSpacing = (-0.02).em - ) - -@Deprecated("use SoraAppTheme custom typography") -val neuBold24: TextStyle - @Composable get() = NeuBold.copy( - fontSize = 24.sp, - lineHeight = 24.sp, - letterSpacing = (-0.03).em - ) - -@Deprecated("use SoraAppTheme custom typography") -val Typography.neuBold15: TextStyle - @Composable get() = NeuBold.copy( - fontSize = 15.sp, - lineHeight = 24.sp, - letterSpacing = (-0.02).em - ) - -@Deprecated("use SoraAppTheme custom typography") -val neuMedium15: TextStyle - @Composable get() = NeuMedium.copy( - fontSize = 15.sp, - lineHeight = 24.sp, - letterSpacing = (-0.02).em - ) - -@Deprecated("use SoraAppTheme custom typography") -val neuRegular11: TextStyle - @Composable get() = NeuRegular.copy( - fontSize = 11.sp, - lineHeight = 16.sp, - ) - -@Deprecated("use SoraAppTheme custom typography") -val neuRegular12: TextStyle - @Composable get() = NeuRegular.copy( - fontSize = 12.sp, - lineHeight = 16.sp, - letterSpacing = (-0.05).em - ) - -@Deprecated("use SoraAppTheme custom typography") -val neuRegular16: TextStyle - @Composable get() = NeuRegular.copy( - fontSize = 16.sp, - lineHeight = 16.sp, - letterSpacing = (-0.05).em - ) - -@Deprecated("use SoraAppTheme custom typography") -val Typography.neuRegular15: TextStyle - @Composable get() = NeuRegular.copy( - fontSize = 15.sp, - lineHeight = 16.sp, - letterSpacing = (-0.02).em - ) - -@Deprecated("use SoraAppTheme custom typography") -val neuSemiBold11: TextStyle - @Composable get() = NeuSemiBold.copy( - fontSize = 11.sp, - lineHeight = 11.sp, - letterSpacing = (-0.05).em - ) - -@Deprecated("use SoraAppTheme custom typography") -val Typography.neuLight15: TextStyle - @Composable get() = NeuLight.copy( - fontSize = 15.sp, - lineHeight = 21.sp, - letterSpacing = (-0.02).em - ) - -@Deprecated("use SoraAppTheme custom typography") -val Typography.neuButton: TextStyle - @Composable get() = NeuBold.copy( - fontSize = 21.sp, - lineHeight = 21.sp, - letterSpacing = (-0.03).em - ) diff --git a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/theme/tokens/Colors.kt b/common/src/main/java/jp/co/soramitsu/common/presentation/compose/theme/tokens/Colors.kt index 866ddeb96..3498c954c 100644 --- a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/theme/tokens/Colors.kt +++ b/common/src/main/java/jp/co/soramitsu/common/presentation/compose/theme/tokens/Colors.kt @@ -36,167 +36,25 @@ import androidx.compose.ui.graphics.Color internal object Colors { - val White100 = Color(0xFFFFFFFF) - - val Black100 = Color(0xFF000000) - - val Grey5 = Color(0xFFFCFCFC) - - val Grey10 = Color(0xFFF9F9F9) - - val Grey20 = Color(0xFFE9E9E9) - - val Grey30 = Color(0xFFCFCFCF) - - val Grey40 = Color(0xFFABABAB) - - val Grey50 = Color(0xFF808080) - - val Grey60 = Color(0xFF565656) - - val Grey70 = Color(0xFF313131) - - val Grey80 = Color(0xFF171717) - - val Grey90 = Color(0xFF070707) - val Brown5 = Color(0xFFF5F2F2) val Brown10 = Color(0xFFE8E1E1) - val Brown20 = Color(0xFFD7CDCD) - val Brown30 = Color(0xFFC3B3B3) - val Brown40 = Color(0xFFAA9999) - val Brown50 = Color(0xFF9D8181) - val Brown60 = Color(0xFF8A6969) - - val Brown70 = Color(0xFF704E4E) - - val Brown80 = Color(0xFF4E3333) - val Brown90 = Color(0xFF281818) val Red5 = Color(0xFFFFE8EB) - val Red10 = Color(0xFFFFD0D5) - - val Red20 = Color(0xFFFF9BA6) - - val Red30 = Color(0xFFFF6B79) - - val Red40 = Color(0xFFFC4252) - - val Red50 = Color(0xFFEE2233) - - val Red60 = Color(0xFFCB0F1F) - - val Red70 = Color(0xFFA00411) - - val Red80 = Color(0xFF6F0009) - - val Red90 = Color(0xFF380005) - val Green5 = Color(0xFFD3F6EC) - val Green10 = Color(0xFFAAECD9) - - val Green20 = Color(0xFF7FDEC3) - - val Green30 = Color(0xFF57CCAB) - - val Green40 = Color(0xFF33B590) - - val Green50 = Color(0xFF169974) - - val Green60 = Color(0xFF007755) - - val Green70 = Color(0xFF17614C) - - val Green80 = Color(0xFF20453A) - - val Green90 = Color(0xFF192320) - val Yellow5 = Color(0xFFFFF1D2) - val Yellow10 = Color(0xFFFFE2A4) - - val Yellow20 = Color(0xFFFFBB44) - val Yellow30 = Color(0xFFFF9900) - val Yellow40 = Color(0xFFEC8A00) - - val Yellow50 = Color(0xFFD57700) - - val Yellow60 = Color(0xFFB66000) - - val Yellow70 = Color(0xFF914600) - - val Yellow80 = Color(0xFF652C00) - - val Yellow90 = Color(0xFF331400) - - val Purple5 = Color(0xFFFAF0FF) - - val Purple10 = Color(0xFFF6E0FF) - - val Purple20 = Color(0xFFEAC8FF) - - val Purple30 = Color(0xFFDAAAFD) - - val Purple40 = Color(0xFFC686F3) - - val Purple50 = Color(0xFFAD61E3) - - val Purple60 = Color(0xFF923ECD) - - val Purple70 = Color(0xFF7522B0) - - val Purple80 = Color(0xFF570D8C) - - val Purple90 = Color(0xFF341B47) - - val Blue5 = Color(0xFFE6F3FF) - - val Blue10 = Color(0xFFCDE6FF) - - val Blue20 = Color(0xFF98CAFB) - - val Blue30 = Color(0xFF69AEF3) - - val Blue40 = Color(0xFF4394E6) - - val Blue50 = Color(0xFF267DD4) - - val Blue60 = Color(0xFF1166BB) - - val Blue70 = Color(0xFF054D94) - - val Blue80 = Color(0xFF003367) - - val Blue90 = Color(0xFF001A34) - - val Polkaswap5 = Color(0xFFFFE3F1) - - val Polkaswap10 = Color(0xFFFFC6E3) - - val Polkaswap20 = Color(0xFFFF8DC1) - - val Polkaswap30 = Color(0xFFFF56A0) - - val Polkaswap40 = Color(0xFFFF2782) - - val Polkaswap50 = Color(0xFFFF0066) - - val Polkaswap60 = Color(0xFFD80057) - - val Polkaswap70 = Color(0xFFAA0044) - - val Polkaswap80 = Color(0xFF75012F) + val AdditionalPolkaswap = Color(0xFFFF0066) - val Polkaswap90 = Color(0xFF3B0219) + val AdditionalPolkaswapContainer = Color(0xFFFFE3F1) } diff --git a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/theme/tokens/DayThemeColors.kt b/common/src/main/java/jp/co/soramitsu/common/presentation/compose/theme/tokens/DayThemeColors.kt index 2257b2cc3..9a8b0e467 100644 --- a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/theme/tokens/DayThemeColors.kt +++ b/common/src/main/java/jp/co/soramitsu/common/presentation/compose/theme/tokens/DayThemeColors.kt @@ -32,25 +32,20 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package jp.co.soramitsu.common.presentation.compose.theme.tokens +import androidx.compose.ui.graphics.Color import jp.co.soramitsu.common.presentation.compose.theme.tokens.Colors.Brown10 import jp.co.soramitsu.common.presentation.compose.theme.tokens.Colors.Brown30 import jp.co.soramitsu.common.presentation.compose.theme.tokens.Colors.Brown5 import jp.co.soramitsu.common.presentation.compose.theme.tokens.Colors.Brown50 import jp.co.soramitsu.common.presentation.compose.theme.tokens.Colors.Brown90 import jp.co.soramitsu.common.presentation.compose.theme.tokens.Colors.Green5 -import jp.co.soramitsu.common.presentation.compose.theme.tokens.Colors.Green50 -import jp.co.soramitsu.common.presentation.compose.theme.tokens.Colors.Polkaswap5 -import jp.co.soramitsu.common.presentation.compose.theme.tokens.Colors.Polkaswap50 import jp.co.soramitsu.common.presentation.compose.theme.tokens.Colors.Red5 -import jp.co.soramitsu.common.presentation.compose.theme.tokens.Colors.Red50 -import jp.co.soramitsu.common.presentation.compose.theme.tokens.Colors.Red60 -import jp.co.soramitsu.common.presentation.compose.theme.tokens.Colors.White100 import jp.co.soramitsu.common.presentation.compose.theme.tokens.Colors.Yellow30 import jp.co.soramitsu.common.presentation.compose.theme.tokens.Colors.Yellow5 object DayThemeColors { - val AccentPrimary = Red50 + val AccentPrimary = Color(0xFFEE2233) val AccentPrimaryContainer = Red5 @@ -64,7 +59,7 @@ object DayThemeColors { val BgPage = Brown5 - val BgSurface = White100 + val BgSurface = Color(0xffffffff) val BgSurfaceVariant = Brown10 @@ -80,7 +75,7 @@ object DayThemeColors { val FgOutline = Brown5 - val StatusSuccess = Green50 + val StatusSuccess = Color(0xFF169974) val StatusSuccessContainer = Green5 @@ -88,11 +83,7 @@ object DayThemeColors { val StatusWarningContainer = Yellow5 - val StatusError = Red60 + val StatusError = Color(0xFFCB0F1F) val StatusErrorContainer = Red5 - - val AdditionalPolkaswap = Polkaswap50 - - val AdditionalPolkaswapContainer = Polkaswap5 } diff --git a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/theme/tokens/NightThemeColors.kt b/common/src/main/java/jp/co/soramitsu/common/presentation/compose/theme/tokens/NightThemeColors.kt index 4013523e0..7713d90d3 100644 --- a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/theme/tokens/NightThemeColors.kt +++ b/common/src/main/java/jp/co/soramitsu/common/presentation/compose/theme/tokens/NightThemeColors.kt @@ -32,67 +32,49 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package jp.co.soramitsu.common.presentation.compose.theme.tokens -import jp.co.soramitsu.common.presentation.compose.theme.tokens.Colors.Brown30 -import jp.co.soramitsu.common.presentation.compose.theme.tokens.Colors.Green40 -import jp.co.soramitsu.common.presentation.compose.theme.tokens.Colors.Green5 -import jp.co.soramitsu.common.presentation.compose.theme.tokens.Colors.Grey5 -import jp.co.soramitsu.common.presentation.compose.theme.tokens.Colors.Grey50 -import jp.co.soramitsu.common.presentation.compose.theme.tokens.Colors.Grey60 -import jp.co.soramitsu.common.presentation.compose.theme.tokens.Colors.Grey70 -import jp.co.soramitsu.common.presentation.compose.theme.tokens.Colors.Grey80 -import jp.co.soramitsu.common.presentation.compose.theme.tokens.Colors.Grey90 -import jp.co.soramitsu.common.presentation.compose.theme.tokens.Colors.Polkaswap40 -import jp.co.soramitsu.common.presentation.compose.theme.tokens.Colors.Polkaswap5 -import jp.co.soramitsu.common.presentation.compose.theme.tokens.Colors.Red40 -import jp.co.soramitsu.common.presentation.compose.theme.tokens.Colors.Red5 -import jp.co.soramitsu.common.presentation.compose.theme.tokens.Colors.Yellow30 -import jp.co.soramitsu.common.presentation.compose.theme.tokens.Colors.Yellow5 +import androidx.compose.ui.graphics.Color object NightThemeColors { - val AccentPrimary = Red40 + val AccentPrimary = Color(0xfff754a3) - val AccentPrimaryContainer = Red5 + val AccentPrimaryContainer = Color(0xffffe8eb) - val AccentSecondary = Grey5 + val AccentSecondary = Color(0xfffcfcfc) - val AccentSecondaryContainer = Grey70 + val AccentSecondaryContainer = Color(0xff313131) - val AccentTertiary = Grey50 + val AccentTertiary = Color(0xff9b6fa5) - val AccentTertiaryContainer = Grey70 + val AccentTertiaryContainer = Color(0xff313131) - val BgPage = Grey90 + val BgPage = Color(0xff45245f) - val BgSurface = Grey80 + val BgSurface = Color(0xFF592d71) - val BgSurfaceVariant = Grey70 + val BgSurfaceVariant = Color(0xff492067) - val BgSurfaceInverted = Grey5 + val BgSurfaceInverted = Color(0xfffcfcfc) - val FgPrimary = Grey5 + val FgPrimary = Color(0xfffcfcfc) - val FgSecondary = Grey50 + val FgSecondary = Color(0xffc29ab7) - val FgTertiary = Brown30 + val FgTertiary = Color(0xff9b6fa5) - val FgInverted = Grey90 + val FgInverted = Color(0xff45245f) - val FgOutline = Grey60 + val FgOutline = Color(0xFF744594) - val StatusSuccess = Green40 + val StatusSuccess = Color(0xFF44e5b2) - val StatusSuccessContainer = Green5 + val StatusSuccessContainer = Color(0xFFd3f6ec) - val StatusWarning = Yellow30 + val StatusWarning = Color(0xFFff9900) - val StatusWarningContainer = Yellow5 + val StatusWarningContainer = Color(0xFFfff1d2) - val StatusError = Red40 + val StatusError = Color(0xFFf24197) - val StatusErrorContainer = Red5 - - val AdditionalPolkaswap = Polkaswap40 - - val AdditionalPolkaswapContainer = Polkaswap5 + val StatusErrorContainer = Color(0xFFffe8eb) } diff --git a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/uikit/organisms/LoadableContentCard.kt b/common/src/main/java/jp/co/soramitsu/common/presentation/compose/uikit/organisms/LoadableContentCard.kt index 7e9747ea5..19aa7f0ba 100644 --- a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/uikit/organisms/LoadableContentCard.kt +++ b/common/src/main/java/jp/co/soramitsu/common/presentation/compose/uikit/organisms/LoadableContentCard.kt @@ -62,6 +62,7 @@ import jp.co.soramitsu.ui_core.theme.customColors @Composable fun LoadableContentCard( modifier: Modifier, + backgroundColor: Color = MaterialTheme.customColors.bgSurface, innerPadding: PaddingValues, cornerRadius: Dp, state: ScreenStatus, @@ -71,6 +72,7 @@ fun LoadableContentCard( ContentCard( modifier = modifier, innerPadding = innerPadding, + backgroundColor = backgroundColor, cornerRadius = cornerRadius ) { when (state) { diff --git a/common/src/main/java/jp/co/soramitsu/common/presentation/view/SoraComposeProgressDialog.kt b/common/src/main/java/jp/co/soramitsu/common/presentation/view/SoraComposeProgressDialog.kt index 5a778211d..fe811a90d 100644 --- a/common/src/main/java/jp/co/soramitsu/common/presentation/view/SoraComposeProgressDialog.kt +++ b/common/src/main/java/jp/co/soramitsu/common/presentation/view/SoraComposeProgressDialog.kt @@ -36,10 +36,11 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.Card import androidx.compose.material.CircularProgressIndicator +import androidx.compose.material.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import jp.co.soramitsu.common.presentation.compose.theme.ThemeColors import jp.co.soramitsu.ui_core.resources.Dimens +import jp.co.soramitsu.ui_core.theme.customColors @Composable fun SoraProgressDialog(modifier: Modifier = Modifier) { @@ -49,7 +50,7 @@ fun SoraProgressDialog(modifier: Modifier = Modifier) { ) { CircularProgressIndicator( Modifier.padding(Dimens.x2), - color = ThemeColors.Primary + color = MaterialTheme.customColors.accentPrimary, ) } } diff --git a/common/src/main/res/values-night/styles.xml b/common/src/main/res/values-night/styles.xml index 0b9c8d42c..8da1d7742 100644 --- a/common/src/main/res/values-night/styles.xml +++ b/common/src/main/res/values-night/styles.xml @@ -25,8 +25,8 @@ @color/grey_700 @color/grey_500 @color/grey_400 - #FF070707 - #FF171717 + #ff45245f + #FF592d71 @color/backgroundDarkColor @color/grey_300 @color/grey_200 @@ -48,7 +48,7 @@ @color/pressedSecondaryColor @color/focusedSecondaryColor - #FF070707 + #ff45245f @color/neu_brand_polkaswap @color/neu_divider_color @color/neu_black_default @@ -70,7 +70,7 @@ @color/neu_status @color/neu_status_warning_day @color/neu_color_black - @color/neu_color_black + #ff45245f @color/neu_color_red @color/neu_status_pink_warning_day @color/neu_color_grey_100 @@ -93,7 +93,7 @@ true @android:color/transparent @android:color/transparent - #FF070707 + #ff45245f \ No newline at end of file diff --git a/common/src/main/res/values-ru/strings.xml b/common/src/main/res/values-ru/strings.xml index fe7d0d098..8159f082c 100644 --- a/common/src/main/res/values-ru/strings.xml +++ b/common/src/main/res/values-ru/strings.xml @@ -234,7 +234,7 @@ Режим редактирования Адрес получателя будет отображен здесь. Получатели появятся здесь - Ввдите пароль резервной копии + Введите пароль резервной копии Введите пароль резервной копии для выбранного аккаунта Неверный пароль Введите пароль diff --git a/common/src/main/res/values-zh-rCN/strings.xml b/common/src/main/res/values-zh-rCN/strings.xml index 6fb57ff37..24c69ab45 100644 --- a/common/src/main/res/values-zh-rCN/strings.xml +++ b/common/src/main/res/values-zh-rCN/strings.xml @@ -41,7 +41,7 @@ 待发送的资产 备份已存在。继续覆盖它。 备份失败。您的Google Drive空间不足，请释放一些空间并重试。 - Backup now + 立即备份 密码的强制要求已满足 至少六个字符。为了更好的安全性，可以包含大写字母、数字和非字母字符。 设置密码将加密您的Google备份。在恢复钱包时，您需要输入此密码。\n最小密码长度为6个字符。 @@ -51,7 +51,7 @@ 购买XOR代币 用欧元购买或出售XOR代币 用法币购买XOR - Can\'t load balance + 无法加载余额 更改语言 更改PIN码 选择代币 @@ -238,7 +238,7 @@ 创建池子 提供流动性并获得奖励 在SORA网络上进行代币兑换 - 如果您无法访问此设备，您的资金将会丢失，除非您备份！ + 如果你无法访问这台设备，除非你进行备份，否则你的资金将会丢失！ 备份选项 显示密码短语 显示原始种子 @@ -386,7 +386,7 @@ %s 秒剩余 结束%s - Protect yourself from losing access to your funds + 保护自己免于失去对资金的访问权限 QR 代码 从相册 接收代币 @@ -491,7 +491,7 @@ IBAN账户详情 登录或注册 没有更多的免费尝试 - 退出 SORA 卡 + 退出SORA卡 您即将退出 SORA Card。您仍然可以使用 SORA Card 独立应用程序，但余额将不再在 SORA 钱包中可用。 推荐并赚取 推荐SORA卡。\n获得20欧元奖金。 @@ -512,7 +512,7 @@ 成功的 状态 您已成功导入一个账户 - Support chat + 支持聊天 确保在此事务之后还剩下 %s。否则，您将无法进行其他交易。 切换节点 系统外观 @@ -530,7 +530,7 @@ 发生了意外错误。\n\n您可以在SORA社区的@SORAhappiness Telegram聊天中解决此问题。 SORA 应用程序的更新已下载并可以安装。 \n\n使用最新版本的应用程序很重要。 \n\n为了更新应用程序，需要重新启动。 您想现在安装更新吗？ - Wallet backup + 钱包备份 已被锁定 已保留 已绑定 diff --git a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/components/compose/receiverequest/ReceiveTokenScreen.kt b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/components/compose/receiverequest/ReceiveTokenScreen.kt index 5d0d3d260..dcdf1a5f8 100644 --- a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/components/compose/receiverequest/ReceiveTokenScreen.kt +++ b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/components/compose/receiverequest/ReceiveTokenScreen.kt @@ -49,6 +49,7 @@ import androidx.compose.foundation.verticalScroll import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview @@ -156,6 +157,7 @@ fun ReceiveTokenByQrScreen( innerPadding = PaddingValues( all = Dimens.x1_5 ), + backgroundColor = Color.White, cornerRadius = Dimens.x4, state = state.screenStatus, contentWhenLoaded = { diff --git a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/components/compose/receiverequest/RequestTokenConfirmScreen.kt b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/components/compose/receiverequest/RequestTokenConfirmScreen.kt index ed51dfe4e..abac4f425 100644 --- a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/components/compose/receiverequest/RequestTokenConfirmScreen.kt +++ b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/components/compose/receiverequest/RequestTokenConfirmScreen.kt @@ -50,6 +50,7 @@ import androidx.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color import androidx.compose.ui.tooling.preview.Preview import jp.co.soramitsu.common.R import jp.co.soramitsu.common.domain.AssetAmountInputState @@ -163,6 +164,7 @@ fun RequestTokenConfirmScreen( innerPadding = PaddingValues( all = Dimens.x1_5 ), + backgroundColor = Color.White, cornerRadius = Dimens.x4, state = state.screenStatus, contentWhenLoaded = { diff --git a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/fullassetlist/FullAssetListViewModel.kt b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/fullassetlist/FullAssetListViewModel.kt index 6e2c01496..ac6b72a85 100644 --- a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/fullassetlist/FullAssetListViewModel.kt +++ b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/fullassetlist/FullAssetListViewModel.kt @@ -32,8 +32,6 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package jp.co.soramitsu.feature_assets_impl.presentation.screens.fullassetlist -import androidx.compose.runtime.getValue -import androidx.compose.runtime.setValue import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject diff --git a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/receiverequest/QRCodeFlowFragment.kt b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/receiverequest/QRCodeFlowFragment.kt index 175dc4caf..e95c6b015 100644 --- a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/receiverequest/QRCodeFlowFragment.kt +++ b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/receiverequest/QRCodeFlowFragment.kt @@ -36,7 +36,6 @@ import android.Manifest import android.os.Bundle import android.view.View import androidx.activity.result.ActivityResultLauncher -import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.foundation.ScrollState import androidx.fragment.app.viewModels import androidx.lifecycle.compose.collectAsStateWithLifecycle @@ -103,7 +102,6 @@ class QRCodeFlowFragment : SoraBaseFragment() { barcodeLauncher.launch(barcodeScanOptions) } - @OptIn(ExperimentalAnimationApi::class) override fun NavGraphBuilder.content( scrollState: ScrollState, navController: NavHostController diff --git a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/receiverequest/QRCodeFlowRoute.kt b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/receiverequest/QRCodeFlowRoute.kt index 54c7ab499..978235d51 100644 --- a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/receiverequest/QRCodeFlowRoute.kt +++ b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/receiverequest/QRCodeFlowRoute.kt @@ -34,9 +34,9 @@ package jp.co.soramitsu.feature_assets_impl.presentation.screens.receiverequest sealed class QRCodeFlowRoute(val route: String) { - object MainScreen : QRCodeFlowRoute("QRCodeFlowMainScreen") + data object MainScreen : QRCodeFlowRoute("QRCodeFlowMainScreen") - object SelectToken : QRCodeFlowRoute("QRCodeFlowSelectToken") + data object SelectToken : QRCodeFlowRoute("QRCodeFlowSelectToken") - object ConfirmRequestByQRCode : QRCodeFlowRoute("QRCodeFlowConfirmRequest") + data object ConfirmRequestByQRCode : QRCodeFlowRoute("QRCodeFlowConfirmRequest") } diff --git a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/receiverequest/QRCodeFlowViewModel.kt b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/receiverequest/QRCodeFlowViewModel.kt index d7cf36c71..dbe0e414d 100644 --- a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/receiverequest/QRCodeFlowViewModel.kt +++ b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/receiverequest/QRCodeFlowViewModel.kt @@ -194,7 +194,7 @@ class QRCodeFlowViewModel @Inject constructor( type = SoramitsuToolbarType.SmallCentered(), basic = BasicToolbarState( title = R.string.qr_code, - navIcon = R.drawable.ic_cross, + navIcon = jp.co.soramitsu.ui_core.R.drawable.ic_cross, ), ) loadReceiveByQrCodeScreenData() diff --git a/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/screens/pooldetails/PoolDetailsFragment.kt b/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/screens/pooldetails/PoolDetailsFragment.kt index 53009e61a..fecafbaf0 100644 --- a/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/screens/pooldetails/PoolDetailsFragment.kt +++ b/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/screens/pooldetails/PoolDetailsFragment.kt @@ -34,7 +34,6 @@ package jp.co.soramitsu.feature_polkaswap_impl.presentation.screens.pooldetails import android.os.Bundle import android.view.View -import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.foundation.ScrollState import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize @@ -91,7 +90,6 @@ class PoolDetailsFragment : SoraBaseFragment() { override fun backgroundColor(): Int = R.attr.polkaswapBackground - @OptIn(ExperimentalAnimationApi::class) override fun NavGraphBuilder.content( scrollState: ScrollState, navController: NavHostController diff --git a/feature_sora_card_impl/src/main/java/jp/co/soramitsu/feature_sora_card_impl/presentation/details/SoraCardDetailsViewModel.kt b/feature_sora_card_impl/src/main/java/jp/co/soramitsu/feature_sora_card_impl/presentation/details/SoraCardDetailsViewModel.kt index 616d71205..48fed53a4 100644 --- a/feature_sora_card_impl/src/main/java/jp/co/soramitsu/feature_sora_card_impl/presentation/details/SoraCardDetailsViewModel.kt +++ b/feature_sora_card_impl/src/main/java/jp/co/soramitsu/feature_sora_card_impl/presentation/details/SoraCardDetailsViewModel.kt @@ -81,7 +81,7 @@ class SoraCardDetailsViewModel @Inject constructor( type = SoramitsuToolbarType.SmallCentered(), basic = BasicToolbarState( title = R.string.sora_card_details_title, - navIcon = R.drawable.ic_cross, + navIcon = jp.co.soramitsu.ui_core.R.drawable.ic_cross, ) ) diff --git a/feature_wallet_impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/presentation/cardshub/SoraCard.kt b/feature_wallet_impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/presentation/cardshub/SoraCard.kt index 4238cce04..517ab7e16 100644 --- a/feature_wallet_impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/presentation/cardshub/SoraCard.kt +++ b/feature_wallet_impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/presentation/cardshub/SoraCard.kt @@ -123,7 +123,7 @@ fun SoraCard( order = Order.TERTIARY, shape = CircleShape, onClick = onCloseClicked, - leftIcon = painterResource(R.drawable.ic_cross), + leftIcon = painterResource(jp.co.soramitsu.ui_core.R.drawable.ic_cross), ) } } diff --git a/feature_wallet_impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/presentation/editcardshub/EditCardsHubViewModel.kt b/feature_wallet_impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/presentation/editcardshub/EditCardsHubViewModel.kt index 4c36fbb1b..70075fb56 100644 --- a/feature_wallet_impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/presentation/editcardshub/EditCardsHubViewModel.kt +++ b/feature_wallet_impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/presentation/editcardshub/EditCardsHubViewModel.kt @@ -91,7 +91,7 @@ class EditCardsHubViewModel @Inject constructor( _toolbarState.value = SoramitsuToolbarState( basic = BasicToolbarState( title = R.string.edit_view, - navIcon = R.drawable.ic_cross_24 + navIcon = jp.co.soramitsu.ui_core.R.drawable.ic_cross ), type = SoramitsuToolbarType.SmallCentered(), )