Add option to create a new note everywhere

app/src/main/java/de/westnordost/streetcomplete/ApplicationConstants.java

@@ -22,6 +22,8 @@ public class ApplicationConstants
 
 	public final static int QUEST_TILE_ZOOM = 14;
 
+	public final static int NOTE_MIN_ZOOM = 15;
+
 	/** a "best before" duration for quests. Quests will not be downloaded again for any tile
 	 *  before the time expired */
 	public static final int REFRESH_QUESTS_AFTER = 7*24*60*60*1000; // one week in ms

app/src/main/java/de/westnordost/streetcomplete/MainActivity.java

@@ -58,6 +58,8 @@
 import de.westnordost.streetcomplete.data.VisibleQuestListener;
 import de.westnordost.streetcomplete.data.osm.OsmQuest;
 import de.westnordost.streetcomplete.data.upload.VersionBannedException;
+import de.westnordost.streetcomplete.data.osmnotes.CreateNoteDialog;
+import de.westnordost.streetcomplete.data.osmnotes.CreateNoteFragment;
 import de.westnordost.streetcomplete.location.LocationRequestFragment;
 import de.westnordost.streetcomplete.location.LocationUtil;
 import de.westnordost.streetcomplete.oauth.OAuthPrefs;
@@ -344,11 +346,36 @@ private int getQuestTitleResId(Quest quest, Map<String,String> tags)
 				if(isConnected()) uploadChanges();
 				else              Toast.makeText(this, R.string.offline, Toast.LENGTH_SHORT).show();
 				return true;
+			case R.id.action_note:
+				createNote();
+				return true;
 		}
 
 		return super.onOptionsItemSelected(item);
 	}
 
+	@UiThread private void createNote()
+	{
+		if (mapFragment.getZoom() < ApplicationConstants.NOTE_MIN_ZOOM)
+		{
+			Toast.makeText(this, R.string.create_new_note_unprecise, Toast.LENGTH_LONG).show();
+		}
+		else
+		{
+			CreateNoteFragment f = new CreateNoteFragment();
+			Bundle args = new Bundle();
+			LatLon pos = mapFragment.getPosition();
+			args.putDouble(CreateNoteDialog.ARG_LAT, pos.getLatitude());
+			args.putDouble(CreateNoteDialog.ARG_LON, pos.getLongitude());
+			f.setArguments(args);
+
+			FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
+			ft.add(R.id.map_create_note_container, f, CREATE_NOTE);
+			ft.addToBackStack(CREATE_NOTE);
+			ft.commit();
+		}
+	}
+
 	@UiThread private void uploadChanges()
 	{
 		// because the app should ask for permission even if there is nothing to upload right now
@@ -559,6 +586,7 @@ else if(e instanceof OsmAuthorizationException)
 	/* ------------ Managing bottom sheet (quest details) and interaction with map  ------------- */
 
 	private final static String BOTTOM_SHEET = "bottom_sheet";
+	public final static String CREATE_NOTE = "create_note";
 
 	@Override public void onBackPressed()
 	{
@@ -597,6 +625,11 @@ else if(e instanceof OsmAuthorizationException)
 		questController.createNote(questId, questTitle, note, imagePaths);
 	}
 
+	@Override public void onLeaveNote(String note, ArrayList<String> imagePaths, LatLon position)
+	{
+		questController.createNote(note, imagePaths, position);
+	}
+
 	@Override public void onSkippedQuest(long questId, QuestGroup group)
 	{
 		closeQuestDetailsFor(questId, group);

app/src/main/java/de/westnordost/streetcomplete/data/QuestController.java

@@ -17,6 +17,7 @@
 import javax.inject.Inject;
 import javax.inject.Provider;
 
+import de.westnordost.osmapi.map.data.LatLon;
 import de.westnordost.streetcomplete.ApplicationConstants;
 import de.westnordost.streetcomplete.data.changesets.OpenChangesetsDao;
 import de.westnordost.streetcomplete.data.download.QuestDownloadService;
@@ -182,6 +183,18 @@ public void createNote(final long osmQuestId, final String questTitle, final Str
 		});
 	}
 
+	public void createNote(final String text, final ArrayList<String> imagePaths, LatLon position)
+	{
+		workerHandler.post(() ->
+		{
+			CreateNote createNote = new CreateNote();
+			createNote.position = position;
+			createNote.text = text;
+			createNote.imagePaths = imagePaths;
+			createNoteDB.add(createNote);
+		});
+	}
+
 	/** Apply the user's answer to the given quest. (The quest will turn invisible.) */
 	public void solveQuest(final long questId, final QuestGroup group, final Bundle answer,
 						   final String source)

app/src/main/java/de/westnordost/streetcomplete/data/osmnotes/CreateNoteDao.java

@@ -46,7 +46,10 @@ public boolean add(CreateNote note)
 			values.put(CreateNoteTable.Columns.IMAGE_PATHS, serializer.toBytes(note.imagePaths));
 		}
 		values.put(CreateNoteTable.Columns.TEXT, note.text);
-		values.put(CreateNoteTable.Columns.QUEST_TITLE, note.questTitle);
+		if (note.questTitle != null)
+		{
+			values.put(CreateNoteTable.Columns.QUEST_TITLE, note.questTitle);
+		}
 
 		long rowId = db.insert(CreateNoteTable.NAME, null, values);
 

app/src/main/java/de/westnordost/streetcomplete/data/osmnotes/CreateNoteDialog.java

@@ -0,0 +1,89 @@
+package de.westnordost.streetcomplete.data.osmnotes;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.DialogFragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import de.westnordost.osmapi.map.data.LatLon;
+import de.westnordost.osmapi.map.data.OsmLatLon;
+import de.westnordost.streetcomplete.R;
+import de.westnordost.streetcomplete.quests.QuestAnswerComponent;
+import de.westnordost.streetcomplete.quests.note_discussion.AttachPhotoFragment;
+
+
+public class CreateNoteDialog extends DialogFragment
+{
+
+	private EditText noteInput;
+
+	private QuestAnswerComponent questAnswerComponent;
+
+	public static final String ARG_LAT = "latitude";
+	public static final String ARG_LON = "longitude";
+
+	public CreateNoteDialog()
+	{
+		super();
+		questAnswerComponent = new QuestAnswerComponent();
+	}
+
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container,
+							 Bundle savedInstanceState)
+	{
+		View view = inflater.inflate(R.layout.dialog_create_note, container, false);
+
+		view.findViewById(R.id.buttonCancel).setOnClickListener(v -> onClickCancel());
+		view.findViewById(R.id.buttonOk).setOnClickListener(v -> onClickOk());
+
+		noteInput = view.findViewById(R.id.noteInput);
+
+		return view;
+	}
+
+	@Override public void onViewCreated(View view, @Nullable Bundle savedInstanceState)
+	{
+		super.onViewCreated(view, savedInstanceState);
+		if(savedInstanceState == null)
+		{
+			getChildFragmentManager().beginTransaction().add(R.id.attachPhotoFragment, new AttachPhotoFragment()).commit();
+		}
+	}
+
+	private @Nullable AttachPhotoFragment getAttachPhotoFragment()
+	{
+		return (AttachPhotoFragment) getChildFragmentManager().findFragmentById(R.id.attachPhotoFragment);
+	}
+
+	private void onClickOk()
+	{
+		String noteText = noteInput.getText().toString().trim();
+
+		if(noteText.isEmpty())
+		{
+			Toast.makeText(getActivity(), R.string.no_changes, Toast.LENGTH_SHORT).show();
+			return;
+		}
+
+		AttachPhotoFragment f = getAttachPhotoFragment();
+
+		Double latitude = getArguments().getDouble(ARG_LAT);
+		Double longitude = getArguments().getDouble(ARG_LON);
+		LatLon position = new OsmLatLon(latitude, longitude);
+
+		questAnswerComponent.onLeaveNote(noteText, f != null ? f.getImagePaths() : null, position);
+		dismiss();
+	}
+
+	private void onClickCancel()
+	{
+		AttachPhotoFragment f = getAttachPhotoFragment();
+		if(f != null) f.deleteImages();
+		dismiss();
+	}
+}

app/src/main/java/de/westnordost/streetcomplete/data/osmnotes/CreateNoteFragment.java

@@ -0,0 +1,53 @@
+package de.westnordost.streetcomplete.data.osmnotes;
+
+import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageButton;
+
+import de.westnordost.streetcomplete.MainActivity;
+import de.westnordost.streetcomplete.R;
+
+public class CreateNoteFragment extends Fragment
+{
+
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container,
+							 Bundle savedInstanceState)
+	{
+		View view = inflater.inflate(R.layout.fragment_create_note, container, false);
+
+		Toolbar noteToolbar = view.findViewById(R.id.note_toolbar);
+		((AppCompatActivity)getActivity()).setSupportActionBar(noteToolbar);
+
+		ImageButton finishNoteCreation = view.findViewById(R.id.finish_note_creation);
+		ImageButton closeNoteCreation = view.findViewById(R.id.close_note_creation);
+
+		finishNoteCreation.setOnClickListener((v) -> openDialog());
+
+		closeNoteCreation.setOnClickListener((v) ->
+		{
+			getActivity().getSupportFragmentManager().popBackStackImmediate(MainActivity.CREATE_NOTE, FragmentManager.POP_BACK_STACK_INCLUSIVE);
+		});
+
+		return view;
+	}
+
+	private void openDialog()
+	{
+		DialogFragment createNoteDialog = new CreateNoteDialog();
+
+		Bundle createNoteArgs = new Bundle();
+		createNoteArgs.putDouble(CreateNoteDialog.ARG_LAT, getArguments().getDouble(CreateNoteDialog.ARG_LAT));
+		createNoteArgs.putDouble(CreateNoteDialog.ARG_LON, getArguments().getDouble(CreateNoteDialog.ARG_LAT));
+		createNoteDialog.setArguments(createNoteArgs);
+
+		createNoteDialog.show(getActivity().getSupportFragmentManager(), null);
+	}
+}

app/src/main/java/de/westnordost/streetcomplete/quests/OsmQuestAnswerListener.java

@@ -4,6 +4,7 @@
 
 import java.util.ArrayList;
 
+import de.westnordost.osmapi.map.data.LatLon;
 import de.westnordost.streetcomplete.data.QuestGroup;
 
 public interface OsmQuestAnswerListener
@@ -17,4 +18,7 @@ public interface OsmQuestAnswerListener
 
 	/** Called when the user chose to skip the quest */
 	void onSkippedQuest(long questId, QuestGroup group);
+
+	/** Called when the user wants to leave a note which is not related to a quest */
+	void onLeaveNote(String note, ArrayList<String> imagePaths, LatLon position);
 }

app/src/main/java/de/westnordost/streetcomplete/quests/QuestAnswerComponent.java

@@ -4,6 +4,7 @@
 
 import java.util.ArrayList;
 
+import de.westnordost.osmapi.map.data.LatLon;
 import de.westnordost.streetcomplete.data.QuestGroup;
 
 public class QuestAnswerComponent
@@ -57,6 +58,11 @@ public void onLeaveNote(String questTitle, String text, ArrayList<String> imageP
 		callbackListener.onLeaveNote(questId, questGroup, questTitle, text, imagePaths);
 	}
 
+	public void onLeaveNote(String text, ArrayList<String> imagePaths, LatLon position)
+	{
+		callbackListener.onLeaveNote(text, imagePaths, position);
+	}
+
 	public void onSkippedQuest()
 	{
 		callbackListener.onSkippedQuest(questId, questGroup);

app/src/main/java/de/westnordost/streetcomplete/tangram/MapFragment.java

@@ -16,6 +16,7 @@
 import android.support.annotation.Nullable;
 import android.support.v13.app.FragmentCompat;
 import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentTransaction;
 import android.support.v7.preference.PreferenceManager;
 import android.text.Html;
 import android.text.TextUtils;
@@ -27,6 +28,7 @@
 import android.view.ViewTreeObserver;
 import android.view.WindowManager;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.mapzen.android.lost.api.LocationListener;
 import com.mapzen.android.lost.api.LocationRequest;
@@ -43,17 +45,21 @@
 import java.io.File;
 
 import de.westnordost.osmapi.map.data.LatLon;
+import de.westnordost.streetcomplete.ApplicationConstants;
 import de.westnordost.streetcomplete.Prefs;
 import de.westnordost.streetcomplete.R;
+import de.westnordost.streetcomplete.data.osmnotes.CreateNoteDialog;
+import de.westnordost.streetcomplete.data.osmnotes.CreateNoteFragment;
 import de.westnordost.streetcomplete.util.SphericalEarthMath;
 
 import static android.content.Context.SENSOR_SERVICE;
+import static de.westnordost.streetcomplete.MainActivity.CREATE_NOTE;
 
 public class MapFragment extends Fragment implements
 		FragmentCompat.OnRequestPermissionsResultCallback, LocationListener,
 		LostApiClient.ConnectionCallbacks, TouchInput.ScaleResponder,
 		TouchInput.ShoveResponder, TouchInput.RotateResponder,
-		TouchInput.PanResponder, TouchInput.DoubleTapResponder, CompassComponent.Listener, MapController.SceneLoadListener
+		TouchInput.PanResponder, TouchInput.DoubleTapResponder, TouchInput.LongPressResponder, CompassComponent.Listener, MapController.SceneLoadListener
 {
 	private CompassComponent compass = new CompassComponent();
 
@@ -138,6 +144,7 @@ public void getMapAsync(String apiKey)
 		controller.setScaleResponder(this);
 		controller.setPanResponder(this);
 		controller.setDoubleTapResponder(this);
+		controller.setLongPressResponder(this);
 		updateMapTileCacheSize();
 		controller.setHttpHandler(httpHandler);
 
@@ -375,6 +382,28 @@ protected void followPosition()
 		return false;
 	}
 
+	@Override public void onLongPress(float x, float y)
+	{
+		if (controller.getZoom() < ApplicationConstants.NOTE_MIN_ZOOM)
+		{
+			Toast.makeText(getActivity(), R.string.create_new_note_unprecise, Toast.LENGTH_LONG).show();
+		}
+		else
+		{
+			CreateNoteFragment f = new CreateNoteFragment();
+			Bundle args = new Bundle();
+			LngLat pos = controller.getPosition();
+			args.putDouble(CreateNoteDialog.ARG_LAT, pos.latitude);
+			args.putDouble(CreateNoteDialog.ARG_LON, pos.longitude);
+			f.setArguments(args);
+
+			FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
+			ft.add(R.id.map_create_note_container, f, CREATE_NOTE);
+			ft.addToBackStack(CREATE_NOTE);
+			ft.commit();
+		}
+	}
+
 	private void onMapOrientation()
 	{
 		onMapOrientation(controller.getRotation(), controller.getTilt());

app/src/main/java/de/westnordost/streetcomplete/tangram/QuestsMapFragment.java

@@ -478,4 +478,9 @@ public LatLon getPosition()
 		return TangramConst.toLatLon(controller.getPosition());
 	}
 
+	public float getZoom()
+	{
+		return controller.getZoom();
+	}
+
 }

app/src/main/res/drawable/ic_check_white_24dp.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="#FFFFFFFF"
+        android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
+</vector>