diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index 8a0062bf..b372543d 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -39,7 +39,8 @@ Избор на клавиатура по подразбиране Назад към Настройки Traditional T9 е активен - Traditional T9 е изключен. Натиснете тук, за да го включите от настройките на Андроид. + Traditional T9 е изключен + Натиснете тук, за да включите TT9 от настройките на Андроид. (задръж) Зареждане на речник Зареждането е отменено. diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 0d7f8f60..95c8aea9 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -41,7 +41,8 @@ Sélectionnez le clavier par défaut Retour à l\'écran des paramètres Traditional T9 est activé - Traditional T9 est désactivé. Cliquez ici pour l\'activer dans les paramètres Android. + Traditional T9 est désactivé + Cliquez ici pour activer TT9 dans les paramètres Android. Nouvelle ligne Caractère lorsque «0» est appuyé deux fois Tapez un mot… diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 77cfd905..6291faf7 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -49,7 +49,8 @@ Выберите клавиатуру по умолчанию Вернуться к настройкам Traditional T9 активен - Traditional T9 отключен. Нажмите здесь, чтобы включить его в настройках Android. + Traditional T9 отключен + Нажмите здесь, чтобы включить TT9 в настройках Android. (зажать) Назад Позвонить diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index fe952672..15b1f07c 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -41,7 +41,8 @@ Вибрати стандартну клавіатуру Назад до налаштувань Traditional T9 активний - Traditional T9 вимкнено. Натисніть тут, щоб увімкнути його в налаштуваннях Android. + Traditional T9 вимкнено + Натисніть тут, щоб увімкнути TT9 в налаштуваннях Android. (затиснути) Додати нове слово Стерти diff --git a/res/values/strings.xml b/res/values/strings.xml index 15ca62fe..5d55baa4 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -60,7 +60,8 @@ Select Default Keyboard Return to Settings Traditional T9 is enabled - Traditional T9 is disabled. Click here to enable it from Android Settings. + Traditional T9 is disabled + Click here to enable TT9 from Android Settings. (hold) -- diff --git a/res/xml/prefs.xml b/res/xml/prefs.xml index f0b41c7a..9a15698e 100644 --- a/res/xml/prefs.xml +++ b/res/xml/prefs.xml @@ -32,6 +32,12 @@ app:layout="@layout/pref_text" app:title="@string/pref_category_keypad" /> + + - - - - - - - diff --git a/src/io/github/sspanak/tt9/preferences/PreferencesActivity.java b/src/io/github/sspanak/tt9/preferences/PreferencesActivity.java index d53d13a6..04d9e5c0 100644 --- a/src/io/github/sspanak/tt9/preferences/PreferencesActivity.java +++ b/src/io/github/sspanak/tt9/preferences/PreferencesActivity.java @@ -20,9 +20,9 @@ import io.github.sspanak.tt9.ime.helpers.InputModeValidator; import io.github.sspanak.tt9.preferences.screens.AppearanceScreen; import io.github.sspanak.tt9.preferences.screens.DictionariesScreen; import io.github.sspanak.tt9.preferences.screens.HotkeysScreen; -import io.github.sspanak.tt9.preferences.screens.SetupScreen; import io.github.sspanak.tt9.preferences.screens.KeyPadScreen; import io.github.sspanak.tt9.preferences.screens.MainSettingsScreen; +import io.github.sspanak.tt9.preferences.screens.SetupScreen; import io.github.sspanak.tt9.ui.DictionaryLoadingBar; public class PreferencesActivity extends AppCompatActivity implements PreferenceFragmentCompat.OnPreferenceStartFragmentCallback { @@ -82,8 +82,10 @@ public class PreferencesActivity extends AppCompatActivity implements Preference return new HotkeysScreen(this); case "KeyPad": return new KeyPadScreen(this); + case "Setup": + return new SetupScreen(this); default: - return globalKeyboardSettings.isTT9Enabled() ? new MainSettingsScreen(this) : new SetupScreen(this); + return new MainSettingsScreen(this); } } diff --git a/src/io/github/sspanak/tt9/preferences/screens/MainSettingsScreen.java b/src/io/github/sspanak/tt9/preferences/screens/MainSettingsScreen.java index 083ae2bc..95da07ca 100644 --- a/src/io/github/sspanak/tt9/preferences/screens/MainSettingsScreen.java +++ b/src/io/github/sspanak/tt9/preferences/screens/MainSettingsScreen.java @@ -5,6 +5,8 @@ import android.net.Uri; import androidx.preference.Preference; +import java.util.ArrayList; +import java.util.Arrays; import java.util.regex.Pattern; import io.github.sspanak.tt9.BuildConfig; @@ -21,13 +23,22 @@ public class MainSettingsScreen extends BaseScreenFragment { @Override protected int getTitle() { return R.string.app_settings;} @Override protected int getXml() { return R.xml.prefs; } + @Override public void onCreate() { + createSettingsSection(); addHelpLink(); createAboutSection(); } + @Override + public void onResume() { + super.onResume(); + createSettingsSection(); + } + + private void addHelpLink() { try { if (!releaseVersionRegex.matcher(BuildConfig.VERSION_NAME).find()) { @@ -58,4 +69,26 @@ public class MainSettingsScreen extends BaseScreenFragment { vi.setSummary(BuildConfig.VERSION_FULL); } } + + + private void createSettingsSection() { + boolean isTT9Enabled = activity.globalKeyboardSettings.isTT9Enabled(); + + Preference gotoSetup = findPreference("screen_setup"); + if (gotoSetup != null) { + gotoSetup.setSummary(isTT9Enabled ? "" : activity.getString(R.string.setup_click_here_to_enable)); + } + + ArrayList screens = new ArrayList<>(Arrays.asList( + findPreference("screen_appearance"), + findPreference("screen_dictionaries"), + findPreference("screen_keypad") + )); + + for (Preference goToScreen : screens) { + if (goToScreen != null) { + goToScreen.setEnabled(isTT9Enabled); + } + } + } } diff --git a/src/io/github/sspanak/tt9/preferences/screens/SetupScreen.java b/src/io/github/sspanak/tt9/preferences/screens/SetupScreen.java index a1ac8bc1..f10b2b58 100644 --- a/src/io/github/sspanak/tt9/preferences/screens/SetupScreen.java +++ b/src/io/github/sspanak/tt9/preferences/screens/SetupScreen.java @@ -2,7 +2,6 @@ package io.github.sspanak.tt9.preferences.screens; import androidx.preference.Preference; -import io.github.sspanak.tt9.BuildConfig; import io.github.sspanak.tt9.R; import io.github.sspanak.tt9.preferences.PreferencesActivity; import io.github.sspanak.tt9.preferences.items.ItemSelectGlobalKeyboard; @@ -18,7 +17,6 @@ public class SetupScreen extends BaseScreenFragment { @Override public void onCreate() { createKeyboardSection(); - createAboutSection(); } @Override @@ -43,18 +41,5 @@ public class SetupScreen extends BaseScreenFragment { if (defaultKeyboardItem != null) { new ItemSetDefaultGlobalKeyboard(defaultKeyboardItem, activity).enableClickHandler(); } - - Preference goToMain = findPreference("goto_main_screen"); - if (goToMain != null) { - goToMain.setEnabled(isTT9On); - } - } - - - private void createAboutSection() { - Preference vi = findPreference("version_info"); - if (vi != null) { - vi.setSummary(BuildConfig.VERSION_FULL); - } } }