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

rename otherKey to toolbarKey, set correct scale/mirror on updateVisibility

Browse source
This commit is contained in:
Helium314 2023-10-19 13:15:12 +02:00
parent 515db3edc9
commit 92e986609c
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
app/src/main/java/org/dslul/openboard/inputmethod/latin/suggestions/SuggestionStripView.java
View file

@ -84,7 +84,7 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick
private static final String DOWN_KEY_TAG = "down_key"; private static final String DOWN_KEY_TAG = "down_key";
private final ViewGroup mSuggestionsStrip; private final ViewGroup mSuggestionsStrip;
private final ImageButton mOtherKey; private final ImageButton mToolbarKey;
private final Drawable mIncognitoIcon; private final Drawable mIncognitoIcon;
private final Drawable mToolbarArrowIcon; private final Drawable mToolbarArrowIcon;
private final ViewGroup mToolbar; private final ViewGroup mToolbar;
@ -149,7 +149,7 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick
inflater.inflate(R.layout.suggestions_strip, this); inflater.inflate(R.layout.suggestions_strip, this);
mSuggestionsStrip = findViewById(R.id.suggestions_strip); mSuggestionsStrip = findViewById(R.id.suggestions_strip);
mOtherKey = findViewById(R.id.suggestions_strip_other_key); mToolbarKey = findViewById(R.id.suggestions_strip_toolbar_key);
mStripVisibilityGroup = new StripVisibilityGroup(this, mSuggestionsStrip); mStripVisibilityGroup = new StripVisibilityGroup(this, mSuggestionsStrip);
mPinnedKeys = findViewById(R.id.pinned_keys); mPinnedKeys = findViewById(R.id.pinned_keys);
mToolbar = findViewById(R.id.toolbar); mToolbar = findViewById(R.id.toolbar);
@ -198,19 +198,19 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick
keyboardAttr.recycle(); keyboardAttr.recycle();
mToolbarArrowIcon = ContextCompat.getDrawable(context, R.drawable.ic_arrow_right); mToolbarArrowIcon = ContextCompat.getDrawable(context, R.drawable.ic_arrow_right);
mDefaultBackground = mOtherKey.getBackground(); mDefaultBackground = mToolbarKey.getBackground();
colors.setBackgroundColor(mDefaultBackground, BackgroundType.SUGGESTION); colors.setBackgroundColor(mDefaultBackground, BackgroundType.SUGGESTION);
mEnabledToolKeyBackground.setColors(new int[] {colors.getAccent(), Color.TRANSPARENT}); mEnabledToolKeyBackground.setColors(new int[] {colors.getAccent(), Color.TRANSPARENT});
mEnabledToolKeyBackground.setGradientType(GradientDrawable.RADIAL_GRADIENT); mEnabledToolKeyBackground.setGradientType(GradientDrawable.RADIAL_GRADIENT);
mEnabledToolKeyBackground.setGradientRadius(mOtherKey.getLayoutParams().height / 2f); // nothing else has a usable height at this state mEnabledToolKeyBackground.setGradientRadius(mToolbarKey.getLayoutParams().height / 2f); // nothing else has a usable height at this state
mOtherKey.setOnClickListener(this); mToolbarKey.setOnClickListener(this);
mOtherKey.setImageDrawable(Settings.getInstance().getCurrent().mIncognitoModeEnabled ? mIncognitoIcon : mToolbarArrowIcon); mToolbarKey.setImageDrawable(Settings.getInstance().getCurrent().mIncognitoModeEnabled ? mIncognitoIcon : mToolbarArrowIcon);
mOtherKey.setColorFilter(colors.getKeyText()); // maybe different color? mToolbarKey.setColorFilter(colors.getKeyText()); // maybe different color?
mOtherKey.setBackground(new ShapeDrawable(new OvalShape())); // ShapeDrawable color is black, need src_atop filter mToolbarKey.setBackground(new ShapeDrawable(new OvalShape())); // ShapeDrawable color is black, need src_atop filter
mOtherKey.getBackground().setColorFilter(colors.getDoubleAdjustedBackground(), PorterDuff.Mode.SRC_ATOP); mToolbarKey.getBackground().setColorFilter(colors.getDoubleAdjustedBackground(), PorterDuff.Mode.SRC_ATOP);
mOtherKey.getLayoutParams().height *= 0.82; // shrink the whole key a little (drawable not affected) mToolbarKey.getLayoutParams().height *= 0.82; // shrink the whole key a little (drawable not affected)
mOtherKey.getLayoutParams().width *= 0.82; mToolbarKey.getLayoutParams().width *= 0.82;
for (int i = 0; i < mToolbar.getChildCount(); i++) { for (int i = 0; i < mToolbar.getChildCount(); i++) {
setupKey((ImageButton) mToolbar.getChildAt(i), colors); setupKey((ImageButton) mToolbar.getChildAt(i), colors);
@ -239,8 +239,8 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick
final View pinnedVoiceKey = mPinnedKeys.findViewWithTag(VOICE_KEY_TAG); final View pinnedVoiceKey = mPinnedKeys.findViewWithTag(VOICE_KEY_TAG);
if (pinnedVoiceKey != null) if (pinnedVoiceKey != null)
pinnedVoiceKey.setVisibility(currentSettingsValues.mShowsVoiceInputKey ? VISIBLE : GONE); pinnedVoiceKey.setVisibility(currentSettingsValues.mShowsVoiceInputKey ? VISIBLE : GONE);
mOtherKey.setImageDrawable(currentSettingsValues.mIncognitoModeEnabled ? mIncognitoIcon : mToolbarArrowIcon); mToolbarKey.setImageDrawable(currentSettingsValues.mIncognitoModeEnabled ? mIncognitoIcon : mToolbarArrowIcon);
mOtherKey.setScaleX(currentSettingsValues.mIncognitoModeEnabled || mToolbarContainer.getVisibility() != VISIBLE ? 1f : -1f); mToolbarKey.setScaleX(mToolbarContainer.getVisibility() != VISIBLE ? 1f : -1f);
} }
public void setSuggestions(final SuggestedWords suggestedWords, final boolean isRtlLanguage) { public void setSuggestions(final SuggestedWords suggestedWords, final boolean isRtlLanguage) {
@ -624,7 +624,7 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick
return; return;
} }
} }
if (view == mOtherKey) { if (view == mToolbarKey) {
if (mToolbarContainer.getVisibility() == VISIBLE) { if (mToolbarContainer.getVisibility() == VISIBLE) {
mToolbarContainer.setVisibility(GONE); mToolbarContainer.setVisibility(GONE);
mSuggestionsStrip.setVisibility(VISIBLE); mSuggestionsStrip.setVisibility(VISIBLE);
@ -634,7 +634,7 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick
mSuggestionsStrip.setVisibility(GONE); mSuggestionsStrip.setVisibility(GONE);
mPinnedKeys.setVisibility(GONE); mPinnedKeys.setVisibility(GONE);
} }
mOtherKey.setScaleX(mToolbarContainer.getVisibility() != VISIBLE ? 1f : -1f); mToolbarKey.setScaleX(mToolbarContainer.getVisibility() != VISIBLE ? 1f : -1f);
} }

2
app/src/main/res/layout/suggestions_strip.xml
View file

@ -32,7 +32,7 @@
<!-- Provide audio and haptic feedback by ourselves based on the keyboard settings. <!-- Provide audio and haptic feedback by ourselves based on the keyboard settings.
We just need to ignore the system's audio and haptic feedback settings. --> We just need to ignore the system's audio and haptic feedback settings. -->
<ImageButton <ImageButton
android:id="@+id/suggestions_strip_other_key" android:id="@+id/suggestions_strip_toolbar_key"
android:layout_width="@dimen/config_suggestions_strip_edge_key_width" android:layout_width="@dimen/config_suggestions_strip_edge_key_width"
android:layout_height="@dimen/config_suggestions_strip_edge_key_width" android:layout_height="@dimen/config_suggestions_strip_edge_key_width"
android:maxHeight="@dimen/config_suggestions_strip_height" android:maxHeight="@dimen/config_suggestions_strip_height"