[+]add place history button @ dashboard, [#]replace textinputlayout with spinner, [#]set icon based on history category

Author: andisoer

app/src/main/java/com/soerjdev/smkcodingproject2/adapter/PlaceHistoryAdapter.kt

@@ -44,6 +44,13 @@ class PlaceHistoryAdapter(
         fun bindItem(item: PlaceHistory){
             tvPlaceNameItemPlaceHistory.text = item.placeName
             tvAddresItemPlaceHistory.text = item.placeAddres
+            tvDateItemPlaceHistory.text = item.placeDate
+
+            when (item.placeCategory){
+                "Pekerjaan" -> ivTypeItemPlaceHistory.setBackgroundResource(R.drawable.ic_action_work)
+                "Belajar" -> ivTypeItemPlaceHistory.setBackgroundResource(R.drawable.ic_action_school)
+                "Belanja" -> ivTypeItemPlaceHistory.setBackgroundResource(R.drawable.ic_action_local_grocery_store)
+            }
 
             val database = FirebaseDatabase.getInstance()
             val auth = FirebaseAuth.getInstance()

app/src/main/java/com/soerjdev/smkcodingproject2/ui/AddPlaceHistoryActivity.kt

@@ -3,6 +3,9 @@ package com.soerjdev.smkcodingproject2.ui
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.util.Log
+import android.view.View
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
 import android.widget.Toast
 import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.database.DatabaseReference
@@ -14,14 +17,19 @@ import com.soerjdev.smkcodingproject2.utils.showToast
 import kotlinx.android.synthetic.*
 import kotlinx.android.synthetic.main.activity_add_place_history.*
 
-class AddPlaceHistoryActivity : AppCompatActivity() {
+class AddPlaceHistoryActivity : AppCompatActivity(),
+    AdapterView.OnItemSelectedListener {
 
     private val database = FirebaseDatabase.getInstance()
     private val auth = FirebaseAuth.getInstance()
     private lateinit var databaseRef: DatabaseReference
     private var OPERATION_TYPE = ""
     private var updatedDataUid = ""
 
+    private lateinit var adapter: ArrayAdapter<CharSequence>
+
+    private var categoryPlaceHistory = ""
+
     private var TAG = AddPlaceHistoryActivity::class.java.name
 
     companion object {
@@ -47,6 +55,14 @@ class AddPlaceHistoryActivity : AppCompatActivity() {
 
         OPERATION_TYPE = intent.getStringExtra(TAG_OPERATION_TYPE)!!
 
+        adapter = ArrayAdapter.createFromResource(
+            this,
+            R.array.place_history_type,
+            android.R.layout.simple_spinner_item
+        )
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+        spinnerCategoryAddPlaceHistory.adapter = adapter
+
         if(OPERATION_TYPE == "Update"){
             val placeName = intent.getStringExtra(PLACE_NAME)
             val placeAddress = intent.getStringExtra(PLACE_ADDRESS)
@@ -59,6 +75,8 @@ class AddPlaceHistoryActivity : AppCompatActivity() {
 
         databaseRef = database.getReference("place_history")
 
+        spinnerCategoryAddPlaceHistory.onItemSelectedListener = this
+
         tbAddPlaceHistory.setNavigationOnClickListener { finish() }
 
         if(OPERATION_TYPE == "Update"){
@@ -75,24 +93,26 @@ class AddPlaceHistoryActivity : AppCompatActivity() {
     private fun setToTextInput(placeName: String?, placeDate: String?, placeAddress: String?, placeType: String?) {
         tieNameAddPlaceHistory.setText(placeName)
         tieAddressAddPlaceHistory.setText(placeAddress)
-        tieCategoryAddPlaceHistory.setText(placeType)
+
+        val spinnerPosition = adapter.getPosition(placeType)
+        spinnerCategoryAddPlaceHistory.setSelection(spinnerPosition)
+
         tieDateAddPlaceHistory.setText(placeDate)
     }
 
     private fun checkForm() {
         val placeName = tieNameAddPlaceHistory.text.toString()
         val placeAddress = tieAddressAddPlaceHistory.text.toString()
-        val placeType = tieCategoryAddPlaceHistory.text.toString()
         val placeDate = tieDateAddPlaceHistory.text.toString()
 
         when {
             placeName.isEmpty() -> tilNameAddPlaceHistory.error = "Isi nama tempat !"
             placeAddress.isEmpty() -> tilAddressAddPlaceHistory.error = "Isi alamat tempat !"
-            placeType.isEmpty() -> tilCategoryAddPlaceHistory.error = "Isi jenis perjalanan !"
+            categoryPlaceHistory.isEmpty() -> showToast(this,"Isi jenis perjalanan !")
             placeDate.isEmpty() -> tilDateAddPlaceHistory.error = "Isi tanggal perjalanan !"
             else -> when(OPERATION_TYPE){
-                "Input" -> insertData(placeName, placeAddress, placeType, placeDate)
-                "Update" -> updateData(placeName, placeAddress, placeType, placeDate)
+                "Input" -> insertData(placeName, placeAddress, categoryPlaceHistory, placeDate)
+                "Update" -> updateData(placeName, placeAddress, categoryPlaceHistory, placeDate)
             }
         }
     }
@@ -125,4 +145,13 @@ class AddPlaceHistoryActivity : AppCompatActivity() {
         super.onDestroy()
         this.clearFindViewByIdCache()
     }
+
+
+    override fun onNothingSelected(p0: AdapterView<*>?) {
+
+    }
+
+    override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+        categoryPlaceHistory = parent?.getItemAtPosition(position).toString()
+    }
 }

app/src/main/java/com/soerjdev/smkcodingproject2/ui/fragment/DashboardFragment.kt

@@ -19,6 +19,7 @@ import com.soerjdev.smkcodingproject2.model.provdata.ProvData
 import com.soerjdev.smkcodingproject2.model.updatedata.UpdateData
 import com.soerjdev.smkcodingproject2.ui.AllCountryDataActivity
 import com.soerjdev.smkcodingproject2.ui.AllProvinceDataActivity
+import com.soerjdev.smkcodingproject2.ui.PlaceHistoryListActivity
 import com.soerjdev.smkcodingproject2.utils.ApiUtils
 import com.soerjdev.smkcodingproject2.viewmodel.GlobalSummaryViewModel
 import com.soerjdev.smkcodingproject2.viewmodel.IndoSummaryViewModel
@@ -82,6 +83,10 @@ class DashboardFragment : Fragment() {
             startActivity(Intent(context, AllCountryDataActivity::class.java))
         }
 
+        containerPlaceHistoryDashboard.setOnClickListener {
+            startActivity(Intent(context, PlaceHistoryListActivity::class.java))
+        }
+
         indoSummaryViewModel.indoSummaryData.observe(viewLifecycleOwner, androidx.lifecycle.Observer { indoSummary ->
             indoSummary?.let {
                 if(it != null){
@@ -250,7 +255,7 @@ class DashboardFragment : Fragment() {
                         globalRecovered = response.body()!!.recovered.value
                         globalDeath = response.body()!!.deaths.value
 
-                        globalSummaryData = GlobalSummary(response.body()!!.confirmed.value, response.body()!!.recovered.value, response.body()!!.deaths.value)
+                        globalSummaryData = GlobalSummary(response.body()!!.confirmed.value, response.body()!!.deaths.value, response.body()!!.recovered.value)
                         globalSummaryViewModel.insert(globalSummaryData)
 
                         containerDataDashboard.visibility = View.VISIBLE

app/src/main/java/com/soerjdev/smkcodingproject2/utils/ProgressDialogUtil.kt

@@ -1,5 +1,4 @@
 package com.soerjdev.smkcodingproject2.utils
 
-import android.app.ProgressDialog
 import android.content.Context
 

app/src/main/res/drawable-anydpi/ic_action_local_grocery_store.xml

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="#4560DF"
+    android:tint="#FFFFFF"
     android:alpha="0.8">
     <path
         android:fillColor="#FF000000"

app/src/main/res/drawable-anydpi/ic_action_work.xml

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="#3185A4"
+    android:tint="#FFFFFF"
     android:alpha="0.8">
     <path
         android:fillColor="#FF000000"