luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-04-19 13:49:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify InlineAutofillUtils code (#595)

Browse source
This commit is contained in:
arcarum 2024-03-31 11:33:12 +04:00 • committed by GitHub
parent 47b5502c1d
commit 69d60742c4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
app/src/main/java/helium314/keyboard/latin/utils/InlineAutofillUtils.java
View file

@ -8,7 +8,6 @@ package helium314.keyboard.latin.utils;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.graphics.Canvas;
import android.graphics.PixelFormat; import android.graphics.PixelFormat;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.drawable.Icon; import android.graphics.drawable.Icon;
@ -16,9 +15,6 @@ import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Size; import android.util.Size;
import android.view.Choreographer;
import android.view.Surface;
import android.view.SurfaceHolder;
import android.view.SurfaceView; import android.view.SurfaceView;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -51,39 +47,37 @@ import helium314.keyboard.latin.common.ColorType;
import helium314.keyboard.latin.common.Colors; import helium314.keyboard.latin.common.Colors;
import helium314.keyboard.latin.settings.Settings; import helium314.keyboard.latin.settings.Settings;
@SuppressLint("RestrictedApi")
@RequiresApi(api = Build.VERSION_CODES.R) @RequiresApi(api = Build.VERSION_CODES.R)
public class InlineAutofillUtils { public class InlineAutofillUtils {
public static InlineSuggestionsRequest createInlineSuggestionRequest(Context context) { public static InlineSuggestionsRequest createInlineSuggestionRequest(final Context context) {
final Colors colors = Settings.getInstance().getCurrent().mColors; final Colors colors = Settings.getInstance().getCurrent().mColors;
final int chipBgDrawableId = androidx.autofill.R.drawable.autofill_inline_suggestion_chip_background;
final int chipBgColor = colors.get(ColorType.AUTOFILL_BACKGROUND_CHIP);
final int chipTextColor = colors.get(ColorType.KEY_TEXT);
final int chipTextHintColor = colors.get(ColorType.KEY_HINT_TEXT);
StylesBuilder stylesBuilder = UiVersions.newStylesBuilder(); StylesBuilder stylesBuilder = UiVersions.newStylesBuilder();
@SuppressLint("RestrictedApi") Style style = InlineSuggestionUi.newStyleBuilder() Style style = InlineSuggestionUi.newStyleBuilder()
.setSingleIconChipStyle( .setSingleIconChipStyle(
new ViewStyle.Builder() new ViewStyle.Builder()
.setBackground( .setBackground(Icon.createWithResource(context, chipBgDrawableId).setTint(chipBgColor))
Icon.createWithResource(context,
androidx.autofill.R.drawable.autofill_inline_suggestion_chip_background)
.setTint(colors.get(ColorType.AUTOFILL_BACKGROUND_CHIP)))
.setPadding(0, 0, 0, 0) .setPadding(0, 0, 0, 0)
.build()) .build())
.setChipStyle( .setChipStyle(
new ViewStyle.Builder() new ViewStyle.Builder()
.setBackground( .setBackground(Icon.createWithResource(context, chipBgDrawableId).setTint(chipBgColor))
Icon.createWithResource(context,
androidx.autofill.R.drawable.autofill_inline_suggestion_chip_background)
.setTint(colors.get(ColorType.AUTOFILL_BACKGROUND_CHIP)))
.build()) .build())
.setStartIconStyle(new ImageViewStyle.Builder().setLayoutMargin(0, 0, 0, 0).build()) .setStartIconStyle(new ImageViewStyle.Builder().setLayoutMargin(0, 0, 0, 0).build())
.setTitleStyle( .setTitleStyle(
new TextViewStyle.Builder() new TextViewStyle.Builder()
.setTextColor(colors.get(ColorType.KEY_TEXT)) .setTextColor(chipTextColor)
.setTextSize(12) .setTextSize(12)
.build()) .build())
.setSubtitleStyle( .setSubtitleStyle(
new TextViewStyle.Builder() new TextViewStyle.Builder()
.setTextColor(colors.get(ColorType.KEY_HINT_TEXT)) .setTextColor(chipTextHintColor)
.setTextSize(10) .setTextSize(10)
.build()) .build())
.setEndIconStyle(new ImageViewStyle.Builder().setLayoutMargin(0, 0, 0, 0).build()) .setEndIconStyle(new ImageViewStyle.Builder().setLayoutMargin(0, 0, 0, 0).build())
@ -106,14 +100,10 @@ public class InlineAutofillUtils {
.build(); .build();
} }
public static InlineContentClipView createView(List<InlineSuggestion> inlineSuggestions, Context context) { public static InlineContentClipView createView(final List<InlineSuggestion> inlineSuggestions,
final int totalSuggestionsCount = inlineSuggestions.size(); final Context context) {
LinearLayout container = new LinearLayout(context); LinearLayout container = new LinearLayout(context);
for (InlineSuggestion inlineSuggestion : inlineSuggestions) {
for (int i = 0; i < totalSuggestionsCount; i++) {
final InlineSuggestion inlineSuggestion = inlineSuggestions.get(i);
inlineSuggestion.inflate(context, new Size(ViewGroup.LayoutParams.WRAP_CONTENT, inlineSuggestion.inflate(context, new Size(ViewGroup.LayoutParams.WRAP_CONTENT,
ViewGroup.LayoutParams.WRAP_CONTENT), context.getMainExecutor(), (view) -> { ViewGroup.LayoutParams.WRAP_CONTENT), context.getMainExecutor(), (view) -> {
if (view != null) if (view != null)
@ -124,13 +114,11 @@ public class InlineAutofillUtils {
HorizontalScrollView inlineSuggestionView = new HorizontalScrollView(context); HorizontalScrollView inlineSuggestionView = new HorizontalScrollView(context);
inlineSuggestionView.setHorizontalScrollBarEnabled(false); inlineSuggestionView.setHorizontalScrollBarEnabled(false);
inlineSuggestionView.setOverScrollMode(View.OVER_SCROLL_NEVER); inlineSuggestionView.setOverScrollMode(View.OVER_SCROLL_NEVER);
inlineSuggestionView.addView(container); inlineSuggestionView.addView(container);
InlineContentClipView mScrollableSuggestionsClip = new InlineContentClipView(context); InlineContentClipView scrollableSuggestionsClip = new InlineContentClipView(context);
mScrollableSuggestionsClip.addView(inlineSuggestionView); scrollableSuggestionsClip.addView(inlineSuggestionView);
return scrollableSuggestionsClip;
return mScrollableSuggestionsClip;
} }
/** /**
@ -140,7 +128,7 @@ public class InlineAutofillUtils {
* the InlineContentViews' surfaces would cover parts of your app as these surfaces * the InlineContentViews' surfaces would cover parts of your app as these surfaces
* are owned by another process and always appearing on top of your app. * are owned by another process and always appearing on top of your app.
*/ */
private static class InlineContentClipView extends FrameLayout { public static class InlineContentClipView extends FrameLayout {
@NonNull @NonNull
private final ViewTreeObserver.OnDrawListener mOnDrawListener = private final ViewTreeObserver.OnDrawListener mOnDrawListener =
this::clipDescendantInlineContentViews; this::clipDescendantInlineContentViews;
@ -148,37 +136,15 @@ public class InlineAutofillUtils {
private final Rect mParentBounds = new Rect(); private final Rect mParentBounds = new Rect();
@NonNull @NonNull
private final Rect mContentBounds = new Rect(); private final Rect mContentBounds = new Rect();
@NonNull
private final SurfaceView mBackgroundView;
private int mBackgroundColor;
public InlineContentClipView(@NonNull Context context) { public InlineContentClipView(@NonNull Context context) {
this(context, /*attrs*/ null); this(context, /*attrs*/ null, /*defStyleAttr*/ 0);
}
public InlineContentClipView(@NonNull Context context, @Nullable AttributeSet attrs) {
this(context, attrs, /*defStyleAttr*/ 0);
} }
public InlineContentClipView(@NonNull Context context, @Nullable AttributeSet attrs, public InlineContentClipView(@NonNull Context context, @Nullable AttributeSet attrs,
@AttrRes int defStyleAttr) { @AttrRes int defStyleAttr) {
super(context, attrs, defStyleAttr); super(context, attrs, defStyleAttr);
mBackgroundView = new SurfaceView(context); SurfaceView mBackgroundView = new SurfaceView(context);
mBackgroundView.setZOrderOnTop(true); mBackgroundView.setZOrderOnTop(true);
mBackgroundView.getHolder().setFormat(PixelFormat.TRANSPARENT); mBackgroundView.getHolder().setFormat(PixelFormat.TRANSPARENT);
mBackgroundView.setLayoutParams(new ViewGroup.LayoutParams(
ViewGroup.LayoutParams.WRAP_CONTENT,
ViewGroup.LayoutParams.WRAP_CONTENT));
mBackgroundView.getHolder().addCallback(new SurfaceHolder.Callback() {
@Override
public void surfaceCreated(@NonNull SurfaceHolder holder) {
drawBackgroundColorIfReady();
}
@Override
public void surfaceChanged(@NonNull SurfaceHolder holder, int format, int width,
int height) { /*do nothing*/ }
@Override
public void surfaceDestroyed(@NonNull SurfaceHolder holder) {
/*do nothing*/
}
});
addView(mBackgroundView); addView(mBackgroundView);
} }
@Override @Override
@ -191,33 +157,13 @@ public class InlineAutofillUtils {
super.onDetachedFromWindow(); super.onDetachedFromWindow();
getViewTreeObserver().removeOnDrawListener(mOnDrawListener); getViewTreeObserver().removeOnDrawListener(mOnDrawListener);
} }
@Override
public void setBackgroundColor(int color) {
mBackgroundColor = color;
Choreographer.getInstance().postFrameCallback((frameTimeNanos) ->
drawBackgroundColorIfReady());
}
private void drawBackgroundColorIfReady() {
final Surface surface = mBackgroundView.getHolder().getSurface();
if (surface.isValid()) {
final Canvas canvas = surface.lockCanvas(null);
try {
canvas.drawColor(mBackgroundColor);
} finally {
surface.unlockCanvasAndPost(canvas);
}
}
}
private void clipDescendantInlineContentViews() { private void clipDescendantInlineContentViews() {
mParentBounds.right = getWidth(); mParentBounds.right = getWidth();
mParentBounds.bottom = getHeight(); mParentBounds.bottom = getHeight();
clipDescendantInlineContentViews(this); clipDescendantInlineContentViews(this);
} }
private void clipDescendantInlineContentViews(@Nullable View root) { private void clipDescendantInlineContentViews(@Nullable View root) {
if (root == null) { if (root == null) return;
return;
}
if (root instanceof InlineContentView inlineContentView) { if (root instanceof InlineContentView inlineContentView) {
mContentBounds.set(mParentBounds); mContentBounds.set(mParentBounds);
offsetRectIntoDescendantCoords(inlineContentView, mContentBounds); offsetRectIntoDescendantCoords(inlineContentView, mContentBounds);
@ -233,5 +179,4 @@ public class InlineAutofillUtils {
} }
} }
} }
} }