Commit 8704c403 authored by Mudar Noufal's avatar Mudar Noufal

SPVM typo

was sometimes called SVPM = socite du vieux port!
parent 66ea240f
......@@ -39,7 +39,7 @@ public class Const {
public interface MapTypes {
String FIRE_HALLS = "fire_halls";
String SVPM_STATIONS = "svpm_stations";
String SPVM_STATIONS = "spvm_stations";
String WATER_SUPPLIES = "water_supplies";
String EMERGENCY_HOSTELS = "emergency_hostels";
String HOSPITALS = "hospitals";
......
......@@ -33,7 +33,7 @@ import ca.mudar.mtlaucasou.Const;
@Retention(RetentionPolicy.SOURCE)
@StringDef({
Const.MapTypes.FIRE_HALLS,
Const.MapTypes.SVPM_STATIONS,
Const.MapTypes.SPVM_STATIONS,
Const.MapTypes.WATER_SUPPLIES,
Const.MapTypes.EMERGENCY_HOSTELS,
Const.MapTypes.HOSPITALS})
......
......@@ -69,14 +69,14 @@ public class MapUtils {
/**
* Get the map marker icon (round buttons)
*
* @param type Selected map type {fire_halls|svpm_stations|water_supplies|emergency_hostels}
* @param type Selected map type {fire_halls|spvm_stations|water_supplies|emergency_hostels}
* @return bitmap for MarkerOptions
*/
public static BitmapDescriptor getMarkerIcon(@MapType String type) {
switch (type) {
case Const.MapTypes.FIRE_HALLS:
return BitmapDescriptorFactory.fromResource(R.drawable.ic_maps_fire_halls);
case Const.MapTypes.SVPM_STATIONS:
case Const.MapTypes.SPVM_STATIONS:
return BitmapDescriptorFactory.fromResource(R.drawable.ic_maps_spvm);
case Const.MapTypes.WATER_SUPPLIES:
return BitmapDescriptorFactory.fromResource(R.drawable.ic_maps_water_supplies);
......@@ -92,7 +92,7 @@ public class MapUtils {
* Get the app's colors for each section. Used for ProgressBar
*
* @param context Context to resolve resources
* @param type Selected map type {fire_halls|svpm_stations|water_supplies|emergency_hostels}
* @return Selected map type {fire_halls|spvm_stations|water_supplies|emergency_hostels|hospitals}
* @return the section's color
*/
@ColorInt
......@@ -102,8 +102,8 @@ public class MapUtils {
case Const.MapTypes.FIRE_HALLS:
color = R.color.color_fire_halls;
break;
case Const.MapTypes.SVPM_STATIONS:
color = R.color.color_svpm;
case Const.MapTypes.SPVM_STATIONS:
color = R.color.color_spvm;
break;
case Const.MapTypes.WATER_SUPPLIES:
color = R.color.color_water_supplies;
......
......@@ -36,7 +36,7 @@ public class NavigUtils {
* Get the bottomBar tabId for the selected SuggestionPlacemark, allowing to switch tabs
* when showing the placemark.
*
* @param type Selected map type {fire_halls|svpm_stations|water_supplies|emergency_hostels|hospitals}
* @param type Selected map type {fire_halls|spvm_stations|water_supplies|emergency_hostels|hospitals}
* @return tabId
*/
@IdRes
......@@ -44,7 +44,7 @@ public class NavigUtils {
switch (type) {
case Const.MapTypes.FIRE_HALLS:
return R.id.tab_fire_halls;
case Const.MapTypes.SVPM_STATIONS:
case Const.MapTypes.SPVM_STATIONS:
return R.id.tab_spvm;
case Const.MapTypes.WATER_SUPPLIES:
return R.id.tab_water_supplies;
......@@ -61,7 +61,7 @@ public class NavigUtils {
* Get the map type when user switches tabs in the bottomBar
*
* @param tabId the selected bottomBar tabId
* @return Selected map type {fire_halls|svpm_stations|water_supplies|emergency_hostels|hospitals}
* @return Selected map type {fire_halls|spvm_stations|water_supplies|emergency_hostels|hospitals}
*/
@MapType
public static String getMapTypeByTabId(int tabId) {
......@@ -69,7 +69,7 @@ public class NavigUtils {
case R.id.tab_fire_halls:
return Const.MapTypes.FIRE_HALLS;
case R.id.tab_spvm:
return Const.MapTypes.SVPM_STATIONS;
return Const.MapTypes.SPVM_STATIONS;
case R.id.tab_water_supplies:
return Const.MapTypes.WATER_SUPPLIES;
case R.id.tab_emergency_hostels:
......@@ -84,7 +84,7 @@ public class NavigUtils {
/**
* Get the BottomBar and SearchSuggestions icon (logos)
*
* @param type Selected map type {fire_halls|svpm_stations|water_supplies|emergency_hostels|hospitals}
* @param type Selected map type {fire_halls|spvm_stations|water_supplies|emergency_hostels|hospitals}
* @return map type resource icon
*/
@DrawableRes
......@@ -92,7 +92,7 @@ public class NavigUtils {
switch (type) {
case Const.MapTypes.FIRE_HALLS:
return R.drawable.ic_fire_hall;
case Const.MapTypes.SVPM_STATIONS:
case Const.MapTypes.SPVM_STATIONS:
return R.drawable.ic_spvm;
case Const.MapTypes.WATER_SUPPLIES:
return R.drawable.ic_water_supplies;
......
......@@ -64,7 +64,7 @@
<color name="color_background_light">@color/grey_200</color>
<color name="color_background_dark">@color/grey_800</color>
<color name="color_fire_halls">@color/red_700</color>
<color name="color_svpm">@color/blue_500</color>
<color name="color_spvm">@color/blue_500</color>
<color name="color_water_supplies">@color/blue_grey_400</color>
<color name="color_emergency_hostels">@color/light_green_700</color>
<color name="color_hospitals">@color/teal_500</color>
......
......@@ -7,7 +7,7 @@
title="@string/btn_hospitals" />
<tab
barColorWhenSelected="@color/color_svpm"
barColorWhenSelected="@color/color_spvm"
icon="@drawable/ic_spvm"
id="@+id/tab_spvm"
title="@string/btn_spvm_stations" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment