moved the haptic feedback setting to the Keypad screen
This commit is contained in:
parent
c04a861f17
commit
a82f8c783e
6 changed files with 10 additions and 11 deletions
|
|
@ -24,19 +24,16 @@ public class AppearanceScreen extends BaseScreenFragment {
|
||||||
|
|
||||||
private void createMainSection() {
|
private void createMainSection() {
|
||||||
(new ItemStatusIcon(findPreference(ItemStatusIcon.NAME), activity.getSettings())).populate();
|
(new ItemStatusIcon(findPreference(ItemStatusIcon.NAME), activity.getSettings())).populate();
|
||||||
ItemHapticFeedback hapticFeedback = (new ItemHapticFeedback(findPreference(ItemHapticFeedback.NAME), activity.getSettings())).populate();
|
|
||||||
|
|
||||||
ItemNumpadAlignment numpadAlignment = new ItemNumpadAlignment(findPreference(ItemNumpadAlignment.NAME), activity.getSettings());
|
ItemNumpadAlignment numpadAlignment = new ItemNumpadAlignment(findPreference(ItemNumpadAlignment.NAME), activity.getSettings());
|
||||||
ItemNumpadKeyHeight numpadKeyHeight = new ItemNumpadKeyHeight(findPreference(ItemNumpadKeyHeight.NAME), activity.getSettings());
|
ItemNumpadKeyHeight numpadKeyHeight = new ItemNumpadKeyHeight(findPreference(ItemNumpadKeyHeight.NAME), activity.getSettings());
|
||||||
|
|
||||||
|
|
||||||
ItemDropDown[] items = {
|
ItemDropDown[] items = {
|
||||||
new ItemSelectTheme(findPreference(ItemSelectTheme.NAME), activity),
|
new ItemSelectTheme(findPreference(ItemSelectTheme.NAME), activity),
|
||||||
new ItemSelectLayoutType(
|
new ItemSelectLayoutType(
|
||||||
findPreference(ItemSelectLayoutType.NAME),
|
findPreference(ItemSelectLayoutType.NAME),
|
||||||
activity,
|
activity,
|
||||||
(layout) -> {
|
(layout) -> {
|
||||||
hapticFeedback.onLayoutChange(layout);
|
|
||||||
numpadKeyHeight.onLayoutChange(layout);
|
numpadKeyHeight.onLayoutChange(layout);
|
||||||
numpadAlignment.onLayoutChange(layout);
|
numpadAlignment.onLayoutChange(layout);
|
||||||
}),
|
}),
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package io.github.sspanak.tt9.preferences.screens.appearance;
|
package io.github.sspanak.tt9.preferences.screens.keypad;
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import androidx.preference.Preference;
|
import androidx.preference.Preference;
|
||||||
|
|
@ -26,7 +26,7 @@ class ItemHapticFeedback extends ItemClickable {
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
void onLayoutChange(int mainViewLayout) {
|
private void onLayoutChange(int mainViewLayout) {
|
||||||
if (item != null) {
|
if (item != null) {
|
||||||
item.setEnabled(mainViewLayout == SettingsStore.LAYOUT_NUMPAD || mainViewLayout == SettingsStore.LAYOUT_SMALL);
|
item.setEnabled(mainViewLayout == SettingsStore.LAYOUT_NUMPAD || mainViewLayout == SettingsStore.LAYOUT_SMALL);
|
||||||
((SwitchPreferenceCompat) item).setChecked(settings.getHapticFeedback());
|
((SwitchPreferenceCompat) item).setChecked(settings.getHapticFeedback());
|
||||||
|
|
@ -16,6 +16,8 @@ public class KeyPadScreen extends BaseScreenFragment {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate() {
|
protected void onCreate() {
|
||||||
|
(new ItemHapticFeedback(findPreference(ItemHapticFeedback.NAME), activity.getSettings())).populate().enableClickHandler();
|
||||||
|
|
||||||
ItemDropDown[] items = {
|
ItemDropDown[] items = {
|
||||||
new ItemSelectZeroKeyCharacter(findPreference(ItemSelectZeroKeyCharacter.NAME), activity),
|
new ItemSelectZeroKeyCharacter(findPreference(ItemSelectZeroKeyCharacter.NAME), activity),
|
||||||
new ItemSelectABCAutoAccceptTime(findPreference(ItemSelectABCAutoAccceptTime.NAME), activity),
|
new ItemSelectABCAutoAccceptTime(findPreference(ItemSelectABCAutoAccceptTime.NAME), activity),
|
||||||
|
|
|
||||||
|
|
@ -142,7 +142,7 @@
|
||||||
<string name="voice_input_error_no_network">Няма връзка с интернет</string>
|
<string name="voice_input_error_no_network">Няма връзка с интернет</string>
|
||||||
<string name="voice_input_error_network_failed">Проблем с мрежовата връзка</string>
|
<string name="voice_input_error_network_failed">Проблем с мрежовата връзка</string>
|
||||||
<string name="voice_input_stopping">Изключване на микрофона…</string>
|
<string name="voice_input_stopping">Изключване на микрофона…</string>
|
||||||
<string name="pref_haptic_feedback_summary">Вибрация при натискане на виртуален клавиш</string>
|
<string name="pref_haptic_feedback_summary">Вибрация при натискане на виртуален клавиш.</string>
|
||||||
<string name="pref_haptic_feedback">Вибрация</string>
|
<string name="pref_haptic_feedback">Вибрация</string>
|
||||||
<string name="pref_numpad_alignment">Подравняване в пейзажен режим</string>
|
<string name="pref_numpad_alignment">Подравняване в пейзажен режим</string>
|
||||||
<string name="virtual_numpad_alignment_center">В средата</string>
|
<string name="virtual_numpad_alignment_center">В средата</string>
|
||||||
|
|
|
||||||
|
|
@ -15,11 +15,6 @@
|
||||||
app:title="@string/pref_layout" />
|
app:title="@string/pref_layout" />
|
||||||
|
|
||||||
<PreferenceCategory app:title="@string/pref_layout_numpad">
|
<PreferenceCategory app:title="@string/pref_layout_numpad">
|
||||||
<SwitchPreferenceCompat
|
|
||||||
app:key="pref_haptic_feedback"
|
|
||||||
app:title="@string/pref_haptic_feedback"
|
|
||||||
app:summary="@string/pref_haptic_feedback_summary"/>
|
|
||||||
|
|
||||||
<DropDownPreference
|
<DropDownPreference
|
||||||
app:key="pref_numpad_key_height"
|
app:key="pref_numpad_key_height"
|
||||||
app:title="@string/pref_numpad_key_height" />
|
app:title="@string/pref_numpad_key_height" />
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,11 @@
|
||||||
app:summary="@string/pref_upside_down_keys_summary"
|
app:summary="@string/pref_upside_down_keys_summary"
|
||||||
app:title="@string/pref_upside_down_keys" />
|
app:title="@string/pref_upside_down_keys" />
|
||||||
|
|
||||||
|
<SwitchPreferenceCompat
|
||||||
|
app:key="pref_haptic_feedback"
|
||||||
|
app:title="@string/pref_haptic_feedback"
|
||||||
|
app:summary="@string/pref_haptic_feedback_summary"/>
|
||||||
|
|
||||||
<PreferenceCategory android:title="@string/pref_category_predictive_mode">
|
<PreferenceCategory android:title="@string/pref_category_predictive_mode">
|
||||||
|
|
||||||
<SwitchPreferenceCompat
|
<SwitchPreferenceCompat
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue