kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[android] Ticker for RTL languages.

Browse source
This commit is contained in:
Dmitry Yunitsky 2015-08-20 12:34:32 +03:00 • committed by Alex Zolotarev
parent 3bea44f852
commit dd7d353062
4 changed files with 37 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android/res/values/donottranslate.xml
View file

@ -39,4 +39,7 @@
<string name="pref_subscribe" translatable="false">Subscribe</string>
<string name="pref_settings" translatable="false">Settings</string>
<string name="pref_file_name" translatable="false">MapsMePrefs</string>
<string name="notification_ticker_ltr" translatable="false">%1$s: %2$s</string>
<string name="notification_ticker_rtl" translatable="false">%2$s :%1$s</string>
</resources>

48
android/src/com/mapswithme/maps/background/Notifier.java
View file

@ -11,6 +11,7 @@ import com.mapswithme.maps.MapStorage.Index;
import com.mapswithme.maps.MwmActivity;
import com.mapswithme.maps.MwmApplication;
import com.mapswithme.maps.R;
import com.mapswithme.util.StringUtils;
import com.mapswithme.util.statistics.Statistics;
public final class Notifier
@ -24,18 +25,6 @@ public final class Notifier
private Notifier() { }
public static NotificationCompat.Builder getBuilder()
{
return new NotificationCompat.Builder(APP)
.setAutoCancel(true)
.setSmallIcon(R.drawable.ic_notification);
}
private static NotificationManager getNotificationManager()
{
return (NotificationManager) APP.getSystemService(Context.NOTIFICATION_SERVICE);
}
public static void notifyUpdateAvailable(String countryName)
{
final String title = APP.getString(R.string.advise_update_maps);
@ -87,11 +76,7 @@ public final class Notifier
private static void placeNotification(String title, String content, PendingIntent pendingIntent, int notificationId)
{
final Notification notification = getBuilder()
.setContentTitle(title)
.setContentText(content)
.setTicker(title + ": " + content)
.setContentIntent(pendingIntent)
final Notification notification = getBuilder(title, content, pendingIntent)
.build();
getNotificationManager().notify(notificationId, notification);
@ -99,14 +84,31 @@ public final class Notifier
private static void placeBigNotification(String title, String content, PendingIntent pendingIntent, int notificationId)
{
final Notification notification = getBuilder()
.setContentTitle(title)
.setContentText(content)
.setTicker(title + ": " + content)
.setContentIntent(pendingIntent)
.setStyle(new NotificationCompat.BigTextStyle().bigText(content))
final Notification notification = getBuilder(title, content, pendingIntent).
setStyle(new NotificationCompat.BigTextStyle().bigText(content))
.build();
getNotificationManager().notify(notificationId, notification);
}
private static NotificationCompat.Builder getBuilder(String title, String content, PendingIntent pendingIntent)
{
return new NotificationCompat.Builder(APP)
.setAutoCancel(true)
.setSmallIcon(R.drawable.ic_notification)
.setContentTitle(title)
.setContentText(content)
.setTicker(getTicker(title, content))
.setContentIntent(pendingIntent);
}
private static CharSequence getTicker(String title, String content)
{
return APP.getString(StringUtils.isRtl() ? R.string.notification_ticker_rtl : R.string.notification_ticker_ltr, title, content);
}
private static NotificationManager getNotificationManager()
{
return (NotificationManager) APP.getSystemService(Context.NOTIFICATION_SERVICE);
}
}

7
android/src/com/mapswithme/util/StringUtils.java
View file

@ -76,6 +76,7 @@ public class StringUtils
/**
* Formats size in bytes to "x MB" or "x KB" format.
*
* @param size Size in bytes
* @return formatted string
*/
@ -87,6 +88,12 @@ public class StringUtils
return (size + Constants.KB - 1) / Constants.KB + " " + MwmApplication.get().getString(R.string.kb);
}
public static boolean isRtl()
{
Locale defLocale = Locale.getDefault();
return Character.getDirectionality(defLocale.getDisplayName(defLocale).charAt(0)) == Character.DIRECTIONALITY_RIGHT_TO_LEFT;
}
public static class SimpleTextWatcher implements TextWatcher
{
@Override

3
android/src/com/mapswithme/util/sharing/SharingTarget.java
View file

@ -3,6 +3,7 @@ package com.mapswithme.util.sharing;
import android.content.ComponentName;
import android.content.Intent;
import android.graphics.drawable.Drawable;
import android.support.annotation.NonNull;
import android.text.TextUtils;
import com.google.gsonaltered.annotations.SerializedName;
@ -29,7 +30,7 @@ public class SharingTarget implements Gsonable, Comparable<SharingTarget>
}
@Override
public int compareTo(SharingTarget another)
public int compareTo(@NonNull SharingTarget another)
{
return (another.usageCount - usageCount);
}