Skip to content

Use Android 15 TextView API directly #58725

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Abbondanzo wants to merge 1 commit into
base: main
Choose a base branch
from
+2 −25
Open

Use Android 15 TextView API directly #58725

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 2 additions & 25 deletions .../react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.AppCompatTextView;
import androidx.core.view.AccessibilityDelegateCompat;
Expand All @@ -47,12 +46,10 @@
import com.facebook.react.uimanager.style.BorderStyle;
import com.facebook.react.uimanager.style.LogicalEdge;
import com.facebook.react.uimanager.style.Overflow;
import com.facebook.react.util.AndroidVersion;
import com.facebook.react.views.text.internal.span.CanvasEffectSpan;
import com.facebook.react.views.text.internal.span.ReactFragmentIndexSpan;
import com.facebook.react.views.text.internal.span.ReactTagSpan;
import com.facebook.yoga.YogaMeasureMode;
import java.lang.reflect.Method;

@Nullsafe(Nullsafe.Mode.LOCAL)
public class ReactTextView extends AppCompatTextView implements ReactCompoundView {
Expand All @@ -63,10 +60,6 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
// https://github.com/aosp-mirror/platform_frameworks_base/blob/master/core/java/android/widget/TextView.java#L854
private static final int DEFAULT_GRAVITY = Gravity.TOP | Gravity.START;

// TextView.setUseBoundsForWidth (API 35+). Looked up reflectively because some internal targets
// compile against an SDK older than 35 (see AndroidVersion).
private static final @Nullable Method SET_USE_BOUNDS_FOR_WIDTH = resolveSetUseBoundsForWidth();

private int mNumberOfLines;
private @Nullable TextUtils.TruncateAt mEllipsizeLocation;
private boolean mAdjustsFontSizeToFit;
Expand All @@ -87,17 +80,6 @@ public ReactTextView(Context context) {
initView();
}

private static @Nullable Method resolveSetUseBoundsForWidth() {
if (Build.VERSION.SDK_INT < AndroidVersion.VERSION_CODE_VANILLA_ICE_CREAM) {
return null;
}
try {
return TextView.class.getMethod("setUseBoundsForWidth", boolean.class);
} catch (NoSuchMethodException e) {
return null;
}
}

/**
* Keeps this view's line breaking on the same basis as TextLayoutManager's measurement.
*
Expand All @@ -109,13 +91,8 @@ public ReactTextView(Context context) {
* one.
*/
private void matchLineBreakingToMeasurement() {
if (SET_USE_BOUNDS_FOR_WIDTH == null) {
return;
}
try {
SET_USE_BOUNDS_FOR_WIDTH.invoke(this, false);
} catch (ReflectiveOperationException e) {
FLog.w(ReactConstants.TAG, "Could not disable useBoundsForWidth on ReactTextView", e);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
setUseBoundsForWidth(false);
}
}

Expand Down
Loading