Chargeprice: show my tariffs first in overview

app/src/main/java/net/vonforst/evmap/adapter/DataBindingAdapters.kt

@@ -107,6 +107,16 @@ class ChargepriceAdapter() :
             field = value
             notifyDataSetChanged()
         }
+    var myTariffs: Set<String>? = null
+        set(value) {
+            field = value
+            notifyDataSetChanged()
+        }
+    var myTariffsAll: Boolean? = null
+        set(value) {
+            field = value
+            notifyDataSetChanged()
+        }
 
     override fun getItemViewType(position: Int): Int = R.layout.item_chargeprice
 
@@ -127,7 +137,11 @@ class ChargepriceAdapter() :
 
     override fun bind(holder: ViewHolder<ChargePrice>, item: ChargePrice) {
         super.bind(holder, item)
-        (holder.binding as ItemChargepriceBinding).meta = meta
+        (holder.binding as ItemChargepriceBinding).apply {
+            this.meta = this@ChargepriceAdapter.meta
+            this.myTariffs = this@ChargepriceAdapter.myTariffs
+            this.myTariffsAll = this@ChargepriceAdapter.myTariffsAll
+        }
     }
 }
 

app/src/main/java/net/vonforst/evmap/api/chargeprice/ChargepriceModel.kt

@@ -179,6 +179,8 @@ class ChargePrice : Resource(), Equatable, Cloneable {
     @field:Json(name = "charge_point_prices")
     lateinit var chargepointPrices: List<ChargepointPrice>
 
+    var tariff: HasOne<ChargepriceTariff>? = null
+
 
     fun formatMonthlyFees(ctx: Context): String {
         return listOfNotNull(
@@ -245,6 +247,7 @@ class ChargePrice : Resource(), Equatable, Cloneable {
             tariffName = this@ChargePrice.tariffName
             totalMonthlyFee = this@ChargePrice.totalMonthlyFee
             url = this@ChargePrice.url
+            tariff = this@ChargePrice.tariff
         }
     }
 }

app/src/main/java/net/vonforst/evmap/fragment/ChargepriceFragment.kt

@@ -112,6 +112,12 @@ class ChargepriceFragment : DialogFragment() {
         vm.chargepriceMetaForChargepoint.observe(viewLifecycleOwner) {
             chargepriceAdapter.meta = it?.data
         }
+        vm.myTariffs.observe(viewLifecycleOwner) {
+            chargepriceAdapter.myTariffs = it
+        }
+        vm.myTariffsAll.observe(viewLifecycleOwner) {
+            chargepriceAdapter.myTariffsAll = it
+        }
 
         val connectorsAdapter = CheckableConnectorAdapter()
 

app/src/main/java/net/vonforst/evmap/ui/BindingAdapters.kt

@@ -291,4 +291,15 @@ fun colorEnabled(ctx: Context, enabled: Boolean): Int {
 @BindingAdapter("app:tint")
 fun setImageTintList(view: ImageView, @ColorInt color: Int) {
     view.imageTintList = ColorStateList.valueOf(color)
+}
+
+@BindingAdapter("myTariffsBackground")
+fun myTariffsBackground(view: View, myTariff: Boolean) {
+    if (myTariff) {
+        view.background = ContextCompat.getDrawable(view.context, R.drawable.my_tariff_background)
+    } else {
+        view.context.obtainStyledAttributes(intArrayOf(R.attr.selectableItemBackground)).use {
+            view.background = it.getDrawable(0)
+        }
+    }
 }

app/src/main/java/net/vonforst/evmap/viewmodel/ChargepriceViewModel.kt

@@ -115,6 +115,7 @@ class ChargepriceViewModel(application: Application, chargepriceApiKey: String)
                     } else if (cps.status == Status.LOADING) {
                         value = Resource.loading(null)
                     } else {
+                        val myTariffs = prefs.chargepriceMyTariffs
                         value = Resource.success(cps.data!!.map { cp ->
                             val filteredPrices =
                                 cp.chargepointPrices.filter { it.plug == chargepoint.type && it.power == chargepoint.power }
@@ -125,13 +126,30 @@ class ChargepriceViewModel(application: Application, chargepriceApiKey: String)
                                     chargepointPrices = filteredPrices
                                 }
                             }
-                        }.filterNotNull().sortedBy { it.chargepointPrices.first().price })
+                        }.filterNotNull()
+                            .sortedBy { it.chargepointPrices.first().price }
+                            .sortedByDescending {
+                                prefs.chargepriceMyTariffsAll ||
+                                        myTariffs != null && it.tariff?.get()?.id in myTariffs
+                            }
+                        )
                     }
                 }
             }
         }
     }
 
+    val myTariffs: LiveData<Set<String>> by lazy {
+        MutableLiveData<Set<String>>().apply {
+            value = prefs.chargepriceMyTariffs
+        }
+    }
+    val myTariffsAll: LiveData<Boolean> by lazy {
+        MutableLiveData<Boolean>().apply {
+            value = prefs.chargepriceMyTariffsAll
+        }
+    }
+
     val chargepriceMetaForChargepoint: MediatorLiveData<Resource<ChargepriceChargepointMeta>> by lazy {
         MediatorLiveData<Resource<ChargepriceChargepointMeta>>().apply {
             listOf(chargePriceMeta, chargepoint).forEach {

app/src/main/res/drawable/my_tariff_background.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/chip_background" />
+    <item android:drawable="?selectableItemBackground" />
+</layer-list>

app/src/main/res/layout/item_chargeprice.xml

@@ -11,6 +11,8 @@
 
         <import type="net.vonforst.evmap.ui.BindingAdaptersKt" />
 
+        <import type="java.util.Set" />
+
         <variable
             name="item"
             type="ChargePrice" />
@@ -18,6 +20,14 @@
         <variable
             name="meta"
             type="ChargepriceChargepointMeta" />
+
+        <variable
+            name="myTariffs"
+            type="Set&lt;String>" />
+
+        <variable
+            name="myTariffsAll"
+            type="Boolean" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -27,7 +37,7 @@
         android:paddingTop="8dp"
         android:paddingRight="16dp"
         android:paddingBottom="8dp"
-        android:background="?selectableItemBackground">
+        app:myTariffsBackground="@{!myTariffsAll &amp;&amp; myTariffs.contains(item.tariff.get().id)}">
 
         <TextView
             android:id="@+id/txtTariff"