Commit 73e20f68 authored by Vladislav Bogdashkin's avatar Vladislav Bogdashkin 🎣

flat info view

parent b24e9054
...@@ -18,6 +18,13 @@ class FlatInfoAdapter : CommonRecyclerAdapter<FlatInfoViewHolder, DisplayInfoMod ...@@ -18,6 +18,13 @@ class FlatInfoAdapter : CommonRecyclerAdapter<FlatInfoViewHolder, DisplayInfoMod
override fun getVhLayout(): Int = R.layout.flate_measure_info_viewholder override fun getVhLayout(): Int = R.layout.flate_measure_info_viewholder
override fun onBindViewHolder(holder: FlatInfoViewHolder, position: Int) {
super.onBindViewHolder(holder, position)
if (position%2 == 0)
holder.itemView.background = holder.itemView.context.getDrawable(R.color.colorDividerLightGray)
else
holder.itemView.background = holder.itemView.context.getDrawable(R.color.colorPrimary)
}
} }
...@@ -26,7 +33,6 @@ class FlatInfoViewHolder(itemView: View) : CommonViewHolder<DisplayInfoModel>(it ...@@ -26,7 +33,6 @@ class FlatInfoViewHolder(itemView: View) : CommonViewHolder<DisplayInfoModel>(it
@BindView(R.id.flat_measure_description) @BindView(R.id.flat_measure_description)
lateinit var infoTitle:MaterialTextView lateinit var infoTitle:MaterialTextView
@BindView(R.id.flat_measure_value) @BindView(R.id.flat_measure_value)
lateinit var infoValue:MaterialTextView lateinit var infoValue:MaterialTextView
......
...@@ -254,9 +254,11 @@ ...@@ -254,9 +254,11 @@
<include <include
android:id="@+id/switch_flat_content_tab" android:id="@+id/switch_flat_content_tab"
layout="@layout/simple_text_tabs" layout="@layout/simple_text_tabs"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:orientation="horizontal" android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
...@@ -265,7 +267,7 @@ ...@@ -265,7 +267,7 @@
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/flat_content_recycler_view" android:id="@+id/flat_content_recycler_view"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="232dp" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:orientation="horizontal" android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
......
...@@ -3,12 +3,15 @@ ...@@ -3,12 +3,15 @@
android:id="@+id/flat_measure_container" android:id="@+id/flat_measure_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="32dp" android:layout_height="32dp"
android:orientation="horizontal"> android:orientation="horizontal"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:weightSum="2">
<com.google.android.material.textview.MaterialTextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/flat_measure_description" android:id="@+id/flat_measure_description"
style="@style/Accent_Minor_TextView.Inverted" style="@style/Accent_Minor_TextView.Inverted"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical" android:gravity="center_vertical"
...@@ -18,8 +21,8 @@ ...@@ -18,8 +21,8 @@
<com.google.android.material.textview.MaterialTextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/flat_measure_value" android:id="@+id/flat_measure_value"
style="@style/Accent_Minor_TextView.Default" style="@style/Accent_Minor_TextView.Default"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical" android:gravity="center_vertical"
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:weightSum="2"> android:weightSum="2">
...@@ -27,6 +27,5 @@ ...@@ -27,6 +27,5 @@
style="@style/Default_TextView.Accent_Text" style="@style/Default_TextView.Accent_Text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Экспликация" /> android:text="Экспликация" />
</LinearLayout> </LinearLayout>
\ No newline at end of file
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
<color name="colorNoticeBackground">#EEEEEE</color> <color name="colorNoticeBackground">#EEEEEE</color>
<color name="colorOpacityBackground">#CC000000</color> <color name="colorOpacityBackground">#CC000000</color>
<color name="colorOpacityCardBackground">#5C000000</color> <color name="colorOpacityCardBackground">#5C000000</color>
<color name="colorDividerLightGray">#F2F2F2</color>
<color name="playTourCardOpacityBackground">#B2000000</color> <color name="playTourCardOpacityBackground">#B2000000</color>
<color name="colorCheckListGradientStart">@color/colorAccent</color> <color name="colorCheckListGradientStart">@color/colorAccent</color>
<color name="colorCheckListGradientEnd">@color/colorAccentSecondary</color> <color name="colorCheckListGradientEnd">@color/colorAccentSecondary</color>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment