diff --git a/android/res/animator/pull_up_on_touch.xml b/android/res/animator/pull_up_on_touch.xml index 4bb123310f..7acf1d59d8 100644 --- a/android/res/animator/pull_up_on_touch.xml +++ b/android/res/animator/pull_up_on_touch.xml @@ -6,7 +6,7 @@ diff --git a/android/res/layout/city_content.xml b/android/res/layout/city_content.xml index d8713e8344..1d80700962 100644 --- a/android/res/layout/city_content.xml +++ b/android/res/layout/city_content.xml @@ -19,7 +19,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/margin_quarter_plus" - android:fontFamily="@string/robotoRegular" + android:fontFamily="@string/robotoMedium" android:lines="1" android:ellipsize="end" android:textColor="?android:textColorSecondary" diff --git a/android/res/layout/outdoor_content.xml b/android/res/layout/outdoor_content.xml index b9dd0ab933..c1a357dea4 100644 --- a/android/res/layout/outdoor_content.xml +++ b/android/res/layout/outdoor_content.xml @@ -22,7 +22,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/margin_quarter" android:ellipsize="end" - android:fontFamily="@string/robotoRegular" + android:fontFamily="@string/robotoMedium" android:lines="1" android:textColor="?android:textColorSecondary" android:textSize="@dimen/text_size_body_4" @@ -43,7 +43,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/margin_quarter" android:ellipsize="end" - android:fontFamily="@string/robotoRegular" + android:fontFamily="@string/robotoMedium" android:lines="1" android:textColor="?android:textColorSecondary" android:textSize="@dimen/text_size_body_4" @@ -64,7 +64,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/margin_quarter" android:ellipsize="end" - android:fontFamily="@string/robotoRegular" + android:fontFamily="@string/robotoMedium" android:lines="1" android:textColor="?android:textColorSecondary" android:textSize="@dimen/text_size_body_4" diff --git a/android/src/com/mapswithme/maps/gallery/Holders.java b/android/src/com/mapswithme/maps/gallery/Holders.java index 969f9df870..f87585cd93 100644 --- a/android/src/com/mapswithme/maps/gallery/Holders.java +++ b/android/src/com/mapswithme/maps/gallery/Holders.java @@ -629,7 +629,6 @@ public class Holders { super.bind(item); bindImage(item); - bindActivationState(item); bindSubtitle(item); bindBottomBlock(item); bindActivationState(item); @@ -743,7 +742,7 @@ public class Holders .getString()) ? "" : item.getOutdoorParams() .getString(); - builder.append(TextUtils.isEmpty(text) ? text : UiUtils.PHRASE_SEPARATOR + text); + builder.append(TextUtils.isEmpty(text) ? text : UiUtils.WIDE_PHRASE_SEPARATOR + text); return builder; } } diff --git a/android/src/com/mapswithme/util/UiUtils.java b/android/src/com/mapswithme/util/UiUtils.java index f6dd49ae3a..f59b405e1c 100644 --- a/android/src/com/mapswithme/util/UiUtils.java +++ b/android/src/com/mapswithme/util/UiUtils.java @@ -50,6 +50,7 @@ public final class UiUtils public static final int NO_ID = -1; public static final String NEW_STRING_DELIMITER = "\n"; public static final String PHRASE_SEPARATOR = " • "; + public static final String WIDE_PHRASE_SEPARATOR = " • "; public static final String APPROXIMATE_SYMBOL = "~"; private static float sScreenDensity;