Skip to content

feat: reorganize options on the settings screen #362

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

Merged
naveensingh merged 1 commit into from
Dec 27, 2025
Merged

feat: reorganize options on the settings screen #362

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
- The space bar now shows the currently selected language ([#62])
- Space bar cursor control now activates immediately on swipe ([#129])
- Reorganized options on the settings screen

## [1.7.0] - 2025-12-16
### Added
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/kotlin/org/fossify/keyboard/activities/SettingsActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,9 @@ class SettingsActivity : SimpleActivity() {
arrayOf(
settingsColorCustomizationSectionLabel,
settingsGeneralSettingsLabel,
settingsKeyboardSettingsLabel,
settingsLayoutAppearanceLabel,
settingsKeypressLabel,
settingsTypingInputLabel,
settingsClipboardSettingsLabel
).forEach {
it.setTextColor(getProperPrimaryColor())
Expand Down
135 changes: 78 additions & 57 deletions app/src/main/res/layout/activity_settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<org.fossify.commons.views.PurchaseThankYouItem
android:id="@+id/settings_purchase_thank_you_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content" />

<RelativeLayout
android:id="@+id/settings_use_english_holder"
Expand Down Expand Up @@ -156,159 +156,181 @@
layout="@layout/divider" />

<TextView
android:id="@+id/settings_keyboard_settings_label"
android:id="@+id/settings_layout_appearance_label"
style="@style/SettingsSectionLabelStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/keyboard_short" />
android:text="@string/layout_and_appearance" />

<RelativeLayout
android:id="@+id/settings_vibrate_on_keypress_holder"
android:id="@+id/settings_show_key_borders_holder"
style="@style/SettingsHolderSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<org.fossify.commons.views.MyMaterialSwitch
android:id="@+id/settings_vibrate_on_keypress"
android:id="@+id/settings_show_key_borders"
style="@style/SettingsSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/vibrate_on_keypress" />

</RelativeLayout>

<RelativeLayout
android:id="@+id/settings_sound_on_keypress_holder"
style="@style/SettingsHolderTextViewStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<org.fossify.commons.views.MyTextView
android:id="@+id/settings_sound_on_keypress_label"
style="@style/SettingsTextLabelStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/sound_on_keypress" />

<org.fossify.commons.views.MyTextView
android:id="@+id/settings_sound_on_keypress"
style="@style/SettingsTextValueStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/settings_sound_on_keypress_label" />
android:text="@string/show_key_borders" />

</RelativeLayout>

<RelativeLayout
android:id="@+id/settings_show_popup_on_keypress_holder"
android:id="@+id/settings_show_numbers_row_holder"
style="@style/SettingsHolderSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<org.fossify.commons.views.MyMaterialSwitch
android:id="@+id/settings_show_popup_on_keypress"
android:id="@+id/settings_show_numbers_row"
style="@style/SettingsSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/show_popup" />
android:text="@string/show_numbers_row" />

</RelativeLayout>

<RelativeLayout
android:id="@+id/settings_show_key_borders_holder"
android:id="@+id/settings_show_emoji_key_holder"
style="@style/SettingsHolderSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<org.fossify.commons.views.MyMaterialSwitch
android:id="@+id/settings_show_key_borders"
android:id="@+id/settings_show_emoji_key"
style="@style/SettingsSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/show_key_borders" />
android:text="@string/show_emoji_key" />

</RelativeLayout>

<RelativeLayout
android:id="@+id/settings_show_numbers_row_holder"
android:id="@+id/settings_show_language_switch_key_holder"
style="@style/SettingsHolderSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<org.fossify.commons.views.MyMaterialSwitch
android:id="@+id/settings_show_numbers_row"
android:id="@+id/settings_show_language_switch_key"
style="@style/SettingsSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/show_numbers_row" />
android:text="@string/show_language_switch_key" />

</RelativeLayout>

<RelativeLayout
android:id="@+id/settings_start_sentences_capitalized_holder"
style="@style/SettingsHolderSwitchStyle"
android:id="@+id/settings_keyboard_height_multiplier_holder"
style="@style/SettingsHolderTextViewStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<org.fossify.commons.views.MyMaterialSwitch
android:id="@+id/settings_start_sentences_capitalized"
style="@style/SettingsSwitchStyle"
<org.fossify.commons.views.MyTextView
android:id="@+id/settings_keyboard_height_multiplier_label"
style="@style/SettingsTextLabelStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/keyboard_height" />

<org.fossify.commons.views.MyTextView
android:id="@+id/settings_keyboard_height_multiplier"
style="@style/SettingsTextValueStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/start_sentences_capitalized" />
android:layout_below="@+id/settings_keyboard_height_multiplier_label"
tools:text="@string/small" />

</RelativeLayout>

<include
android:id="@+id/settings_layout_appearance_divider"
layout="@layout/divider" />

<TextView
android:id="@+id/settings_keypress_label"
style="@style/SettingsSectionLabelStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/keypress" />

<RelativeLayout
android:id="@+id/settings_show_emoji_key_holder"
android:id="@+id/settings_show_popup_on_keypress_holder"
style="@style/SettingsHolderSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<org.fossify.commons.views.MyMaterialSwitch
android:id="@+id/settings_show_emoji_key"
android:id="@+id/settings_show_popup_on_keypress"
style="@style/SettingsSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/show_emoji_key" />
android:text="@string/show_popup" />

</RelativeLayout>

<RelativeLayout
android:id="@+id/settings_show_language_switch_key_holder"
android:id="@+id/settings_vibrate_on_keypress_holder"
style="@style/SettingsHolderSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<org.fossify.commons.views.MyMaterialSwitch
android:id="@+id/settings_show_language_switch_key"
android:id="@+id/settings_vibrate_on_keypress"
style="@style/SettingsSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/show_language_switch_key" />
android:text="@string/vibrate_on_keypress" />

</RelativeLayout>

<RelativeLayout
android:id="@+id/settings_keyboard_height_multiplier_holder"
android:id="@+id/settings_sound_on_keypress_holder"
style="@style/SettingsHolderTextViewStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<org.fossify.commons.views.MyTextView
android:id="@+id/settings_keyboard_height_multiplier_label"
android:id="@+id/settings_sound_on_keypress_label"
style="@style/SettingsTextLabelStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/keyboard_height" />
android:text="@string/sound_on_keypress" />

<org.fossify.commons.views.MyTextView
android:id="@+id/settings_keyboard_height_multiplier"
android:id="@+id/settings_sound_on_keypress"
style="@style/SettingsTextValueStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/settings_sound_on_keypress_label" />

</RelativeLayout>

<include
android:id="@+id/settings_keypress_divider"
layout="@layout/divider" />

<TextView
android:id="@+id/settings_typing_input_label"
style="@style/SettingsSectionLabelStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/typing_and_input" />

<RelativeLayout
android:id="@+id/settings_start_sentences_capitalized_holder"
style="@style/SettingsHolderSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<org.fossify.commons.views.MyMaterialSwitch
android:id="@+id/settings_start_sentences_capitalized"
style="@style/SettingsSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/settings_keyboard_height_multiplier_label"
tools:text="@string/small" />
android:text="@string/start_sentences_capitalized" />

</RelativeLayout>

Expand Down Expand Up @@ -336,10 +358,9 @@
</RelativeLayout>

<include
android:id="@+id/settings_keyboard_divider"
android:id="@+id/settings_typing_input_divider"
layout="@layout/divider" />

<!-- CLIPBOARD SETTINGS -->
<TextView
android:id="@+id/settings_clipboard_settings_label"
style="@style/SettingsSectionLabelStyle"
Expand Down
3 changes: 3 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 @@ -28,6 +28,9 @@
<string name="keycode_enter">Enter</string>
<string name="keycode_space">Spacebar</string>
<!-- Settings -->
<string name="layout_and_appearance">Layout &amp; appearance</string>
<string name="keypress">Keypress</string>
<string name="typing_and_input">Typing &amp; input</string>
<string name="show_clipboard_content">Show clipboard content if available</string>
<string name="show_popup">Show a popup on keypress</string>
<string name="vibrate_on_keypress">Vibrate on keypress</string>
Expand Down
Loading