Skip to content

Commit

Permalink
Remove use of Parceable span
Browse files Browse the repository at this point in the history
  • Loading branch information
simonpoole committed Nov 10, 2023
1 parent 49bbd74 commit 5628952
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 114 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.txt
@@ -1,5 +1,9 @@
See https://github.com/MarcusWolschon/osmeditor4android/ for documentation on this version and all changes.

19.3.1:

- Fix don't implement ParceableSpan, fixes crash in disambiguation menu

19.3.0:

- Fix use a monospace font for arrows
Expand Down
2 changes: 1 addition & 1 deletion src/main/AndroidManifest.xml
Expand Up @@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
package="de.blau.android"
android:installLocation="auto"
android:versionCode="2701"
android:versionCode="2702"
android:versionName="@string/app_version" >

<uses-sdk tools:overrideLibrary="androidx.core.splashscreen" />
Expand Down
86 changes: 0 additions & 86 deletions src/main/java/de/blau/android/util/LeakyTypefaceStorage.java

This file was deleted.

26 changes: 1 addition & 25 deletions src/main/java/de/blau/android/util/TypefaceSpanCompat.java
Expand Up @@ -43,7 +43,7 @@
* <img src="{@docRoot}reference/android/images/text/style/typefacespan.png" /> <figcaption>Text with
* <code>TypefaceSpan</code>s constructed based on a font from resource and from a font family.</figcaption>
*/
public class TypefaceSpanCompat extends MetricAffectingSpan implements ParcelableSpan {
public class TypefaceSpanCompat extends MetricAffectingSpan {
@Nullable
private final String mFamily;
@Nullable
Expand All @@ -69,35 +69,11 @@ public TypefaceSpanCompat(@NonNull Typeface typeface) {
this(null, typeface);
}

/**
* Constructs a {@link TypefaceSpan} from a parcel.
*/
public TypefaceSpanCompat(@NonNull Parcel src) {
mFamily = src.readString();
mTypeface = LeakyTypefaceStorage.readTypefaceFromParcel(src);
}

private TypefaceSpanCompat(@Nullable String family, @Nullable Typeface typeface) {
mFamily = family;
mTypeface = typeface;
}

@Override
public int getSpanTypeId() {
return 13 /* android.text.TextUtils.TYPEFACE_SPAN */;
}

@Override
public int describeContents() {
return 0;
}

@Override
public void writeToParcel(@NonNull Parcel dest, int flags) {
dest.writeString(mFamily);
LeakyTypefaceStorage.writeTypefaceToParcel(mTypeface, dest);
}

/**
* Returns the font family name set in the span.
*
Expand Down
4 changes: 2 additions & 2 deletions src/main/res/values/appname.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string translatable="false" name="app_name">Vespucci</string>
<string translatable="false" name="app_version">19.3.0.0</string>
<string translatable="false" name="app_name_version">Vespucci 19.3.0</string>
<string translatable="false" name="app_version">19.3.1.0</string>
<string translatable="false" name="app_name_version">Vespucci 19.3.1</string>
</resources>

0 comments on commit 5628952

Please sign in to comment.