From 7448592d4982f3c998fdc78899192afeb4cb8cf7 Mon Sep 17 00:00:00 2001
From: ilhamhadisyah <ilhamhadisyahsmd@gmail.com>
Date: Wed, 2 Jun 2021 13:45:09 +0700
Subject: [PATCH 1/2] Make view scrolled in small screen and add some language

---
 .../res/layout/activity_asking_questions.xml  | 347 +++++++++---------
 .../src/main/res/layout/activity_result.xml   |   9 +-
 .../src/main/res/layout/activity_splash.xml   |   2 +-
 .../res/layout/activity_welcome_slider.xml    |   7 +-
 .../app/src/main/res/layout/article_item.xml  |   4 +-
 .../main/res/layout/fragment_first_page.xml   |   7 +-
 .../main/res/layout/fragment_second_page.xml  |   7 +-
 .../main/res/layout/fragment_third_page.xml   |   7 +-
 .../app/src/main/res/values-in/strings.xml    |  11 +
 .../app/src/main/res/values/strings.xml       |  11 +
 10 files changed, 223 insertions(+), 189 deletions(-)

diff --git a/Dermateapps/app/src/main/res/layout/activity_asking_questions.xml b/Dermateapps/app/src/main/res/layout/activity_asking_questions.xml
index 5942c5c..4924863 100644
--- a/Dermateapps/app/src/main/res/layout/activity_asking_questions.xml
+++ b/Dermateapps/app/src/main/res/layout/activity_asking_questions.xml
@@ -1,215 +1,222 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:background="@color/home_background"
-    android:orientation="vertical"
     android:layout_height="match_parent"
+    android:background="@color/home_background"
     tools:context=".ui.question.AskingQuestionsActivity">
-    <androidx.cardview.widget.CardView
+
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="5dp"
-        app:cardElevation="0dp"
-        app:cardBackgroundColor="@color/card_background"
-        app:cardCornerRadius="10dp">
+        android:orientation="vertical">
 
-        <LinearLayout
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/question_text1"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:padding="10dp"
-                android:text="Question" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/home_background" />
+            android:layout_margin="5dp"
+            app:cardBackgroundColor="@color/card_background"
+            app:cardCornerRadius="10dp"
+            app:cardElevation="0dp">
 
-            <RadioGroup
-                android:id="@+id/rg_quest1"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
-                android:orientation="horizontal">
-
-                <RadioButton
-                    android:id="@+id/rb_yes1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="20dp"
-                    android:text="yes" />
+                android:orientation="vertical">
 
-                <RadioButton
-                    android:id="@+id/rb_no1"
-                    android:layout_width="wrap_content"
+                <TextView
+                    android:id="@+id/question_text1"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="20dp"
-                    android:text="No"/>
-            </RadioGroup>
-        </LinearLayout>
-    </androidx.cardview.widget.CardView>
+                    android:padding="10dp"
+                    android:text="@string/question" />
 
-    <androidx.cardview.widget.CardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="5dp"
-        app:cardElevation="0dp"
-        app:cardBackgroundColor="@color/card_background"
-        app:cardCornerRadius="10dp">
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/home_background" />
 
-        <LinearLayout
+                <RadioGroup
+                    android:id="@+id/rg_quest1"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_horizontal"
+                    android:orientation="horizontal">
+
+                    <RadioButton
+                        android:id="@+id/rb_yes1"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="20dp"
+                        android:text="@string/yes" />
+
+                    <RadioButton
+                        android:id="@+id/rb_no1"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="20dp"
+                        android:text="@string/no" />
+                </RadioGroup>
+            </LinearLayout>
+        </androidx.cardview.widget.CardView>
+
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/question_text2"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:padding="10dp"
-                android:text="Question" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/home_background" />
+            android:layout_margin="5dp"
+            app:cardBackgroundColor="@color/card_background"
+            app:cardCornerRadius="10dp"
+            app:cardElevation="0dp">
 
-            <RadioGroup
-                android:id="@+id/rg_quest2"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
-                android:orientation="horizontal">
+                android:orientation="vertical">
 
-                <RadioButton
-                    android:id="@+id/rb_yes2"
-                    android:layout_width="wrap_content"
+                <TextView
+                    android:id="@+id/question_text2"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginEnd="20dp"
-                    android:text="yes" />
+                    android:padding="10dp"
+                    android:text="@string/question" />
 
-                <RadioButton
-                    android:id="@+id/rb_no2"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="20dp"
-                    android:text="No"/>
-            </RadioGroup>
-        </LinearLayout>
-    </androidx.cardview.widget.CardView>
-    <androidx.cardview.widget.CardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="5dp"
-        app:cardElevation="0dp"
-        app:cardBackgroundColor="@color/card_background"
-        app:cardCornerRadius="10dp">
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/home_background" />
 
-        <LinearLayout
+                <RadioGroup
+                    android:id="@+id/rg_quest2"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_horizontal"
+                    android:orientation="horizontal">
+
+                    <RadioButton
+                        android:id="@+id/rb_yes2"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="20dp"
+                        android:text="@string/yes" />
+
+                    <RadioButton
+                        android:id="@+id/rb_no2"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="20dp"
+                        android:text="@string/no" />
+                </RadioGroup>
+            </LinearLayout>
+        </androidx.cardview.widget.CardView>
+
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/question_text3"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:padding="10dp"
-                android:text="Question" />
+            android:layout_margin="5dp"
+            app:cardBackgroundColor="@color/card_background"
+            app:cardCornerRadius="10dp"
+            app:cardElevation="0dp">
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/home_background" />
-
-            <RadioGroup
-                android:id="@+id/rg_quest3"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
-                android:orientation="horizontal">
+                android:orientation="vertical">
 
-                <RadioButton
-                    android:id="@+id/rb_yes3"
-                    android:layout_width="wrap_content"
+                <TextView
+                    android:id="@+id/question_text3"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginEnd="20dp"
-                    android:text="yes" />
+                    android:padding="10dp"
+                    android:text="@string/question" />
 
-                <RadioButton
-                    android:id="@+id/rb_no3"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="20dp"
-                    android:text="No"/>
-            </RadioGroup>
-        </LinearLayout>
-    </androidx.cardview.widget.CardView>
-    <androidx.cardview.widget.CardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="5dp"
-        app:cardElevation="0dp"
-        app:cardBackgroundColor="@color/card_background"
-        app:cardCornerRadius="10dp">
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/home_background" />
 
-        <LinearLayout
+                <RadioGroup
+                    android:id="@+id/rg_quest3"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_horizontal"
+                    android:orientation="horizontal">
+
+                    <RadioButton
+                        android:id="@+id/rb_yes3"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="20dp"
+                        android:text="@string/yes" />
+
+                    <RadioButton
+                        android:id="@+id/rb_no3"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="20dp"
+                        android:text="@string/no" />
+                </RadioGroup>
+            </LinearLayout>
+        </androidx.cardview.widget.CardView>
+
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:layout_margin="5dp"
+            app:cardBackgroundColor="@color/card_background"
+            app:cardCornerRadius="10dp"
+            app:cardElevation="0dp">
 
-            <TextView
-                android:id="@+id/question_text4"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="10dp"
-                android:text="Question" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/home_background" />
+                android:orientation="vertical">
 
-            <RadioGroup
-                android:id="@+id/rg_quest4"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
-                android:orientation="horizontal">
-
-                <RadioButton
-                    android:id="@+id/rb_yes4"
-                    android:layout_width="wrap_content"
+                <TextView
+                    android:id="@+id/question_text4"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginEnd="20dp"
-                    android:text="yes" />
+                    android:padding="10dp"
+                    android:text="@string/question" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/home_background" />
 
-                <RadioButton
-                    android:id="@+id/rb_no4"
-                    android:layout_width="wrap_content"
+                <RadioGroup
+                    android:id="@+id/rg_quest4"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="20dp"
-                    android:text="No"/>
-            </RadioGroup>
-        </LinearLayout>
-    </androidx.cardview.widget.CardView>
-
-    <Button
-        android:id="@+id/submit_answer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="30dp"
-        android:background="@drawable/button_oval"
-        android:paddingLeft="30dp"
-        android:paddingRight="30dp"
-        android:text="Next"
-        android:layout_gravity="center"/>
-
-</LinearLayout>
\ No newline at end of file
+                    android:gravity="center_horizontal"
+                    android:orientation="horizontal">
+
+                    <RadioButton
+                        android:id="@+id/rb_yes4"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="20dp"
+                        android:text="@string/yes" />
+
+                    <RadioButton
+                        android:id="@+id/rb_no4"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="20dp"
+                        android:text="@string/no" />
+                </RadioGroup>
+            </LinearLayout>
+        </androidx.cardview.widget.CardView>
+
+        <Button
+            android:id="@+id/submit_answer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_margin="30dp"
+            android:background="@drawable/button_oval"
+            android:paddingLeft="30dp"
+            android:paddingRight="30dp"
+            android:text="@string/next" />
+    </LinearLayout>
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/Dermateapps/app/src/main/res/layout/activity_result.xml b/Dermateapps/app/src/main/res/layout/activity_result.xml
index 7016750..8a70da1 100644
--- a/Dermateapps/app/src/main/res/layout/activity_result.xml
+++ b/Dermateapps/app/src/main/res/layout/activity_result.xml
@@ -34,7 +34,8 @@
                         android:id="@+id/image_result_preview"
                         android:layout_width="match_parent"
                         android:layout_height="400dp"
-                        android:scaleType="centerCrop" />
+                        android:scaleType="centerCrop"
+                        android:contentDescription="@string/open_image" />
                 </androidx.cardview.widget.CardView>
 
                 <TextView
@@ -42,7 +43,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_margin="10dp"
-                    android:text="Prediction Result"
+                    android:text="@string/prediction_result"
                     android:textSize="20sp"
                     android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="parent"
@@ -53,7 +54,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="10dp"
-                    android:text="Prediction"
+                    android:text="@string/prediction"
                     android:textSize="20sp"
                     android:textStyle="bold"
                     app:layout_constraintEnd_toEndOf="@+id/cv"
@@ -66,7 +67,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dp"
                     android:layout_marginBottom="10dp"
-                    android:text="Result Prediction"
+                    android:text="@string/diagnose"
                     android:textColor="@color/green"
                     android:textSize="18sp"
                     app:layout_constraintBottom_toBottomOf="parent"
diff --git a/Dermateapps/app/src/main/res/layout/activity_splash.xml b/Dermateapps/app/src/main/res/layout/activity_splash.xml
index fcf7382..9ee943a 100644
--- a/Dermateapps/app/src/main/res/layout/activity_splash.xml
+++ b/Dermateapps/app/src/main/res/layout/activity_splash.xml
@@ -11,7 +11,7 @@
     <ImageView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:contentDescription="logo"
+        android:contentDescription="@string/logo"
         android:padding="100dp"
         android:src="@drawable/logo_white"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/Dermateapps/app/src/main/res/layout/activity_welcome_slider.xml b/Dermateapps/app/src/main/res/layout/activity_welcome_slider.xml
index 9a4b4b5..7060e22 100644
--- a/Dermateapps/app/src/main/res/layout/activity_welcome_slider.xml
+++ b/Dermateapps/app/src/main/res/layout/activity_welcome_slider.xml
@@ -29,7 +29,7 @@
         android:textSize="16sp"
         android:text="@string/skip"
         android:textAllCaps="true"
-        android:textColor="?attr/colorOnPrimary"
+        android:textColor="@color/white"
         android:layout_alignParentBottom="true"
         android:layout_alignParentStart="true"
         android:clickable="true"
@@ -44,12 +44,13 @@
         android:textSize="16sp"
         android:text="@string/next"
         android:textAllCaps="true"
-        android:textColor="?attr/colorOnPrimary"
+        android:textColor="@color/white"
         android:layout_alignParentBottom="true"
         android:layout_alignParentEnd="true"
         android:clickable="true"
         android:background="?selectableItemBackground"
-        android:focusable="true" />
+        android:focusable="true"
+        tools:ignore="RelativeOverlap" />
 
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/Dermateapps/app/src/main/res/layout/article_item.xml b/Dermateapps/app/src/main/res/layout/article_item.xml
index ba0b48f..68a28ea 100644
--- a/Dermateapps/app/src/main/res/layout/article_item.xml
+++ b/Dermateapps/app/src/main/res/layout/article_item.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="10dp"
@@ -32,7 +31,8 @@
                 android:layout_width="match_parent"
                 android:background="@drawable/thumbnail_placeholder"
                 android:layout_height="match_parent"
-                android:scaleType="centerCrop" />
+                android:scaleType="centerCrop"
+                android:contentDescription="@string/image_thumbnail" />
         </androidx.cardview.widget.CardView>
 
         <TextView
diff --git a/Dermateapps/app/src/main/res/layout/fragment_first_page.xml b/Dermateapps/app/src/main/res/layout/fragment_first_page.xml
index 63a078a..c3eb379 100644
--- a/Dermateapps/app/src/main/res/layout/fragment_first_page.xml
+++ b/Dermateapps/app/src/main/res/layout/fragment_first_page.xml
@@ -14,7 +14,8 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        android:contentDescription="@string/image_thumbnail" />
 
     <TextView
         android:layout_width="match_parent"
@@ -25,7 +26,7 @@
         android:layout_marginStart="30dp"
         android:layout_marginEnd="30dp"
         android:textAlignment="center"
-        android:text="Know more about your baby skin problem and its possible diagnosis using Artificial Intelligence"
+        android:text="@string/fist_page_desc"
         app:layout_constraintTop_toBottomOf="@+id/imageView" />
 
     <TextView
@@ -38,7 +39,7 @@
         android:textSize="20sp"
         android:textAlignment="center"
         android:fontFamily="@font/poppins_bold"
-        android:text="Find out about your baby's skin diseases in a click"
+        android:text="@string/first_page_title"
         app:layout_constraintBottom_toTopOf="@+id/imageView" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Dermateapps/app/src/main/res/layout/fragment_second_page.xml b/Dermateapps/app/src/main/res/layout/fragment_second_page.xml
index be6f7c7..9c3a214 100644
--- a/Dermateapps/app/src/main/res/layout/fragment_second_page.xml
+++ b/Dermateapps/app/src/main/res/layout/fragment_second_page.xml
@@ -14,7 +14,8 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        android:contentDescription="@string/image_thumbnail" />
 
     <TextView
         android:layout_width="match_parent"
@@ -25,7 +26,7 @@
         android:layout_marginStart="30dp"
         android:layout_marginEnd="30dp"
         android:textAlignment="center"
-        android:text="By adding follow up question (anamnesis) from authorized doctors to get to know more about your baby's current condition"
+        android:text="@string/second_page_desc"
         app:layout_constraintTop_toBottomOf="@+id/imageView" />
 
     <TextView
@@ -38,7 +39,7 @@
         android:textSize="20sp"
         android:textAlignment="center"
         android:fontFamily="@font/poppins_bold"
-        android:text="We make sure to give accurate diagnosis for your loved one"
+        android:text="@string/second_page_title"
         app:layout_constraintBottom_toTopOf="@+id/imageView" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Dermateapps/app/src/main/res/layout/fragment_third_page.xml b/Dermateapps/app/src/main/res/layout/fragment_third_page.xml
index 3fc1c0e..6dc7156 100644
--- a/Dermateapps/app/src/main/res/layout/fragment_third_page.xml
+++ b/Dermateapps/app/src/main/res/layout/fragment_third_page.xml
@@ -13,7 +13,8 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        android:contentDescription="@string/image_thumbnail" />
 
     <TextView
         android:layout_width="match_parent"
@@ -24,7 +25,7 @@
         android:layout_marginStart="30dp"
         android:layout_marginEnd="30dp"
         android:textAlignment="center"
-        android:text="We provide you number of baby's skin disease articles from official healthcare web page"
+        android:text="@string/third_page_desc"
         app:layout_constraintTop_toBottomOf="@+id/imageView" />
 
     <TextView
@@ -37,7 +38,7 @@
         android:textSize="20sp"
         android:textAlignment="center"
         android:fontFamily="@font/poppins_bold"
-        android:text="Get daily tips and knowledge about baby's skin diseases"
+        android:text="@string/third_page_title"
         app:layout_constraintBottom_toTopOf="@+id/imageView" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Dermateapps/app/src/main/res/values-in/strings.xml b/Dermateapps/app/src/main/res/values-in/strings.xml
index d5b279e..f844df5 100644
--- a/Dermateapps/app/src/main/res/values-in/strings.xml
+++ b/Dermateapps/app/src/main/res/values-in/strings.xml
@@ -25,4 +25,15 @@
     <string name="on">Nyalakan</string>
     <string name="off">Matikan</string>
     <string name="article_provider">"Oleh</string>
+    <string name="prediction_result">Hasil Prediksi</string>
+    <string name="prediction">Prediksi</string>
+    <string name="diagnose">Diagnosa</string>
+    <string name="logo">logo</string>
+    <string name="image_thumbnail">Image thumbnail</string>
+    <string name="fist_page_desc">Ketahui lebih banyak tentang masalah kulit bayi anda dan kemungkinan diagnosisnya menggunakan Kecerdasan Buatan</string>
+    <string name="first_page_title">Cari tahu tentang penyakit kulit bayi Anda dalam sekali klik</string>
+    <string name="second_page_desc">Dengan menambahkan pertanyaan lanjutan (anamnesa) dari dokter yang berwenang untuk mengetahui lebih lanjut tentang kondisi bayi Anda saat ini</string>
+    <string name="second_page_title">Kami pastikan untuk memberikan diagnosis yang akurat untuk orang yang Anda cintai</string>
+    <string name="third_page_desc">Kami menyediakan sejumlah artikel penyakit kulit bayi dari halaman web perawatan kesehatan resmi official</string>
+    <string name="third_page_title">Dapatkan tips dan pengetahuan harian tentang penyakit kulit bayi</string>
 </resources>
\ No newline at end of file
diff --git a/Dermateapps/app/src/main/res/values/strings.xml b/Dermateapps/app/src/main/res/values/strings.xml
index ee4f105..9c34f74 100644
--- a/Dermateapps/app/src/main/res/values/strings.xml
+++ b/Dermateapps/app/src/main/res/values/strings.xml
@@ -25,5 +25,16 @@
     <string name="on">Turn On</string>
     <string name="off">Turn Off</string>
     <string name="article_provider">"Article by</string>
+    <string name="prediction_result">Prediction Result</string>
+    <string name="prediction">Prediction</string>
+    <string name="diagnose">Diagnose</string>
+    <string name="logo">logo</string>
+    <string name="image_thumbnail">Image thumbnail</string>
+    <string name="fist_page_desc">Know more about your baby skin problem and its possible diagnosis using Artificial Intelligence</string>
+    <string name="first_page_title">Find out about your baby\'s skin diseases in a click</string>
+    <string name="second_page_desc">By adding follow up question (anamnesis) from authorized doctors to get to know more about your baby\'s current condition</string>
+    <string name="second_page_title">We make sure to give accurate diagnosis for your loved one</string>
+    <string name="third_page_desc">We provide you number of baby\'s skin disease articles from official healthcare web page</string>
+    <string name="third_page_title">Get daily tips and knowledge about baby\'s skin diseases</string>
 
 </resources>
\ No newline at end of file

From 9a7ab668ac246d66749455393b63a8d16e21f9fa Mon Sep 17 00:00:00 2001
From: ilhamhadisyah <ilhamhadisyahsmd@gmail.com>
Date: Wed, 2 Jun 2021 14:28:14 +0700
Subject: [PATCH 2/2] shuffle article in home fragment and defining color by
 article provider

---
 .../ui/adapter/ArticleListViewAdapter.kt      | 18 ++++++-
 .../dermate/ui/home/fragments/HomeFragment.kt |  2 +-
 .../app/src/main/res/layout/article_item.xml  |  1 +
 .../app/src/main/res/layout/question_item.xml | 51 -------------------
 .../app/src/main/res/values/colors.xml        |  2 +
 5 files changed, 21 insertions(+), 53 deletions(-)
 delete mode 100644 Dermateapps/app/src/main/res/layout/question_item.xml

diff --git a/Dermateapps/app/src/main/java/com/example/dermate/ui/adapter/ArticleListViewAdapter.kt b/Dermateapps/app/src/main/java/com/example/dermate/ui/adapter/ArticleListViewAdapter.kt
index a54a920..42820f6 100644
--- a/Dermateapps/app/src/main/java/com/example/dermate/ui/adapter/ArticleListViewAdapter.kt
+++ b/Dermateapps/app/src/main/java/com/example/dermate/ui/adapter/ArticleListViewAdapter.kt
@@ -3,6 +3,7 @@ package com.example.dermate.ui.adapter
 import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.content.res.Resources
+import android.graphics.Color
 import android.net.Uri
 import android.view.LayoutInflater
 import android.view.View
@@ -24,6 +25,7 @@ class ArticleListViewAdapter(private val articleList: List<String>) :
 
         private val binding = ArticleItemBinding.bind(view)
         private lateinit var richPreview: RichPreview
+        @ExperimentalStdlibApi
         internal fun bind(url: String) {
 
             extractUrl(url)
@@ -41,6 +43,7 @@ class ArticleListViewAdapter(private val articleList: List<String>) :
             }
         }
 
+        @ExperimentalStdlibApi
         private fun extractUrl(url: String) {
             var data: MetaData
 
@@ -55,8 +58,20 @@ class ArticleListViewAdapter(private val articleList: List<String>) :
                         title.joinToString(" ")
                     }
                     binding.apply {
+                        val halodoc = "HALODOC"
+                        val alodokter = "ALODOKTER"
                         val articleProviderText ="Article by ${data.sitename}"
-                        articleProvider.text = articleProviderText
+                        if (data.sitename.equals(halodoc,true)){
+                            articleProvider.text = articleProviderText
+                            articleProvider.setTextColor(itemView.resources.getColor(R.color.red_pastel))
+                        } else if (data.sitename.equals(alodokter,true)){
+                            articleProvider.text = articleProviderText
+                            articleProvider.setTextColor(itemView.resources.getColor(R.color.blue_pastel))
+                        }else{
+                            articleProvider.text = articleProviderText
+                            articleProvider.setTextColor(itemView.resources.getColor(R.color.theme_color))
+                        }
+
                         urlTitle.text = trimTitle
                         Glide.with(itemView.context.applicationContext).load(data.imageurl).into(imageThumbnail)
                     }
@@ -80,6 +95,7 @@ class ArticleListViewAdapter(private val articleList: List<String>) :
         return ViewHolder(view)
     }
 
+    @ExperimentalStdlibApi
     override fun onBindViewHolder(holder: ArticleListViewAdapter.ViewHolder, position: Int) {
 
         holder.bind(articleList[position])
diff --git a/Dermateapps/app/src/main/java/com/example/dermate/ui/home/fragments/HomeFragment.kt b/Dermateapps/app/src/main/java/com/example/dermate/ui/home/fragments/HomeFragment.kt
index abcbae0..370cd06 100644
--- a/Dermateapps/app/src/main/java/com/example/dermate/ui/home/fragments/HomeFragment.kt
+++ b/Dermateapps/app/src/main/java/com/example/dermate/ui/home/fragments/HomeFragment.kt
@@ -32,7 +32,7 @@ class HomeFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
         articleViewModel = ViewModelProvider(this)[ArticleViewModel::class.java]
         articleViewModel.articleData().observe(requireParentFragment().viewLifecycleOwner,  {
-            it.url?.let { data -> setUi(data) }
+            it.url?.let { data -> setUi(data.shuffled()) }
         })
     }
     private fun setUi(data : List<String>){
diff --git a/Dermateapps/app/src/main/res/layout/article_item.xml b/Dermateapps/app/src/main/res/layout/article_item.xml
index 68a28ea..3d6175e 100644
--- a/Dermateapps/app/src/main/res/layout/article_item.xml
+++ b/Dermateapps/app/src/main/res/layout/article_item.xml
@@ -50,6 +50,7 @@
         <TextView
             android:id="@+id/article_provider"
             android:layout_width="0dp"
+            android:textColor="@color/red_pastel"
             android:layout_height="wrap_content"
             android:textSize="12sp"
             app:layout_constraintEnd_toEndOf="@+id/url_title"
diff --git a/Dermateapps/app/src/main/res/layout/question_item.xml b/Dermateapps/app/src/main/res/layout/question_item.xml
deleted file mode 100644
index d394cde..0000000
--- a/Dermateapps/app/src/main/res/layout/question_item.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView 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="wrap_content"
-    android:layout_margin="5dp"
-    app:cardElevation="0dp"
-    app:cardBackgroundColor="@color/card_background"
-    app:cardCornerRadius="10dp">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/question_text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="10dp"
-            android:text="@string/question" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@color/home_background" />
-
-        <RadioGroup
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:orientation="horizontal">
-
-            <RadioButton
-                android:id="@+id/rb_yes"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="20dp"
-                android:text="@string/yes" />
-
-            <RadioButton
-                android:id="@+id/rb_no"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="20dp"
-                android:text="@string/no"/>
-        </RadioGroup>
-
-    </LinearLayout>
-
-</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/Dermateapps/app/src/main/res/values/colors.xml b/Dermateapps/app/src/main/res/values/colors.xml
index f66a63c..097a266 100644
--- a/Dermateapps/app/src/main/res/values/colors.xml
+++ b/Dermateapps/app/src/main/res/values/colors.xml
@@ -6,6 +6,8 @@
     <color name="white">#FFFFFFFF</color>
     <color name="theme_color">#13D5D5</color>
     <color name="red">#AA0000</color>
+    <color name="red_pastel">#C83535</color>
+    <color name="blue_pastel">#026ECC</color>
     <color name="green">#00AA03</color>
     <color name="yellow">#D3C900</color>
     <color name="unselected_color">#CACACA</color>