Release 0.1.2

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "net.vonforst.evmap"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 8
-        versionName "0.1.1"
+        versionCode 10
+        versionName "0.1.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

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

@@ -20,6 +20,9 @@ import net.vonforst.evmap.api.goingelectric.Chargepoint
 import net.vonforst.evmap.databinding.ItemFilterMultipleChoiceBinding
 import net.vonforst.evmap.databinding.ItemFilterSliderBinding
 import net.vonforst.evmap.viewmodel.*
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
+import java.time.format.FormatStyle
 
 interface Equatable {
     override fun equals(other: Any?): Boolean;
@@ -113,8 +116,20 @@ fun buildDetails(loc: ChargeLocation?, ctx: Context): List<DetailAdapter.Detail>
             R.string.network,
             loc.network
         ) else null,
+        if (loc.faultReport != null) DetailAdapter.Detail(
+            R.drawable.ic_fault_report,
+            R.string.fault_report,
+            loc.faultReport.created?.let {
+                ctx.getString(R.string.fault_report_date,
+                    loc.faultReport.created
+                        .atZone(ZoneId.systemDefault())
+                        .format(DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT)))
+            } ?: "",
+            loc.faultReport.description ?: "",
+            clickable = true
+        ) else null,
         // TODO: separate layout for opening hours with expandable details
-        if (loc.openinghours != null) DetailAdapter.Detail(
+        if (loc.openinghours != null && !loc.openinghours.isEmpty) DetailAdapter.Detail(
             R.drawable.ic_hours,
             R.string.hours,
             loc.openinghours.getStatusText(ctx),

app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricAdapters.kt

@@ -2,6 +2,7 @@ package net.vonforst.evmap.api.goingelectric
 
 import com.squareup.moshi.*
 import java.lang.reflect.Type
+import java.time.Instant
 import java.time.LocalTime
 
 
@@ -65,7 +66,8 @@ internal class ChargepointListItemJsonAdapter(val moshi: Moshi) :
 }
 
 internal class JsonObjectOrFalseAdapter<T> private constructor(
-    private val objectDelegate: JsonAdapter<T>?
+    private val objectDelegate: JsonAdapter<T>,
+    private val clazz: Class<*>
 ) : JsonAdapter<T>() {
 
     class Factory() : JsonAdapter.Factory {
@@ -80,27 +82,32 @@ internal class JsonObjectOrFalseAdapter<T> private constructor(
             )) {
                 false -> null
                 true -> JsonObjectOrFalseAdapter(
-                    moshi.adapter(clazz)
+                    moshi.adapter(clazz), clazz
                 )
             }
         }
     }
 
-    override fun fromJson(reader: JsonReader) = when (reader.peek()) {
+    @Suppress("UNCHECKED_CAST")
+    override fun fromJson(reader: JsonReader): T? = when (reader.peek()) {
         JsonReader.Token.BOOLEAN -> when (reader.nextBoolean()) {
             false -> null // Response was false
-            else ->
-                throw IllegalStateException("Non-false boolean for @JsonObjectOrFalse field")
+            else -> {
+                if (this.clazz == FaultReport::class.java) {
+                    FaultReport(null, null) as T
+                } else {
+                    throw IllegalStateException("Non-false boolean for @JsonObjectOrFalse field")
+                }
+            }
         }
-        JsonReader.Token.BEGIN_OBJECT -> objectDelegate?.fromJson(reader)
-        JsonReader.Token.STRING -> objectDelegate?.fromJson(reader)
-        JsonReader.Token.NUMBER -> objectDelegate?.fromJson(reader)
+        JsonReader.Token.BEGIN_OBJECT -> objectDelegate.fromJson(reader)
+        JsonReader.Token.STRING -> objectDelegate.fromJson(reader)
+        JsonReader.Token.NUMBER -> objectDelegate.fromJson(reader)
         else ->
             throw IllegalStateException("Non-object-non-boolean value for @JsonObjectOrFalse field")
     }
 
-    override fun toJson(writer: JsonWriter, value: T?) =
-        objectDelegate?.toJson(writer, value) ?: Unit
+    override fun toJson(writer: JsonWriter, value: T?) = objectDelegate.toJson(writer, value)
 }
 
 private fun hasJsonObjectOrFalseAnnotation(annotations: Set<Annotation>?) =
@@ -139,4 +146,14 @@ internal class HoursAdapter {
         }
     }
 
+}
+
+internal class InstantAdapter {
+    @FromJson
+    fun fromJson(value: Long?): Instant? = value?.let {
+        Instant.ofEpochSecond(it)
+    }
+
+    @ToJson
+    fun toJson(value: Instant?): Long? = value?.epochSecond
 }

app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricApi.kt

@@ -64,6 +64,7 @@ interface GoingElectricApi {
                 .add(ChargepointListItemJsonAdapterFactory())
                 .add(JsonObjectOrFalseAdapter.Factory())
                 .add(HoursAdapter())
+                .add(InstantAdapter())
                 .build()
 
             val retrofit = Retrofit.Builder()

app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricModel.kt

@@ -12,6 +12,7 @@ import kotlinx.android.parcel.Parcelize
 import net.vonforst.evmap.R
 import net.vonforst.evmap.adapter.Equatable
 import java.time.DayOfWeek
+import java.time.Instant
 import java.time.LocalDate
 import java.time.LocalTime
 import java.util.*
@@ -42,7 +43,7 @@ data class ChargeLocation(
     val chargepoints: List<Chargepoint>,
     @JsonObjectOrFalse val network: String?,
     val url: String,
-    // @Json(name = "fault_report") val faultReport: Boolean, <- Object or false in detail, true or false in overview
+    @Embedded(prefix="fault_report_") @JsonObjectOrFalse @Json(name = "fault_report") val faultReport: FaultReport?,
     val verified: Boolean,
     // only shown in details:
     @JsonObjectOrFalse val operator: String?,
@@ -107,6 +108,10 @@ data class OpeningHours(
     @JsonObjectOrFalse val description: String?,
     @Embedded val days: OpeningHoursDays?
 ) {
+    val isEmpty: Boolean
+        get() = description == "Leider noch keine Informationen zu Öffnungszeiten vorhanden."
+                && days == null && !twentyfourSeven
+
     fun getStatusText(ctx: Context): CharSequence {
         if (twentyfourSeven) {
             return HtmlCompat.fromHtml(ctx.getString(R.string.open_247), 0)
@@ -134,8 +139,6 @@ data class OpeningHours(
                     ), 0
                 )
             }
-        } else if (description != null) {
-            return description
         } else {
             return ""
         }
@@ -242,4 +245,7 @@ data class Chargepoint(val type: String, val power: Double, val count: Int) : Eq
         const val CEE_BLAU = "CEE Blau"
         const val CEE_ROT = "CEE Rot"
     }
-}
+}
+
+@JsonClass(generateAdapter = true)
+data class FaultReport(val created: Instant?, val description: String?)

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

@@ -203,6 +203,11 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 (activity as? MapsActivity)?.openUrl("https:${charger.url}")
             }
         }
+        binding.detailView.btnChargeprice.setOnClickListener {
+            val charger = vm.charger.value?.data ?: return@setOnClickListener
+            (activity as? MapsActivity)?.openUrl(
+                "https://www.chargeprice.app/?poi_id=${charger.id}&poi_source=going_electric")
+        }
         binding.detailView.topPart.setOnClickListener {
             bottomSheetBehavior.state = BottomSheetBehaviorGoogleMapsLike.STATE_ANCHOR_POINT
         }
@@ -241,6 +246,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
     }
 
     private fun openLayersMenu() {
+        binding.fabLayers.tag = false
         val materialTransform = MaterialContainerTransform().apply {
             startView = binding.fabLayers
             endView = binding.layersSheet
@@ -253,6 +259,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
     }
 
     private fun closeLayersMenu() {
+        binding.fabLayers.tag = true
         val materialTransform = MaterialContainerTransform().apply {
             startView = binding.layersSheet
             endView = binding.fabLayers
@@ -284,6 +291,10 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
             override fun onStateChanged(bottomSheet: View, newState: Int) {
                 vm.bottomSheetState.value = newState
                 updateBackPressedCallback()
+
+                if (vm.layersMenuOpen.value!! && newState !in listOf(BottomSheetBehaviorGoogleMapsLike.STATE_SETTLING, BottomSheetBehaviorGoogleMapsLike.STATE_HIDDEN, BottomSheetBehaviorGoogleMapsLike.STATE_COLLAPSED)) {
+                    closeLayersMenu()
+                }
             }
         })
         vm.chargerSparse.observe(viewLifecycleOwner, Observer {
@@ -434,12 +445,15 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         binding.detailView.details.apply {
             adapter = DetailAdapter().apply {
                 onClickListener = {
-                    when (it.icon) {
-                        R.drawable.ic_location -> {
-                            val charger = vm.chargerSparse.value
-                            if (charger != null) {
+                    val charger = vm.chargerSparse.value
+                    if (charger != null) {
+                        when (it.icon) {
+                            R.drawable.ic_location -> {
                                 (activity as? MapsActivity)?.showLocation(charger)
                             }
+                            R.drawable.ic_fault_report -> {
+                                (activity as? MapsActivity)?.openUrl("https:${charger.url}")
+                            }
                         }
                     }
                 }

app/src/main/java/net/vonforst/evmap/storage/Database.kt

@@ -19,7 +19,7 @@ import net.vonforst.evmap.viewmodel.SliderFilterValue
         MultipleChoiceFilterValue::class,
         SliderFilterValue::class,
         Plug::class
-    ], version = 5
+    ], version = 6
 )
 @TypeConverters(Converters::class)
 abstract class AppDatabase : RoomDatabase() {
@@ -31,7 +31,7 @@ abstract class AppDatabase : RoomDatabase() {
         private lateinit var context: Context
         private val database: AppDatabase by lazy(LazyThreadSafetyMode.SYNCHRONIZED) {
             Room.databaseBuilder(context, AppDatabase::class.java, "evmap.db")
-                .addMigrations(MIGRATION_2, MIGRATION_3, MIGRATION_4, MIGRATION_5)
+                .addMigrations(MIGRATION_2, MIGRATION_3, MIGRATION_4, MIGRATION_5, MIGRATION_6)
                 .build()
         }
 
@@ -86,5 +86,18 @@ abstract class AppDatabase : RoomDatabase() {
                 }
             }
         }
+
+        private val MIGRATION_6 = object : Migration(5, 6) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.beginTransaction()
+                try {
+                    db.execSQL("ALTER TABLE `ChargeLocation` ADD `fault_report_created` INTEGER")
+                    db.execSQL("ALTER TABLE `ChargeLocation` ADD `fault_report_description` TEXT")
+                    db.setTransactionSuccessful()
+                } finally {
+                    db.endTransaction()
+                }
+            }
+        }
     }
 }

app/src/main/java/net/vonforst/evmap/storage/TypeConverters.kt

@@ -5,6 +5,7 @@ import com.squareup.moshi.Moshi
 import com.squareup.moshi.Types
 import net.vonforst.evmap.api.goingelectric.Chargepoint
 import net.vonforst.evmap.api.goingelectric.ChargerPhoto
+import java.time.Instant
 import java.time.LocalTime
 
 class Converters {
@@ -49,11 +50,23 @@ class Converters {
 
     @TypeConverter
     fun toLocalTime(value: String?): LocalTime? {
-        return value.let {
+        return value?.let {
             LocalTime.parse(it)
         }
     }
 
+    @TypeConverter
+    fun fromInstant(value: Instant?): Long? {
+        return value?.toEpochMilli()
+    }
+
+    @TypeConverter
+    fun toInstant(value: Long?): Instant? {
+        return value?.let {
+            Instant.ofEpochMilli(it)
+        }
+    }
+
     @TypeConverter
     fun fromStringSet(value: Set<String>?): String {
         return stringSetAdapter.toJson(value)

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

@@ -2,11 +2,15 @@ package net.vonforst.evmap.ui
 
 import android.content.Context
 import android.content.res.ColorStateList
+import android.os.Build
+import android.text.Html
+import android.text.Spanned
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.use
+import androidx.core.text.HtmlCompat
 import androidx.databinding.BindingAdapter
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
@@ -109,6 +113,15 @@ fun applySelectableItemBackground(view: View, apply: Boolean) {
     }
 }
 
+@BindingAdapter("htmlText")
+fun setHtmlTextValue(textView: TextView, htmlText: String?) {
+    if (htmlText == null) {
+        textView.text = null
+    } else {
+        textView.text = HtmlCompat.fromHtml(htmlText, HtmlCompat.FROM_HTML_MODE_LEGACY)
+    }
+}
+
 private fun availabilityColor(
     status: List<ChargepointStatus>?,
     context: Context

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

@@ -0,0 +1,112 @@
+package net.vonforst.evmap.ui
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.view.ViewCompat
+import androidx.core.widget.NestedScrollView
+import com.google.android.material.floatingactionbutton.FloatingActionButton
+import com.mahc.custombottomsheetbehavior.BottomSheetBehaviorGoogleMapsLike
+
+
+class HideOnExpandFabBehavior(context: Context, attrs: AttributeSet) :
+    FloatingActionButton.Behavior(context, attrs) {
+
+    override fun onStartNestedScroll(
+        coordinatorLayout: CoordinatorLayout,
+        child: FloatingActionButton,
+        directTargetChild: View,
+        target: View,
+        axes: Int,
+        type: Int
+    ): Boolean {
+        return axes == ViewCompat.SCROLL_AXIS_VERTICAL || super.onStartNestedScroll(
+            coordinatorLayout,
+            child,
+            directTargetChild,
+            target,
+            axes,
+            type
+        )
+    }
+
+    override fun layoutDependsOn(
+        parent: CoordinatorLayout,
+        child: FloatingActionButton,
+        dependency: View
+    ): Boolean {
+        if (dependency is NestedScrollView) {
+            try {
+                val behavior = BottomSheetBehaviorGoogleMapsLike.from<View>(dependency)
+                behavior.addBottomSheetCallback(object :
+                    BottomSheetBehaviorGoogleMapsLike.BottomSheetCallback() {
+                    override fun onSlide(bottomSheet: View, slideOffset: Float) {
+
+                    }
+
+                    override fun onStateChanged(bottomSheet: View, newState: Int) {
+                        onDependentViewChanged(parent, child, dependency)
+                    }
+                })
+                return true
+            } catch (e: IllegalArgumentException) {
+            }
+        }
+        return false
+    }
+
+    override fun onDependentViewChanged(
+        parent: CoordinatorLayout,
+        child: FloatingActionButton,
+        dependency: View
+    ): Boolean {
+        val behavior = BottomSheetBehaviorGoogleMapsLike.from<View>(dependency)
+        when (behavior.state) {
+            BottomSheetBehaviorGoogleMapsLike.STATE_SETTLING -> {
+
+            }
+            BottomSheetBehaviorGoogleMapsLike.STATE_HIDDEN -> {
+                if (child.tag as? Boolean != false) child.show()
+            }
+            BottomSheetBehaviorGoogleMapsLike.STATE_COLLAPSED -> {
+                if (child.tag as? Boolean != false) child.show()
+            }
+            else -> {
+                child.hide()
+            }
+        }
+        return false
+    }
+
+    override fun onNestedScroll(
+        coordinatorLayout: CoordinatorLayout,
+        child: FloatingActionButton,
+        target: View,
+        dxConsumed: Int,
+        dyConsumed: Int,
+        dxUnconsumed: Int,
+        dyUnconsumed: Int,
+        type: Int,
+        consumed: IntArray
+    ) {
+        super.onNestedScroll(
+            coordinatorLayout,
+            child,
+            target,
+            dxConsumed,
+            dyConsumed,
+            dxUnconsumed,
+            dyUnconsumed,
+            type,
+            consumed
+        )
+        if (dyConsumed > 0 && child.getVisibility() == View.VISIBLE) {
+            // User scrolled down and the FAB is currently visible -> hide the FAB
+            child.hide();
+        } else if (dyConsumed < 0 && child.getVisibility() != View.VISIBLE) {
+            // User scrolled up and the FAB is currently not visible -> show the FAB
+            child.show();
+        }
+    }
+}

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

@@ -0,0 +1,4 @@
+<vector android:height="15.811624dp" android:viewportHeight="131.5"
+    android:viewportWidth="199.6" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M197.544,65.685l-9.2,-4.8l8,-4.2c2.7,-1.4 2.7,-3.8 0,-5.2l-8.6,-4.5l8.6,-4.5c2.7,-1.4 2.7,-3.8 0,-5.2l-68.9,-36.1c-2.7,-1.4 -7.2,-1.4 -9.9,0l-115.5,59.7c-2.7,1.4 -2.7,3.7 0,5.1l8.8,4.5l-8.8,4.6c-2.7,1.4 -2.7,3.7 0,5.1l9.4,4.8l-8.2,4.3c-2.7,1.4 -2.7,3.7 0,5.1l70.4,36.2c2.7,1.4 7.2,1.4 9.9,0l114,-59.6C200.344,69.385 200.344,67.085 197.544,65.685L197.544,65.685zM123.144,18.785L105.844,38.685c-0.9,1 -0.6,2.3 0.6,2.9l13.7,7.1c1.2,0.6 1.2,1.6 0,2.2l-43.1,22.3c-1.2,0.6 -1.4,0.3 -0.6,-0.7l17.3,-19.9c0.9,-1 0.6,-2.3 -0.6,-2.9l-13.7,-7.1c-1.2,-0.6 -1.2,-1.6 0,-2.2l43.1,-22.3C123.744,17.485 123.944,17.785 123.144,18.785L123.144,18.785z"/>
+</vector>

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

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/>
+</vector>

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

@@ -184,7 +184,7 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="1.0"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/textView13"
+                app:layout_constraintTop_toBottomOf="@+id/btnChargeprice"
                 tools:itemCount="3"
                 tools:listitem="@layout/item_detail" />
 
@@ -230,6 +230,18 @@
                 app:layout_constraintStart_toStartOf="@+id/guideline"
                 app:layout_constraintTop_toTopOf="@+id/textView" />
 
+            <Button
+                android:id="@+id/btnChargeprice"
+                style="@style/Widget.MaterialComponents.Button.OutlinedButton.Icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:text="@string/go_to_chargeprice"
+                app:icon="@drawable/ic_chargeprice"
+                app:layout_constraintEnd_toStartOf="@+id/guideline2"
+                app:layout_constraintStart_toStartOf="@+id/guideline"
+                app:layout_constraintTop_toBottomOf="@+id/textView13" />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.cardview.widget.CardView>

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

@@ -158,10 +158,13 @@
             android:layout_gravity="top|end"
             android:layout_marginEnd="12dp"
             android:layout_marginTop="96dp"
+            android:tint="?colorControlNormal"
+            android:elevation="-1dp"
             app:backgroundTint="?android:colorBackground"
             app:borderWidth="0dp"
             app:fabSize="mini"
-            app:srcCompat="@drawable/ic_layers" />
+            app:srcCompat="@drawable/ic_layers"
+            app:layout_behavior="net.vonforst.evmap.ui.HideOnExpandFabBehavior"/>
 
         <androidx.cardview.widget.CardView
             android:id="@+id/layers_sheet"
@@ -170,6 +173,7 @@
             android:layout_gravity="top|end"
             android:layout_marginEnd="8dp"
             android:layout_marginTop="96dp"
+            android:elevation="-1dp"
             android:visibility="gone"
             tools:visibility="visible">
 

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

@@ -34,10 +34,12 @@
             android:id="@+id/textView2"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
             android:ellipsize="end"
             android:maxLines="1"
             android:text="@{item.charger.address.toString()}"
             android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
+            app:layout_constraintEnd_toStartOf="@+id/textView7"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/textView15"
             tools:text="Beispielstraße 10, 12345 Berlin" />
@@ -46,10 +48,12 @@
             android:id="@+id/textView3"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
             android:ellipsize="end"
             android:maxLines="1"
             android:text="@{item.charger.formatChargepoints()}"
             android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
+            app:layout_constraintEnd_toStartOf="@+id/textView7"
             app:layout_constraintStart_toStartOf="@+id/textView2"
             app:layout_constraintTop_toBottomOf="@+id/textView2"
             tools:text="2x Typ 2 22 kW" />

app/src/main/res/values-de/strings.xml

@@ -76,4 +76,7 @@
     <string name="faq">FAQ</string>
     <string name="menu_filters_active">Filter aktiv</string>
     <string name="menu_edit_filters">Filter bearbeiten…</string>
+    <string name="go_to_chargeprice"><![CDATA[Preisvergleich<br/><small>mit Chargeprice.app</small>]]></string>
+    <string name="fault_report">Störungsmeldung</string>
+    <string name="fault_report_date">Störungsmeldung (Letztes Update: %s)</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -75,4 +75,7 @@
     <string name="faq">FAQ</string>
     <string name="menu_filters_active">Filters active</string>
     <string name="menu_edit_filters">Edit filters…</string>
+    <string name="go_to_chargeprice">Compare prices</string>
+    <string name="fault_report">Fault report</string>
+    <string name="fault_report_date">Fault report (last update: %s)</string>
 </resources>