Skip to content
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

Fix toolbar keys order in RTL layout #574

Merged
merged 10 commits into from
Mar 27, 2024
Merged

Fix toolbar keys order in RTL layout #574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ff95ffc
Make toolbar keys order consistent
codokie Mar 18, 2024
660fd69
Fix collapse/expand arrow key direction key in RTL
codokie Mar 19, 2024
1eac01e
Fix collapse/expand arrow key direction key in RTL #2
codokie Mar 19, 2024
45dc4fb
Private field 'mRtl' is assigned but never accessed
codokie Mar 19, 2024
bef29b2
Set the direction according to the locale
codokie Mar 19, 2024
845e6f9
Add toggle to fix the toolbar direction
Mar 23, 2024
1a223d3
Merge branch 'Helium314:main' into rtl-toolbar-fix
codokie Mar 23, 2024
938eaf2
Add toggle summary
Mar 24, 2024
e7fa2a2
Merge remote-tracking branch 'origin/rtl-toolbar-fix' into rtl-toolba…
Mar 24, 2024
07b866c
Change toggle name and description
Mar 26, 2024
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
1 change: 1 addition & 0 deletions app/src/main/java/helium314/keyboard/latin/settings/Settings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
public static final String PREF_BLOCK_POTENTIALLY_OFFENSIVE = "block_potentially_offensive";
public static final String PREF_LANGUAGE_SWITCH_KEY = "language_switch_key";
public static final String PREF_SHOW_EMOJI_KEY = "show_emoji_key";
public static final String PREF_VARIABLE_TOOLBAR_DIRECTION = "var_toolbar_direction";
public static final String PREF_ADDITIONAL_SUBTYPES = "additional_subtypes";
public static final String PREF_ENABLE_SPLIT_KEYBOARD = "split_keyboard";
public static final String PREF_SPLIT_SPACER_SCALE = "split_spacer_scale";
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/helium314/keyboard/latin/settings/SettingsValues.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ public class SettingsValues {
public final boolean mShowsPopupHints;
public final boolean mSpaceForLangChange;
public final boolean mShowsEmojiKey;
public final boolean mVarToolbarDirection;
public final boolean mUsePersonalizedDicts;
public final boolean mUseDoubleSpacePeriod;
public final boolean mBlockPotentiallyOffensive;
Expand Down Expand Up @@ -150,6 +151,7 @@ public SettingsValues(final Context context, final SharedPreferences prefs, fina
mShowsPopupHints = prefs.getBoolean(Settings.PREF_SHOW_POPUP_HINTS, false);
mSpaceForLangChange = prefs.getBoolean(Settings.PREF_SPACE_TO_CHANGE_LANG, true);
mShowsEmojiKey = prefs.getBoolean(Settings.PREF_SHOW_EMOJI_KEY, false);
mVarToolbarDirection = prefs.getBoolean(Settings.PREF_VARIABLE_TOOLBAR_DIRECTION, true);
mUsePersonalizedDicts = prefs.getBoolean(Settings.PREF_KEY_USE_PERSONALIZED_DICTS, true);
mUseDoubleSpacePeriod = prefs.getBoolean(Settings.PREF_KEY_USE_DOUBLE_SPACE_PERIOD, true)
&& inputAttributes.mIsGeneralTextInput;
Expand Down
14 changes: 9 additions & 5 deletions app/src/main/java/helium314/keyboard/latin/suggestions/SuggestionStripView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,7 @@ public StripVisibilityGroup(final View suggestionStripView,
showSuggestionsStrip();
}

public void setLayoutDirection(final boolean isRtlLanguage) {
final int layoutDirection = isRtlLanguage ? ViewCompat.LAYOUT_DIRECTION_RTL
: ViewCompat.LAYOUT_DIRECTION_LTR;
public void setLayoutDirection(final int layoutDirection) {
ViewCompat.setLayoutDirection(mSuggestionStripView, layoutDirection);
ViewCompat.setLayoutDirection(mSuggestionsStrip, layoutDirection);
}
Expand Down Expand Up @@ -265,8 +263,14 @@ private void updateKeys() {
}

public void setRtl(final boolean isRtlLanguage) {
mStripVisibilityGroup.setLayoutDirection(isRtlLanguage);
mRtl = isRtlLanguage ? -1 : 1;
final int layoutDirection;
if (!Settings.getInstance().getCurrent().mVarToolbarDirection)
layoutDirection = ViewCompat.LAYOUT_DIRECTION_LOCALE;
else{
layoutDirection = isRtlLanguage ? ViewCompat.LAYOUT_DIRECTION_RTL : ViewCompat.LAYOUT_DIRECTION_LTR;
mRtl = isRtlLanguage ? -1 : 1;
}
mStripVisibilityGroup.setLayoutDirection(layoutDirection);
}

public void setSuggestions(final SuggestedWords suggestedWords, final boolean isRtlLanguage) {
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,4 +776,8 @@ New dictionary:
<string name="action_none">None</string>
<!-- Option to move the cursor when swiping the spacebar -->
<string name="space_swipe_move_cursor_entry">Move Cursor</string>
<!-- Title of the settings for variable toolbar direction -->
<string name="var_toolbar_direction">Variable toolbar direction</string>
<!-- Description of the variable toolbar direction setting -->
<string name="var_toolbar_direction_summary">Reverse direction when a right-to-left keyboard subtype is selected</string>
</resources>
7 changes: 7 additions & 0 deletions app/src/main/res/xml/prefs_screen_preferences.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,13 @@
android:key="toolbar_keys"
android:title="@string/toolbar_keys" />

<SwitchPreference
android:key="var_toolbar_direction"
android:title="@string/var_toolbar_direction"
android:summary="@string/var_toolbar_direction_summary"
android:defaultValue="true"
android:persistent="true" />

</PreferenceCategory>

<PreferenceCategory android:title="@string/settings_category_clipboard_history">
Expand Down