From 8adaa0096755a260c542080e1e51cd15c367a1db Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 23 Sep 2017 10:28:39 +0200 Subject: [PATCH] fix #111, add a toggle for showing keyboard at startup --- .../notes/activities/MainActivity.kt | 8 ++++--- .../notes/activities/SettingsActivity.kt | 9 ++++++++ .../notes/adapters/NotesPagerAdapter.kt | 2 +- .../notes/fragments/NoteFragment.kt | 6 +---- .../simplemobiletools/notes/helpers/Config.kt | 4 ++++ .../notes/helpers/Constants.kt | 1 + app/src/main/res/layout/activity_settings.xml | 23 +++++++++++++++++++ app/src/main/res/values-de/strings.xml | 5 ++-- app/src/main/res/values-es/strings.xml | 5 ++-- app/src/main/res/values-fr/strings.xml | 5 ++-- app/src/main/res/values-hu/strings.xml | 5 ++-- app/src/main/res/values-it/strings.xml | 5 ++-- app/src/main/res/values-ja/strings.xml | 5 ++-- app/src/main/res/values-lt/strings.xml | 5 ++-- app/src/main/res/values-pl/strings.xml | 5 ++-- app/src/main/res/values-pt-rBR/strings.xml | 5 ++-- app/src/main/res/values-pt/strings.xml | 5 ++-- app/src/main/res/values-ru/strings.xml | 5 ++-- app/src/main/res/values-sk/strings.xml | 5 ++-- app/src/main/res/values-sv/strings.xml | 5 ++-- app/src/main/res/values/strings.xml | 5 ++-- 21 files changed, 86 insertions(+), 37 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt index 94bde843..c38b2863 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt @@ -127,6 +127,9 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener { currentItem = itemIndex addOnPageChangeListener(this@MainActivity) } + + if (!config.showKeyboard) + hideKeyboard() } override fun onResume() { @@ -154,8 +157,7 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener { findItem(R.id.delete_note).isVisible = shouldBeVisible } - pager_title_strip.visibility = if (shouldBeVisible) View.VISIBLE else View.GONE - + pager_title_strip.beVisibleIf(shouldBeVisible) return super.onPrepareOptionsMenu(menu) } @@ -225,7 +227,7 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener { updateSelectedNote(id) view_pager.viewTreeObserver.addOnGlobalLayoutListener(object : ViewTreeObserver.OnGlobalLayoutListener { override fun onGlobalLayout() { - mAdapter?.showKeyboard(getNoteIndexWithId(id)) + mAdapter?.focusEditText(getNoteIndexWithId(id)) view_pager.viewTreeObserver.removeOnGlobalLayoutListener(this) } }) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt index 042222c1..01a000f8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt @@ -29,6 +29,7 @@ class SettingsActivity : SimpleActivity() { setupDisplaySuccess() setupClickableLinks() setupMonospacedFont() + setupShowKeyboard() setupFontSize() setupGravity() setupWidgetNote() @@ -66,6 +67,14 @@ class SettingsActivity : SimpleActivity() { } } + private fun setupShowKeyboard() { + settings_show_keyboard.isChecked = config.showKeyboard + settings_show_keyboard_holder.setOnClickListener { + settings_show_keyboard.toggle() + config.showKeyboard = settings_show_keyboard.isChecked + } + } + private fun setupFontSize() { settings_font_size.text = getFontSizeText() settings_font_size_holder.setOnClickListener { diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt index 19715055..cfd3987c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt @@ -39,7 +39,7 @@ class NotesPagerAdapter(fm: FragmentManager, val notes: List, val activity fun saveCurrentNote(position: Int) = fragments[position]?.saveText() - fun showKeyboard(position: Int) = fragments[position]?.showKeyboard() + fun focusEditText(position: Int) = fragments[position]?.focusEditText() override fun finishUpdate(container: ViewGroup?) { try { diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt b/app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt index 718e6eec..5e077e1d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt @@ -1,6 +1,5 @@ package com.simplemobiletools.notes.fragments -import android.content.Context import android.graphics.Typeface import android.os.Bundle import android.support.v4.app.Fragment @@ -11,7 +10,6 @@ import android.view.Gravity import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.view.inputmethod.InputMethodManager import com.simplemobiletools.notes.R import com.simplemobiletools.notes.activities.MainActivity import com.simplemobiletools.notes.extensions.config @@ -73,10 +71,8 @@ class NoteFragment : Fragment() { } } - fun showKeyboard() { + fun focusEditText() { view.notes_view.requestFocus() - val imm = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager - imm.showSoftInput(view.notes_view, InputMethodManager.SHOW_IMPLICIT) } private fun saveNoteValue(note: Note) { diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Config.kt index 76e35565..d1a4e6d8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Config.kt @@ -20,6 +20,10 @@ class Config(context: Context) : BaseConfig(context) { get() = prefs.getBoolean(MONOSPACED_FONT, false) set(monospacedFont) = prefs.edit().putBoolean(MONOSPACED_FONT, monospacedFont).apply() + var showKeyboard: Boolean + get() = prefs.getBoolean(SHOW_KEYBOARD, true) + set(showKeyboard) = prefs.edit().putBoolean(SHOW_KEYBOARD, showKeyboard).apply() + var fontSize: Int get() = prefs.getInt(FONT_SIZE, FONT_SIZE_MEDIUM) set(size) = prefs.edit().putInt(FONT_SIZE, size).apply() diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Constants.kt index 6975fd3e..a4e88390 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Constants.kt @@ -9,6 +9,7 @@ val DISPLAY_SUCCESS = "display_success" val CLICKABLE_LINKS = "clickable_links" val WIDGET_NOTE_ID = "widget_note_id" val MONOSPACED_FONT = "monospaced_font" +val SHOW_KEYBOARD = "show_keyboard" val FONT_SIZE = "font_size" val GRAVITY = "gravity" val CURSOR_PLACEMENT = "cursor_placement" diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 82cafdfb..fe1d44d5 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -116,6 +116,29 @@ + + + + + + Übernehme Änderungen an der Notiz in die Datei\n(Notiz wird gelöscht, wenn die Datei gelöscht wird oder sich der Pfad ändert.) Lösche Datei \"%s\" Notiz \"%s\" erfolgreich gespeichert - Zeige Benachrichtigung bei erfolgreichem Speichern - Widget-Notiz + Zeige Benachrichtigung bei erfolgreichem Speichern Links und E-Mail Adressen anklickbar Place cursor to the end of note Use monospaced font + Show keyboard on startup Ausrichtung Linksbündig Zentriert Rechtsbündig + Widget-Notiz diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 914dc634..fb9cbe9d 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -24,17 +24,18 @@ Update the file itself at updating the note\n(note gets deleted if file gets deleted, or path changes) Also delete file \"%s\" Note \"%s\" saved successfully - Display save success messages + Display save success messages Make links and emails clickable Place cursor to the end of note Use monospaced font - Nota del widget + Show keyboard on startup Alineación del texto Izquierda Centrado Derecha + Nota del widget diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 8e6ef7ae..3c09683d 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -24,17 +24,18 @@ Metttre à jour le fichier lui-même lors de la mise à jour de la note\n(la note est supprimée si le fichier est supprimé, ou que le chemin change) Supprimer également le fichier \"%s\" Note \"%s\" sauvegardée avec succès - Afficher les messages de succès de sauvegarde - Note utilisée dans le widget + Afficher les messages de succès de sauvegarde Rendre les liens et les emails cliquables Placer le curseur à la fin de la note Use monospaced font + Show keyboard on startup Alignment Gauche Centre Droite + Note utilisée dans le widget diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 44c18a98..a52913a4 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -24,17 +24,18 @@ A jegyzetbe íráskor a fájlba is írás\n(a jegyzet törlődik ha a fájl törlődik, vagy változik az elérési útvonala) \"%s\" fájl is törlődjön \"%s\" nevű jegyzet elmentve - Sikeres mentés üzenetek megjelenítése - Widgetben használt jegyzet + Sikeres mentés üzenetek megjelenítése Hivatkozások és e-mail címek felismerése Place cursor to the end of note Use monospaced font + Show keyboard on startup Igazítottság Bal Közép Jobb + Widgetben használt jegyzet diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d313f1a0..966a0bb7 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -24,17 +24,18 @@ Update the file itself at updating the note\n(note gets deleted if file gets deleted, or path changes) Also delete file \"%s\" Note \"%s\" saved successfully - Display save success messages + Display save success messages Make links and emails clickable Place cursor to the end of note Use monospaced font - Note used in widget + Show keyboard on startup Alignment Left Center Right + Note used in widget diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index d5a274f0..b563b453 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -24,17 +24,18 @@ Update the file itself at updating the note\n(note gets deleted if file gets deleted, or path changes) Also delete file \"%s\" Note \"%s\" saved successfully - Display save success messages + Display save success messages Make links and emails clickable Place cursor to the end of note Use monospaced font - ウィジェットで使用するメモ + Show keyboard on startup 重力 左 中央 右 + ウィジェットで使用するメモ diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index a8584bf0..5232172c 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -24,17 +24,18 @@ Atnaujinti failà kai atnaujinamas áraðas\n(Áraðas iðtrinamas, jei iðtrinamas failas ar pakeièiama talpinimo vieta) Taip pat iðtrinti failà \"%s\" Áraðas \"%s\" sëkmingai iðsaugotas - Rodyti sëkmingo iðsaugojimo praneðimus - Áraðas panaudotas ðaukinyje + Rodyti sëkmingo iðsaugojimo praneðimus Paspaudþiamos nuorodos ir elektroninio paðto adresai Perkelti þymeklá á áraðo pabaigà Use monospaced font + Show keyboard on startup Átrauka Kairëje Centre Deðinëje + Áraðas panaudotas ðaukinyje diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 2dd43911..861fe928 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -24,17 +24,18 @@ Zaktualizuj plik po zaktualizowaniu notatki\n(notatka zostanie usunięta jeśli plik zostanie usunięty lub zmieni się jego lokalizacja) Usuń także plik \"%s\" Notatka \"%s\" została zapisana - Wyświetlaj informacje o pomyślnym zapisaniu notatki - Notatka używana w widżecie + Wyświetlaj informacje o pomyślnym zapisaniu notatki Przetwarzaj linki i adresy e-mail do klikalnej formy. Umieszczaj kursor na końcu notatki Use monospaced font + Show keyboard on startup Wyrównanie tekstu w notatkach Do lewej strony Do środka Do prawej strony + Notatka używana w widżecie diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 6b54dd19..50cb743e 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -24,17 +24,18 @@ Update the file itself at updating the note\n(note gets deleted if file gets deleted, or path changes) Apagar também o arquivo \"%s\" Nota \"%s\" guardada com sucesso - Mostrar mensagens de gravação com sucesso + Mostrar mensagens de gravação com sucesso Ativar clique em ligações e endereços de e-mail Place cursor to the end of note Use monospaced font - Nota utilizada no widget + Show keyboard on startup Gravidade Esquerda Centro Direita + Nota utilizada no widget diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 22123654..f2836264 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -24,17 +24,18 @@ Atualizar o ficheiro ao atualizar a nota\n(a nota será removida se apagar o ficheiro ou se mudar a sua localização) Apagar também o ficheiro \"%s\" Nota \"%s\" guardada com sucesso - Mostrar mensagens de gravação com sucesso + Mostrar mensagens de gravação com sucesso Ativar clique em ligações e endereços de e-mail Colocar cursor no fim da nota Use monospaced font - Nota utilizada no widget + Show keyboard on startup Gravidade Esquerda Centro Direita + Nota utilizada no widget diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index b6a0df0e..dbb6172f 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -24,17 +24,18 @@ Обновлять содержимое файла при обновлении заметки\n(заметка удалится, если удалить файл или изменить путь к нему) Также удалить файл \"%s\" Заметка \"%s\" сохранена успешно - Уведомлять, что файл успешно сохранен - Заметка, отображаемая в виджете + Уведомлять, что файл успешно сохранен Сделать ссылки и адреса электронной почты активными Помещать курсор в конец заметки Использовать моноширинный шрифт + Show keyboard on startup Выравнивание По левому краю По центру По правому краю + Заметка, отображаемая в виджете diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 1494a9c6..b7006e13 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -24,17 +24,18 @@ Aktualizovať samotný súbor po úprave poznámky\n(ak bude daný súbor presunutý, alebo vymazaný, bude vymazaná aj poznámka) Odstrániť aj súbor \"%s\" Poznámka \"%s\" bola úspešne uložená - Zobraziť správu o úspešnom uložení poznámky - Poznámka použitá vo widgete + Zobraziť správu o úspešnom uložení poznámky Spraviť odkazy a emaily klikateľnými Umiestniť kurzor na koniec poznámky Použiť písmo Monospace + Zobraziť klávesnicu po spustení Zarovnanie Vľavo Uprostred Vpravo + Poznámka použitá vo widgete diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index c35bc489..fc81b1d3 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -24,17 +24,18 @@ Uppdatera själva filen när anteckningen uppdateras\n(anteckningen tas bort om filen tas bort eller sökvägen ändras) Ta även bort filen \"%s\" Anteckningen \"%s\" har sparats - Visa ett meddelande när en anteckning har sparats + Visa ett meddelande när en anteckning har sparats Gör länkar och e-postadresser klickbara Placera markören vid slutet av anteckningen Use monospaced font - Anteckningen används i widgeten + Show keyboard on startup Justering Vänster Centrerad Höger + Anteckningen används i widgeten diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4d8e491f..85bf5122 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -24,17 +24,18 @@ Update the file itself at updating the note\n(note gets deleted if file gets deleted, or path changes) Also delete file \"%s\" Note \"%s\" saved successfully - Display save success messages - Note used in widget + Display save success messages Make links and emails clickable Place cursor to the end of note Use monospaced font + Show keyboard on startup Alignment Left Center Right + Note used in widget