Skip to content

Commit

Permalink
create toolbar keys programmatically
Browse files Browse the repository at this point in the history 
for easier addition of keys, and adjustment of order
  • Loading branch information
@Helium314
Helium314 committed Dec 20, 2023
1 parent 1cc3313 commit 347a955
Show file tree
Hide file tree
Showing 13 changed files with 56 additions and 198 deletions.
112 changes: 55 additions & 57 deletions app/src/main/java/org/dslul/openboard/inputmethod/latin/suggestions/SuggestionStripView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
import android.view.ViewParent;
import android.view.accessibility.AccessibilityEvent;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;

Expand Down Expand Up @@ -86,6 +88,10 @@ public interface Listener {
private static final String DOWN_KEY_TAG = "down_key";
private static final String UNDO_TAG = "undo";
private static final String REDO_TAG = "redo";
// tags of keys to be added to toolbar, in order (all tags must be considered in getStyleableIconId)
private static final String[] toolbarKeyTags = new String[] {VOICE_KEY_TAG, CLIPBOARD_KEY_TAG,
SELECT_ALL_KEY_TAG, COPY_KEY_TAG, ONE_HANDED_KEY_TAG, SETTINGS_KEY_TAG, LEFT_KEY_TAG,
RIGHT_KEY_TAG, UP_KEY_TAG, DOWN_KEY_TAG};

private final ViewGroup mSuggestionsStrip;
private final ImageButton mToolbarKey;
Expand Down Expand Up @@ -160,16 +166,6 @@ public SuggestionStripView(final Context context, final AttributeSet attrs,
mPinnedKeys = findViewById(R.id.pinned_keys);
mToolbar = findViewById(R.id.toolbar);
mToolbarContainer = findViewById(R.id.toolbar_container);
final ImageButton voiceKey = findViewById(R.id.suggestions_strip_voice_key);
final ImageButton clipboardKey = findViewById(R.id.suggestions_strip_clipboard_key);
final ImageButton selectAllKey = findViewById(R.id.suggestions_strip_select_all_key);
final ImageButton copyKey = findViewById(R.id.suggestions_strip_copy_key);
final ImageButton settingsKey = findViewById(R.id.suggestions_strip_settings_key);
final ImageButton oneHandedKey = findViewById(R.id.suggestions_strip_one_handed_key);
final ImageButton arrowLeft = findViewById(R.id.suggestions_strip_left_key);
final ImageButton arrowRight = findViewById(R.id.suggestions_strip_right_key);
final ImageButton arrowUp = findViewById(R.id.suggestions_strip_up_key);
final ImageButton arrowDown = findViewById(R.id.suggestions_strip_down_key);

for (int pos = 0; pos < SuggestedWords.MAX_SUGGESTIONS; pos++) {
final TextView word = new TextView(context, null, R.attr.suggestionWordStyle);
Expand Down Expand Up @@ -201,16 +197,26 @@ public SuggestionStripView(final Context context, final AttributeSet attrs,
mIncognitoIcon = keyboardAttr.getDrawable(R.styleable.Keyboard_iconIncognitoKey);
mToolbarArrowIcon = keyboardAttr.getDrawable(R.styleable.Keyboard_iconToolbarKey);
mBinIcon = keyboardAttr.getDrawable(R.styleable.Keyboard_iconBin);
voiceKey.setImageDrawable(keyboardAttr.getDrawable(R.styleable.Keyboard_iconShortcutKey));
clipboardKey.setImageDrawable(keyboardAttr.getDrawable(R.styleable.Keyboard_iconClipboardNormalKey));
settingsKey.setImageDrawable(keyboardAttr.getDrawable(R.styleable.Keyboard_iconSettingsKey));
selectAllKey.setImageDrawable(keyboardAttr.getDrawable(R.styleable.Keyboard_iconSelectAll));
copyKey.setImageDrawable(keyboardAttr.getDrawable(R.styleable.Keyboard_iconCopyKey));
arrowLeft.setImageDrawable(keyboardAttr.getDrawable(R.styleable.Keyboard_iconArrowLeft));
arrowRight.setImageDrawable(keyboardAttr.getDrawable(R.styleable.Keyboard_iconArrowRight));
arrowUp.setImageDrawable(keyboardAttr.getDrawable(R.styleable.Keyboard_iconArrowUp));
arrowDown.setImageDrawable(keyboardAttr.getDrawable(R.styleable.Keyboard_iconArrowDown));
oneHandedKey.setImageDrawable(keyboardAttr.getDrawable(R.styleable.Keyboard_iconStartOneHandedMode));

final LinearLayout.LayoutParams toolbarKeyLayoutParams = new LinearLayout.LayoutParams(
getResources().getDimensionPixelSize(R.dimen.config_suggestions_strip_edge_key_width),
LinearLayout.LayoutParams.MATCH_PARENT
);
for (final String tag : toolbarKeyTags) {
final ImageButton button = new ImageButton(getContext(), null, R.attr.suggestionWordStyle);
button.setScaleType(ImageView.ScaleType.CENTER);
button.setLayoutParams(toolbarKeyLayoutParams);
button.setTag(tag);
final Drawable icon = keyboardAttr.getDrawable(getStyleableIconId(tag));
if (tag.equals(LEFT_KEY_TAG) || tag.equals(RIGHT_KEY_TAG) || tag.equals(UP_KEY_TAG) || tag.equals(DOWN_KEY_TAG)) {
// arrows look a little awkward when not scaled
button.setScaleX(1.2f);
button.setScaleY(1.2f);
}
button.setImageDrawable(icon);
setupKey(button, colors);
mToolbar.addView(button);
}
keyboardAttr.recycle();

final int toolbarHeight = Math.min(mToolbarKey.getLayoutParams().height, (int) getResources().getDimension(R.dimen.config_suggestions_strip_height));
Expand All @@ -230,12 +236,9 @@ public SuggestionStripView(final Context context, final AttributeSet attrs,
mToolbarKey.getLayoutParams().height *= 0.82; // shrink the whole key a little (drawable not affected)
mToolbarKey.getLayoutParams().width *= 0.82;

for (int i = 0; i < mToolbar.getChildCount(); i++) {
setupKey((ImageButton) mToolbar.getChildAt(i), colors);
}
for (final String pinnedKey : Settings.getInstance().getCurrent().mPinnedKeys) {
mToolbar.findViewWithTag(pinnedKey).setBackground(mEnabledToolKeyBackground);
addKeyToPinnedKeys(pinnedKey, inflater);
addKeyToPinnedKeys(pinnedKey);
}

colors.setBackground(this, ColorType.SUGGESTION_BACKGROUND);
Expand Down Expand Up @@ -365,7 +368,7 @@ private void onLongClickToolKey(final View view) {
final String tag = (String) view.getTag();
final View pinnedKeyView = mPinnedKeys.findViewWithTag(tag);
if (pinnedKeyView == null) {
addKeyToPinnedKeys(tag, LayoutInflater.from(getContext()));
addKeyToPinnedKeys(tag);
mToolbar.findViewWithTag(tag).setBackground(mEnabledToolKeyBackground);
Settings.addPinnedKey(DeviceProtectedUtils.getSharedPreferences(getContext()), tag);
} else {
Expand Down Expand Up @@ -706,14 +709,19 @@ public void setToolbarVisibility(final boolean visible) {
mToolbarKey.setScaleX(visible ? -1f : 1f);
}

private void addKeyToPinnedKeys(final String pinnedKey, final LayoutInflater inflater) {
final int resId = getKeyLayoutIdForTag(pinnedKey);
if (resId == 0) return;
final ImageButton view = (ImageButton) inflater.inflate(resId, null);
view.setImageDrawable(((ImageButton) mToolbar.findViewWithTag(pinnedKey)).getDrawable());
view.setLayoutParams(mToolbar.findViewWithTag(pinnedKey).getLayoutParams());
setupKey(view, Settings.getInstance().getCurrent().mColors);
mPinnedKeys.addView(view);
private void addKeyToPinnedKeys(final String pinnedKey) {
final ImageButton original = (ImageButton) mToolbar.findViewWithTag(pinnedKey);
if (original == null) return;
final ImageButton copy = new ImageButton(getContext(), null, R.attr.suggestionWordStyle);
copy.setTag(pinnedKey);
copy.setScaleType(original.getScaleType());
copy.setScaleX(original.getScaleX());
copy.setScaleY(original.getScaleY());
copy.setContentDescription(original.getContentDescription()); // todo (later): add some content description
copy.setImageDrawable(original.getDrawable());
copy.setLayoutParams(original.getLayoutParams());
setupKey(copy, Settings.getInstance().getCurrent().mColors);
mPinnedKeys.addView(copy);
}

private void setupKey(final ImageButton view, final Colors colors) {
Expand All @@ -723,29 +731,19 @@ private void setupKey(final ImageButton view, final Colors colors) {
colors.setBackground(view, ColorType.SUGGESTION_BACKGROUND);
}

private static int getKeyLayoutIdForTag(final String tag) {
switch (tag) {
case VOICE_KEY_TAG:
return R.layout.suggestions_strip_voice_key;
case SETTINGS_KEY_TAG:
return R.layout.suggestions_strip_settings_key;
case CLIPBOARD_KEY_TAG:
return R.layout.suggestions_strip_clipboard_key;
case SELECT_ALL_KEY_TAG:
return R.layout.suggestions_strip_select_all_key;
case COPY_KEY_TAG:
return R.layout.suggestions_strip_copy_key;
case ONE_HANDED_KEY_TAG:
return R.layout.suggestions_strip_one_handed_key;
case LEFT_KEY_TAG:
return R.layout.suggestions_strip_left_key;
case RIGHT_KEY_TAG:
return R.layout.suggestions_strip_right_key;
case UP_KEY_TAG:
return R.layout.suggestions_strip_up_key;
case DOWN_KEY_TAG:
return R.layout.suggestions_strip_down_key;
}
return 0;
private int getStyleableIconId(final String buttonTag) {
return switch (buttonTag) {
case VOICE_KEY_TAG -> R.styleable.Keyboard_iconShortcutKey;
case SETTINGS_KEY_TAG -> R.styleable.Keyboard_iconSettingsKey;
case CLIPBOARD_KEY_TAG -> R.styleable.Keyboard_iconClipboardNormalKey;
case SELECT_ALL_KEY_TAG -> R.styleable.Keyboard_iconSelectAll;
case COPY_KEY_TAG -> R.styleable.Keyboard_iconCopyKey;
case ONE_HANDED_KEY_TAG -> R.styleable.Keyboard_iconStartOneHandedMode;
case LEFT_KEY_TAG -> R.styleable.Keyboard_iconArrowLeft;
case RIGHT_KEY_TAG -> R.styleable.Keyboard_iconArrowRight;
case UP_KEY_TAG -> R.styleable.Keyboard_iconArrowUp;
case DOWN_KEY_TAG -> R.styleable.Keyboard_iconArrowDown;
default -> throw (new IllegalArgumentException("no styleable id for " + buttonTag));
};
}
}
30 changes: 0 additions & 30 deletions app/src/main/res/layout/suggestions_strip.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,36 +37,6 @@
android:layout_height="match_parent"
android:orientation="horizontal"
style="?attr/suggestionWordStyle">
<include
android:id="@+id/suggestions_strip_voice_key"
layout="@layout/suggestions_strip_voice_key" />
<include
android:id="@+id/suggestions_strip_clipboard_key"
layout="@layout/suggestions_strip_clipboard_key" />
<include
android:id="@+id/suggestions_strip_select_all_key"
layout="@layout/suggestions_strip_select_all_key" />
<include
android:id="@+id/suggestions_strip_copy_key"
layout="@layout/suggestions_strip_copy_key" />
<include
android:id="@+id/suggestions_strip_one_handed_key"
layout="@layout/suggestions_strip_one_handed_key" />
<include
android:id="@+id/suggestions_strip_settings_key"
layout="@layout/suggestions_strip_settings_key" />
<include
android:id="@+id/suggestions_strip_left_key"
layout="@layout/suggestions_strip_left_key" />
<include
android:id="@+id/suggestions_strip_right_key"
layout="@layout/suggestions_strip_right_key" />
<include
android:id="@+id/suggestions_strip_up_key"
layout="@layout/suggestions_strip_up_key" />
<include
android:id="@+id/suggestions_strip_down_key"
layout="@layout/suggestions_strip_down_key" />
</LinearLayout>
</HorizontalScrollView>
<!-- Provide audio and haptic feedback by ourselves based on the keyboard settings.
Expand Down
10 changes: 0 additions & 10 deletions app/src/main/res/layout/suggestions_strip_clipboard_key.xml
View file

This file was deleted.

10 changes: 0 additions & 10 deletions app/src/main/res/layout/suggestions_strip_copy_key.xml
View file

This file was deleted.

12 changes: 0 additions & 12 deletions app/src/main/res/layout/suggestions_strip_down_key.xml
View file

This file was deleted.

12 changes: 0 additions & 12 deletions app/src/main/res/layout/suggestions_strip_left_key.xml
View file

This file was deleted.

10 changes: 0 additions & 10 deletions app/src/main/res/layout/suggestions_strip_one_handed_key.xml
View file

This file was deleted.

12 changes: 0 additions & 12 deletions app/src/main/res/layout/suggestions_strip_right_key.xml
View file

This file was deleted.

10 changes: 0 additions & 10 deletions app/src/main/res/layout/suggestions_strip_select_all_key.xml
View file

This file was deleted.

11 changes: 0 additions & 11 deletions app/src/main/res/layout/suggestions_strip_settings_key.xml
View file

This file was deleted.

12 changes: 0 additions & 12 deletions app/src/main/res/layout/suggestions_strip_up_key.xml
View file

This file was deleted.

11 changes: 0 additions & 11 deletions app/src/main/res/layout/suggestions_strip_voice_key.xml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion app/src/main/res/values-land/config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@

<dimen name="config_suggestions_strip_height">36dp</dimen>
<dimen name="config_suggestions_strip_horizontal_margin">54dp</dimen>
<dimen name="config_suggestions_strip_edge_key_width">54dp</dimen>
<dimen name="config_suggestions_strip_edge_key_width">48dp</dimen>
<dimen name="config_more_suggestions_row_height">36dp</dimen>
<integer name="config_max_more_suggestions_row">2</integer>
<fraction name="config_min_more_suggestions_width">60%</fraction>
Expand Down

0 comments on commit 347a955

Please sign in to comment.