Display surface as floating circular image

streetcomplete · Feb 12, 2022 · b42f1bb · b42f1bb · westnordost · Feb 12, 2022
1 parent 664aa20
commit b42f1bb
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 6 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -183,6 +183,9 @@ dependencies {
 
     // opening hours parser
     implementation("ch.poole:OpeningHoursParser:0.26.0")
+
+    // circular image view
+    implementation("de.hdodenhof:circleimageview:3.1.0")
 }
 
 /** Localizations that should be pulled from POEditor etc. */

diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddSidewalkSurfaceForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddSidewalkSurfaceForm.kt
@@ -140,16 +140,15 @@ class AddSidewalkSurfaceForm : AbstractQuestFormAnswerFragment<SidewalkSurfaceAn
     }
 
     private fun onSelectedSide(surface: SurfaceAnswer, isRight: Boolean) {
-        val icon = ResImage(surface.value.asItem().drawableId!!)
-        val title = ResText(surface.value.asItem().titleId!!)
+        val image = ResImage(surface.value.asItem().drawableId!!)
 
         if (isRight) {
-            binding.puzzleView.replaceRightSideImage(icon)
-            binding.puzzleView.setRightSideText(title)
+            binding.puzzleView.replaceRightSideFloatingCircularImage(image)
+            binding.puzzleView.replaceRightSideImage(ResImage(R.drawable.ic_sidewalk_illustration_yes))
             rightSide = surface
         } else {
-            binding.puzzleView.replaceLeftSideImage(icon)
-            binding.puzzleView.setLeftSideText(title)
+            binding.puzzleView.replaceLeftSideFloatingCircularImage(image)
+            binding.puzzleView.replaceLeftSideImage(ResImage(R.drawable.ic_sidewalk_illustration_yes))
             leftSide = surface
         }
         updateLastAnswerButtonVisibility()

diff --git a/app/src/main/java/de/westnordost/streetcomplete/view/StreetSideSelectPuzzle.kt b/app/src/main/java/de/westnordost/streetcomplete/view/StreetSideSelectPuzzle.kt
@@ -132,6 +132,26 @@ class StreetSideSelectPuzzle @JvmOverloads constructor(
         binding.rightSideFloatingIcon.isGone = image == null
     }
 
+    fun replaceLeftSideFloatingCircularImage(image: Image?) {
+        setLeftSideFloatingCircularImage(image)
+        binding.leftSideFloatingCircularImage.animateFallDown()
+    }
+
+    fun replaceRightSideFloatingCircularImage(image: Image?) {
+        setRightSideFloatingCircularImage(image)
+        binding.rightSideFloatingCircularImage.animateFallDown()
+    }
+
+    fun setLeftSideFloatingCircularImage(image: Image?) {
+        binding.leftSideFloatingCircularImage.setImage(image)
+        binding.leftSideFloatingCircularImage.isGone = image == null
+    }
+
+    fun setRightSideFloatingCircularImage(image: Image?) {
+        binding.rightSideFloatingCircularImage.setImage(image)
+        binding.rightSideFloatingCircularImage.isGone = image == null
+    }
+
     fun replaceLeftSideFloatingIcon(image: Image?) {
         setLeftSideFloatingIcon(image)
         binding.leftSideFloatingIcon.animateFallDown()

diff --git a/app/src/main/res/layout/view_side_select_puzzle.xml b/app/src/main/res/layout/view_side_select_puzzle.xml
@@ -65,6 +65,20 @@
                 tools:src="@drawable/ic_no_parking"
                 tools:visibility="visible" />
 
+            <de.hdodenhof.circleimageview.CircleImageView
+                android:id="@+id/leftSideFloatingCircularImage"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_centerInParent="true"
+                android:clickable="false"
+                android:focusable="false"
+                android:padding="8dp"
+                android:visibility="gone"
+                android:src="@drawable/surface_asphalt"
+                app:civ_border_width="2dp"
+                app:civ_border_color="#FFCCCCCC"
+                tools:visibility="visible" />
+
         </RelativeLayout>
 
         <RelativeLayout
@@ -112,6 +126,20 @@
                 tools:src="@drawable/ic_no_parking"
                 />
 
+            <de.hdodenhof.circleimageview.CircleImageView
+                android:id="@+id/rightSideFloatingCircularImage"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_centerInParent="true"
+                android:clickable="false"
+                android:focusable="false"
+                android:padding="8dp"
+                android:visibility="gone"
+                android:src="@drawable/surface_asphalt"
+                app:civ_border_width="2dp"
+                app:civ_border_color="#FFCCCCCC"
+                tools:visibility="visible" />
+
         </RelativeLayout>
 
     </RelativeLayout>