release sora v3.5.0.0 104

sora-xor · Oct 16, 2023 · 9f60ff8 · 9f60ff8
1 parent d7c5ea0
commit 9f60ff8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 136 deletions.
diff --git 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
@@ -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/...c/main/java/jp/co/soramitsu/feature_ecosystem_impl/presentation/explore/DiscoverScreen.kt b/...c/main/java/jp/co/soramitsu/feature_ecosystem_impl/presentation/explore/DiscoverScreen.kt
diff --git a/.../main/java/jp/co/soramitsu/feature_ecosystem_impl/presentation/explore/ExploreFragment.kt b/.../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<ExploreViewModel>() {
@@ -63,25 +63,20 @@ class ExploreFragment : SoraBaseFragment<ExploreViewModel>() {
         }
     }
 
-    @OptIn(ExperimentalAnimationApi::class)
     override fun NavGraphBuilder.content(
         scrollState: ScrollState,
         navController: NavHostController
     ) {
         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,