From 93bebc40be804dead1fb349d60799d685b5a753f Mon Sep 17 00:00:00 2001
From: derysudrajat <dery.sudrajat17@gmail.com>
Date: Thu, 16 Apr 2020 22:35:38 +0700
Subject: [PATCH] update ui in item layout

---
 app/src/main/res/layout/item_asesmen.xml      | 14 ++++++----
 .../main/res/layout/item_data_overview.xml    |  6 ++++-
 .../main/res/layout/item_history_report.xml   | 27 ++++++++++++++-----
 app/src/main/res/layout/item_hotline.xml      |  2 ++
 .../main/res/layout/item_hotline_provinsi.xml |  9 ++++---
 .../main/res/layout/item_menu_navigation.xml  |  6 ++++-
 app/src/main/res/layout/item_prevention.xml   |  1 +
 app/src/main/res/layout/item_provinsi.xml     | 13 ++++++---
 .../main/res/layout/item_step_prevention.xml  | 11 +++++---
 9 files changed, 65 insertions(+), 24 deletions(-)

diff --git a/app/src/main/res/layout/item_asesmen.xml b/app/src/main/res/layout/item_asesmen.xml
index 5de7151..2e6b96a 100644
--- a/app/src/main/res/layout/item_asesmen.xml
+++ b/app/src/main/res/layout/item_asesmen.xml
@@ -2,13 +2,13 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content">
 
     <androidx.cardview.widget.CardView
-        android:id="@+id/cardView6"
+        android:id="@+id/cv_content_asesment"
         style="@style/ItemsTouchable"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         app:cardCornerRadius="16dp"
         app:cardUseCompatPadding="true"
         app:layout_constraintEnd_toEndOf="parent"
@@ -21,8 +21,8 @@
 
             <androidx.cardview.widget.CardView
                 android:id="@+id/cardView7"
-                android:layout_width="100dp"
-                android:layout_height="100dp"
+                android:layout_width="80dp"
+                android:layout_height="80dp"
                 android:layout_margin="16dp"
                 app:cardCornerRadius="8dp"
                 app:layout_constraintBottom_toBottomOf="parent"
@@ -30,6 +30,8 @@
                 app:layout_constraintTop_toTopOf="parent">
 
                 <ImageView
+                    android:padding="16dp"
+                    android:tint="@color/white"
                     android:id="@+id/iv_history_report"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
@@ -42,6 +44,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
+                android:textColor="@color/color_text_1"
                 android:layout_marginTop="16dp"
                 android:text="Risiko Rendah"
                 android:textSize="18sp"
@@ -53,6 +56,7 @@
                 android:id="@+id/tv_desc_report"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
+                android:textColor="@color/color_text_2"
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
                 android:text="Anda tidak memiliki gejala maupun riwayat paparan terkait Covid-19"
diff --git a/app/src/main/res/layout/item_data_overview.xml b/app/src/main/res/layout/item_data_overview.xml
index 7a5c8fa..5500cb7 100644
--- a/app/src/main/res/layout/item_data_overview.xml
+++ b/app/src/main/res/layout/item_data_overview.xml
@@ -45,7 +45,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="-20dp"
                     android:text="0"
-                    android:textSize="20sp"
+                    android:textColor="@color/color_text_1"
+                    android:textSize="24sp"
                     android:textStyle="bold"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -97,6 +98,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="0"
+                    android:textColor="@color/color_text_1"
                     android:textSize="20sp"
                     android:textStyle="bold"
                     app:layout_constraintLeft_toLeftOf="parent"
@@ -118,6 +120,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="0"
+                    android:textColor="@color/color_text_1"
                     android:textSize="20sp"
                     android:textStyle="bold"
                     app:layout_constraintLeft_toLeftOf="parent"
@@ -150,6 +153,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="0"
+                    android:textColor="@color/color_text_1"
                     android:textSize="20sp"
                     android:textStyle="bold"
                     app:layout_constraintLeft_toLeftOf="parent"
diff --git a/app/src/main/res/layout/item_history_report.xml b/app/src/main/res/layout/item_history_report.xml
index dd87e90..2683ddc 100644
--- a/app/src/main/res/layout/item_history_report.xml
+++ b/app/src/main/res/layout/item_history_report.xml
@@ -4,7 +4,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="16dp">
+    android:paddingStart="16dp"
+    android:paddingTop="16dp"
+    android:paddingEnd="16dp">
 
     <TextView
         android:id="@+id/textView3"
@@ -12,20 +14,33 @@
         android:layout_height="wrap_content"
         android:padding="8dp"
         android:text="Riwayat Penilaian Diri"
+        android:textColor="@color/color_text_1"
         android:textSize="20sp"
         android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
-        android:id="@+id/tv_more_report"
+    <androidx.cardview.widget.CardView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:padding="8dp"
-        android:text="Selengkapnya"
+        app:cardBackgroundColor="@color/transparent"
+        app:cardCornerRadius="16dp"
+        app:cardElevation="0dp"
+        app:cardUseCompatPadding="true"
         app:layout_constraintBottom_toTopOf="@+id/cardView6"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/tv_more_report"
+            style="@style/ItemsTouchable"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="8dp"
+            android:text="Selengkapnya"
+            android:textColor="@color/color_text_2" />
+
+    </androidx.cardview.widget.CardView>
 
 
     <include
diff --git a/app/src/main/res/layout/item_hotline.xml b/app/src/main/res/layout/item_hotline.xml
index 451af94..8daaac1 100644
--- a/app/src/main/res/layout/item_hotline.xml
+++ b/app/src/main/res/layout/item_hotline.xml
@@ -8,6 +8,7 @@
     android:padding="16dp">
 
     <TextView
+        android:textColor="@color/color_text_1"
         android:id="@+id/tv_rs_name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -18,6 +19,7 @@
         tools:layout_editor_absoluteX="16dp" />
 
     <TextView
+        android:textColor="@color/color_text_2"
         android:id="@+id/tv_no_telp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_hotline_provinsi.xml b/app/src/main/res/layout/item_hotline_provinsi.xml
index 62fdc3b..7158eec 100644
--- a/app/src/main/res/layout/item_hotline_provinsi.xml
+++ b/app/src/main/res/layout/item_hotline_provinsi.xml
@@ -37,17 +37,18 @@
 
                 <ImageView
                     android:id="@+id/iv_call"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:src="@drawable/ic_call" />
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_centerVertical="true" />
 
                 <TextView
                     android:id="@+id/tv_title_hotline"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
+                    android:textColor="@color/colorPrimaryDark"
                     android:layout_marginStart="16dp"
+                    android:textSize="20sp"
                     android:layout_toStartOf="@id/headerIndicator"
                     android:layout_toEndOf="@id/iv_call"
                     android:text="Trip name"
diff --git a/app/src/main/res/layout/item_menu_navigation.xml b/app/src/main/res/layout/item_menu_navigation.xml
index 25137b9..6f3ce8a 100644
--- a/app/src/main/res/layout/item_menu_navigation.xml
+++ b/app/src/main/res/layout/item_menu_navigation.xml
@@ -54,6 +54,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Data Covid"
+            android:textColor="@color/color_text_1"
             android:textStyle="bold"
             app:layout_constraintEnd_toStartOf="@+id/guideline3"
             app:layout_constraintStart_toStartOf="parent"
@@ -82,7 +83,8 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Laporan Diri"
+            android:text="Penilaian Diri"
+            android:textColor="@color/color_text_1"
             android:textStyle="bold"
             app:layout_constraintEnd_toStartOf="@+id/guideline4"
             app:layout_constraintStart_toStartOf="@+id/guideline3"
@@ -112,6 +114,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Hotline"
+            android:textColor="@color/color_text_1"
             android:textStyle="bold"
             app:layout_constraintEnd_toStartOf="@+id/guideline5"
             app:layout_constraintStart_toStartOf="@+id/guideline4"
@@ -141,6 +144,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Pencegahan"
+            android:textColor="@color/color_text_1"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="@+id/guideline5"
diff --git a/app/src/main/res/layout/item_prevention.xml b/app/src/main/res/layout/item_prevention.xml
index 5cab785..1757342 100644
--- a/app/src/main/res/layout/item_prevention.xml
+++ b/app/src/main/res/layout/item_prevention.xml
@@ -24,6 +24,7 @@
             <TextView
                 android:id="@+id/tvItemPrevention"
                 android:layout_width="wrap_content"
+                android:textColor="@color/color_text_1"
                 android:layout_height="wrap_content"
                 android:layout_alignParentStart="true"
                 android:layout_centerVertical="true"
diff --git a/app/src/main/res/layout/item_provinsi.xml b/app/src/main/res/layout/item_provinsi.xml
index 34512d4..42cd883 100644
--- a/app/src/main/res/layout/item_provinsi.xml
+++ b/app/src/main/res/layout/item_provinsi.xml
@@ -26,6 +26,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="16dp"
                 android:text="Provinsi"
+                android:textColor="@color/color_text_1"
                 android:textSize="20sp"
                 android:textStyle="bold" />
 
@@ -48,7 +49,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
                     android:layout_toEndOf="@id/ivProvPositif"
-                    android:text="Positif" />
+                    android:text="Positif"
+                    android:textColor="@color/color_text_2" />
 
                 <TextView
                     android:id="@+id/tv_item_positif_prov"
@@ -57,6 +59,7 @@
                     android:layout_below="@id/tvTitleProvPositif"
                     android:layout_centerHorizontal="true"
                     android:text="200"
+                    android:textColor="@color/color_text_1"
                     android:textSize="18sp"
                     android:textStyle="bold" />
             </RelativeLayout>
@@ -81,7 +84,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
                     android:layout_toEndOf="@id/ivProvSembuh"
-                    android:text="Sembuh" />
+                    android:text="Sembuh"
+                    android:textColor="@color/color_text_2" />
 
                 <TextView
                     android:id="@+id/tv_item_sembuh_prov"
@@ -90,6 +94,7 @@
                     android:layout_below="@id/tvTitleProvSembuh"
                     android:layout_centerHorizontal="true"
                     android:text="200"
+                    android:textColor="@color/color_text_1"
                     android:textSize="18sp"
                     android:textStyle="bold" />
             </RelativeLayout>
@@ -114,7 +119,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
                     android:layout_toEndOf="@id/ivProvMeninggal"
-                    android:text="Meninggal" />
+                    android:text="Meninggal"
+                    android:textColor="@color/color_text_2" />
 
                 <TextView
                     android:id="@+id/tv_item_meni_prov"
@@ -123,6 +129,7 @@
                     android:layout_below="@id/tvTitleProvMeninggal"
                     android:layout_centerHorizontal="true"
                     android:text="200"
+                    android:textColor="@color/color_text_1"
                     android:textSize="18sp"
                     android:textStyle="bold" />
             </RelativeLayout>
diff --git a/app/src/main/res/layout/item_step_prevention.xml b/app/src/main/res/layout/item_step_prevention.xml
index 7d6950e..52ec660 100644
--- a/app/src/main/res/layout/item_step_prevention.xml
+++ b/app/src/main/res/layout/item_step_prevention.xml
@@ -34,22 +34,25 @@
                 android:id="@+id/tvTitleStepPrevention"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="20dp"
+                android:padding="16dp"
+                android:textColor="@color/color_text_1"
                 android:text="Ini Judul"
-                android:textSize="28sp"
+                android:textSize="20sp"
                 android:textStyle="bold"
                 app:layout_constraintTop_toTopOf="@+id/guideline" />
 
             <TextView
                 android:id="@+id/tvDescStepPrevention"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="0dp"
                 android:ellipsize="end"
                 android:paddingStart="16dp"
                 android:paddingEnd="16dp"
                 android:paddingBottom="16dp"
                 android:text="Ini adalah tex yang panjang Ini adalah tex yang panjang Ini adalah tex yang panjang Ini adalah tex yang panjang Ini adalah tex yang panjang Ini adalah tex yang panjang Ini adalah tex yang panjang Ini adalah tex yang panjang Ini adalah tex yang panjang Ini adalah tex yang panjang Ini adalah tex yang panjang Ini adalah tex yang panjang Ini adalah tex yang panjang "
-                android:textSize="20sp"
+                android:textColor="@color/color_text_2"
+                android:textSize="14sp"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/tvTitleStepPrevention" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>