set different layout

streetcomplete · Aug 15, 2018 · 23973aa · 23973aa
1 parent 449dc00
commit 23973aa
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 6 deletions.
diff --git a/...main/java/de/westnordost/streetcomplete/quests/segregated/AddCyclewaySegregationForm.java b/...main/java/de/westnordost/streetcomplete/quests/segregated/AddCyclewaySegregationForm.java
@@ -1,5 +1,9 @@
 package de.westnordost.streetcomplete.quests.segregated;
 
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.View;
+
 import de.westnordost.streetcomplete.R;
 import de.westnordost.streetcomplete.quests.ImageListQuestAnswerFragment;
 import de.westnordost.streetcomplete.view.Item;
@@ -13,5 +17,11 @@ public class AddCyclewaySegregationForm extends ImageListQuestAnswerFragment {
 		};
 	}
 
+	@Override public void onViewCreated(View view, @Nullable Bundle savedInstanceState)
+	{
+		super.onViewCreated(view, savedInstanceState);
+		imageSelector.setCellLayout(R.layout.cell_labeled_icon_select_right);
+	}
+
 	@Override protected int getItemsPerRow() { return 2; }
 }
diff --git a/app/src/main/res/drawable/ic_path_segregated.xml b/app/src/main/res/drawable/ic_path_segregated.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
+    android:width="64dp"
+    android:height="64dp"
     android:viewportWidth="128"
     android:viewportHeight="128">
   <path

diff --git a/app/src/main/res/drawable/ic_path_segregated_l.xml b/app/src/main/res/drawable/ic_path_segregated_l.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
+    android:width="64dp"
+    android:height="64dp"
     android:viewportWidth="128"
     android:viewportHeight="128">
   <path

diff --git a/app/src/main/res/drawable/ic_path_segregated_no.xml b/app/src/main/res/drawable/ic_path_segregated_no.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
+    android:width="64dp"
+    android:height="64dp"
     android:viewportWidth="128"
     android:viewportHeight="128">
   <path

diff --git a/app/src/main/res/layout/cell_labeled_icon_select_right.xml b/app/src/main/res/layout/cell_labeled_icon_select_right.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    tools:layout_width="180dp"
+    android:padding="6dp"
+    android:background="@drawable/image_select_cell">
+
+    <ImageView
+        android:id="@+id/imageView"
+        android:layout_alignParentStart="true"
+        android:layout_centerVertical="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="6dp"
+        android:scaleType="fitCenter"
+        tools:src="@drawable/ic_path_segregated_no"
+        />
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toEndOf="@id/imageView"
+        android:layout_centerVertical="true"
+        style="@style/ImageSelectDescription"
+        tools:text="@string/quest_segregated_mixed" />
+
+</RelativeLayout>