forked from upstream-mirrors/OpenTracks
All marker management is now in MarkerEditActivity (including take photo and added gallery image to the marker).
Issue 122.
This commit is contained in:
Román
@@ -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>
|
||||
@@ -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>
|
||||
@@ -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>
|
||||
@@ -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>
|
||||
|
||||
|
||||
@@ -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>
|
||||
@@ -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"
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user