diff --git a/drawable-svg/ic_activity_climbing.svg b/drawable-svg/ic_activity_climbing.svg new file mode 100644 index 000000000..212df9a83 --- /dev/null +++ b/drawable-svg/ic_activity_climbing.svg @@ -0,0 +1,474 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/drawable-svg/ic_activity_escooter.svg b/drawable-svg/ic_activity_escooter.svg new file mode 100644 index 000000000..c1fba4e52 --- /dev/null +++ b/drawable-svg/ic_activity_escooter.svg @@ -0,0 +1,496 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/drawable-svg/ic_activity_inline_skating.svg b/drawable-svg/ic_activity_inline_skating.svg new file mode 100644 index 000000000..88b2b5273 --- /dev/null +++ b/drawable-svg/ic_activity_inline_skating.svg @@ -0,0 +1,515 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/drawable-svg/ic_activity_motorbike.svg b/drawable-svg/ic_activity_motorbike.svg new file mode 100644 index 000000000..82f8cd47b --- /dev/null +++ b/drawable-svg/ic_activity_motorbike.svg @@ -0,0 +1,546 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/drawable-svg/ic_activity_mtb.svg b/drawable-svg/ic_activity_mtb.svg new file mode 100644 index 000000000..fb9be5648 --- /dev/null +++ b/drawable-svg/ic_activity_mtb.svg @@ -0,0 +1,464 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/drawable-svg/ic_activity_sailing.svg b/drawable-svg/ic_activity_sailing.svg new file mode 100644 index 000000000..784c2b960 --- /dev/null +++ b/drawable-svg/ic_activity_sailing.svg @@ -0,0 +1,477 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/drawable-svg/ic_activity_skateboarding.svg b/drawable-svg/ic_activity_skateboarding.svg new file mode 100644 index 000000000..ef3e0072b --- /dev/null +++ b/drawable-svg/ic_activity_skateboarding.svg @@ -0,0 +1,482 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/drawable-svg/ic_activity_skiing.svg b/drawable-svg/ic_activity_skiing.svg new file mode 100644 index 000000000..7ce7ceb7e --- /dev/null +++ b/drawable-svg/ic_activity_skiing.svg @@ -0,0 +1,469 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/drawable-svg/ic_activity_snowboarding.svg b/drawable-svg/ic_activity_snowboarding.svg new file mode 100644 index 000000000..bdc240b6a --- /dev/null +++ b/drawable-svg/ic_activity_snowboarding.svg @@ -0,0 +1,470 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java b/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java index 3af1a0f30..c5232c757 100644 --- a/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java +++ b/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java @@ -40,23 +40,37 @@ public class TrackIconUtils { private static final String AIRPLANE = "AIRPLANE"; private static final String BIKE = "BIKE"; + private static final String MOUNTAIN_BIKE = "MOUNTAIN_BIKE"; + private static final String MOTOR_BIKE = "MOTOR_BIKE"; private static final String BOAT = "BOAT"; + private static final String SAILING = "SAILING"; private static final String DRIVE = "DRIVE"; private static final String RUN = "RUN"; private static final String SKI = "SKI"; private static final String SNOW_BOARDING = "SNOW_BOARDING"; private static final String UNKNOWN = "UNKNOWN"; private static final String WALK = "WALK"; + private static final String ESCOOTER = "ESCOOTER"; + private static final String INLINE_SKATING = "INLINES_SKATING"; + private static final String SKATE_BOARDING = "SKATE_BOARDING"; + private static final String CLIMBING = "CLIMBING"; private static final int ACTIVITY_UNKNOWN_LOGO = R.drawable.ic_logo_white_24dp; private static final int[] AIRPLANE_LIST = new int[]{R.string.activity_type_airplane, R.string.activity_type_commercial_airplane, R.string.activity_type_rc_airplane}; - private static final int[] BIKE_LIST = new int[]{R.string.activity_type_biking, R.string.activity_type_cycling, R.string.activity_type_dirt_bike, R.string.activity_type_motor_bike, R.string.activity_type_mountain_biking, R.string.activity_type_road_biking, R.string.activity_type_track_cycling}; + private static final int[] BIKE_LIST = new int[]{R.string.activity_type_biking, R.string.activity_type_cycling, R.string.activity_type_dirt_bike, R.string.activity_type_mountain_biking, R.string.activity_type_road_biking, R.string.activity_type_track_cycling}; private static final int[] BOAT_LIST = new int[]{R.string.activity_type_boat, R.string.activity_type_ferry, R.string.activity_type_motor_boating, R.string.activity_type_rc_boat}; + private static final int[] CLIMBING_LIST = new int[]{R.string.activity_type_climbing}; private static final int[] DRIVE_LIST = new int[]{R.string.activity_type_atv, R.string.activity_type_driving, R.string.activity_type_driving_bus, R.string.activity_type_driving_car}; + private static final int[] MOTOR_BIKE_LIST = new int[]{R.string.activity_type_motor_bike}; + private static final int[] MOUNTAIN_BIKE_LIST = new int[]{R.string.activity_type_mountain_biking}; + private static final int[] ESCOOTER_LIST = new int[]{R.string.activity_type_escooter}; + private static final int[] INLINE_SKATING_LIST = new int[]{R.string.activity_type_inline_skating}; private static final int[] RUN_LIST = new int[]{R.string.activity_type_running, R.string.activity_type_street_running, R.string.activity_type_track_running, R.string.activity_type_trail_running}; + private static final int[] SAILING_LIST = new int[]{R.string.activity_type_sailing}; private static final int[] SKI_LIST = new int[]{R.string.activity_type_cross_country_skiing, R.string.activity_type_skiing}; private static final int[] SNOW_BOARDING_LIST = new int[]{R.string.activity_type_snow_boarding}; + private static final int[] SKATE_BOARDING_LIST = new int[]{R.string.activity_type_skate_boarding}; private static final int[] WALK_LIST = new int[]{R.string.activity_type_hiking, R.string.activity_type_off_trail_hiking, R.string.activity_type_speed_walking, R.string.activity_type_trail_hiking, R.string.activity_type_walking}; // List of icons whose sports associated use speed (in km/h or mi/h). @@ -66,11 +80,13 @@ public class TrackIconUtils { // All airplane categories. R.string.activity_type_airplane, R.string.activity_type_commercial_airplane, R.string.activity_type_rc_airplane, // All bike categories. - R.string.activity_type_biking, R.string.activity_type_cycling, R.string.activity_type_dirt_bike, R.string.activity_type_motor_bike, R.string.activity_type_mountain_biking, R.string.activity_type_road_biking, R.string.activity_type_track_cycling, + R.string.activity_type_biking, R.string.activity_type_cycling, R.string.activity_type_dirt_bike, R.string.activity_type_motor_bike, R.string.activity_type_mountain_biking, R.string.activity_type_road_biking, R.string.activity_type_track_cycling, R.string.activity_type_inline_skating, // All boat categories. - R.string.activity_type_boat, R.string.activity_type_ferry, R.string.activity_type_motor_boating, R.string.activity_type_rc_boat, + R.string.activity_type_boat, R.string.activity_type_ferry, R.string.activity_type_motor_boating, R.string.activity_type_rc_boat, R.string.activity_type_sailing, // All drive categories. - R.string.activity_type_atv, R.string.activity_type_driving, R.string.activity_type_driving_bus, R.string.activity_type_driving_car, + R.string.activity_type_atv, R.string.activity_type_driving, R.string.activity_type_driving_bus, R.string.activity_type_driving_car, R.string.activity_type_escooter, R.string.activity_type_skate_boarding, + // All wintersport categories + R.string.activity_type_skiing, R.string.activity_type_snow_boarding }; @@ -81,13 +97,19 @@ public class TrackIconUtils { MAP.put(UNKNOWN, new Pair<>(R.string.activity_type_unknown, ACTIVITY_UNKNOWN_LOGO)); 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(CLIMBING, new Pair<>(R.string.activity_type_climbing, R.drawable.ic_activity_climbing_24dp)); + MAP.put(SKATE_BOARDING, new Pair<>(R.string.activity_type_skate_boarding, R.drawable.ic_activity_skateboarding_24dp)); + MAP.put(INLINE_SKATING, new Pair<>(R.string.activity_type_inline_skating, R.drawable.ic_activity_inline_skating_24dp)); + MAP.put(SNOW_BOARDING, new Pair<>(R.string.activity_type_snow_boarding, R.drawable.ic_activity_snowboarding_24dp)); + MAP.put(SKI, new Pair<>(R.string.activity_type_skiing, R.drawable.ic_activity_skiing_24dp)); + MAP.put(ESCOOTER, new Pair<>(R.string.activity_type_escooter, R.drawable.ic_activity_escooter_24dp)); MAP.put(BIKE, new Pair<>(R.string.activity_type_biking, R.drawable.ic_activity_bike_24dp)); + MAP.put(MOUNTAIN_BIKE, new Pair<>(R.string.activity_type_mountain_biking, R.drawable.ic_activity_mtb_24dp)); + MAP.put(MOTOR_BIKE, new Pair<>(R.string.activity_type_motor_bike, R.drawable.ic_activity_motorbike_24dp)); MAP.put(DRIVE, new Pair<>(R.string.activity_type_driving, R.drawable.ic_activity_drive_24dp)); - // TODO Need new icons -// 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_activity_flight_24dp)); MAP.put(BOAT, new Pair<>(R.string.activity_type_boat, R.drawable.ic_activity_boat_24dp)); + MAP.put(SAILING, new Pair<>(R.string.activity_type_sailing, R.drawable.ic_activity_sailing_24dp)); } private TrackIconUtils() { @@ -142,21 +164,42 @@ public class TrackIconUtils { if (inList(context, activityType, BIKE_LIST)) { return BIKE; } + if (inList(context, activityType, MOUNTAIN_BIKE_LIST)) { + return MOUNTAIN_BIKE; + } + if (inList(context, activityType, CLIMBING_LIST)) { + return CLIMBING; + } + if (inList(context, activityType, MOTOR_BIKE_LIST)) { + return MOTOR_BIKE; + } if (inList(context, activityType, BOAT_LIST)) { return BOAT; } + if (inList(context, activityType, SAILING_LIST)) { + return SAILING; + } if (inList(context, activityType, DRIVE_LIST)) { return DRIVE; } + if (inList(context, activityType, INLINE_SKATING_LIST)) { + return INLINE_SKATING; + } + if (inList(context, activityType, ESCOOTER_LIST)) { + return ESCOOTER; + } if (inList(context, activityType, RUN_LIST)) { return RUN; } -// if (inList(context, activityType, SKI_LIST)) { -// return SKI; -// } -// if (inList(context, activityType, SNOW_BOARDING_LIST)) { -// return SNOW_BOARDING; -// } + if (inList(context, activityType, SKI_LIST)) { + return SKI; + } + if (inList(context, activityType, SNOW_BOARDING_LIST)) { + return SNOW_BOARDING; + } + if (inList(context, activityType, SKATE_BOARDING_LIST)) { + return SKATE_BOARDING; + } if (inList(context, activityType, WALK_LIST)) { return WALK; } diff --git a/src/main/res/drawable/ic_activity_climbing_24dp.xml b/src/main/res/drawable/ic_activity_climbing_24dp.xml new file mode 100644 index 000000000..a660f3fd5 --- /dev/null +++ b/src/main/res/drawable/ic_activity_climbing_24dp.xml @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/res/drawable/ic_activity_escooter_24dp.xml b/src/main/res/drawable/ic_activity_escooter_24dp.xml new file mode 100644 index 000000000..fcb0495bb --- /dev/null +++ b/src/main/res/drawable/ic_activity_escooter_24dp.xml @@ -0,0 +1,271 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/res/drawable/ic_activity_inline_skating_24dp.xml b/src/main/res/drawable/ic_activity_inline_skating_24dp.xml new file mode 100644 index 000000000..6e863d841 --- /dev/null +++ b/src/main/res/drawable/ic_activity_inline_skating_24dp.xml @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/res/drawable/ic_activity_motorbike_24dp.xml b/src/main/res/drawable/ic_activity_motorbike_24dp.xml new file mode 100644 index 000000000..22faa4fe1 --- /dev/null +++ b/src/main/res/drawable/ic_activity_motorbike_24dp.xml @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/res/drawable/ic_activity_mtb_24dp.xml b/src/main/res/drawable/ic_activity_mtb_24dp.xml new file mode 100644 index 000000000..852249130 --- /dev/null +++ b/src/main/res/drawable/ic_activity_mtb_24dp.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/res/drawable/ic_activity_sailing_24dp.xml b/src/main/res/drawable/ic_activity_sailing_24dp.xml new file mode 100644 index 000000000..e2cdf8cb7 --- /dev/null +++ b/src/main/res/drawable/ic_activity_sailing_24dp.xml @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/res/drawable/ic_activity_skateboarding_24dp.xml b/src/main/res/drawable/ic_activity_skateboarding_24dp.xml new file mode 100644 index 000000000..87d07167f --- /dev/null +++ b/src/main/res/drawable/ic_activity_skateboarding_24dp.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/res/drawable/ic_activity_skiing_24dp.xml b/src/main/res/drawable/ic_activity_skiing_24dp.xml new file mode 100644 index 000000000..585f28363 --- /dev/null +++ b/src/main/res/drawable/ic_activity_skiing_24dp.xml @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/res/drawable/ic_activity_snowboarding_24dp.xml b/src/main/res/drawable/ic_activity_snowboarding_24dp.xml new file mode 100644 index 000000000..cddbe1c69 --- /dev/null +++ b/src/main/res/drawable/ic_activity_snowboarding_24dp.xml @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index a5b350cee..7779da143 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -115,6 +115,7 @@ limitations under the License. driving driving bus driving car + escooter ferry frisbee gliding