Introduced material design icons.

metadata/en-US/changelogs/next_release.txt

@@ -2,6 +2,7 @@
 
 Changes:
 - Removed Widget
+- Introduced material design icons
 
 Bugfix:
 - Fixed search functionality

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

@@ -18,12 +18,9 @@ package de.dennisguse.opentracks;
 
 import android.os.Bundle;
 import android.speech.tts.TextToSpeech;
-import android.view.Menu;
 
 import androidx.fragment.app.FragmentActivity;
 
-import de.dennisguse.opentracks.util.TrackIconUtils;
-
 /**
  * @author Jimmy Shih
  */
@@ -43,10 +40,4 @@ public abstract class AbstractActivity extends FragmentActivity {
      * Gets the layout resource id.
      */
     protected abstract int getLayoutResId();
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        TrackIconUtils.setMenuIconColor(menu);
-        return super.onCreateOptionsMenu(menu);
-    }
 }

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

@@ -528,8 +528,7 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
             startGpsMenuItem.setVisible(!isRecording);
             if (!isRecording) {
                 startGpsMenuItem.setTitle(isGpsStarted ? R.string.menu_stop_gps : R.string.menu_start_gps);
-                startGpsMenuItem.setIcon(isGpsStarted ? R.drawable.ic_menu_stop_gps : R.drawable.ic_menu_start_gps);
-                TrackIconUtils.setMenuIconColor(startGpsMenuItem);
+                startGpsMenuItem.setIcon(isGpsStarted ? R.drawable.ic_gps_off_24dp : R.drawable.ic_gps_fixed_24dp);
             }
         }
         if (aggregatedStatisticsMenuItem != null) {

src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeDialogFragment.java

@@ -21,8 +21,6 @@ import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.graphics.BitmapFactory;
-import android.graphics.BitmapFactory.Options;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.AdapterView;
@@ -68,15 +66,7 @@ public class ChooseActivityTypeDialogFragment extends DialogFragment {
             imageIds.add(TrackIconUtils.getIconDrawable(iconValue));
         }
 
-        Options options = new BitmapFactory.Options();
-        options.inJustDecodeBounds = true;
-        BitmapFactory.decodeResource(activity.getResources(), R.drawable.ic_track_airplane, options);
-        int padding = 32;
-        int width = options.outWidth + 2 * padding;
-        int height = options.outHeight + 2 * padding;
-        gridView.setColumnWidth(width);
-
-        final ChooseActivityTypeImageAdapter imageAdapter = new ChooseActivityTypeImageAdapter(activity, imageIds, width, height, padding);
+        final ChooseActivityTypeImageAdapter imageAdapter = new ChooseActivityTypeImageAdapter(imageIds);
         gridView.setAdapter(imageAdapter);
 
         final AlertDialog alertDialog = new AlertDialog.Builder(activity).setTitle(R.string.track_edit_activity_type_hint).setView(view).create();

src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeImageAdapter.java

@@ -16,7 +16,6 @@
 
 package de.dennisguse.opentracks.fragments;
 
-import android.content.Context;
 import android.graphics.Color;
 import android.view.View;
 import android.view.ViewGroup;
@@ -26,6 +25,7 @@ import android.widget.ImageView;
 import java.util.List;
 
 import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.util.ResourceUtils;
 
 /**
  * Image adapter for choosing an activity type.
@@ -34,19 +34,11 @@ import de.dennisguse.opentracks.R;
  */
 public class ChooseActivityTypeImageAdapter extends BaseAdapter {
 
-    private final Context context;
     private final List<Integer> imageIds;
-    private final int width;
-    private final int height;
-    private final int padding;
     private int selected = -1;
 
-    ChooseActivityTypeImageAdapter(Context context, List<Integer> imageIds, int width, int height, int padding) {
-        this.context = context;
+    ChooseActivityTypeImageAdapter(List<Integer> imageIds) {
         this.imageIds = imageIds;
-        this.width = width;
-        this.height = height;
-        this.padding = padding;
     }
 
     @Override
@@ -76,19 +68,23 @@ public class ChooseActivityTypeImageAdapter extends BaseAdapter {
     public View getView(int position, View convertView, ViewGroup parent) {
         ImageView imageView;
         if (convertView == null) {
-            imageView = new ImageView(context);
+            imageView = new ImageView(parent.getContext());
+            imageView.setScaleType(ImageView.ScaleType.FIT_CENTER);
+            imageView.setAdjustViewBounds(true);
+
+            int padding = ResourceUtils.dpToPx(parent.getContext(), 8);
+            imageView.setPaddingRelative(padding, padding, padding, padding);
         } else {
             imageView = (ImageView) convertView;
         }
+
         if (position == selected) {
             imageView.setBackgroundResource(R.drawable.list_selector_background_transition_holo_dark);
         } else {
             imageView.setBackgroundColor(Color.TRANSPARENT);
         }
+
         imageView.setImageResource(imageIds.get(position));
-        imageView.setMinimumHeight(height);
-        imageView.setMinimumWidth(width);
-        imageView.setPadding(padding, padding, padding, padding);
         return imageView;
     }
 }

src/main/java/de/dennisguse/opentracks/fragments/MarkerDetailFragment.java

@@ -48,7 +48,6 @@ import de.dennisguse.opentracks.util.IntentUtils;
 import de.dennisguse.opentracks.util.ListItemUtils;
 import de.dennisguse.opentracks.util.StatsUtils;
 import de.dennisguse.opentracks.util.StringUtils;
-import de.dennisguse.opentracks.util.TrackIconUtils;
 
 /**
  * A fragment to show marker details.
@@ -179,8 +178,6 @@ public class MarkerDetailFragment extends Fragment {
         inflater.inflate(R.menu.marker_detail, menu);
 
         updateWaypoint(false);
-
-        TrackIconUtils.setMenuIconColor(menu);
     }
 
     @Override

src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java

@@ -515,8 +515,7 @@ public class TrackRecordingService extends Service {
         track.setId(trackId);
         track.setName(TrackNameUtils.getTrackName(this, trackId, now));
 
-        String category = PreferencesUtils.getString(
-                this, R.string.default_activity_key, PreferencesUtils.DEFAULT_ACTIVITY_DEFAULT);
+        String category = PreferencesUtils.getString(this, R.string.default_activity_key, PreferencesUtils.DEFAULT_ACTIVITY_DEFAULT);
         track.setCategory(category);
         track.setIcon(TrackIconUtils.getIconValue(this, category));
         track.setTripStatistics(trackTripStatisticsUpdater.getTripStatistics());

src/main/java/de/dennisguse/opentracks/settings/ActivityTypePreference.java

@@ -64,14 +64,12 @@ public class ActivityTypePreference extends DialogPreference {
                 getContext(), R.string.default_activity_key, PreferencesUtils.DEFAULT_ACTIVITY_DEFAULT);
         textView.setText(category);
 
-        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(
-                getContext(), R.array.activity_types, android.R.layout.simple_dropdown_item_1line);
+        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(getContext(), R.array.activity_types, android.R.layout.simple_dropdown_item_1line);
         textView.setAdapter(adapter);
         textView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
-                String iconValue = TrackIconUtils.getIconValue(
-                        getContext(), (String) textView.getAdapter().getItem(position));
+                String iconValue = TrackIconUtils.getIconValue(getContext(), (String) textView.getAdapter().getItem(position));
                 TrackIconUtils.setIconSpinner(spinner, iconValue);
             }
         });

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

@@ -0,0 +1,17 @@
+package de.dennisguse.opentracks.util;
+
+import android.content.Context;
+
+/**
+ * Utils related to handling Android resources.
+ */
+public class ResourceUtils {
+
+    /**
+     * Convert display density to physical pixel.
+     */
+    public static int dpToPx(Context context, int dp) {
+        float density = context.getResources().getDisplayMetrics().density;
+        return Math.round(dp * density);
+    }
+}

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

@@ -17,15 +17,7 @@
 package de.dennisguse.opentracks.util;
 
 import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Color;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffColorFilter;
-import android.graphics.drawable.Drawable;
 import android.util.Pair;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.ImageView;
@@ -67,14 +59,14 @@ public class TrackIconUtils {
     private static final LinkedHashMap<String, Pair<Integer, Integer>> MAP = new LinkedHashMap<>();
 
     static {
-        MAP.put(RUN, new Pair<>(R.string.activity_type_running, R.drawable.ic_track_run));
-        MAP.put(WALK, new Pair<>(R.string.activity_type_walking, R.drawable.ic_track_walk));
-        MAP.put(BIKE, new Pair<>(R.string.activity_type_biking, R.drawable.ic_track_bike));
-        MAP.put(DRIVE, new Pair<>(R.string.activity_type_driving, R.drawable.ic_track_drive));
+        MAP.put(RUN, new Pair<>(R.string.activity_type_running, R.drawable.ic_activity_run_24dp));
+        MAP.put(WALK, new Pair<>(R.string.activity_type_walking, R.drawable.ic_activity_walk_24dp));
+        MAP.put(BIKE, new Pair<>(R.string.activity_type_biking, R.drawable.ic_activity_bike_24dp));
+        MAP.put(DRIVE, new Pair<>(R.string.activity_type_driving, R.drawable.ic_activity_drive_24dp));
         MAP.put(SKI, new Pair<>(R.string.activity_type_skiing, R.drawable.ic_track_ski));
         MAP.put(SNOW_BOARDING, new Pair<>(R.string.activity_type_snow_boarding, R.drawable.ic_track_snow_boarding));
-        MAP.put(AIRPLANE, new Pair<>(R.string.activity_type_airplane, R.drawable.ic_track_airplane));
-        MAP.put(BOAT, new Pair<>(R.string.activity_type_boat, R.drawable.ic_track_boat));
+        MAP.put(AIRPLANE, new Pair<>(R.string.activity_type_airplane, R.drawable.ic_activity_flight_24dp));
+        MAP.put(BOAT, new Pair<>(R.string.activity_type_boat, R.drawable.ic_activity_boat_24dp));
     }
 
     private TrackIconUtils() {
@@ -163,10 +155,17 @@ public class TrackIconUtils {
             @NonNull
             @Override
             public View getView(int position, View convertView, @NonNull android.view.ViewGroup parent) {
-                ImageView imageView = convertView != null ? (ImageView) convertView : new ImageView(getContext());
-                Bitmap source = BitmapFactory.decodeResource(context.getResources(), TrackIconUtils.getIconDrawable(getItem(position) + ""));
-                imageView.setImageBitmap(source);
-                imageView.setPadding(4, 4, -4, -4);
+                ImageView imageView;
+                if (convertView != null) {
+                    imageView = (ImageView) convertView;
+                } else {
+                    imageView = new ImageView(getContext());
+                }
+
+                imageView.setImageResource(TrackIconUtils.getIconDrawable(getItem(position) + ""));
+
+                int padding = ResourceUtils.dpToPx(getContext(), 1);
+                imageView.setPaddingRelative(padding, padding, padding, -padding);
                 return imageView;
             }
         };
@@ -187,38 +186,4 @@ public class TrackIconUtils {
         }
         return false;
     }
-
-    /**
-     * Sets the menu icon color.
-     *
-     * @param menu the menu
-     */
-    public static void setMenuIconColor(Menu menu) {
-        for (int i = 0; i < menu.size(); i++) {
-            MenuItem menuitem = menu.getItem(i);
-            setMenuIconColor(menuitem);
-        }
-    }
-
-    /**
-     * Sets the menu icon color.
-     *
-     * @param menuitem the menu item
-     */
-    public static void setMenuIconColor(MenuItem menuitem) {
-        revertMenuIconColor(menuitem);
-    }
-
-    /**
-     * Reverts the menu icon color.
-     *
-     * @param menuitem the menu item
-     */
-    private static void revertMenuIconColor(MenuItem menuitem) {
-        Drawable drawable = menuitem.getIcon();
-        if (drawable != null) {
-            final PorterDuffColorFilter colorFilter = new PorterDuffColorFilter(Color.rgb(255, 255, 255), PorterDuff.Mode.MULTIPLY);
-            drawable.setColorFilter(colorFilter);
-        }
-    }
 }

src/main/res/drawable/ic_activity_bike_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M15.5,5.5c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM5,12c-2.8,0 -5,2.2 -5,5s2.2,5 5,5 5,-2.2 5,-5 -2.2,-5 -5,-5zM5,20.5c-1.9,0 -3.5,-1.6 -3.5,-3.5s1.6,-3.5 3.5,-3.5 3.5,1.6 3.5,3.5 -1.6,3.5 -3.5,3.5zM10.8,10.5l2.4,-2.4 0.8,0.8c1.3,1.3 3,2.1 5.1,2.1L19.1,9c-1.5,0 -2.7,-0.6 -3.6,-1.5l-1.9,-1.9c-0.5,-0.4 -1,-0.6 -1.6,-0.6s-1.1,0.2 -1.4,0.6L7.8,8.4c-0.4,0.4 -0.6,0.9 -0.6,1.4 0,0.6 0.2,1.1 0.6,1.4L11,14v5h2v-6.2l-2.2,-2.3zM19,12c-2.8,0 -5,2.2 -5,5s2.2,5 5,5 5,-2.2 5,-5 -2.2,-5 -5,-5zM19,20.5c-1.9,0 -3.5,-1.6 -3.5,-3.5s1.6,-3.5 3.5,-3.5 3.5,1.6 3.5,3.5 -1.6,3.5 -3.5,3.5z"/>
+</vector>

src/main/res/drawable/ic_activity_boat_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M20,21c-1.39,0 -2.78,-0.47 -4,-1.32 -2.44,1.71 -5.56,1.71 -8,0C6.78,20.53 5.39,21 4,21H2v2h2c1.38,0 2.74,-0.35 4,-0.99 2.52,1.29 5.48,1.29 8,0 1.26,0.65 2.62,0.99 4,0.99h2v-2h-2zM3.95,19H4c1.6,0 3.02,-0.88 4,-2 0.98,1.12 2.4,2 4,2s3.02,-0.88 4,-2c0.98,1.12 2.4,2 4,2h0.05l1.89,-6.68c0.08,-0.26 0.06,-0.54 -0.06,-0.78s-0.34,-0.42 -0.6,-0.5L20,10.62V6c0,-1.1 -0.9,-2 -2,-2h-3V1H9v3H6c-1.1,0 -2,0.9 -2,2v4.62l-1.29,0.42c-0.26,0.08 -0.48,0.26 -0.6,0.5s-0.15,0.52 -0.06,0.78L3.95,19zM6,6h12v3.97L12,8 6,9.97V6z"/>
+</vector>

src/main/res/drawable/ic_activity_drive_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M18.92,6.01C18.72,5.42 18.16,5 17.5,5h-11c-0.66,0 -1.21,0.42 -1.42,1.01L3,12v8c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-1h12v1c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-8l-2.08,-5.99zM6.5,16c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,13 6.5,13s1.5,0.67 1.5,1.5S7.33,16 6.5,16zM17.5,16c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM5,11l1.5,-4.5h11L19,11L5,11z"/>
+</vector>

src/main/res/drawable/ic_activity_flight_24dp.xml

@@ -0,0 +1,6 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M10.18,9"/>
+    <path android:fillColor="#FF000000" android:pathData="M21,16v-2l-8,-5V3.5c0,-0.83 -0.67,-1.5 -1.5,-1.5S10,2.67 10,3.5V9l-8,5v2l8,-2.5V19l-2,1.5V22l3.5,-1 3.5,1v-1.5L13,19v-5.5l8,2.5z"/>
+</vector>

src/main/res/drawable/ic_activity_run_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M13.49,5.48c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM9.89,19.38l1,-4.4 2.1,2v6h2v-7.5l-2.1,-2 0.6,-3c1.3,1.5 3.3,2.5 5.5,2.5v-2c-1.9,0 -3.5,-1 -4.3,-2.4l-1,-1.6c-0.4,-0.6 -1,-1 -1.7,-1 -0.3,0 -0.5,0.1 -0.8,0.1l-5.2,2.2v4.7h2v-3.4l1.8,-0.7 -1.6,8.1 -4.9,-1 -0.4,2 7,1.4z"/>
+</vector>

src/main/res/drawable/ic_activity_walk_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M13.5,5.5c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM9.8,8.9L7,23h2.1l1.8,-8 2.1,2v6h2v-7.5l-2.1,-2 0.6,-3C14.8,12 16.8,13 19,13v-2c-1.9,0 -3.5,-1 -4.3,-2.4l-1,-1.6c-0.4,-0.6 -1,-1 -1.7,-1 -0.3,0 -0.5,0.1 -0.8,0.1L6,8.3V13h2V9.6l1.8,-0.7"/>
+</vector>

src/main/res/drawable/ic_camera_24dp.xml

@@ -0,0 +1,6 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"/>
+    <path android:fillColor="#FF000000" android:pathData="M9,2L7.17,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2L9,2zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z"/>
+</vector>

src/main/res/drawable/ic_delete_forever_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2L18,7L6,7v12zM8.46,11.88l1.41,-1.41L12,12.59l2.12,-2.12 1.41,1.41L13.41,14l2.12,2.12 -1.41,1.41L12,15.41l-2.12,2.12 -1.41,-1.41L10.59,14l-2.13,-2.12zM15.5,4l-1,-1h-5l-1,1L5,4v2h14L19,4z"/>
+</vector>

src/main/res/drawable/ic_edit_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
+</vector>

src/main/res/drawable/ic_gps_fixed_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94L13,1h-2v2.06C6.83,3.52 3.52,6.83 3.06,11L1,11v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94L11,23h2v-2.06c4.17,-0.46 7.48,-3.77 7.94,-7.94L23,13v-2h-2.06zM12,19c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z"/>
+</vector>

src/main/res/drawable/ic_gps_not_fixed_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94V1h-2v2.06C6.83,3.52 3.52,6.83 3.06,11H1v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94V23h2v-2.06c4.17,-0.46 7.48,-3.77 7.94,-7.94H23v-2h-2.06zM12,19c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z"/>
+</vector>

src/main/res/drawable/ic_gps_off_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94L13,1h-2v2.06c-1.13,0.12 -2.19,0.46 -3.16,0.97l1.5,1.5C10.16,5.19 11.06,5 12,5c3.87,0 7,3.13 7,7 0,0.94 -0.19,1.84 -0.52,2.65l1.5,1.5c0.5,-0.96 0.84,-2.02 0.97,-3.15L23,13v-2h-2.06zM3,4.27l2.04,2.04C3.97,7.62 3.25,9.23 3.06,11L1,11v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94L11,23h2v-2.06c1.77,-0.2 3.38,-0.91 4.69,-1.98L19.73,21 21,19.73 4.27,3 3,4.27zM16.27,17.54C15.09,18.45 13.61,19 12,19c-3.87,0 -7,-3.13 -7,-7 0,-1.61 0.55,-3.09 1.46,-4.27l9.81,9.81z"/>
+</vector>

src/main/res/drawable/ic_location_on_black_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
+</vector>

src/main/res/drawable/ic_map_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="M20.5,3l-0.16,0.03L15,5.1 9,3 3.36,4.9c-0.21,0.07 -0.36,0.25 -0.36,0.48V20.5c0,0.28 0.22,0.5 0.5,0.5l0.16,-0.03L9,18.9l6,2.1 5.64,-1.9c0.21,-0.07 0.36,-0.25 0.36,-0.48V3.5c0,-0.28 -0.22,-0.5 -0.5,-0.5zM15,19l-6,-2.11V5l6,2.11V19z"/>
+</vector>

src/main/res/drawable/ic_marker_add_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12,2C8.14,2 5,5.14 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.86 -3.14,-7 -7,-7zM16,10h-3v3h-2v-3L8,10L8,8h3L11,5h2v3h3v2z"/>
+</vector>

src/main/res/drawable/ic_marker_show_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
+</vector>

src/main/res/drawable/ic_select_all_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M3,5h2L5,3c-1.1,0 -2,0.9 -2,2zM3,13h2v-2L3,11v2zM7,21h2v-2L7,19v2zM3,9h2L5,7L3,7v2zM13,3h-2v2h2L13,3zM19,3v2h2c0,-1.1 -0.9,-2 -2,-2zM5,21v-2L3,19c0,1.1 0.9,2 2,2zM3,17h2v-2L3,15v2zM9,3L7,3v2h2L9,3zM11,21h2v-2h-2v2zM19,13h2v-2h-2v2zM19,21c1.1,0 2,-0.9 2,-2h-2v2zM19,9h2L21,7h-2v2zM19,17h2v-2h-2v2zM15,21h2v-2h-2v2zM15,5h2L17,3h-2v2zM7,17h10L17,7L7,7v10zM9,9h6v6L9,15L9,9z"/>
+</vector>

src/main/res/drawable/ic_settings_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M19.1,12.9a2.8,2.8 0,0 0,0.1 -0.9,2.8 2.8,0 0,0 -0.1,-0.9l2.1,-1.6a0.7,0.7 0,0 0,0.1 -0.6L19.4,5.5a0.7,0.7 0,0 0,-0.6 -0.2l-2.4,1a6.5,6.5 0,0 0,-1.6 -0.9l-0.4,-2.6a0.5,0.5 0,0 0,-0.5 -0.4H10.1a0.5,0.5 0,0 0,-0.5 0.4L9.3,5.4a5.6,5.6 0,0 0,-1.7 0.9l-2.4,-1a0.4,0.4 0,0 0,-0.5 0.2l-2,3.4c-0.1,0.2 0,0.4 0.2,0.6l2,1.6a2.8,2.8 0,0 0,-0.1 0.9,2.8 2.8,0 0,0 0.1,0.9L2.8,14.5a0.7,0.7 0,0 0,-0.1 0.6l1.9,3.4a0.7,0.7 0,0 0,0.6 0.2l2.4,-1a6.5,6.5 0,0 0,1.6 0.9l0.4,2.6a0.5,0.5 0,0 0,0.5 0.4h3.8a0.5,0.5 0,0 0,0.5 -0.4l0.3,-2.6a5.6,5.6 0,0 0,1.7 -0.9l2.4,1a0.4,0.4 0,0 0,0.5 -0.2l2,-3.4c0.1,-0.2 0,-0.4 -0.2,-0.6ZM12,15.6A3.6,3.6 0,1 1,15.6 12,3.6 3.6,0 0,1 12,15.6Z"/>
+</vector>

src/main/res/drawable/ic_split_frequency_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M15,1L9,1v2h6L15,1zM11,14h2L13,8h-2v6zM19.03,7.39l1.42,-1.42c-0.43,-0.51 -0.9,-0.99 -1.41,-1.41l-1.42,1.42C16.07,4.74 14.12,4 12,4c-4.97,0 -9,4.03 -9,9s4.02,9 9,9 9,-4.03 9,-9c0,-2.12 -0.74,-4.07 -1.97,-5.61zM12,20c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z"/>
+</vector>

src/main/res/drawable/ic_statistics_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM9,17L7,17v-7h2v7zM13,17h-2L11,7h2v10zM17,17h-2v-4h2v4z"/>
+</vector>

src/main/res/layout/choose_activity_type.xml

@@ -20,11 +20,15 @@ limitations under the License.
 
     <GridView
         android:id="@+id/choose_activity_type_grid_view"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="0dp"
         android:layout_weight="1"
+        android:columnWidth="64dp"
         android:numColumns="4"
-        android:padding="4dp"
+        android:paddingStart="12dp"
+        android:paddingTop="12dp"
+        android:paddingBottom="12dp"
+        android:paddingEnd="12dp"
         android:stretchMode="spacingWidth"
         android:verticalSpacing="4dp" />
 </LinearLayout>

src/main/res/layout/list_item.xml

@@ -104,7 +104,7 @@ limitations under the License.
                                 android:layout_marginBottom="1dp"
                                 android:contentDescription="@string/image_marker_count"
                                 android:scaleType="centerInside"
-                                android:src="@drawable/ic_menu_insert_marker" />
+                                android:src="@drawable/ic_marker_show_24dp" />
 
                             <TextView
                                 android:id="@+id/list_item_marker_count"

src/main/res/menu/list_context_menu.xml

@@ -21,22 +21,22 @@ limitations under the License.
         android:title="@string/menu_share" />
     <item
         android:id="@+id/list_context_menu_show_on_map"
-        android:icon="@drawable/ic_menu_show_on_map"
+        android:icon="@drawable/ic_map_24dp"
         android:showAsAction="ifRoom"
         android:title="@string/menu_show_on_map" />
     <item
         android:id="@+id/list_context_menu_edit"
-        android:icon="@drawable/ic_menu_edit"
+        android:icon="@drawable/ic_edit_24dp"
         android:showAsAction="ifRoom"
         android:title="@string/menu_edit" />
     <item
         android:id="@+id/list_context_menu_delete"
-        android:icon="@drawable/ic_menu_delete"
+        android:icon="@drawable/ic_delete_forever_24dp"
         android:showAsAction="ifRoom"
         android:title="@string/menu_delete" />
     <item
         android:id="@+id/list_context_menu_select_all"
-        android:icon="@drawable/ic_menu_select_all"
+        android:icon="@drawable/ic_select_all_24dp"
         android:showAsAction="ifRoom"
         android:title="@string/menu_select_all" />
 </menu>

src/main/res/menu/marker_detail.xml

@@ -16,17 +16,17 @@ limitations under the License.
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/marker_detail_show_on_map"
-        android:icon="@drawable/ic_menu_show_on_map"
+        android:icon="@drawable/ic_map_24dp"
         android:showAsAction="ifRoom"
         android:title="@string/menu_show_on_map" />
     <item
         android:id="@+id/marker_detail_edit"
-        android:icon="@drawable/ic_menu_edit"
+        android:icon="@drawable/ic_edit_24dp"
         android:showAsAction="ifRoom"
         android:title="@string/menu_edit" />
     <item
         android:id="@+id/marker_detail_delete"
-        android:icon="@drawable/ic_menu_delete"
+        android:icon="@drawable/ic_delete_forever_24dp"
         android:showAsAction="ifRoom"
         android:title="@string/menu_delete" />
 </menu>

src/main/res/menu/marker_list.xml

@@ -16,7 +16,7 @@ limitations under the License.
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/marker_list_insert_marker"
-        android:icon="@drawable/ic_menu_insert_marker"
+        android:icon="@drawable/ic_marker_show_24dp"
         android:showAsAction="ifRoom"
         android:title="@string/menu_insert_marker" />
     <item

src/main/res/menu/track_detail.xml

@@ -16,19 +16,19 @@ limitations under the License.
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/track_detail_insert_marker"
-        android:icon="@drawable/ic_menu_insert_marker"
+        android:icon="@drawable/ic_marker_add_24dp"
         android:orderInCategory="1"
         android:showAsAction="ifRoom"
         android:title="@string/menu_insert_marker" />
     <item
         android:id="@+id/track_detail_insert_photo"
-        android:icon="@drawable/ic_menu_insert_photo"
+        android:icon="@drawable/ic_camera_24dp"
         android:orderInCategory="2"
         android:showAsAction="ifRoom"
         android:title="@string/menu_insert_photo" />
     <item
         android:id="@+id/track_detail_menu_show_on_map"
-        android:icon="@drawable/ic_menu_show_on_map"
+        android:icon="@drawable/ic_map_24dp"
         android:showAsAction="ifRoom"
         android:title="@string/menu_show_on_map" />
     <item
@@ -39,18 +39,18 @@ limitations under the License.
         android:title="@string/menu_share" />
     <item
         android:id="@+id/track_detail_markers"
-        android:icon="@drawable/ic_menu_insert_marker"
+        android:icon="@drawable/ic_marker_show_24dp"
         android:orderInCategory="5"
         android:showAsAction="ifRoom"
         android:title="@string/menu_markers" />
     <item
         android:id="@+id/track_detail_edit"
-        android:icon="@drawable/ic_menu_edit"
+        android:icon="@drawable/ic_edit_24dp"
         android:orderInCategory="9"
         android:title="@string/menu_edit" />
     <item
         android:id="@+id/track_detail_delete"
-        android:icon="@drawable/ic_menu_delete"
+        android:icon="@drawable/ic_delete_forever_24dp"
         android:orderInCategory="10"
         android:title="@string/menu_delete" />
     <item
@@ -60,12 +60,12 @@ limitations under the License.
         android:title="@string/menu_voice_frequency" />
     <item
         android:id="@+id/track_detail_split_frequency"
-        android:icon="@drawable/ic_menu_split_frequency"
+        android:icon="@drawable/ic_split_frequency_24dp"
         android:orderInCategory="12"
         android:title="@string/menu_split_frequency" />
     <item
         android:id="@+id/track_detail_settings"
-        android:icon="@drawable/ic_menu_settings"
+        android:icon="@drawable/ic_settings_24dp"
         android:orderInCategory="13"
         android:title="@string/menu_settings" />
 </menu>

src/main/res/menu/track_list.xml

@@ -21,24 +21,24 @@ limitations under the License.
         android:title="@string/menu_search" />
     <item
         android:id="@+id/track_list_start_gps"
-        android:icon="@drawable/ic_menu_start_gps"
+        android:icon="@drawable/ic_gps_off_24dp"
         android:showAsAction="ifRoom"
         android:title="@string/menu_start_gps" />
     <item
         android:id="@+id/track_list_markers"
-        android:icon="@drawable/ic_menu_insert_marker"
+        android:icon="@drawable/ic_marker_show_24dp"
         android:showAsAction="ifRoom"
         android:title="@string/menu_markers" />
     <item
         android:id="@+id/track_list_aggregated_statistics"
-        android:icon="@drawable/ic_menu_aggregated_statistics"
+        android:icon="@drawable/ic_statistics_24dp"
         android:title="@string/menu_aggregated_statistics" />
     <item
         android:id="@+id/track_list_delete_all"
-        android:icon="@drawable/ic_menu_delete"
+        android:icon="@drawable/ic_delete_forever_24dp"
         android:title="@string/menu_delete_all" />
     <item
         android:id="@+id/track_list_settings"
-        android:icon="@drawable/ic_menu_settings"
+        android:icon="@drawable/ic_settings_24dp"
         android:title="@string/menu_settings" />
 </menu>