TP-00000 | Master → Development (Release 3.4.5) (#7077)

app/build.gradle

@@ -18,8 +18,8 @@ kapt {
     correctErrorTypes true
 }
 
-def VERSION_CODE = 325
-def VERSION_NAME = "3.4.4"
+def VERSION_CODE = 326
+def VERSION_NAME = "3.4.5"
 
 android {
     namespace 'com.naviapp'

app/src/main/java/com/naviapp/home/fragment/HomeFragment.kt

@@ -21,9 +21,12 @@ import android.view.View.VISIBLE
 import android.view.ViewGroup
 import android.view.animation.AnimationUtils
 import android.widget.Toast
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
@@ -442,6 +445,7 @@ class HomeFragment : PaymentBaseFragment(), WidgetCallback, PlayStoreActionListe
                     showUitronWidgets(binding.composeView, composeWidgets, this@HomeFragment)
                 } else {
                     binding.recycleView.visibility = View.VISIBLE
+                    binding.composeView.visibility = View.GONE
                     handleOldUi(contentWidget)
                 }
             }
@@ -615,16 +619,17 @@ class HomeFragment : PaymentBaseFragment(), WidgetCallback, PlayStoreActionListe
     ) {
         composeView.visibility = VISIBLE
         composeView.setContent {
-            LazyColumn(
+            Column(
                 modifier = Modifier
                     .fillMaxWidth()
                     .fillMaxHeight()
+                    .verticalScroll(rememberScrollState())
             ) {
-                items(composeWidgets.size) {
+                composeWidgets.forEachIndexed { index, _ ->
                     UiTronRenderer(
-                        (composeWidgets[it] as NaviUiTronWidget).uiTronWidget?.data,
+                        (composeWidgets[index] as NaviUiTronWidget).uiTronWidget?.data,
                         homeFragment.viewModel
-                    ).Render(composeViews = (composeWidgets[it] as NaviUiTronWidget).uiTronWidget?.parentComposeView.orEmpty())
+                    ).Render(composeViews = (composeWidgets[index] as NaviUiTronWidget).uiTronWidget?.parentComposeView.orEmpty())
                 }
             }
         }