diff --git a/app/src/main/java/com/example/ca_kotlin/DetailsActivity.kt b/app/src/main/java/com/example/ca_kotlin/DetailsActivity.kt index 3cedb63..06de2c8 100644 --- a/app/src/main/java/com/example/ca_kotlin/DetailsActivity.kt +++ b/app/src/main/java/com/example/ca_kotlin/DetailsActivity.kt @@ -30,9 +30,6 @@ class DetailsActivity: AppCompatActivity() { button.setOnClickListener { val dao = AppDatabaseHelper.getDatabase(this) .vehicleDAO() - val res = dao - .find(id.toLong()) - println(res) try { dao.insert(Vehicle( diff --git a/app/src/main/java/com/example/ca_kotlin/MainActivity.kt b/app/src/main/java/com/example/ca_kotlin/MainActivity.kt index 4da7c8b..333b425 100644 --- a/app/src/main/java/com/example/ca_kotlin/MainActivity.kt +++ b/app/src/main/java/com/example/ca_kotlin/MainActivity.kt @@ -11,10 +11,11 @@ import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.example.ca_kotlin.adapters.CountryAdapter +import com.example.ca_kotlin.adapters.VehicleAdapter import com.example.ca_kotlin.api.ApiClient import com.example.ca_kotlin.api.Vehicles import com.example.ca_kotlin.dao.AppDatabaseHelper +import com.example.ca_kotlin.dao.Vehicle import retrofit2.Call import retrofit2.Callback import retrofit2.Response @@ -45,7 +46,7 @@ class MainActivity : AppCompatActivity() { progressDialog.setCancelable(false) progressDialog.show() - val adapter = CountryAdapter(data) + val adapter = VehicleAdapter(data) recycler.adapter = adapter val switch = findViewById(R.id.switch1) @@ -62,20 +63,23 @@ class MainActivity : AppCompatActivity() { global(adapter, recycler, progressDialog) } - fun favorites(adapter: CountryAdapter, recycler: RecyclerView, progressDialog: ProgressDialog) { + private fun favorites(adapter: VehicleAdapter, recycler: RecyclerView, progressDialog: ProgressDialog) { val vehicles = AppDatabaseHelper.getDatabase(this) .vehicleDAO() .getVehicles() + + val filteredData = data.filter { dVehicle -> (vehicles.find { it.vehicleId == dVehicle.vehicleId }) != null } data.clear() - data.addAll(vehicles as ArrayList) - println(vehicles) + data.addAll(filteredData) + println(filteredData) + adapter.update(data.clone() as ArrayList) adapter.notifyDataSetChanged() } - fun global(adapter: CountryAdapter, recycler: RecyclerView, progressDialog: ProgressDialog) { + private fun global(adapter: VehicleAdapter, recycler: RecyclerView, progressDialog: ProgressDialog) { ApiClient.getClient.getVehicles().enqueue(object : Callback> { override fun onResponse(call: Call>?, response: Response>?) { - + data.clear() data.addAll(response!!.body()!!) adapter.update(data.clone() as ArrayList) adapter.notifyDataSetChanged() diff --git a/app/src/main/java/com/example/ca_kotlin/adapters/CountryAdapter.kt b/app/src/main/java/com/example/ca_kotlin/adapters/VehicleAdapter.kt similarity index 96% rename from app/src/main/java/com/example/ca_kotlin/adapters/CountryAdapter.kt rename to app/src/main/java/com/example/ca_kotlin/adapters/VehicleAdapter.kt index ebc223c..766d013 100644 --- a/app/src/main/java/com/example/ca_kotlin/adapters/CountryAdapter.kt +++ b/app/src/main/java/com/example/ca_kotlin/adapters/VehicleAdapter.kt @@ -13,7 +13,7 @@ import com.example.ca_kotlin.api.Vehicles import com.squareup.picasso.Picasso // Adapter for the CountrySelector -class CountryAdapter(list: ArrayList) : RecyclerView.Adapter() { +class VehicleAdapter(list: ArrayList) : RecyclerView.Adapter() { private var list: ArrayList = ArrayList() diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 51e47eb..2243f65 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -32,9 +32,10 @@