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 index 365bfe0..32f3958 100644 --- 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) } } \ No newline at end of file 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 index 62d73dc..3bc041a 100644 --- 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,7 +37,6 @@ class HasilActivity : AppCompatActivity() { textHasilDiagnosis.text = penyakitBurung!!.toString() textSolusi.text = solusi textPencegahan.text = pencegahan - } private fun bindView() { @@ -45,6 +44,5 @@ class HasilActivity : AppCompatActivity() { 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 index a16d7ca..8261416 100644 --- 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() { 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) } } \ No newline at end of file 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 index 224733b..95b5e50 100644 --- 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 new file mode 100644 index 0000000..21d1926 Binary files /dev/null and b/app/src/main/res/drawable/app_logo_text.png differ diff --git a/app/src/main/res/drawable/ic_app_logo_text.xml b/app/src/main/res/drawable/ic_app_logo_text.xml new file mode 100644 index 0000000..0fc18f4 --- /dev/null +++ b/app/src/main/res/drawable/ic_app_logo_text.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_diagnosis.xml b/app/src/main/res/layout/activity_diagnosis.xml index 8a8ec03..9b91017 100644 --- a/app/src/main/res/layout/activity_diagnosis.xml +++ b/app/src/main/res/layout/activity_diagnosis.xml @@ -70,13 +70,14 @@ diff --git a/app/src/main/res/layout/activity_hasil.xml b/app/src/main/res/layout/activity_hasil.xml index 017244d..9254b9c 100644 --- 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 index 8814496..e739457 100644 --- 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" /> + @@ -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 index 5cc21f3..a2b120d 100644 --- 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" /> + app:layout_constraintGuide_percent="0.45" /> + app:layout_constraintTop_toTopOf="@id/guideline_horizontal_45" /> - - - diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index d722f29..da110d4 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -4,9 +4,9 @@ #0092dc #ee4102 - #212121 - #757575 - #BDBDBD + #212121 + #757575 + #bdbdbd #ffffff #eaeaea diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 20fe57b..993ade9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -8,7 +8,7 @@ Logo aplikasi pada home - mulai + mulai Pilih gejala yang timbul @@ -23,6 +23,7 @@ Gambar titik hijau pada item hasil Pencegahan Hasil + teks logo splashscreen