diff --git a/metadata/en-US/changelogs/next_release.txt b/metadata/en-US/changelogs/next_release.txt index 3b01de839..479cdfc5c 100644 --- a/metadata/en-US/changelogs/next_release.txt +++ b/metadata/en-US/changelogs/next_release.txt @@ -2,6 +2,7 @@ Changes: - Removed Widget +- Introduced material design icons Bugfix: - Fixed search functionality diff --git a/src/main/java/de/dennisguse/opentracks/AbstractActivity.java b/src/main/java/de/dennisguse/opentracks/AbstractActivity.java index d981ee875..ac6d742f7 100644 --- a/src/main/java/de/dennisguse/opentracks/AbstractActivity.java +++ b/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); - } } diff --git a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java index 2658e8233..2765df98d 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java +++ b/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) { diff --git a/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeDialogFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeDialogFragment.java index a7c713647..380897dbf 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeDialogFragment.java +++ b/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(); diff --git a/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeImageAdapter.java b/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeImageAdapter.java index f01157a37..ea428c9ca 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeImageAdapter.java +++ b/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 imageIds; - private final int width; - private final int height; - private final int padding; private int selected = -1; - ChooseActivityTypeImageAdapter(Context context, List imageIds, int width, int height, int padding) { - this.context = context; + ChooseActivityTypeImageAdapter(List 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; } } diff --git a/src/main/java/de/dennisguse/opentracks/fragments/MarkerDetailFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/MarkerDetailFragment.java index ad30e8d5c..116464435 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/MarkerDetailFragment.java +++ b/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 diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java index 683bdb252..60723d56a 100644 --- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java +++ b/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()); diff --git a/src/main/java/de/dennisguse/opentracks/settings/ActivityTypePreference.java b/src/main/java/de/dennisguse/opentracks/settings/ActivityTypePreference.java index 83d88a4fb..50757e7ea 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/ActivityTypePreference.java +++ b/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 adapter = ArrayAdapter.createFromResource( - getContext(), R.array.activity_types, android.R.layout.simple_dropdown_item_1line); + ArrayAdapter 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); } }); diff --git a/src/main/java/de/dennisguse/opentracks/util/ResourceUtils.java b/src/main/java/de/dennisguse/opentracks/util/ResourceUtils.java new file mode 100644 index 000000000..a2ecdbb73 --- /dev/null +++ b/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); + } +} diff --git a/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java b/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java index abfe82677..505022ca8 100644 --- a/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java +++ b/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> 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); - } - } } diff --git a/src/main/res/drawable-hdpi/ic_menu_aggregated_statistics.png b/src/main/res/drawable-hdpi/ic_menu_aggregated_statistics.png deleted file mode 100644 index 6b58c2dab..000000000 Binary files a/src/main/res/drawable-hdpi/ic_menu_aggregated_statistics.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_menu_delete.png b/src/main/res/drawable-hdpi/ic_menu_delete.png deleted file mode 100644 index ffd19d9e8..000000000 Binary files a/src/main/res/drawable-hdpi/ic_menu_delete.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_menu_edit.png b/src/main/res/drawable-hdpi/ic_menu_edit.png deleted file mode 100644 index 3eb5190fb..000000000 Binary files a/src/main/res/drawable-hdpi/ic_menu_edit.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_menu_insert_marker.png b/src/main/res/drawable-hdpi/ic_menu_insert_marker.png deleted file mode 100644 index e6c7bf317..000000000 Binary files a/src/main/res/drawable-hdpi/ic_menu_insert_marker.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_menu_insert_photo.png b/src/main/res/drawable-hdpi/ic_menu_insert_photo.png deleted file mode 100644 index d9d87393e..000000000 Binary files a/src/main/res/drawable-hdpi/ic_menu_insert_photo.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_menu_select_all.png b/src/main/res/drawable-hdpi/ic_menu_select_all.png deleted file mode 100644 index 26a270b33..000000000 Binary files a/src/main/res/drawable-hdpi/ic_menu_select_all.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_menu_settings.png b/src/main/res/drawable-hdpi/ic_menu_settings.png deleted file mode 100644 index 3e4580e05..000000000 Binary files a/src/main/res/drawable-hdpi/ic_menu_settings.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_menu_show_on_map.png b/src/main/res/drawable-hdpi/ic_menu_show_on_map.png deleted file mode 100644 index e5907072f..000000000 Binary files a/src/main/res/drawable-hdpi/ic_menu_show_on_map.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_menu_split_frequency.png b/src/main/res/drawable-hdpi/ic_menu_split_frequency.png deleted file mode 100644 index e6351a076..000000000 Binary files a/src/main/res/drawable-hdpi/ic_menu_split_frequency.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_menu_start_gps.png b/src/main/res/drawable-hdpi/ic_menu_start_gps.png deleted file mode 100644 index d7fae7e98..000000000 Binary files a/src/main/res/drawable-hdpi/ic_menu_start_gps.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_menu_stop_gps.png b/src/main/res/drawable-hdpi/ic_menu_stop_gps.png deleted file mode 100644 index 48c28191f..000000000 Binary files a/src/main/res/drawable-hdpi/ic_menu_stop_gps.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_track_airplane.png b/src/main/res/drawable-hdpi/ic_track_airplane.png deleted file mode 100644 index 85df6cf21..000000000 Binary files a/src/main/res/drawable-hdpi/ic_track_airplane.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_track_bike.png b/src/main/res/drawable-hdpi/ic_track_bike.png deleted file mode 100644 index 139b191d2..000000000 Binary files a/src/main/res/drawable-hdpi/ic_track_bike.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_track_boat.png b/src/main/res/drawable-hdpi/ic_track_boat.png deleted file mode 100644 index 3c0b8cfef..000000000 Binary files a/src/main/res/drawable-hdpi/ic_track_boat.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_track_drive.png b/src/main/res/drawable-hdpi/ic_track_drive.png deleted file mode 100644 index 43e6dd523..000000000 Binary files a/src/main/res/drawable-hdpi/ic_track_drive.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_track_run.png b/src/main/res/drawable-hdpi/ic_track_run.png deleted file mode 100644 index a0b9ec1b0..000000000 Binary files a/src/main/res/drawable-hdpi/ic_track_run.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_track_walk.png b/src/main/res/drawable-hdpi/ic_track_walk.png deleted file mode 100644 index eda1b3927..000000000 Binary files a/src/main/res/drawable-hdpi/ic_track_walk.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_menu_aggregated_statistics.png b/src/main/res/drawable-mdpi/ic_menu_aggregated_statistics.png deleted file mode 100644 index 5b87a5fbf..000000000 Binary files a/src/main/res/drawable-mdpi/ic_menu_aggregated_statistics.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_menu_delete.png b/src/main/res/drawable-mdpi/ic_menu_delete.png deleted file mode 100644 index a8ee5f253..000000000 Binary files a/src/main/res/drawable-mdpi/ic_menu_delete.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_menu_edit.png b/src/main/res/drawable-mdpi/ic_menu_edit.png deleted file mode 100644 index 4a28d0322..000000000 Binary files a/src/main/res/drawable-mdpi/ic_menu_edit.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_menu_insert_marker.png b/src/main/res/drawable-mdpi/ic_menu_insert_marker.png deleted file mode 100644 index de9a29e7c..000000000 Binary files a/src/main/res/drawable-mdpi/ic_menu_insert_marker.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_menu_insert_photo.png b/src/main/res/drawable-mdpi/ic_menu_insert_photo.png deleted file mode 100644 index 61e231797..000000000 Binary files a/src/main/res/drawable-mdpi/ic_menu_insert_photo.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_menu_select_all.png b/src/main/res/drawable-mdpi/ic_menu_select_all.png deleted file mode 100644 index 070593ff8..000000000 Binary files a/src/main/res/drawable-mdpi/ic_menu_select_all.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_menu_settings.png b/src/main/res/drawable-mdpi/ic_menu_settings.png deleted file mode 100644 index d3e42edcb..000000000 Binary files a/src/main/res/drawable-mdpi/ic_menu_settings.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_menu_show_on_map.png b/src/main/res/drawable-mdpi/ic_menu_show_on_map.png deleted file mode 100644 index 21de20114..000000000 Binary files a/src/main/res/drawable-mdpi/ic_menu_show_on_map.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_menu_split_frequency.png b/src/main/res/drawable-mdpi/ic_menu_split_frequency.png deleted file mode 100644 index 939e0754c..000000000 Binary files a/src/main/res/drawable-mdpi/ic_menu_split_frequency.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_menu_start_gps.png b/src/main/res/drawable-mdpi/ic_menu_start_gps.png deleted file mode 100644 index 9d1f4403a..000000000 Binary files a/src/main/res/drawable-mdpi/ic_menu_start_gps.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_menu_stop_gps.png b/src/main/res/drawable-mdpi/ic_menu_stop_gps.png deleted file mode 100644 index 7181d60c0..000000000 Binary files a/src/main/res/drawable-mdpi/ic_menu_stop_gps.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_track_airplane.png b/src/main/res/drawable-mdpi/ic_track_airplane.png deleted file mode 100644 index 007fb2abc..000000000 Binary files a/src/main/res/drawable-mdpi/ic_track_airplane.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_track_bike.png b/src/main/res/drawable-mdpi/ic_track_bike.png deleted file mode 100644 index 663f94f2a..000000000 Binary files a/src/main/res/drawable-mdpi/ic_track_bike.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_track_boat.png b/src/main/res/drawable-mdpi/ic_track_boat.png deleted file mode 100644 index 7aeb57bb0..000000000 Binary files a/src/main/res/drawable-mdpi/ic_track_boat.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_track_drive.png b/src/main/res/drawable-mdpi/ic_track_drive.png deleted file mode 100644 index 00e86e962..000000000 Binary files a/src/main/res/drawable-mdpi/ic_track_drive.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_track_run.png b/src/main/res/drawable-mdpi/ic_track_run.png deleted file mode 100644 index df34276e2..000000000 Binary files a/src/main/res/drawable-mdpi/ic_track_run.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_track_walk.png b/src/main/res/drawable-mdpi/ic_track_walk.png deleted file mode 100644 index 9495aba55..000000000 Binary files a/src/main/res/drawable-mdpi/ic_track_walk.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_menu_aggregated_statistics.png b/src/main/res/drawable-xhdpi/ic_menu_aggregated_statistics.png deleted file mode 100644 index 4b4355c4d..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_menu_aggregated_statistics.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_menu_delete.png b/src/main/res/drawable-xhdpi/ic_menu_delete.png deleted file mode 100644 index 412b33354..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_menu_delete.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_menu_edit.png b/src/main/res/drawable-xhdpi/ic_menu_edit.png deleted file mode 100644 index 4215579ae..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_menu_edit.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_menu_insert_marker.png b/src/main/res/drawable-xhdpi/ic_menu_insert_marker.png deleted file mode 100644 index 6b197c30f..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_menu_insert_marker.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_menu_insert_photo.png b/src/main/res/drawable-xhdpi/ic_menu_insert_photo.png deleted file mode 100644 index 0323155c4..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_menu_insert_photo.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_menu_select_all.png b/src/main/res/drawable-xhdpi/ic_menu_select_all.png deleted file mode 100644 index 52d1155d2..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_menu_select_all.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_menu_settings.png b/src/main/res/drawable-xhdpi/ic_menu_settings.png deleted file mode 100644 index 09b014834..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_menu_settings.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_menu_show_on_map.png b/src/main/res/drawable-xhdpi/ic_menu_show_on_map.png deleted file mode 100644 index f5ce90a33..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_menu_show_on_map.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_menu_split_frequency.png b/src/main/res/drawable-xhdpi/ic_menu_split_frequency.png deleted file mode 100644 index ad204e4f0..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_menu_split_frequency.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_menu_start_gps.png b/src/main/res/drawable-xhdpi/ic_menu_start_gps.png deleted file mode 100644 index 52ca8ab7f..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_menu_start_gps.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_menu_stop_gps.png b/src/main/res/drawable-xhdpi/ic_menu_stop_gps.png deleted file mode 100644 index 6f6e64d9b..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_menu_stop_gps.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_track_airplane.png b/src/main/res/drawable-xhdpi/ic_track_airplane.png deleted file mode 100644 index 9daef53d5..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_track_airplane.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_track_bike.png b/src/main/res/drawable-xhdpi/ic_track_bike.png deleted file mode 100644 index 1130430e7..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_track_bike.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_track_boat.png b/src/main/res/drawable-xhdpi/ic_track_boat.png deleted file mode 100644 index e042e635a..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_track_boat.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_track_drive.png b/src/main/res/drawable-xhdpi/ic_track_drive.png deleted file mode 100644 index 91be8722b..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_track_drive.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_track_run.png b/src/main/res/drawable-xhdpi/ic_track_run.png deleted file mode 100644 index b86ae6863..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_track_run.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_track_walk.png b/src/main/res/drawable-xhdpi/ic_track_walk.png deleted file mode 100644 index f0e44c2b2..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_track_walk.png and /dev/null differ diff --git a/src/main/res/drawable/ic_activity_bike_24dp.xml b/src/main/res/drawable/ic_activity_bike_24dp.xml new file mode 100644 index 000000000..f165cea9c --- /dev/null +++ b/src/main/res/drawable/ic_activity_bike_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/src/main/res/drawable/ic_activity_boat_24dp.xml b/src/main/res/drawable/ic_activity_boat_24dp.xml new file mode 100644 index 000000000..48021a3a9 --- /dev/null +++ b/src/main/res/drawable/ic_activity_boat_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/src/main/res/drawable/ic_activity_drive_24dp.xml b/src/main/res/drawable/ic_activity_drive_24dp.xml new file mode 100644 index 000000000..981334c17 --- /dev/null +++ b/src/main/res/drawable/ic_activity_drive_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/src/main/res/drawable/ic_activity_flight_24dp.xml b/src/main/res/drawable/ic_activity_flight_24dp.xml new file mode 100644 index 000000000..5c656403e --- /dev/null +++ b/src/main/res/drawable/ic_activity_flight_24dp.xml @@ -0,0 +1,6 @@ + + + + diff --git a/src/main/res/drawable/ic_activity_run_24dp.xml b/src/main/res/drawable/ic_activity_run_24dp.xml new file mode 100644 index 000000000..2fb069d1a --- /dev/null +++ b/src/main/res/drawable/ic_activity_run_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/src/main/res/drawable/ic_activity_walk_24dp.xml b/src/main/res/drawable/ic_activity_walk_24dp.xml new file mode 100644 index 000000000..1e2de9195 --- /dev/null +++ b/src/main/res/drawable/ic_activity_walk_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/src/main/res/drawable/ic_camera_24dp.xml b/src/main/res/drawable/ic_camera_24dp.xml new file mode 100644 index 000000000..28972c689 --- /dev/null +++ b/src/main/res/drawable/ic_camera_24dp.xml @@ -0,0 +1,6 @@ + + + + diff --git a/src/main/res/drawable/ic_delete_forever_24dp.xml b/src/main/res/drawable/ic_delete_forever_24dp.xml new file mode 100644 index 000000000..0d6fef810 --- /dev/null +++ b/src/main/res/drawable/ic_delete_forever_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/src/main/res/drawable/ic_edit_24dp.xml b/src/main/res/drawable/ic_edit_24dp.xml new file mode 100644 index 000000000..46462b572 --- /dev/null +++ b/src/main/res/drawable/ic_edit_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/src/main/res/drawable/ic_gps_fixed_24dp.xml b/src/main/res/drawable/ic_gps_fixed_24dp.xml new file mode 100644 index 000000000..2ed495236 --- /dev/null +++ b/src/main/res/drawable/ic_gps_fixed_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/src/main/res/drawable/ic_gps_not_fixed_24dp.xml b/src/main/res/drawable/ic_gps_not_fixed_24dp.xml new file mode 100644 index 000000000..82448cca3 --- /dev/null +++ b/src/main/res/drawable/ic_gps_not_fixed_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/src/main/res/drawable/ic_gps_off_24dp.xml b/src/main/res/drawable/ic_gps_off_24dp.xml new file mode 100644 index 000000000..973b4cc1e --- /dev/null +++ b/src/main/res/drawable/ic_gps_off_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/src/main/res/drawable/ic_location_on_black_24dp.xml b/src/main/res/drawable/ic_location_on_black_24dp.xml new file mode 100644 index 000000000..aea56cb5a --- /dev/null +++ b/src/main/res/drawable/ic_location_on_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/src/main/res/drawable/ic_map_24dp.xml b/src/main/res/drawable/ic_map_24dp.xml new file mode 100644 index 000000000..4cb341e6e --- /dev/null +++ b/src/main/res/drawable/ic_map_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/src/main/res/drawable/ic_marker_add_24dp.xml b/src/main/res/drawable/ic_marker_add_24dp.xml new file mode 100644 index 000000000..8b7200f0a --- /dev/null +++ b/src/main/res/drawable/ic_marker_add_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/src/main/res/drawable/ic_marker_show_24dp.xml b/src/main/res/drawable/ic_marker_show_24dp.xml new file mode 100644 index 000000000..aea56cb5a --- /dev/null +++ b/src/main/res/drawable/ic_marker_show_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/src/main/res/drawable/ic_select_all_24dp.xml b/src/main/res/drawable/ic_select_all_24dp.xml new file mode 100644 index 000000000..bc75904c3 --- /dev/null +++ b/src/main/res/drawable/ic_select_all_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/src/main/res/drawable/ic_settings_24dp.xml b/src/main/res/drawable/ic_settings_24dp.xml new file mode 100644 index 000000000..1397d370e --- /dev/null +++ b/src/main/res/drawable/ic_settings_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/src/main/res/drawable/ic_split_frequency_24dp.xml b/src/main/res/drawable/ic_split_frequency_24dp.xml new file mode 100644 index 000000000..704a3b8e0 --- /dev/null +++ b/src/main/res/drawable/ic_split_frequency_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/src/main/res/drawable/ic_statistics_24dp.xml b/src/main/res/drawable/ic_statistics_24dp.xml new file mode 100644 index 000000000..13cfc8fad --- /dev/null +++ b/src/main/res/drawable/ic_statistics_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/src/main/res/layout/choose_activity_type.xml b/src/main/res/layout/choose_activity_type.xml index 647848dc7..8e6b3d7e5 100644 --- a/src/main/res/layout/choose_activity_type.xml +++ b/src/main/res/layout/choose_activity_type.xml @@ -20,11 +20,15 @@ limitations under the License. \ No newline at end of file diff --git a/src/main/res/layout/list_item.xml b/src/main/res/layout/list_item.xml index 39c2ddfc3..5d7f71587 100644 --- a/src/main/res/layout/list_item.xml +++ b/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" /> \ No newline at end of file diff --git a/src/main/res/menu/marker_detail.xml b/src/main/res/menu/marker_detail.xml index 5d513ed59..0b1d9f168 100644 --- a/src/main/res/menu/marker_detail.xml +++ b/src/main/res/menu/marker_detail.xml @@ -16,17 +16,17 @@ limitations under the License. \ No newline at end of file diff --git a/src/main/res/menu/marker_list.xml b/src/main/res/menu/marker_list.xml index f31c568ae..882af11cd 100644 --- a/src/main/res/menu/marker_list.xml +++ b/src/main/res/menu/marker_list.xml @@ -16,7 +16,7 @@ limitations under the License. \ No newline at end of file diff --git a/src/main/res/menu/track_list.xml b/src/main/res/menu/track_list.xml index e71505e1c..e332c4e0b 100644 --- a/src/main/res/menu/track_list.xml +++ b/src/main/res/menu/track_list.xml @@ -21,24 +21,24 @@ limitations under the License. android:title="@string/menu_search" /> \ No newline at end of file