Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Introduce base class for proper RTL - styling

Browse source
This commit is contained in:
Victor Shcherb 2019-07-24 17:39:26 +02:00
parent 63d7dd270f
commit 06fc69d0f3
2 changed files with 41 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
OsmAnd/src/net/osmand/AndroidUtils.java
View file

@ -30,6 +30,7 @@ import android.support.annotation.NonNull;
import android.support.design.widget.Snackbar;
import android.support.v4.content.ContextCompat;
import android.support.v4.content.FileProvider;
import android.text.ParcelableSpan;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.SpannableStringBuilder;
@ -37,6 +38,7 @@ import android.text.Spanned;
import android.text.TextPaint;
import android.text.TextUtils;
import android.text.format.DateFormat;
import android.text.style.CharacterStyle;
import android.text.style.ImageSpan;
import android.text.style.StyleSpan;
import android.text.style.URLSpan;
@ -558,19 +560,39 @@ public class AndroidUtils {
KeyguardManager keyguardManager = (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE);
return keyguardManager.inKeyguardRestrictedInputMode();
}
public static CharSequence getStyledString(CharSequence baseString, CharSequence stringToInsertAndStyle, int typefaceStyle) {
if (typefaceStyle == Typeface.NORMAL || typefaceStyle == Typeface.BOLD
|| typefaceStyle == Typeface.ITALIC || typefaceStyle == Typeface.BOLD_ITALIC
|| baseString.toString().contains(STRING_PLACEHOLDER)) {
int indexOfPlaceholder = baseString.toString().indexOf(STRING_PLACEHOLDER);
SpannableStringBuilder ssb = new SpannableStringBuilder(
baseString.toString().replace(STRING_PLACEHOLDER, stringToInsertAndStyle));
ssb.setSpan(new StyleSpan(typefaceStyle), indexOfPlaceholder,
stringToInsertAndStyle.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
public static CharSequence getStyledString(CharSequence baseString, CharSequence stringToInsertAndStyle, int typefaceStyle) {
if (typefaceStyle == Typeface.NORMAL || typefaceStyle == Typeface.BOLD
|| typefaceStyle == Typeface.ITALIC || typefaceStyle == Typeface.BOLD_ITALIC
|| baseString.toString().contains(STRING_PLACEHOLDER)) {
return getStyledString(baseString, stringToInsertAndStyle, null, new StyleSpan(typefaceStyle));
} else {
return baseString;
}
}
public static CharSequence getStyledString(CharSequence baseString, CharSequence stringToInsertAndStyle,
CharacterStyle baseStyle, CharacterStyle replaceStyle) {
int indexOfPlaceholder = baseString.toString().indexOf(STRING_PLACEHOLDER);
if (replaceStyle != null || baseStyle != null || indexOfPlaceholder != -1) {
String nStr = baseString.toString().replace(STRING_PLACEHOLDER, stringToInsertAndStyle);
SpannableStringBuilder ssb = new SpannableStringBuilder(nStr);
if(baseStyle != null) {
if(indexOfPlaceholder > 0) {
ssb.setSpan(baseStyle, 0, indexOfPlaceholder, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
}
if(indexOfPlaceholder + stringToInsertAndStyle.length() < nStr.length()) {
ssb.setSpan(baseStyle,
indexOfPlaceholder + stringToInsertAndStyle.length(),
nStr.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
}
}
if(replaceStyle != null) {
ssb.setSpan(replaceStyle, indexOfPlaceholder,
stringToInsertAndStyle.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
}
return ssb;
} else {
return baseString;

11
OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java
View file

@ -23,6 +23,7 @@ import android.text.style.ForegroundColorSpan;
import android.view.View;
import android.widget.Toast;
import net.osmand.AndroidUtils;
import net.osmand.GPXUtilities;
import net.osmand.GPXUtilities.GPXFile;
import net.osmand.GPXUtilities.WptPt;
@ -857,11 +858,13 @@ public class ImportHelper {
int nameColor = getResolvedColor(nightMode ? R.color.active_color_primary_dark : R.color.active_color_primary_light);
int descrColor = getResolvedColor(nightMode ? R.color.text_color_secondary_dark : R.color.text_color_secondary_light);
String descr = getString(R.string.import_gpx_file_description);
SpannableStringBuilder text = new SpannableStringBuilder(fileName).append(" ").append(descr);
text.setSpan(new ForegroundColorSpan(nameColor), 0, fileName.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
text.setSpan(new ForegroundColorSpan(descrColor), fileName.length() + 1, text.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
if(!descr.contains("%s")) {
descr = "%s " +descr;
}
items.add(new ShortDescriptionItem(text));
CharSequence txt = AndroidUtils.getStyledString(descr, fileName, new ForegroundColorSpan(descrColor),
new ForegroundColorSpan(nameColor));
items.add(new ShortDescriptionItem(txt));
BaseBottomSheetItem asFavoritesItem = new SimpleBottomSheetItem.Builder()
.setIcon(getContentIcon(R.drawable.ic_action_fav_dark))