fix #1057

streetcomplete · Jun 8, 2018 · 6ea73ab · 6ea73ab
1 parent 35880e3
commit 6ea73ab
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 118 deletions.
diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/bikeway/AddCyclewayForm.java b/app/src/main/java/de/westnordost/streetcomplete/quests/bikeway/AddCyclewayForm.java
@@ -25,7 +25,6 @@
 import de.westnordost.streetcomplete.data.osm.tql.TagFilterExpression;
 import de.westnordost.streetcomplete.quests.AbstractQuestFormAnswerFragment;
 import de.westnordost.streetcomplete.util.SphericalEarthMath;
-import de.westnordost.streetcomplete.view.CompassView;
 import de.westnordost.streetcomplete.view.ListAdapter;
 import de.westnordost.streetcomplete.view.StreetSideSelectPuzzle;
 import de.westnordost.streetcomplete.view.dialogs.AlertDialogBuilder;
@@ -48,7 +47,7 @@ public class AddCyclewayForm extends AbstractQuestFormAnswerFragment
 
 
 	private StreetSideSelectPuzzle puzzle;
-	private CompassView compassView;
+	private ImageView compassView;
 	private float wayOrientationAtCenter;
 
 	private boolean isDefiningBothSides;
@@ -149,7 +148,8 @@ private void initPuzzleImages(Bundle inState)
 			}
 			if(compassView != null)
 			{
-				compassView.setOrientation(rotation, tilt);
+				compassView.setRotation((float) (180*rotation/Math.PI));
+				compassView.setRotationX((float) (180*tilt/Math.PI));
 			}
 		});
 	}

diff --git a/app/src/main/java/de/westnordost/streetcomplete/tangram/MapControlsFragment.java b/app/src/main/java/de/westnordost/streetcomplete/tangram/MapControlsFragment.java
@@ -17,6 +17,7 @@
 import android.view.ViewGroup;
 import android.view.animation.AnimationUtils;
 import android.widget.ImageButton;
+import android.widget.ImageView;
 
 import com.github.florent37.viewtooltip.ViewTooltip;
 import com.mapzen.android.lost.api.LocationRequest;
@@ -30,13 +31,12 @@
 import de.westnordost.streetcomplete.location.LocationStateButton;
 import de.westnordost.streetcomplete.location.LocationUtil;
 import de.westnordost.streetcomplete.location.SingleLocationRequest;
-import de.westnordost.streetcomplete.view.CompassView;
 
 public class MapControlsFragment extends Fragment
 {
 	private SingleLocationRequest singleLocationRequest;
 	private MapFragment mapFragment;
-	private CompassView compassNeedle;
+	private ImageView compassNeedle;
 	private LocationStateButton trackingButton;
 
 	@Inject SharedPreferences prefs;
@@ -175,7 +175,10 @@ public interface Listener
 
 	@AnyThread public void onMapOrientation(float rotation, float tilt)
 	{
-		compassNeedle.setOrientation(rotation, tilt);
+		getActivity().runOnUiThread(() -> {
+			compassNeedle.setRotation((float) (180*rotation/Math.PI));
+			compassNeedle.setRotationX((float) (180*tilt/Math.PI));
+		});
 	}
 
 	public void onMapInitialized()

diff --git a/app/src/main/java/de/westnordost/streetcomplete/view/CompassView.java b/app/src/main/java/de/westnordost/streetcomplete/view/CompassView.java
diff --git a/app/src/main/res/drawable/ic_compass_needle_black_24dp.xml b/app/src/main/res/drawable/ic_compass_needle_black_24dp.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="24dp" android:width="24dp"
+        android:viewportWidth="2" android:viewportHeight="2">
+    <path android:fillColor="#000" android:pathData="M1,0L0.3,2L1,1.7L1.7,2z" />
+</vector>
diff --git a/app/src/main/res/layout/fragment_map_controls.xml b/app/src/main/res/layout/fragment_map_controls.xml
@@ -25,12 +25,13 @@
             android:layout_alignParentTop="true"
             android:text="@string/compass_north_one_letter"/>
 
-        <de.westnordost.streetcomplete.view.CompassView
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_marginTop="-2dp"
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_centerHorizontal="true"
             android:id="@+id/compassNeedle"
+            android:src="@drawable/ic_compass_needle_black_24dp"
+            android:tint="#cc3333"
             android:layout_below="@+id/compassNorth"
             />
 
@@ -91,4 +92,4 @@
 
 
 
-</RelativeLayout>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/quest_cycleway.xml b/app/src/main/res/layout/quest_cycleway.xml
@@ -29,14 +29,15 @@
             android:text="@string/compass_north_one_letter"
             android:textSize="10dp"/>
 
-        <de.westnordost.streetcomplete.view.CompassView
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:layout_marginTop="-2dp"
+        <ImageView
+            android:layout_width="16dp"
+            android:layout_height="16dp"
             android:layout_centerHorizontal="true"
+            android:src="@drawable/ic_compass_needle_black_24dp"
+            android:tint="#cc3333"
             android:id="@+id/compassNeedle"
             android:layout_below="@+id/compassNorth"
             />
     </RelativeLayout>
 
-</RelativeLayout>
+</RelativeLayout>