From e460b52b1b0285283f5952205fc7207a713854ba Mon Sep 17 00:00:00 2001
From: Johan von Forstner <johan.forstner@gmail.com>
Date: Sat, 28 Mar 2020 19:42:40 +0100
Subject: [PATCH] Add additional items in detail view

---
 .../main/java/com/johan/evmap/MapsActivity.kt |  7 ++
 .../evmap/adapter/DataBindingAdapters.kt      | 27 ++++--
 .../com/johan/evmap/api/GoingElectricModel.kt | 25 +++++-
 app/src/main/res/drawable/ic_cost.xml         |  9 ++
 app/src/main/res/layout/detail_view.xml       | 88 ++++++++++++++++---
 app/src/main/res/layout/item_detail.xml       | 27 +++++-
 app/src/main/res/values-de/strings.xml        |  7 ++
 app/src/main/res/values/strings.xml           |  7 ++
 8 files changed, 173 insertions(+), 24 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_cost.xml

diff --git a/app/src/main/java/com/johan/evmap/MapsActivity.kt b/app/src/main/java/com/johan/evmap/MapsActivity.kt
index 4aa9f4f6..eb8718a0 100644
--- a/app/src/main/java/com/johan/evmap/MapsActivity.kt
+++ b/app/src/main/java/com/johan/evmap/MapsActivity.kt
@@ -115,6 +115,13 @@ class MapsActivity : AppCompatActivity(), OnMapReadyCallback {
                 }
             }
         }
+        binding.detailView.goingelectricButton.setOnClickListener {
+            val charger = binding.charger
+            if (charger != null) {
+                val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https:${charger.url}"))
+                startActivity(intent)
+            }
+        }
     }
 
     private fun setupAdapters() {
diff --git a/app/src/main/java/com/johan/evmap/adapter/DataBindingAdapters.kt b/app/src/main/java/com/johan/evmap/adapter/DataBindingAdapters.kt
index 4bf6287f..0a71e870 100644
--- a/app/src/main/java/com/johan/evmap/adapter/DataBindingAdapters.kt
+++ b/app/src/main/java/com/johan/evmap/adapter/DataBindingAdapters.kt
@@ -51,8 +51,12 @@ class ConnectorAdapter : DataBindingAdapter<Chargepoint>() {
 }
 
 class DetailAdapter : DataBindingAdapter<DetailAdapter.Detail>() {
-    data class Detail(val icon: Int, val contentDescription: Int, val text: CharSequence) :
-        Equatable
+    data class Detail(
+        val icon: Int,
+        val contentDescription: Int,
+        val text: CharSequence,
+        val detailText: CharSequence? = null
+    ) : Equatable
 
     override fun getItemViewType(position: Int): Int = R.layout.item_detail
 }
@@ -61,7 +65,12 @@ fun buildDetails(loc: ChargeLocation?, ctx: Context): List<DetailAdapter.Detail>
     if (loc == null) return emptyList()
 
     return listOfNotNull(
-        DetailAdapter.Detail(R.drawable.ic_address, R.string.address, loc.address.toString()),
+        DetailAdapter.Detail(
+            R.drawable.ic_address,
+            R.string.address,
+            loc.address.toString(),
+            loc.locationDescription
+        ),
         if (loc.operator != null) DetailAdapter.Detail(
             R.drawable.ic_operator,
             R.string.operator,
@@ -76,7 +85,15 @@ fun buildDetails(loc: ChargeLocation?, ctx: Context): List<DetailAdapter.Detail>
         if (loc.openinghours != null) DetailAdapter.Detail(
             R.drawable.ic_hours,
             R.string.hours,
-            loc.openinghours.getStatusText(ctx)
-        ) else null
+            loc.openinghours.getStatusText(ctx),
+            loc.openinghours.description
+        ) else null,
+        if (loc.cost != null) DetailAdapter.Detail(
+            R.drawable.ic_cost,
+            R.string.cost,
+            loc.cost.getStatusText(ctx),
+            loc.cost.descriptionLong ?: loc.cost.descriptionShort
+        )
+        else null
     )
 }
diff --git a/app/src/main/java/com/johan/evmap/api/GoingElectricModel.kt b/app/src/main/java/com/johan/evmap/api/GoingElectricModel.kt
index 3d7da7d7..5e4deaac 100644
--- a/app/src/main/java/com/johan/evmap/api/GoingElectricModel.kt
+++ b/app/src/main/java/com/johan/evmap/api/GoingElectricModel.kt
@@ -31,10 +31,13 @@ data class ChargeLocation(
     val verified: Boolean,
     // only shown in details:
     @JsonObjectOrFalse val operator: String?,
-    @Json(name = "general_information") @JsonObjectOrFalse val generalInformation: String?,
+    @JsonObjectOrFalse @Json(name = "general_information") val generalInformation: String?,
+    @JsonObjectOrFalse @Json(name = "ladeweile") val amenities: String?,
+    @JsonObjectOrFalse @Json(name = "location_description") val locationDescription: String?,
     val photos: List<ChargerPhoto>?,
     //val chargecards: Boolean?
-    val openinghours: OpeningHours?
+    val openinghours: OpeningHours?,
+    val cost: Cost?
 ) : ChargepointListItem() {
     val maxPower: Double
         get() {
@@ -48,6 +51,24 @@ data class ChargeLocation(
     }
 }
 
+@JsonClass(generateAdapter = true)
+data class Cost(
+    val freecharging: Boolean,
+    val freeparking: Boolean,
+    @JsonObjectOrFalse @Json(name = "description_short") val descriptionShort: String?,
+    @JsonObjectOrFalse @Json(name = "description_long") val descriptionLong: String?
+) {
+    fun getStatusText(ctx: Context): CharSequence {
+        return HtmlCompat.fromHtml(
+            ctx.getString(
+                R.string.cost_detail,
+                if (freecharging) ctx.getString(R.string.free) else ctx.getString(R.string.paid),
+                if (freeparking) ctx.getString(R.string.free) else ctx.getString(R.string.paid)
+            ), 0
+        )
+    }
+}
+
 @JsonClass(generateAdapter = true)
 data class OpeningHours(
     @Json(name = "24/7") val twentyfourSeven: Boolean,
diff --git a/app/src/main/res/drawable/ic_cost.xml b/app/src/main/res/drawable/ic_cost.xml
new file mode 100644
index 00000000..d44ed917
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cost.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15,4c-4.42,0 -8,3.58 -8,8s3.58,8 8,8 8,-3.58 8,-8 -3.58,-8 -8,-8zM15,18c-3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6 6,2.69 6,6 -2.69,6 -6,6zM3,12c0,-2.61 1.67,-4.83 4,-5.65L7,4.26C3.55,5.15 1,8.27 1,12s2.55,6.85 6,7.74v-2.09c-2.33,-0.82 -4,-3.04 -4,-5.65z" />
+</vector>
diff --git a/app/src/main/res/layout/detail_view.xml b/app/src/main/res/layout/detail_view.xml
index 3d2ed715..74460e99 100644
--- a/app/src/main/res/layout/detail_view.xml
+++ b/app/src/main/res/layout/detail_view.xml
@@ -24,7 +24,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?android:colorBackground"
-            android:minHeight="600dp"
             android:paddingTop="8dp"
             android:paddingBottom="8dp">
 
@@ -67,18 +66,6 @@
                 app:layout_constraintTop_toBottomOf="@+id/textView2"
                 tools:text="2x Typ 2 22 kW" />
 
-            <TextView
-                android:id="@+id/textView4"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:text="@{charger.generalInformation}"
-                app:layout_constraintEnd_toStartOf="@+id/guideline2"
-                app:layout_constraintHorizontal_bias="0.0"
-                app:layout_constraintStart_toStartOf="@+id/guideline"
-                app:layout_constraintTop_toBottomOf="@+id/details"
-                tools:text="Nur für Gäste." />
-
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/connectors"
                 android:layout_width="wrap_content"
@@ -104,6 +91,61 @@
                 app:layout_constraintStart_toStartOf="@+id/guideline"
                 app:layout_constraintTop_toBottomOf="@+id/textView3" />
 
+            <TextView
+                android:id="@+id/textView12"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:text="@string/amenities"
+                android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle2"
+                android:textColor="?colorPrimary"
+                app:goneUnless="@{charger.amenities != null}"
+                app:layout_constraintEnd_toStartOf="@+id/guideline2"
+                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintStart_toStartOf="@+id/guideline"
+                app:layout_constraintTop_toBottomOf="@+id/details" />
+
+            <TextView
+                android:id="@+id/textView11"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:text="@{charger.amenities}"
+                android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
+                app:goneUnless="@{charger.amenities != null}"
+                app:layout_constraintEnd_toStartOf="@+id/guideline2"
+                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintStart_toStartOf="@+id/guideline"
+                app:layout_constraintTop_toBottomOf="@+id/textView12"
+                tools:text="Toilet" />
+
+            <TextView
+                android:id="@+id/textView10"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:text="@string/general_info"
+                android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle2"
+                android:textColor="?colorPrimary"
+                app:goneUnless="@{charger.generalInformation != null}"
+                app:layout_constraintEnd_toStartOf="@+id/guideline2"
+                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintStart_toStartOf="@+id/guideline"
+                app:layout_constraintTop_toBottomOf="@+id/textView11" />
+
+            <TextView
+                android:id="@+id/textView4"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:text="@{charger.generalInformation}"
+                android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
+                app:goneUnless="@{charger.generalInformation != null}"
+                app:layout_constraintEnd_toStartOf="@+id/guideline2"
+                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintStart_toStartOf="@+id/guideline3"
+                app:layout_constraintTop_toBottomOf="@+id/textView10"
+                tools:text="Only for guests" />
 
             <androidx.constraintlayout.widget.Guideline
                 android:id="@+id/guideline"
@@ -133,6 +175,26 @@
                 tools:itemCount="3"
                 tools:listitem="@layout/item_detail" />
 
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guideline3"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_constraintGuide_begin="16dp" />
+
+            <Button
+                android:id="@+id/goingelectricButton"
+                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="16dp"
+                android:text="@string/go_to_goingelectric"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/guideline2"
+                app:layout_constraintStart_toStartOf="@+id/guideline"
+                app:layout_constraintTop_toBottomOf="@+id/textView4" />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/item_detail.xml b/app/src/main/res/layout/item_detail.xml
index f75b114e..141fe044 100644
--- a/app/src/main/res/layout/item_detail.xml
+++ b/app/src/main/res/layout/item_detail.xml
@@ -17,15 +17,19 @@
         <TextView
             android:id="@+id/textView9"
             android:layout_width="0dp"
-            android:layout_height="19dp"
+            android:layout_height="wrap_content"
             android:layout_marginStart="24dp"
+            android:layout_marginTop="18dp"
             android:layout_marginEnd="16dp"
+            android:layout_marginBottom="14dp"
             android:maxLines="1"
             android:text="@{item.text}"
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/imageView3"
             app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.0"
             tools:text="Lorem ipsum" />
 
         <ImageView
@@ -33,15 +37,30 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp"
+            android:layout_marginTop="16dp"
             android:contentDescription="@{item.contentDescription}"
             android:tint="?colorPrimary"
-            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@{item.icon}"
             tools:srcCompat="@drawable/ic_address" />
 
+        <TextView
+            android:id="@+id/textView8"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="14dp"
+            android:text="@{item.detailText}"
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
+            android:autoLink="phone|web"
+            app:goneUnless="@{item.detailText != null}"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/textView9"
+            app:layout_constraintTop_toBottomOf="@+id/textView9"
+            tools:text="Lorem ipsum" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index d4a69715..43ac3143 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -12,4 +12,11 @@
     <string name="closed"><![CDATA[<b>Geschlossen</b>]]></string>
     <string name="open_closesat"><![CDATA[<b>Geöffnet</b> · Schließt um %s]]></string>
     <string name="closed_opensat"><![CDATA[<b>Geschlossen</b> · Öffnet um %s]]></string>
+    <string name="cost">Kosten</string>
+    <string name="cost_detail"><![CDATA[<b>Laden:</b> %s · <b>Parken:</b> %s]]></string>
+    <string name="free">Kostenlos</string>
+    <string name="paid">Kostenpflichtig</string>
+    <string name="amenities">Ladeweile</string>
+    <string name="general_info">Allgemeine Hinweise</string>
+    <string name="go_to_goingelectric">Quelle: goingelectric.de</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a515e617..a93a3964 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -11,4 +11,11 @@
     <string name="closed"><![CDATA[<b>Closed</b>]]></string>
     <string name="open_closesat"><![CDATA[<b>Open</b> · Closes at %s]]></string>
     <string name="closed_opensat"><![CDATA[<b>Closed</b> · Opens at %s]]></string>
+    <string name="cost">Cost</string>
+    <string name="cost_detail"><![CDATA[<b>Charging:</b> %s · <b>Parking:</b> %s]]></string>
+    <string name="free">Free</string>
+    <string name="paid">Paid</string>
+    <string name="amenities">Amenities</string>
+    <string name="general_info">General information</string>
+    <string name="go_to_goingelectric">Source: goingelectric.de</string>
 </resources>