All marker management is now in MarkerEditActivity (including take photo and added gallery image to the marker).

Issue 122.

src/main/java/de/dennisguse/opentracks/MarkerEditActivity.java

@@ -16,18 +16,38 @@
 
 package de.dennisguse.opentracks;
 
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.net.Uri;
 import android.os.Bundle;
+import android.os.ParcelFileDescriptor;
+import android.provider.MediaStore;
 import android.util.Log;
+import android.util.Pair;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+
+import java.io.File;
+import java.io.FileDescriptor;
+import java.io.IOException;
 
 import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
+import de.dennisguse.opentracks.util.FileUtils;
+import de.dennisguse.opentracks.util.IntentUtils;
 
 /**
  * An activity to add/edit a marker.
@@ -39,16 +59,27 @@ public class MarkerEditActivity extends AbstractActivity {
     public static final String EXTRA_TRACK_ID = "track_id";
     public static final String EXTRA_MARKER_ID = "marker_id";
 
+    private static final int CAMERA_REQUEST_CODE = 5;
+    private static final int GALLERY_IMG_REQUEST_CODE = 7;
+
     private static final String TAG = MarkerEditActivity.class.getSimpleName();
     private long trackId;
     private long markerId;
     private TrackRecordingServiceConnection trackRecordingServiceConnection;
     private Waypoint waypoint;
 
+    private MenuItem insertPhotoMenuItem;
+    private MenuItem insertGalleryImgMenuItem;
+
+    private Uri photoUri;
+    private boolean hasCamera;
+
     // UI elements
     private EditText waypointName;
     private AutoCompleteTextView waypointMarkerType;
     private EditText waypointDescription;
+    private ImageView waypointPhoto;
+    private ImageView waypointDeletePhotoBtn;
     private Button done;
 
     @Override
@@ -59,12 +90,27 @@ public class MarkerEditActivity extends AbstractActivity {
         markerId = getIntent().getLongExtra(EXTRA_MARKER_ID, -1L);
         trackRecordingServiceConnection = new TrackRecordingServiceConnection(this, null);
 
+        hasCamera = getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA_ANY);
+
         // Setup UI elements
         waypointName = findViewById(R.id.marker_edit_waypoint_name);
         waypointMarkerType = findViewById(R.id.marker_edit_waypoint_marker_type);
         ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this, R.array.waypoint_types, android.R.layout.simple_dropdown_item_1line);
         waypointMarkerType.setAdapter(adapter);
         waypointDescription = findViewById(R.id.marker_edit_waypoint_description);
+        waypointPhoto = findViewById(R.id.marker_edit_waypoint_photo);
+
+        waypointDeletePhotoBtn = findViewById(R.id.marker_edit_waypoint_photo_delete);
+        waypointDeletePhotoBtn.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (waypoint != null && waypoint.hasPhoto())
+                    waypoint.setPhotoUrl(null);
+                waypointPhoto.setImageBitmap(null);
+                photoUri = null;
+                hideAndShowOptions();
+            }
+        });
 
         Button cancel = findViewById(R.id.marker_edit_cancel);
         cancel.setOnClickListener(new OnClickListener() {
@@ -94,6 +140,64 @@ public class MarkerEditActivity extends AbstractActivity {
         return R.layout.marker_edit;
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.marker_edit, menu);
+
+        insertPhotoMenuItem = menu.findItem(R.id.marker_edit_insert_photo);
+        insertPhotoMenuItem.setVisible(hasCamera);
+        insertGalleryImgMenuItem = menu.findItem(R.id.marker_edit_insert_gallery_img);
+        hideAndShowOptions();
+
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.marker_edit_insert_photo:
+                createWaypointWithPicture();
+                return true;
+            case R.id.marker_edit_insert_gallery_img:
+                createWaypointWithGalleryImage();
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == CAMERA_REQUEST_CODE) {
+            if (resultCode == RESULT_CANCELED) {
+                Toast.makeText(this, R.string.marker_add_photo_canceled, Toast.LENGTH_LONG).show();
+                return;
+            } else if (resultCode == RESULT_OK) {
+                setWaypointImageView(photoUri);
+            }
+        } else if (requestCode == GALLERY_IMG_REQUEST_CODE) {
+            if (resultCode == RESULT_CANCELED) {
+                Toast.makeText(this, R.string.marker_add_photo_canceled, Toast.LENGTH_LONG).show();
+                return;
+            } else if (resultCode == RESULT_OK)  {
+                Uri srcUri = data.getData();
+                try (ParcelFileDescriptor parcelFd = getContentResolver().openFileDescriptor(srcUri, "r")) {
+                    FileDescriptor srcFd = parcelFd.getFileDescriptor();
+                    File dstFile = new File(FileUtils.getImageUrl(this, getTrackId()));
+                    FileUtils.copy(srcFd, dstFile);
+
+                    photoUri = FileUtils.getUriForFile(this, dstFile);
+                    setWaypointImageView(photoUri);
+                } catch(Exception e) {
+                    Log.e(TAG, e.getMessage());
+                    Toast.makeText(this, R.string.marker_add_canceled, Toast.LENGTH_LONG).show();
+                    return;
+                }
+            }
+        }
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+
     /**
      * Updates the UI based on the marker id.
      */
@@ -133,7 +237,62 @@ public class MarkerEditActivity extends AbstractActivity {
             waypointName.setText(waypoint.getName());
             waypointMarkerType.setText(waypoint.getCategory());
             waypointDescription.setText(waypoint.getDescription());
+            if (waypoint.hasPhoto()) {
+                photoUri = waypoint.getPhotoURI();
+                setWaypointImageView(photoUri);
+            }
         }
+
+        hideAndShowOptions();
+    }
+
+    /**
+     * Checks and hide/shows all buttons/options about marker photo options.
+     *
+     * If a photo is set then one's options are shown, otherwise another ones are shown.
+     */
+    private void hideAndShowOptions() {
+        boolean isPhotoSet = (waypoint != null && waypoint.hasPhoto()) || photoUri != null;
+        if (insertPhotoMenuItem != null && insertGalleryImgMenuItem != null) {
+            insertPhotoMenuItem.setVisible(isPhotoSet ? false : true);
+            insertGalleryImgMenuItem.setVisible(isPhotoSet ? false : true);
+        }
+        waypointDeletePhotoBtn.setVisibility(isPhotoSet ? View.VISIBLE : View.GONE);
+    }
+
+    /**
+     * Returns the trackId. If trackId == -1 then get it from waypoint object.
+     */
+    private long getTrackId() {
+        return trackId == -1 ? waypoint.getTrackId() : trackId;
+    }
+
+    /**
+     * Sets the ImageView waypointPhoto with the uri photo.
+     *
+     * @param uri the uri photo.
+     */
+    private void setWaypointImageView(Uri uri) {
+        try (ParcelFileDescriptor pfd = getContentResolver().openFileDescriptor(uri, "r")) {
+            FileDescriptor fd = pfd.getFileDescriptor();
+            Bitmap bitmap = BitmapFactory.decodeFileDescriptor(fd);
+            waypointPhoto.setImageBitmap(bitmap);
+            hideAndShowOptions();
+        } catch(IOException e) {
+            Log.e(TAG, e.getMessage());
+            Toast.makeText(this, R.string.marker_add_photo_canceled, Toast.LENGTH_LONG).show();
+        }
+    }
+
+    private void createWaypointWithPicture() {
+        Pair<Intent, Uri> intentAndPhotoUri = IntentUtils.createTakePictureIntent(this, getTrackId());
+        photoUri = intentAndPhotoUri.second;
+        startActivityForResult(intentAndPhotoUri.first, CAMERA_REQUEST_CODE);
+    }
+
+    private void createWaypointWithGalleryImage() {
+        Intent intent = new Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
+        startActivityForResult(intent, GALLERY_IMG_REQUEST_CODE);
     }
 
     /**
@@ -144,7 +303,7 @@ public class MarkerEditActivity extends AbstractActivity {
                 waypointName.getText().toString(),
                 waypointMarkerType.getText().toString(),
                 waypointDescription.getText().toString(),
-                null);
+                photoUri != null ? photoUri.toString() : null);
     }
 
     /**
@@ -154,6 +313,7 @@ public class MarkerEditActivity extends AbstractActivity {
         waypoint.setName(waypointName.getText().toString());
         waypoint.setCategory(waypointMarkerType.getText().toString());
         waypoint.setDescription(waypointDescription.getText().toString());
+        waypoint.setPhotoUrl(photoUri != null ? photoUri.toString() : null);
 
         new ContentProviderUtils(this).updateWaypoint(waypoint);
     }

src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java

@@ -16,25 +16,18 @@
 
 package de.dennisguse.opentracks;
 
-import android.Manifest;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
-import android.content.pm.PackageManager;
-import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.provider.MediaStore;
-import android.util.Pair;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.WindowManager;
-import android.widget.Toast;
 
 import androidx.annotation.NonNull;
-import androidx.core.app.ActivityCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentPagerAdapter;
 import androidx.viewpager.widget.ViewPager;
@@ -70,16 +63,8 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
     private static final String TAG = TrackDetailActivity.class.getSimpleName();
 
     private static final String CURRENT_TAB_TAG_KEY = "current_tab_tag_key";
-    private static final String PHOTO_URI_KEY = "photo_uri_key";
-    private static final String HAS_PHOTO_KEY = "has_photo_key";
-
-    private static final int CAMERA_REQUEST_CODE = 5;
-    private static final int EXTERNAL_STORAGE_PERMISSION_REQUEST_CODE = 6;
 
     // The following are set in onCreate
-    private boolean hasCamera;
-    private Uri photoUri;
-    private boolean hasPhoto;
     private ContentProviderUtils contentProviderUtils;
     private SharedPreferences sharedPreferences;
     private TrackRecordingServiceConnection trackRecordingServiceConnection;
@@ -102,10 +87,6 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
                 @Override
                 public void run() {
                     trackController.update(isRecording(), recordingTrackPaused);
-                    if (hasPhoto && photoUri != null) {
-                        hasPhoto = false;
-                        long markerId = trackRecordingServiceConnection.addMarker(TrackDetailActivity.this, null, null, null, photoUri.toString());
-                    }
                 }
             });
         }
@@ -148,7 +129,6 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
     };
 
     private MenuItem insertMarkerMenuItem;
-    private MenuItem insertPhotoMenuItem;
     private MenuItem markerListMenuItem;
     private MenuItem shareMenuItem;
 
@@ -182,10 +162,6 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
         super.onCreate(savedInstanceState);
         recordingTrackPaused = PreferencesUtils.isRecordingTrackPausedDefault(this);
 
-        hasCamera = getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA);
-        photoUri = savedInstanceState != null ? (Uri) savedInstanceState.getParcelable(PHOTO_URI_KEY) : null;
-        hasPhoto = savedInstanceState != null && savedInstanceState.getBoolean(HAS_PHOTO_KEY, false);
-
         contentProviderUtils = new ContentProviderUtils(this);
         handleIntent(getIntent());
 
@@ -307,23 +283,6 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
     protected void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putInt(CURRENT_TAB_TAG_KEY, pager.getCurrentItem());
-
-        if (photoUri != null) {
-            outState.putParcelable(PHOTO_URI_KEY, photoUri);
-        }
-        outState.putBoolean(HAS_PHOTO_KEY, hasPhoto);
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == CAMERA_REQUEST_CODE) {
-            if (resultCode == RESULT_CANCELED) {
-                Toast.makeText(this, R.string.marker_add_canceled, Toast.LENGTH_LONG).show();
-                return;
-            }
-            hasPhoto = resultCode == RESULT_OK;
-        }
-        super.onActivityResult(requestCode, resultCode, data);
     }
 
     @Override
@@ -343,8 +302,6 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
         getMenuInflater().inflate(R.menu.track_detail, menu);
 
         insertMarkerMenuItem = menu.findItem(R.id.track_detail_insert_marker);
-        insertPhotoMenuItem = menu.findItem(R.id.track_detail_insert_photo);
-        insertPhotoMenuItem.setVisible(new Intent(MediaStore.ACTION_IMAGE_CAPTURE).resolveActivity(getPackageManager()) != null);
         shareMenuItem = menu.findItem(R.id.track_detail_share);
         markerListMenuItem = menu.findItem(R.id.track_detail_markers);
 
@@ -372,9 +329,6 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
                 intent = Intent.createChooser(intent, null);
                 startActivity(intent);
                 return true;
-            case R.id.track_detail_insert_photo:
-                createWaypointWithPicture();
-                return true;
             case R.id.track_detail_menu_show_on_map:
                 IntentUtils.showTrackOnMap(this, new long[]{trackId});
                 return true;
@@ -400,20 +354,6 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
         }
     }
 
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        if (requestCode == EXTERNAL_STORAGE_PERMISSION_REQUEST_CODE) {
-            if (ActivityCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_DENIED) {
-                Toast.makeText(this, R.string.external_storage_not_writable, Toast.LENGTH_LONG).show();
-            } else {
-                createWaypointWithPicture();
-            }
-            return;
-        }
-
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-    }
-
     @Override
     protected TrackRecordingServiceConnection getTrackRecordingServiceConnection() {
         return trackRecordingServiceConnection;
@@ -471,7 +411,6 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
      */
     private void updateMenuItems(boolean isPaused) {
         insertMarkerMenuItem.setVisible(isRecording() && !isPaused);
-        insertPhotoMenuItem.setVisible(hasCamera && isRecording() && !isPaused);
         shareMenuItem.setVisible(!isRecording());
         markerListMenuItem.setShowAsAction(isRecording() ? MenuItem.SHOW_AS_ACTION_NEVER : MenuItem.SHOW_AS_ACTION_IF_ROOM);
         String title;
@@ -484,12 +423,6 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
         setTitle(title);
     }
 
-    private void createWaypointWithPicture() {
-        Pair<Intent, Uri> intentAndPhotoUri = IntentUtils.createTakePictureIntent(this, trackId);
-        photoUri = intentAndPhotoUri.second;
-        startActivityForResult(intentAndPhotoUri.first, CAMERA_REQUEST_CODE);
-    }
-
     public void chooseActivityType(String category) {
         ChooseActivityTypeDialogFragment.showDialog(getSupportFragmentManager(), category);
     }

src/main/java/de/dennisguse/opentracks/util/FileUtils.java

@@ -16,11 +16,21 @@
 package de.dennisguse.opentracks.util;
 
 import android.content.Context;
+import android.net.Uri;
 import android.os.Environment;
+import android.util.Log;
 
+import androidx.core.content.FileProvider;
 import androidx.documentfile.provider.DocumentFile;
 
 import java.io.File;
+import java.io.FileDescriptor;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.channels.FileChannel;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 import de.dennisguse.opentracks.BuildConfig;
 
@@ -31,6 +41,8 @@ import de.dennisguse.opentracks.BuildConfig;
  */
 public class FileUtils {
 
+    private static final String TAG = FileUtils.class.getSimpleName();
+
     /**
      * Used to transfer picture from the camera.
      */
@@ -38,6 +50,8 @@ public class FileUtils {
 
     public static final String EXPORT_DIR = "OpenTracks";
 
+    private static final String JPEG_EXTENSION = "jpeg";
+
     /**
      * The maximum FAT32 path length. See the FAT32 spec at
      * http://msdn.microsoft.com/en-us/windows/hardware/gg463080
@@ -196,4 +210,46 @@ public class FileUtils {
 
         return name;
     }
+
+    /**
+     * Returns the image's absolute path from a track identified by trackId.
+     *
+     * @param context the context.
+     * @param trackId the track id.
+     */
+    public static String getImageUrl(Context context, long trackId) {
+        File dir = FileUtils.getPhotoDir(context, trackId);
+
+        String fileName = SimpleDateFormat.getDateTimeInstance().format(new Date());
+        File file = new File(dir, FileUtils.buildUniqueFileName(dir, fileName, JPEG_EXTENSION));
+
+        return file.getAbsolutePath();
+    }
+
+        /**
+     * Copy a File (src) to a File (dst).
+     *
+     * @param src source file.
+     * @param dst destination file.
+     * @throws IOException
+     */
+    public static void copy(FileDescriptor src, File dst) throws IOException {
+        try (FileChannel in = new FileInputStream(src).getChannel();
+             FileChannel out = new FileOutputStream(dst).getChannel()) {
+            in.transferTo(0, in.size(), out);
+        } catch (Exception e) {
+            // post to log
+            Log.e(TAG, e.getMessage());
+        }
+    }
+
+    /**
+     * Returns a Uri for the file.
+     *
+     * @param context the context.
+     * @param file    the file.
+     */
+    public static Uri getUriForFile(Context context, File file) {
+        return FileProvider.getUriForFile(context, FileUtils.FILEPROVIDER, file);
+    }
 }

src/main/res/drawable/ic_add_a_photo_24dp.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@android:color/white"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M3,4V1h2v3h3v2H5v3H3V6H0V4H3zM6,10V7h3V4h7l1.83,2H21c1.1,0 2,0.9 2,2v12c0,1.1 -0.9,2 -2,2H5c-1.1,0 -2,-0.9 -2,-2V10H6zM13,19c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5s-5,2.24 -5,5S10.24,19 13,19zM9.8,14c0,1.77 1.43,3.2 3.2,3.2s3.2,-1.43 3.2,-3.2s-1.43,-3.2 -3.2,-3.2S9.8,12.23 9.8,14z"/>
+</vector>

src/main/res/drawable/ic_add_photo_alternate_24dp.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@android:color/white"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M19,7v2.99s-1.99,0.01 -2,0L17,7h-3s0.01,-1.99 0,-2h3L17,2h2v3h3v2h-3zM16,11L16,8h-3L13,5L5,5c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2v-8h-3zM5,19l3,-4 2,3 3,-4 4,5L5,19z"/>
+</vector>

src/main/res/drawable/shape_circle_darkgray.xml

@@ -0,0 +1,5 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid
+        android:color="@color/text_gradient_center"/>
+</shape>

src/main/res/layout/marker_edit.xml

@@ -67,6 +67,39 @@ limitations under the License.
                     android:imeOptions="actionDone"
                     android:importantForAutofill="no" />
             </LinearLayout>
+
+            <RelativeLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp">
+
+                <ImageView
+                    android:id="@+id/marker_edit_waypoint_photo"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentStart="true"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentBottom="true"
+                    android:scaleType="fitStart"
+                    android:adjustViewBounds="true"
+                    android:contentDescription="@string/image_photo_marker" />
+
+                <ImageView
+                    android:id="@+id/marker_edit_waypoint_photo_delete"
+                    android:layout_width="32dp"
+                    android:layout_height="32dp"
+                    android:background="@drawable/shape_circle_darkgray"
+                    android:padding="4dp"
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentEnd="true"
+                    android:layout_margin="16dp"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginEnd="8dp"
+                    android:layout_marginBottom="8dp"
+                    android:src="@drawable/ic_delete_forever_24dp" />
+            </RelativeLayout>
         </LinearLayout>
     </ScrollView>
 

src/main/res/menu/marker_edit.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/marker_edit_insert_photo"
+        android:icon="@drawable/ic_add_a_photo_24dp"
+        android:orderInCategory="2"
+        app:showAsAction="ifRoom"
+        android:title="@string/menu_insert_photo" />
+    <item
+        android:id="@+id/marker_edit_insert_gallery_img"
+        android:icon="@drawable/ic_add_photo_alternate_24dp"
+        android:orderInCategory="2"
+        app:showAsAction="ifRoom"
+        android:title="@string/menu_insert_gallery_img" />
+</menu>

src/main/res/menu/track_detail.xml

@@ -21,12 +21,6 @@ limitations under the License.
         android:orderInCategory="1"
         app:showAsAction="ifRoom"
         android:title="@string/menu_insert_marker" />
-    <item
-        android:id="@+id/track_detail_insert_photo"
-        android:icon="@drawable/ic_camera_24dp"
-        android:orderInCategory="2"
-        app:showAsAction="ifRoom"
-        android:title="@string/menu_insert_photo" />
     <item
         android:id="@+id/track_detail_menu_show_on_map"
         android:icon="@drawable/ic_map_24dp"

src/main/res/values-b+es+419/strings.xml

@@ -192,6 +192,7 @@
     <string name="menu_import_all">Importar todo</string>
     <string name="menu_insert_marker">Insertar marcador</string>
     <string name="menu_insert_photo">Insertar foto</string>
+    <string name="menu_insert_gallery_img">Insertar imagen de galería</string>
     <string name="menu_map">Mapa</string>
     <string name="menu_markers">Marcadores</string>
     <string name="menu_play">Reproducir</string>

src/main/res/values-es/strings.xml

@@ -169,6 +169,7 @@
     <string name="marker_add_error">No se puede insertar el marcador. No se recibe señal de GPS. Inténtalo de nuevo.</string>
     <string name="marker_add_success">Se ha insertado un marcador</string>
     <string name="marker_add_canceled">Cancelado, no se ha añadido ningún marcador</string>
+    <string name="marker_add_photo_canceled">Cancelado, no se ha añadido la foto al marcador</string>
     <string name="marker_delete_all_confirm_message">Todos los marcadores de esta ruta se eliminarán del dispositivo de forma permanente</string>
     <string name="marker_delete_one_confirm_message">El marcador se eliminará del dispositivo de forma permanente</string>
     <string name="marker_delete_one_confirm_title">¿Eliminar marcador?</string>
@@ -195,6 +196,7 @@
     <string name="menu_import_all">Importar todo</string>
     <string name="menu_insert_marker">Insertar marcador</string>
     <string name="menu_insert_photo">Insertar foto</string>
+    <string name="menu_insert_gallery_img">Insertar imagen de galería</string>
     <string name="menu_map">Mapa</string>
     <string name="menu_markers">Marcadores</string>
     <string name="menu_play">Reproducir</string>

src/main/res/values/strings.xml

@@ -275,6 +275,7 @@ limitations under the License.
     <string name="marker_add_error">Unable to insert a marker. No GPS signal. Try again.</string>
     <string name="marker_add_success">A marker was inserted</string>
     <string name="marker_add_canceled">Canceled, no marker added</string>
+    <string name="marker_add_photo_canceled">Canceled, no photo marker added</string>
     <string name="marker_delete_all_confirm_message">All markers for this track will be permanently deleted from the device</string>
     <string name="marker_delete_one_confirm_message">The marker will be permanently deleted from the device</string>
     <string name="marker_delete_one_confirm_title">Delete marker?</string>
@@ -305,6 +306,7 @@ limitations under the License.
     <string name="menu_import_all">Import all</string>
     <string name="menu_insert_marker">Insert marker</string>
     <string name="menu_insert_photo">Insert photo</string>
+    <string name="menu_insert_gallery_img">Insert gallery image</string>
     <string name="menu_map">Map</string>
     <string name="menu_markers">Markers</string>
     <string name="menu_play">Play</string>