added actions to show properly explication or commoninfo based on selected plan type

app/src/main/java/com/biganto/visual/roompark/presentation/screen/estate/ScreenController.kt

@@ -214,7 +214,6 @@ class EstateScreenController  :
 
         viewState.types.forEach {
             try {
-
                 val tab = planTypesTabLayout.newTab()
                     .setCustomView(R.layout.select_text_tab).setTag(it.planId)
                 

app/src/main/java/com/biganto/visual/roompark/presentation/screen/estate/ScreenPresenter.kt

@@ -53,13 +53,22 @@ class EstateScreenPresenter @Inject constructor(
 
         val fetchPlan = intent(EstateScreen::planTypesTabSelected)
             .map { planList?.get(it) }
-            .flatMap {
-                interactor.getPlan(it)
+            .flatMap {planPreset ->
+                interactor.getPlan(planPreset)
                     .map<EstateScreenViewState> { plan -> EstateScreenViewState.LoadPlan(plan) }
                     .startWith(
                         Observable.just<EstateScreenViewState>(
-                            EstateScreenViewState.PlanTypeSelected(
-                                it
+                            EstateScreenViewState.PlanTypeSelected(planPreset)
+                        )
+                    )
+                    .startWith(
+                        Observable.just<EstateScreenViewState>(
+
+                            EstateScreenViewState.ShowEstateInfo(
+                                showType
+                                ,if (showType==InfoShowType.COMMON_INFO)
+                                    mapCommonInfo(estate?.commonInfo)
+                            else mapCommonInfo(planPreset.explication)
                             )
                         )
                     )
@@ -136,8 +145,9 @@ class EstateScreenPresenter @Inject constructor(
             }
         )
 
-    private fun mapCommonInfo(info: CommonInfoModel): ArrayList<DisplayInfoModel> {
+    private fun mapCommonInfo(info: CommonInfoModel?): ArrayList<DisplayInfoModel> {
         val r = arrayListOf<DisplayInfoModel>()
+        if (info == null) return r
         info.building.let {
             r.add(DisplayInfoModel(langString(R.string.building),"$it"))
         }

app/src/main/res/layout/flat_full_card_screen.xml

@@ -280,7 +280,7 @@
             android:id="@+id/include10"
             layout="@layout/horizontal_divider"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="1dp"
             android:layout_marginTop="32dp"
             android:orientation="horizontal"
             app:layout_constraintEnd_toEndOf="parent"
@@ -307,7 +307,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginTop="32dp"
+            android:layout_marginTop="8dp"
             android:layout_marginEnd="16dp"
             android:orientation="horizontal"
             app:layout_constraintEnd_toEndOf="parent"
@@ -318,7 +318,7 @@
             android:id="@+id/include11"
             layout="@layout/horizontal_divider"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="1dp"
             android:layout_marginTop="32dp"
             android:orientation="horizontal"
             app:layout_constraintEnd_toEndOf="parent"
@@ -331,8 +331,12 @@
             layout="@layout/site_link_viewholder"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
             android:layout_marginTop="24dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="16dp"
             android:orientation="horizontal"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/include11" />