update splashscreen layout

anprimordi · Nov 25, 2019 · cb645dd · cb645dd
1 parent 33dc7c2
commit cb645dd
Show file tree

Hide file tree

Showing 13 changed files with 40 additions and 40 deletions.
diff --git a/app/src/main/java/com/makaryostudio/lovebird/feature/diagnosis/DiagnosisAdapter.kt b/app/src/main/java/com/makaryostudio/lovebird/feature/diagnosis/DiagnosisAdapter.kt
@@ -87,7 +87,7 @@ class DiagnosisAdapter internal constructor(private val context: Context) :
         }
     }
 
-    class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+    inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
         var mCbGejala: CheckBox = itemView.findViewById(R.id.checkbox_gejala)
     }
 
@@ -389,9 +389,7 @@ class DiagnosisAdapter internal constructor(private val context: Context) :
         intent.putExtra("solusi", solusi)
         intent.putExtra("pencegahan", pencegahan)
         intent.putExtra("persentaseCBR", persentaseCbr.toString())
-        //            Toast.makeText(context, R.string.diagnosis_empty_msg, Toast.LENGTH_SHORT).show()
-//        if (mCheckedGejala.isEmpty()) nilai = 0
-//        else nilai = 1
+
         context.startActivity(intent)
     }
 }
diff --git a/app/src/main/java/com/makaryostudio/lovebird/feature/hasil/HasilActivity.kt b/app/src/main/java/com/makaryostudio/lovebird/feature/hasil/HasilActivity.kt
@@ -37,14 +37,12 @@ class HasilActivity : AppCompatActivity() {
         textHasilDiagnosis.text = penyakitBurung!!.toString()
         textSolusi.text = solusi
         textPencegahan.text = pencegahan
-
     }
 
     private fun bindView() {
         rvGejalaDialami = findViewById(R.id.rv_gejala_dialami)
         rvGejalaDialami.layoutManager = LinearLayoutManager(this)
         adapter = HasilAdapter()
         rvGejalaDialami.adapter = adapter
-
     }
 }
diff --git a/app/src/main/java/com/makaryostudio/lovebird/feature/hasil/HasilAdapter.kt b/app/src/main/java/com/makaryostudio/lovebird/feature/hasil/HasilAdapter.kt
@@ -39,7 +39,7 @@ class HasilAdapter : RecyclerView.Adapter<HasilAdapter.ViewHolder>() {
         holder.textGejalaDialami.text = gejala.gejalaDialami
     }
 
-    class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+    inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
         var textGejalaDialami: TextView = itemView.findViewById(R.id.text_hasil_gejala)
     }
 }
diff --git a/app/src/main/java/com/makaryostudio/lovebird/feature/home/HomeActivity.kt b/app/src/main/java/com/makaryostudio/lovebird/feature/home/HomeActivity.kt
@@ -9,7 +9,7 @@ import com.makaryostudio.lovebird.feature.diagnosis.DiagnosisActivity
 
 class HomeActivity : AppCompatActivity() {
 
-    lateinit var btnMulai: Button
+    private lateinit var btnMulai: Button
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

diff --git a/app/src/main/res/drawable/app_logo_text.png b/app/src/main/res/drawable/app_logo_text.png
diff --git a/app/src/main/res/drawable/ic_app_logo_text.xml b/app/src/main/res/drawable/ic_app_logo_text.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <bitmap android:src="@drawable/app_logo_text" />
+    </item>
+</layer-list>
diff --git a/app/src/main/res/layout/activity_diagnosis.xml b/app/src/main/res/layout/activity_diagnosis.xml
@@ -70,13 +70,14 @@
 
             <TextView
                 android:id="@+id/title_pilih_gejala"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
                 android:layout_marginTop="8dp"
                 android:text="@string/diagnosis_pilih_gejala_text"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                android:textColor="@color/primary_text"
+                android:textColor="@color/colorAccent"
+                android:textStyle="italic"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 

diff --git a/app/src/main/res/layout/activity_hasil.xml b/app/src/main/res/layout/activity_hasil.xml
@@ -87,10 +87,10 @@
                     android:id="@+id/title_gejala_dialami"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
+                    android:layout_marginTop="16dp"
                     android:text="@string/hasil_gejala_dialami_text"
                     android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                    android:textColor="@color/primary_text"
+                    android:textColor="@color/textPrimary"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
@@ -112,7 +112,7 @@
                     android:layout_marginTop="16dp"
                     android:text="@string/hasil_diagnosis_penyakit_text"
                     android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                    android:textColor="@color/primary_text"
+                    android:textColor="@color/textPrimary"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/rv_gejala_dialami" />
@@ -136,7 +136,7 @@
                     android:layout_marginTop="16dp"
                     android:text="@string/hasil_solusi_text"
                     android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                    android:textColor="@color/primary_text"
+                    android:textColor="@color/textPrimary"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/text_hasil_diagnosis" />
@@ -161,7 +161,7 @@
                     android:layout_marginTop="16dp"
                     android:text="@string/hasil_pencegahan_text"
                     android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                    android:textColor="@color/primary_text"
+                    android:textColor="@color/textPrimary"
                     app:layout_constraintBottom_toTopOf="@id/title_pencegahan"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
@@ -77,12 +77,13 @@
                 android:ellipsize="end"
                 android:maxLines="15"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                android:textColor="@color/primary_text"
+                android:textColor="@color/textPrimary"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 tools:text="@tools:sample/lorem/random" />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.cardview.widget.CardView>
 
@@ -91,7 +92,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="@drawable/btn_rounded_blue"
-        android:text="@string/action_mulai"
+        android:text="@string/home_mulai_action"
         app:layout_constraintBottom_toBottomOf="@id/card_home_app_description"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/layout/activity_splash_screen.xml b/app/src/main/res/layout/activity_splash_screen.xml
@@ -10,16 +10,16 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:background="@color/colorPrimary"
-        app:layout_constraintBottom_toTopOf="@id/guideline_horizontal_25"
+        app:layout_constraintBottom_toTopOf="@id/guideline_horizontal_45"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline_horizontal_25"
+        android:id="@+id/guideline_horizontal_45"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.5" />
+        app:layout_constraintGuide_percent="0.45" />
 
     <de.hdodenhof.circleimageview.CircleImageView
         android:id="@+id/image_splashscreen_logo"
@@ -30,17 +30,18 @@
         app:civ_border_color="@color/solid_white"
         app:civ_border_width="4dp"
         app:civ_circle_background_color="@color/solid_white"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toBottomOf="@id/guideline_horizontal_45"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="@id/guideline_horizontal_45" />
 
-    <TextView
-        android:id="@+id/text_splashscreen_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+    <ImageView
+        android:id="@+id/image_splashscreen_title"
+        android:layout_width="232dp"
+        android:layout_height="40dp"
         android:layout_marginTop="16dp"
-        android:text="@string/app_name"
+        android:contentDescription="@string/splashscreen_applogo_text"
+        android:src="@drawable/app_logo_text"
         android:textAppearance="@style/TextAppearance.AppCompat.Large"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"

diff --git a/app/src/main/res/layout/item_hasil.xml b/app/src/main/res/layout/item_hasil.xml
@@ -6,19 +6,13 @@
     android:layout_height="wrap_content"
     android:orientation="horizontal">
 
-    <ImageView
-        android:layout_marginStart="4dp"
-        android:layout_gravity="center"
-        android:src="@drawable/ic_circle_green_8dp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:contentDescription="@string/hasil_green_dot_img" />
-
     <TextView
-        android:layout_marginStart="4dp"
         android:id="@+id/text_hasil_gejala"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
+        android:drawableStart="@drawable/ic_circle_green_8dp"
+        android:drawablePadding="4dp"
         android:ellipsize="end"
         android:maxLines="1"
         tools:text="@tools:sample/lorem/random" />

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -4,9 +4,9 @@
     <color name="colorPrimaryDark">#0092dc</color>
     <color name="colorAccent">#ee4102</color>
 
-    <color name="primary_text">#212121</color>
-    <color name="secondary_text">#757575</color>
-    <color name="divider">#BDBDBD</color>
+    <color name="textPrimary">#212121</color>
+    <color name="textSecondary">#757575</color>
+    <color name="divider">#bdbdbd</color>
 
     <color name="solid_white">#ffffff</color>
     <color name="darker_white">#eaeaea</color>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -8,7 +8,7 @@
 
     <!--  home  -->
     <string name="home_logo_img_description">Logo aplikasi pada home</string>
-    <string name="action_mulai">mulai</string>
+    <string name="home_mulai_action">mulai</string>
 
     <!--  input  -->
     <string name="diagnosis_pilih_gejala_text">Pilih gejala yang timbul</string>
@@ -23,6 +23,7 @@
     <string name="hasil_green_dot_img">Gambar titik hijau pada item hasil</string>
     <string name="hasil_pencegahan_text">Pencegahan</string>
     <string name="hasil_hasil_text">Hasil</string>
+    <string name="splashscreen_applogo_text">teks logo splashscreen</string>
 
     <!--  nama penyakit  -->
     <array name="array_nama_penyakit">