fenix/Simple-Notes
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Notes.git synced 2025-04-13 06:52:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix #111, add a toggle for showing keyboard at startup

Browse Source
This commit is contained in:
tibbi 2017-09-23 10:28:39 +02:00
parent 1e97d58c0c
commit 8adaa00967
21 changed files with 86 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt
View File

@ -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)
}
})

9
app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt
View File

@ -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 {

2
app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt
View File

@ -39,7 +39,7 @@ class NotesPagerAdapter(fm: FragmentManager, val notes: List<Note>, 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 {

6
app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt
View File

@ -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) {

4
app/src/main/kotlin/com/simplemobiletools/notes/helpers/Config.kt
View File

@ -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()

1
app/src/main/kotlin/com/simplemobiletools/notes/helpers/Constants.kt
View File

@ -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"

23
app/src/main/res/layout/activity_settings.xml
View File

@ -116,6 +116,29 @@
</RelativeLayout>
<RelativeLayout
android:id="@+id/settings_show_keyboard_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin"
android:background="?attr/selectableItemBackground"
android:paddingBottom="@dimen/bigger_margin"
android:paddingLeft="@dimen/activity_margin"
android:paddingRight="@dimen/activity_margin"
android:paddingTop="@dimen/bigger_margin">
<com.simplemobiletools.commons.views.MySwitchCompat
android:id="@+id/settings_show_keyboard"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:clickable="false"
android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/medium_margin"
android:text="@string/show_keyboard"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/settings_font_size_holder"
android:layout_width="match_parent"

5
app/src/main/res/values-de/strings.xml
View File

@ -24,17 +24,18 @@
<string name="update_file_at_note">Übernehme Änderungen an der Notiz in die Datei\n(Notiz wird gelöscht, wenn die Datei gelöscht wird oder sich der Pfad ändert.)</string>
<string name="delete_file_itself">Lösche Datei \"%s\"</string>
<string name="note_saved_successfully">Notiz \"%s\" erfolgreich gespeichert</string>
<string name="display_success_message">Zeige Benachrichtigung bei erfolgreichem Speichern</string>
<!-- Settings -->
<string name="widget_note">Widget-Notiz</string>
<string name="display_success_message">Zeige Benachrichtigung bei erfolgreichem Speichern</string>
<string name="links_and_emails_clickable">Links und E-Mail Adressen anklickbar</string>
<string name="place_cursor_end">Place cursor to the end of note</string>
<string name="monospaced_font">Use monospaced font</string>
<string name="show_keyboard">Show keyboard on startup</string>
<string name="alignment">Ausrichtung</string>
<string name="left">Linksbündig</string>
<string name="center">Zentriert</string>
<string name="right">Rechtsbündig</string>
<string name="widget_note">Widget-Notiz</string>
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
<!-- Short description has to have less than 80 chars -->

5
app/src/main/res/values-es/strings.xml
View File

@ -24,17 +24,18 @@
<string name="update_file_at_note">Update the file itself at updating the note\n(note gets deleted if file gets deleted, or path changes)</string>
<string name="delete_file_itself">Also delete file \"%s\"</string>
<string name="note_saved_successfully">Note \"%s\" saved successfully</string>
<string name="display_success_message">Display save success messages</string>
<!-- Settings -->
<string name="display_success_message">Display save success messages</string>
<string name="links_and_emails_clickable">Make links and emails clickable</string>
<string name="place_cursor_end">Place cursor to the end of note</string>
<string name="monospaced_font">Use monospaced font</string>
<string name="widget_note">Nota del widget</string>
<string name="show_keyboard">Show keyboard on startup</string>
<string name="alignment">Alineación del texto</string>
<string name="left">Izquierda</string>
<string name="center">Centrado</string>
<string name="right">Derecha</string>
<string name="widget_note">Nota del widget</string>
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
<!-- Short description has to have less than 80 chars -->

5
app/src/main/res/values-fr/strings.xml
View File

@ -24,17 +24,18 @@
<string name="update_file_at_note">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)</string>
<string name="delete_file_itself">Supprimer également le fichier \"%s\"</string>
<string name="note_saved_successfully">Note \"%s\" sauvegardée avec succès</string>
<string name="display_success_message">Afficher les messages de succès de sauvegarde</string>
<!-- Settings -->
<string name="widget_note">Note utilisée dans le widget</string>
<string name="display_success_message">Afficher les messages de succès de sauvegarde</string>
<string name="links_and_emails_clickable">Rendre les liens et les emails cliquables</string>
<string name="place_cursor_end">Placer le curseur à la fin de la note</string>
<string name="monospaced_font">Use monospaced font</string>
<string name="show_keyboard">Show keyboard on startup</string>
<string name="alignment">Alignment</string>
<string name="left">Gauche</string>
<string name="center">Centre</string>
<string name="right">Droite</string>
<string name="widget_note">Note utilisée dans le widget</string>
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
<!-- Short description has to have less than 80 chars -->

5
app/src/main/res/values-hu/strings.xml
View File

@ -24,17 +24,18 @@
<string name="update_file_at_note">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)</string>
<string name="delete_file_itself">\"%s\" fájl is törlődjön</string>
<string name="note_saved_successfully">\"%s\" nevű jegyzet elmentve</string>
<string name="display_success_message">Sikeres mentés üzenetek megjelenítése</string>
<!-- Settings -->
<string name="widget_note">Widgetben használt jegyzet</string>
<string name="display_success_message">Sikeres mentés üzenetek megjelenítése</string>
<string name="links_and_emails_clickable">Hivatkozások és e-mail címek felismerése</string>
<string name="place_cursor_end">Place cursor to the end of note</string>
<string name="monospaced_font">Use monospaced font</string>
<string name="show_keyboard">Show keyboard on startup</string>
<string name="alignment">Igazítottság</string>
<string name="left">Bal</string>
<string name="center">Közép</string>
<string name="right">Jobb</string>
<string name="widget_note">Widgetben használt jegyzet</string>
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
<!-- Short description has to have less than 80 chars -->

5
app/src/main/res/values-it/strings.xml
View File

@ -24,17 +24,18 @@
<string name="update_file_at_note">Update the file itself at updating the note\n(note gets deleted if file gets deleted, or path changes)</string>
<string name="delete_file_itself">Also delete file \"%s\"</string>
<string name="note_saved_successfully">Note \"%s\" saved successfully</string>
<string name="display_success_message">Display save success messages</string>
<!-- Settings -->
<string name="display_success_message">Display save success messages</string>
<string name="links_and_emails_clickable">Make links and emails clickable</string>
<string name="place_cursor_end">Place cursor to the end of note</string>
<string name="monospaced_font">Use monospaced font</string>
<string name="widget_note">Note used in widget</string>
<string name="show_keyboard">Show keyboard on startup</string>
<string name="alignment">Alignment</string>
<string name="left">Left</string>
<string name="center">Center</string>
<string name="right">Right</string>
<string name="widget_note">Note used in widget</string>
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
<!-- Short description has to have less than 80 chars -->

5
app/src/main/res/values-ja/strings.xml
View File

@ -24,17 +24,18 @@
<string name="update_file_at_note">Update the file itself at updating the note\n(note gets deleted if file gets deleted, or path changes)</string>
<string name="delete_file_itself">Also delete file \"%s\"</string>
<string name="note_saved_successfully">Note \"%s\" saved successfully</string>
<string name="display_success_message">Display save success messages</string>
<!-- Settings -->
<string name="display_success_message">Display save success messages</string>
<string name="links_and_emails_clickable">Make links and emails clickable</string>
<string name="place_cursor_end">Place cursor to the end of note</string>
<string name="monospaced_font">Use monospaced font</string>
<string name="widget_note">ウィジェットで使用するメモ</string>
<string name="show_keyboard">Show keyboard on startup</string>
<string name="alignment">重力</string>
<string name="left">左</string>
<string name="center">中央</string>
<string name="right">右</string>
<string name="widget_note">ウィジェットで使用するメモ</string>
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
<!-- Short description has to have less than 80 chars -->

5
app/src/main/res/values-lt/strings.xml
View File

@ -24,17 +24,18 @@
<string name="update_file_at_note">Atnaujinti failà kai atnaujinamas áraðas\n(Áraðas iðtrinamas, jei iðtrinamas failas ar pakeièiama talpinimo vieta)</string>
<string name="delete_file_itself">Taip pat iðtrinti failà \"%s\"</string>
<string name="note_saved_successfully">Áraðas \"%s\" sëkmingai iðsaugotas</string>
<string name="display_success_message">Rodyti sëkmingo iðsaugojimo praneðimus</string>
<!-- Settings -->
<string name="widget_note">Áraðas panaudotas ðaukinyje</string>
<string name="display_success_message">Rodyti sëkmingo iðsaugojimo praneðimus</string>
<string name="links_and_emails_clickable">Paspaudþiamos nuorodos ir elektroninio paðto adresai</string>
<string name="place_cursor_end">Perkelti þymeklá á áraðo pabaigà</string>
<string name="monospaced_font">Use monospaced font</string>
<string name="show_keyboard">Show keyboard on startup</string>
<string name="alignment">Átrauka</string>
<string name="left">Kairëje</string>
<string name="center">Centre</string>
<string name="right">Deðinëje</string>
<string name="widget_note">Áraðas panaudotas ðaukinyje</string>
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
<!-- Short description has to have less than 80 chars -->

5
app/src/main/res/values-pl/strings.xml
View File

@ -24,17 +24,18 @@
<string name="update_file_at_note">Zaktualizuj plik po zaktualizowaniu notatki\n(notatka zostanie usunięta jeśli plik zostanie usunięty lub zmieni się jego lokalizacja)</string>
<string name="delete_file_itself">Usuń także plik \"%s\"</string>
<string name="note_saved_successfully">Notatka \"%s\" została zapisana</string>
<string name="display_success_message">Wyświetlaj informacje o pomyślnym zapisaniu notatki</string>
<!-- Settings -->
<string name="widget_note">Notatka używana w widżecie</string>
<string name="display_success_message">Wyświetlaj informacje o pomyślnym zapisaniu notatki</string>
<string name="links_and_emails_clickable">Przetwarzaj linki i adresy e-mail do klikalnej formy.</string>
<string name="place_cursor_end">Umieszczaj kursor na końcu notatki</string>
<string name="monospaced_font">Use monospaced font</string>
<string name="show_keyboard">Show keyboard on startup</string>
<string name="alignment">Wyrównanie tekstu w notatkach</string>
<string name="left">Do lewej strony</string>
<string name="center">Do środka</string>
<string name="right">Do prawej strony</string>
<string name="widget_note">Notatka używana w widżecie</string>
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
<!-- Short description has to have less than 80 chars -->

5
app/src/main/res/values-pt-rBR/strings.xml
View File

@ -24,17 +24,18 @@
<string name="update_file_at_note">Update the file itself at updating the note\n(note gets deleted if file gets deleted, or path changes)</string>
<string name="delete_file_itself">Apagar também o arquivo \"%s\"</string>
<string name="note_saved_successfully">Nota \"%s\" guardada com sucesso</string>
<string name="display_success_message">Mostrar mensagens de gravação com sucesso</string>
<!-- Settings -->
<string name="display_success_message">Mostrar mensagens de gravação com sucesso</string>
<string name="links_and_emails_clickable">Ativar clique em ligações e endereços de e-mail</string>
<string name="place_cursor_end">Place cursor to the end of note</string>
<string name="monospaced_font">Use monospaced font</string>
<string name="widget_note">Nota utilizada no widget</string>
<string name="show_keyboard">Show keyboard on startup</string>
<string name="alignment">Gravidade</string>
<string name="left">Esquerda</string>
<string name="center">Centro</string>
<string name="right">Direita</string>
<string name="widget_note">Nota utilizada no widget</string>
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
<!-- Short description has to have less than 80 chars -->

5
app/src/main/res/values-pt/strings.xml
View File

@ -24,17 +24,18 @@
<string name="update_file_at_note">Atualizar o ficheiro ao atualizar a nota\n(a nota será removida se apagar o ficheiro ou se mudar a sua localização)</string>
<string name="delete_file_itself">Apagar também o ficheiro \"%s\"</string>
<string name="note_saved_successfully">Nota \"%s\" guardada com sucesso</string>
<string name="display_success_message">Mostrar mensagens de gravação com sucesso</string>
<!-- Settings -->
<string name="display_success_message">Mostrar mensagens de gravação com sucesso</string>
<string name="links_and_emails_clickable">Ativar clique em ligações e endereços de e-mail</string>
<string name="place_cursor_end">Colocar cursor no fim da nota</string>
<string name="monospaced_font">Use monospaced font</string>
<string name="widget_note">Nota utilizada no widget</string>
<string name="show_keyboard">Show keyboard on startup</string>
<string name="alignment">Gravidade</string>
<string name="left">Esquerda</string>
<string name="center">Centro</string>
<string name="right">Direita</string>
<string name="widget_note">Nota utilizada no widget</string>
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
<!-- Short description has to have less than 80 chars -->

5
app/src/main/res/values-ru/strings.xml
View File

@ -24,17 +24,18 @@
<string name="update_file_at_note">Обновлять содержимое файла при обновлении заметки\n(заметка удалится, если удалить файл или изменить путь к нему)</string>
<string name="delete_file_itself">Также удалить файл \"%s\"</string>
<string name="note_saved_successfully">Заметка \"%s\" сохранена успешно</string>
<string name="display_success_message">Уведомлять, что файл успешно сохранен</string>
<!-- Settings -->
<string name="widget_note">Заметка, отображаемая в виджете</string>
<string name="display_success_message">Уведомлять, что файл успешно сохранен</string>
<string name="links_and_emails_clickable">Сделать ссылки и адреса электронной почты активными</string>
<string name="place_cursor_end">Помещать курсор в конец заметки</string>
<string name="monospaced_font">Использовать моноширинный шрифт</string>
<string name="show_keyboard">Show keyboard on startup</string>
<string name="alignment">Выравнивание</string>
<string name="left">По левому краю</string>
<string name="center">По центру</string>
<string name="right">По правому краю</string>
<string name="widget_note">Заметка, отображаемая в виджете</string>
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
<!-- Short description has to have less than 80 chars -->

5
app/src/main/res/values-sk/strings.xml
View File

@ -24,17 +24,18 @@
<string name="update_file_at_note">Aktualizovať samotný súbor po úprave poznámky\n(ak bude daný súbor presunutý, alebo vymazaný, bude vymazaná aj poznámka)</string>
<string name="delete_file_itself">Odstrániť aj súbor \"%s\"</string>
<string name="note_saved_successfully">Poznámka \"%s\" bola úspešne uložená</string>
<string name="display_success_message">Zobraziť správu o úspešnom uložení poznámky</string>
<!-- Settings -->
<string name="widget_note">Poznámka použitá vo widgete</string>
<string name="display_success_message">Zobraziť správu o úspešnom uložení poznámky</string>
<string name="links_and_emails_clickable">Spraviť odkazy a emaily klikateľnými</string>
<string name="place_cursor_end">Umiestniť kurzor na koniec poznámky</string>
<string name="monospaced_font">Použiť písmo Monospace</string>
<string name="show_keyboard">Zobraziť klávesnicu po spustení</string>
<string name="alignment">Zarovnanie</string>
<string name="left">Vľavo</string>
<string name="center">Uprostred</string>
<string name="right">Vpravo</string>
<string name="widget_note">Poznámka použitá vo widgete</string>
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
<!-- Short description has to have less than 80 chars -->

5
app/src/main/res/values-sv/strings.xml
View File

@ -24,17 +24,18 @@
<string name="update_file_at_note">Uppdatera själva filen när anteckningen uppdateras\n(anteckningen tas bort om filen tas bort eller sökvägen ändras)</string>
<string name="delete_file_itself">Ta även bort filen \"%s\"</string>
<string name="note_saved_successfully">Anteckningen \"%s\" har sparats</string>
<string name="display_success_message">Visa ett meddelande när en anteckning har sparats</string>
<!-- Settings -->
<string name="display_success_message">Visa ett meddelande när en anteckning har sparats</string>
<string name="links_and_emails_clickable">Gör länkar och e-postadresser klickbara</string>
<string name="place_cursor_end">Placera markören vid slutet av anteckningen</string>
<string name="monospaced_font">Use monospaced font</string>
<string name="widget_note">Anteckningen används i widgeten</string>
<string name="show_keyboard">Show keyboard on startup</string>
<string name="alignment">Justering</string>
<string name="left">Vänster</string>
<string name="center">Centrerad</string>
<string name="right">Höger</string>
<string name="widget_note">Anteckningen används i widgeten</string>
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
<!-- Short description has to have less than 80 chars -->

5
app/src/main/res/values/strings.xml
View File

@ -24,17 +24,18 @@
<string name="update_file_at_note">Update the file itself at updating the note\n(note gets deleted if file gets deleted, or path changes)</string>
<string name="delete_file_itself">Also delete file \"%s\"</string>
<string name="note_saved_successfully">Note \"%s\" saved successfully</string>
<string name="display_success_message">Display save success messages</string>
<!-- Settings -->
<string name="widget_note">Note used in widget</string>
<string name="display_success_message">Display save success messages</string>
<string name="links_and_emails_clickable">Make links and emails clickable</string>
<string name="place_cursor_end">Place cursor to the end of note</string>
<string name="monospaced_font">Use monospaced font</string>
<string name="show_keyboard">Show keyboard on startup</string>
<string name="alignment">Alignment</string>
<string name="left">Left</string>
<string name="center">Center</string>
<string name="right">Right</string>
<string name="widget_note">Note used in widget</string>
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
<!-- Short description has to have less than 80 chars -->