From 9f60ff8adea5f6ea3b94e60eba3562222f72eaf0 Mon Sep 17 00:00:00 2001 From: arvifox Date: Mon, 16 Oct 2023 13:42:19 +0300 Subject: [PATCH] release sora v3.5.0.0 104 --- app/build.gradle | 2 +- build.gradle | 8 +- .../presentation/explore/DiscoverScreen.kt | 120 ------------------ .../presentation/explore/ExploreFragment.kt | 17 +-- 4 files changed, 11 insertions(+), 136 deletions(-) delete mode 100644 feature_ecosystem_impl/src/main/java/jp/co/soramitsu/feature_ecosystem_impl/presentation/explore/DiscoverScreen.kt diff --git a/app/build.gradle b/app/build.gradle index 20a53a22d..e29364735 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -140,7 +140,7 @@ play { serviceAccountCredentials = file(System.env.CI_PLAY_KEY ?: "../key/fake.json") track = "internal" releaseStatus = ReleaseStatus.DRAFT - releaseName = "3.4.0.0 - SORA IBAN Balance" + releaseName = "3.5.0.0 - Explore SORA Ecosystem" } dependencies { diff --git a/build.gradle b/build.gradle index 701972544..34803eec2 100644 --- a/build.gradle +++ b/build.gradle @@ -39,7 +39,7 @@ buildscript { insetter : '0.6.0', truth : '1.1.5', lottie : '4.2.0', - xNetworking : '0.2.2', + xNetworking : '0.2.3', compose : '1.5.2', composeCompiler : '1.5.3', composeConstraintLayout: '1.1.0-alpha05', @@ -55,10 +55,10 @@ buildscript { ext { // soralution 113 3.5.0.0 2023.10.10 - // sora dae 103 3.4.0.0 2023.10.10 + // sora dae 104 3.5.0.0 2023.10.16 // appVersionCode = Integer.valueOf(System.env.BUILD_NUMBER ?: 96) - appVersionCode = Integer.valueOf(System.env.CI_BUILD_ID ?: 103) - appVersionName = '3.4.0.0' + appVersionCode = Integer.valueOf(System.env.CI_BUILD_ID ?: 104) + appVersionName = '3.5.0.0' compileVersion = 34 minVersion = 24 diff --git a/feature_ecosystem_impl/src/main/java/jp/co/soramitsu/feature_ecosystem_impl/presentation/explore/DiscoverScreen.kt b/feature_ecosystem_impl/src/main/java/jp/co/soramitsu/feature_ecosystem_impl/presentation/explore/DiscoverScreen.kt deleted file mode 100644 index ebfe99dda..000000000 --- a/feature_ecosystem_impl/src/main/java/jp/co/soramitsu/feature_ecosystem_impl/presentation/explore/DiscoverScreen.kt +++ /dev/null @@ -1,120 +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.feature_ecosystem_impl.presentation.explore - -import androidx.compose.foundation.ScrollState -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.wrapContentHeight -import androidx.compose.foundation.verticalScroll -import androidx.compose.material.MaterialTheme -import androidx.compose.material.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.res.stringResource -import jp.co.soramitsu.common.R -import jp.co.soramitsu.common.util.ext.testTagAsId -import jp.co.soramitsu.ui_core.component.button.FilledButton -import jp.co.soramitsu.ui_core.component.button.properties.Order -import jp.co.soramitsu.ui_core.component.button.properties.Size -import jp.co.soramitsu.ui_core.component.card.ContentCard -import jp.co.soramitsu.ui_core.resources.Dimens -import jp.co.soramitsu.ui_core.theme.customColors -import jp.co.soramitsu.ui_core.theme.customTypography - -@Composable -internal fun DiscoverScreen( - onAddLiquidityClicked: () -> Unit, - scrollState: ScrollState, -) { - Column( - modifier = Modifier - .fillMaxSize() - .verticalScroll(scrollState) - .padding(horizontal = Dimens.x2) - ) { - Text( - modifier = Modifier.padding( - start = Dimens.x2, - end = Dimens.x2, - top = Dimens.x3, - bottom = Dimens.x2 - ), - text = stringResource(id = R.string.common_explore), - style = MaterialTheme.customTypography.headline1, - color = MaterialTheme.customColors.fgPrimary, - ) - ContentCard( - modifier = Modifier - .fillMaxWidth() - .wrapContentHeight(), - ) { - Column( - modifier = Modifier - .fillMaxWidth() - .wrapContentHeight() - .padding(Dimens.x3) - ) { - Text( - modifier = Modifier - .fillMaxWidth() - .wrapContentHeight(), - text = stringResource(id = R.string.discovery_polkaswap_pools), - style = MaterialTheme.customTypography.headline2, - color = MaterialTheme.customColors.fgPrimary, - ) - Text( - modifier = Modifier - .padding(top = Dimens.x2) - .fillMaxWidth() - .wrapContentHeight(), - text = stringResource(id = R.string.discover_coming_soon), - style = MaterialTheme.customTypography.paragraphM, - color = MaterialTheme.customColors.fgSecondary, - ) - FilledButton( - modifier = Modifier - .testTagAsId("AddLiquidity") - .padding(top = Dimens.x2) - .fillMaxWidth(), - size = Size.Large, - order = Order.PRIMARY, - text = stringResource(id = R.string.add_liquidity_title), - onClick = onAddLiquidityClicked, - ) - } - } - } -} diff --git a/feature_ecosystem_impl/src/main/java/jp/co/soramitsu/feature_ecosystem_impl/presentation/explore/ExploreFragment.kt b/feature_ecosystem_impl/src/main/java/jp/co/soramitsu/feature_ecosystem_impl/presentation/explore/ExploreFragment.kt index 2ad98af3f..b2dd389cc 100644 --- a/feature_ecosystem_impl/src/main/java/jp/co/soramitsu/feature_ecosystem_impl/presentation/explore/ExploreFragment.kt +++ b/feature_ecosystem_impl/src/main/java/jp/co/soramitsu/feature_ecosystem_impl/presentation/explore/ExploreFragment.kt @@ -32,7 +32,6 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package jp.co.soramitsu.feature_ecosystem_impl.presentation.explore -import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.foundation.ScrollState import androidx.fragment.app.viewModels import androidx.lifecycle.compose.collectAsStateWithLifecycle @@ -45,6 +44,7 @@ import jp.co.soramitsu.common.domain.BottomBarController import jp.co.soramitsu.feature_ecosystem_impl.presentation.ExploreRoutes import jp.co.soramitsu.feature_ecosystem_impl.presentation.allcurrencies.AllCurrenciesScreen import jp.co.soramitsu.feature_ecosystem_impl.presentation.allpools.AllPoolsScreen +import jp.co.soramitsu.feature_ecosystem_impl.presentation.start.StartScreen @AndroidEntryPoint class ExploreFragment : SoraBaseFragment() { @@ -63,7 +63,6 @@ class ExploreFragment : SoraBaseFragment() { } } - @OptIn(ExperimentalAnimationApi::class) override fun NavGraphBuilder.content( scrollState: ScrollState, navController: NavHostController @@ -71,17 +70,13 @@ class ExploreFragment : SoraBaseFragment() { composable( route = ExploreRoutes.START, ) { - DiscoverScreen( - onAddLiquidityClicked = viewModel::onPoolPlus, + StartScreen( scrollState = scrollState, + onCurrencyShowMore = { navController.navigate(ExploreRoutes.ALL_CURRENCIES) }, + onPoolShowMore = { navController.navigate(ExploreRoutes.ALL_POOLS) }, + onTokenClicked = viewModel::onTokenClicked, + onPoolClicked = viewModel::onPoolClicked, ) -// StartScreen( -// scrollState = scrollState, -// onCurrencyShowMore = { navController.navigate(ExploreRoutes.ALL_CURRENCIES) }, -// onPoolShowMore = { navController.navigate(ExploreRoutes.ALL_POOLS) }, -// onTokenClicked = viewModel::onTokenClicked, -// onPoolClicked = viewModel::onPoolClicked, -// ) } composable( route = ExploreRoutes.ALL_CURRENCIES,