mnalis/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Fixed font style in guides gallery item, added spase to dot separator, decreased on 8dp the pull on touch animation in guides gallery

Browse source
This commit is contained in:
Александр Зацепин 2020-06-09 13:47:07 +03:00 • committed by Vladimir Byko-Ianko
parent 3cf4c3ac73
commit 5dbca2ffe6
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/res/animator/pull_up_on_touch.xml
View file

@ -6,7 +6,7 @@
<objectAnimator
android:duration="100"
android:propertyName="translationY"
android:valueTo="-16dp"
android:valueTo="-8dp"
android:valueType="floatType"/>
</set>
</item>

2
android/res/layout/city_content.xml
View file

@ -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"

6
android/res/layout/outdoor_content.xml
View file

@ -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"

3
android/src/com/mapswithme/maps/gallery/Holders.java
View file

@ -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;
}
}

1
android/src/com/mapswithme/util/UiUtils.java
View file

@ -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;