From e763f05ec8316f6c1bb564af370410cb334a702d Mon Sep 17 00:00:00 2001 From: Christopher Date: Mon, 20 Nov 2017 22:39:01 +0100 Subject: [PATCH 1/7] Add optional Word Count to Note - Setting included (default: deactived) - Translation for en/de refs #40 --- .../notes/activities/SettingsActivity.kt | 9 +++++ .../notes/fragments/NoteFragment.kt | 38 +++++++++++++++++++ .../simplemobiletools/notes/helpers/Config.kt | 4 ++ .../notes/helpers/Constants.kt | 1 + app/src/main/res/layout/activity_settings.xml | 23 +++++++++++ app/src/main/res/layout/fragment_note.xml | 17 +++++++++ app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 8 files changed, 94 insertions(+) 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 30d75c75..8cbd8e16 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt @@ -35,6 +35,7 @@ class SettingsActivity : SimpleActivity() { setupClickableLinks() setupMonospacedFont() setupShowKeyboard() + setupShowWordCount() setupFontSize() setupGravity() setupWidgetNote() @@ -90,6 +91,14 @@ class SettingsActivity : SimpleActivity() { } } + private fun setupShowWordCount() { + settings_show_word_count.isChecked = config.showWordCount + settings_show_word_count_holder.setOnClickListener { + settings_show_word_count.toggle() + config.showWordCount = settings_show_word_count.isChecked + } + } + private fun setupFontSize() { settings_font_size.text = getFontSizeText() settings_font_size_holder.setOnClickListener { 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 104e5588..c5edd22a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt @@ -3,6 +3,8 @@ package com.simplemobiletools.notes.fragments import android.graphics.Typeface import android.os.Bundle import android.support.v4.app.Fragment +import android.text.Editable +import android.text.TextWatcher import android.text.method.LinkMovementMethod import android.text.util.Linkify import android.util.TypedValue @@ -95,6 +97,7 @@ class NoteFragment : Fragment() { super.onResume() val config = context!!.config + view.notes_view.apply { typeface = if (config.monospacedFont) Typeface.MONOSPACE else Typeface.DEFAULT @@ -113,10 +116,45 @@ class NoteFragment : Fragment() { setSelection(if (config.placeCursorToEnd) text.length else 0) } } + + if (config.showWordCount) { + view.notes_view.addTextChangedListener(textWatcher) + view.notes_counter.visibility = View.VISIBLE + setWordCounter(view.notes_view.text) + } + else { + view.notes_counter.visibility = View.GONE + } } override fun onPause() { super.onPause() saveText() + + removeTextWatcher() + } + + private fun removeTextWatcher() { + //Avoid memory leak + view.notes_view.removeTextChangedListener(textWatcher) + } + + private fun setWordCounter(text: Editable) { + //Replace new lines with space + val wordArray = text.toString().replace("\n", " ").split(" ") + //Count only items which are not empty + notes_counter.text = wordArray.count { it.isNotEmpty() }.toString() + } + + private var textWatcher: TextWatcher = object : TextWatcher { + override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + } + + override fun afterTextChanged(editable: Editable) { + setWordCounter(editable) + } } } 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 97c0dda4..25bc327e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Config.kt @@ -24,6 +24,10 @@ class Config(context: Context) : BaseConfig(context) { get() = prefs.getBoolean(SHOW_KEYBOARD, true) set(showKeyboard) = prefs.edit().putBoolean(SHOW_KEYBOARD, showKeyboard).apply() + var showWordCount: Boolean + get() = prefs.getBoolean(SHOW_WORDCOUNT, false) + set(showWordCount) = prefs.edit().putBoolean(SHOW_WORDCOUNT, showWordCount).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 9c5d64f9..d147b8a9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Constants.kt @@ -10,6 +10,7 @@ val CLICKABLE_LINKS = "clickable_links" val WIDGET_NOTE_ID = "widget_note_id" val MONOSPACED_FONT = "monospaced_font" val SHOW_KEYBOARD = "show_keyboard" +val SHOW_WORDCOUNT = "show_word_count" 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 c5a6dc67..d9348b05 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -159,6 +159,29 @@ + + + + + + + + + + + + diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 9aafc561..8ba59260 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -32,6 +32,7 @@ Platziere Cursor am Ende der Notiz Benutze Monospace Schrift Zeige Tastatur beim Start + Zeige Wort Zähler Ausrichtung Linksbündig Zentriert diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 508be5da..8f4cd7c0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -32,6 +32,7 @@ Place cursor to the end of note Use monospaced font Show keyboard on startup + Show word counter Alignment Left Center From 0c3bd3a828f2607c59fbb021d8362c138235e868 Mon Sep 17 00:00:00 2001 From: Christopher Date: Mon, 20 Nov 2017 22:52:14 +0100 Subject: [PATCH 2/7] Cleanup comments & add id to new relative layout refs #141 --- .../com/simplemobiletools/notes/fragments/NoteFragment.kt | 3 --- app/src/main/res/layout/fragment_note.xml | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) 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 c5edd22a..70d40594 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt @@ -135,14 +135,11 @@ class NoteFragment : Fragment() { } private fun removeTextWatcher() { - //Avoid memory leak view.notes_view.removeTextChangedListener(textWatcher) } private fun setWordCounter(text: Editable) { - //Replace new lines with space val wordArray = text.toString().replace("\n", " ").split(" ") - //Count only items which are not empty notes_counter.text = wordArray.count { it.isNotEmpty() }.toString() } diff --git a/app/src/main/res/layout/fragment_note.xml b/app/src/main/res/layout/fragment_note.xml index 037bdbc9..d7a114d8 100644 --- a/app/src/main/res/layout/fragment_note.xml +++ b/app/src/main/res/layout/fragment_note.xml @@ -13,6 +13,7 @@ Date: Mon, 20 Nov 2017 22:52:51 +0100 Subject: [PATCH 3/7] Add new setting_wordcount string to all string files refs #141 --- app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-hu/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-lt/strings.xml | 1 + app/src/main/res/values-nl/strings.xml | 1 + app/src/main/res/values-pl/strings.xml | 1 + app/src/main/res/values-pt-rBR/strings.xml | 1 + app/src/main/res/values-pt/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-sk/strings.xml | 1 + app/src/main/res/values-sv/strings.xml | 1 + 13 files changed, 13 insertions(+) diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 6281ffab..a2b235e7 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -32,6 +32,7 @@ Place cursor to the end of note Use monospaced font Show keyboard on startup + Show word counter Alineación del texto Izquierda Centrado diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 3795b717..a5912b8d 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -32,6 +32,7 @@ Placer le curseur à la fin de la note Use monospaced font Show keyboard on startup + Show word counter Alignment Gauche Centre diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index c7445d7e..e00c1653 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -32,6 +32,7 @@ Place cursor to the end of note Use monospaced font Show keyboard on startup + Show word counter Igazítottság Bal Közép diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 07144df0..2edecda7 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -32,6 +32,7 @@ Place cursor to the end of note Use monospaced font Show keyboard on startup + Show word counter Alignment Left Center diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index cd499385..bd462925 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -32,6 +32,7 @@ Place cursor to the end of note Use monospaced font Show keyboard on startup + Show word counter 重力 中央 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 591a0371..d9cb2bd0 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -32,6 +32,7 @@ Perkelti þymeklá á áraðo pabaigà Use monospaced font Show keyboard on startup + Show word counter Átrauka Kairëje Centre diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 5e33d456..2f2ec54d 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -32,6 +32,7 @@ Cursor onderaan notitie plaatsen Lettertype met vaste breedte gebruiken Toetsenbord bij start tonen + Show word counter Uitlijning Links Midden diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 3062fef4..9bc49528 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -32,6 +32,7 @@ Umieszczaj kursor na końcu notatki Używaj czcionki monospace Pokazuj klawiaturę na starcie + Show word counter Wyrównanie tekstu w notatkach Do lewej strony Do środka diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 35ee3d4e..91bef3d8 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -32,6 +32,7 @@ Place cursor to the end of note Use monospaced font Show keyboard on startup + Show word counter Gravidade Esquerda Centro diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 3d62362c..930ec11b 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -32,6 +32,7 @@ Colocar cursor no fim da nota Usar letra mono-espaçada Mostrar teclado ao inciar + Show word counter Gravidade Esquerda Centro diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index fa76daaf..eca91b1c 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -32,6 +32,7 @@ Помещать курсор в конец заметки Использовать моноширинный шрифт Показывать клавиатуру при запуске + Show word counter Выравнивание По левому краю По центру diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 06bf5b75..25b88042 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -32,6 +32,7 @@ Umiestniť kurzor na koniec poznámky Použiť písmo Monospace Zobraziť klávesnicu po spustení + Show word counter Zarovnanie Vľavo Uprostred diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index e3b3be3a..b3d1aea1 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -32,6 +32,7 @@ Placera markören vid slutet av anteckningen Use monospaced font Show keyboard on startup + Show word counter Justering Vänster Centrerad From d2fb9240fa2fc61d4d8a21e497cdd43246faf328 Mon Sep 17 00:00:00 2001 From: Christopher Date: Mon, 20 Nov 2017 22:58:36 +0100 Subject: [PATCH 4/7] Fix missing import refs #141 --- .../kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt | 1 + 1 file changed, 1 insertion(+) 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 70d40594..19e370aa 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt @@ -20,6 +20,7 @@ import com.simplemobiletools.notes.helpers.GRAVITY_CENTER import com.simplemobiletools.notes.helpers.GRAVITY_RIGHT import com.simplemobiletools.notes.helpers.NOTE_ID import com.simplemobiletools.notes.models.Note +import kotlinx.android.synthetic.main.fragment_note.* import kotlinx.android.synthetic.main.fragment_note.view.* import java.io.File From 460c278809989fdda23589c265f8c759a7946f67 Mon Sep 17 00:00:00 2001 From: Christopher Date: Mon, 20 Nov 2017 23:02:13 +0100 Subject: [PATCH 5/7] Applied feedback - changes string name to show_word_count - changed id of relative layout to notes_relative_layout refs #141 --- .../main/kotlin/com/simplemobiletools/notes/helpers/Config.kt | 4 ++-- .../kotlin/com/simplemobiletools/notes/helpers/Constants.kt | 2 +- app/src/main/res/layout/activity_settings.xml | 2 +- app/src/main/res/layout/fragment_note.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-hu/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-ja/strings.xml | 2 +- app/src/main/res/values-lt/strings.xml | 2 +- app/src/main/res/values-nl/strings.xml | 2 +- app/src/main/res/values-pl/strings.xml | 2 +- app/src/main/res/values-pt-rBR/strings.xml | 2 +- app/src/main/res/values-pt/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-sk/strings.xml | 2 +- app/src/main/res/values-sv/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 19 files changed, 20 insertions(+), 20 deletions(-) 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 25bc327e..54b43093 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Config.kt @@ -25,8 +25,8 @@ class Config(context: Context) : BaseConfig(context) { set(showKeyboard) = prefs.edit().putBoolean(SHOW_KEYBOARD, showKeyboard).apply() var showWordCount: Boolean - get() = prefs.getBoolean(SHOW_WORDCOUNT, false) - set(showWordCount) = prefs.edit().putBoolean(SHOW_WORDCOUNT, showWordCount).apply() + get() = prefs.getBoolean(SHOW_WORD_COUNT, false) + set(showWordCount) = prefs.edit().putBoolean(SHOW_WORD_COUNT, showWordCount).apply() var fontSize: Int get() = prefs.getInt(FONT_SIZE, FONT_SIZE_MEDIUM) 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 d147b8a9..814f0c8c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Constants.kt @@ -10,7 +10,7 @@ val CLICKABLE_LINKS = "clickable_links" val WIDGET_NOTE_ID = "widget_note_id" val MONOSPACED_FONT = "monospaced_font" val SHOW_KEYBOARD = "show_keyboard" -val SHOW_WORDCOUNT = "show_word_count" +val SHOW_WORD_COUNT = "show_word_count" 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 d9348b05..ddf8e41d 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -178,7 +178,7 @@ android:clickable="false" android:paddingLeft="@dimen/medium_margin" android:paddingStart="@dimen/medium_margin" - android:text="@string/show_wordcount"/> + android:text="@string/show_word_count"/> diff --git a/app/src/main/res/layout/fragment_note.xml b/app/src/main/res/layout/fragment_note.xml index d7a114d8..c9105113 100644 --- a/app/src/main/res/layout/fragment_note.xml +++ b/app/src/main/res/layout/fragment_note.xml @@ -13,7 +13,7 @@ Platziere Cursor am Ende der Notiz Benutze Monospace Schrift Zeige Tastatur beim Start - Zeige Wort Zähler + Zeige Wort Zähler Ausrichtung Linksbündig Zentriert diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index a2b235e7..9c7f45ec 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -32,7 +32,7 @@ Place cursor to the end of note Use monospaced font Show keyboard on startup - Show word counter + Show word counter Alineación del texto Izquierda Centrado diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index a5912b8d..35f79897 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -32,7 +32,7 @@ Placer le curseur à la fin de la note Use monospaced font Show keyboard on startup - Show word counter + Show word counter Alignment Gauche Centre diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index e00c1653..654f0784 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -32,7 +32,7 @@ Place cursor to the end of note Use monospaced font Show keyboard on startup - Show word counter + Show word counter Igazítottság Bal Közép diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 2edecda7..5e97a7c6 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -32,7 +32,7 @@ Place cursor to the end of note Use monospaced font Show keyboard on startup - Show word counter + Show word counter Alignment Left Center diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index bd462925..a67b279c 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -32,7 +32,7 @@ Place cursor to the end of note Use monospaced font Show keyboard on startup - Show word counter + Show word counter 重力 中央 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index d9cb2bd0..f2d89cd5 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -32,7 +32,7 @@ Perkelti þymeklá á áraðo pabaigà Use monospaced font Show keyboard on startup - Show word counter + Show word counter Átrauka Kairëje Centre diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 2f2ec54d..68216d2c 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -32,7 +32,7 @@ Cursor onderaan notitie plaatsen Lettertype met vaste breedte gebruiken Toetsenbord bij start tonen - Show word counter + Show word counter Uitlijning Links Midden diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 9bc49528..5fcaa18f 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -32,7 +32,7 @@ Umieszczaj kursor na końcu notatki Używaj czcionki monospace Pokazuj klawiaturę na starcie - Show word counter + Show word counter Wyrównanie tekstu w notatkach Do lewej strony Do środka diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 91bef3d8..97f29982 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -32,7 +32,7 @@ Place cursor to the end of note Use monospaced font Show keyboard on startup - Show word counter + Show word counter Gravidade Esquerda Centro diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 930ec11b..2396aec6 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -32,7 +32,7 @@ Colocar cursor no fim da nota Usar letra mono-espaçada Mostrar teclado ao inciar - Show word counter + Show word counter Gravidade Esquerda Centro diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index eca91b1c..35de01d0 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -32,7 +32,7 @@ Помещать курсор в конец заметки Использовать моноширинный шрифт Показывать клавиатуру при запуске - Show word counter + Show word counter Выравнивание По левому краю По центру diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 25b88042..41f43636 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -32,7 +32,7 @@ Umiestniť kurzor na koniec poznámky Použiť písmo Monospace Zobraziť klávesnicu po spustení - Show word counter + Show word counter Zarovnanie Vľavo Uprostred diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index b3d1aea1..2f926d48 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -32,7 +32,7 @@ Placera markören vid slutet av anteckningen Use monospaced font Show keyboard on startup - Show word counter + Show word counter Justering Vänster Centrerad diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8f4cd7c0..d1d08aa8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -32,7 +32,7 @@ Place cursor to the end of note Use monospaced font Show keyboard on startup - Show word counter + Show word counter Alignment Left Center From 6d7bc862f132abd47885d5e1ec77d48c944c5160 Mon Sep 17 00:00:00 2001 From: Christopher Date: Mon, 20 Nov 2017 23:05:02 +0100 Subject: [PATCH 6/7] Add tools:text to word count textview refs #141 --- app/src/main/res/layout/fragment_note.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/layout/fragment_note.xml b/app/src/main/res/layout/fragment_note.xml index c9105113..41e23c5a 100644 --- a/app/src/main/res/layout/fragment_note.xml +++ b/app/src/main/res/layout/fragment_note.xml @@ -1,6 +1,6 @@ - @@ -32,7 +32,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textStyle="italic" - android:text="" + tools:text="123" android:padding="5dp" android:layout_alignParentBottom="true" android:layout_alignParentEnd="true" From b39177274403ef9f5ea501aa87bc1ccf17a72a08 Mon Sep 17 00:00:00 2001 From: Christopher Date: Tue, 21 Nov 2017 08:42:12 +0100 Subject: [PATCH 7/7] Adjust settings string for word count refs #141 --- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-hu/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-ja/strings.xml | 2 +- app/src/main/res/values-lt/strings.xml | 2 +- app/src/main/res/values-nl/strings.xml | 2 +- app/src/main/res/values-pl/strings.xml | 2 +- app/src/main/res/values-pt-rBR/strings.xml | 2 +- app/src/main/res/values-pt/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-sk/strings.xml | 2 +- app/src/main/res/values-sv/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 82880d18..c77647a7 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -32,7 +32,7 @@ Platziere Cursor am Ende der Notiz Benutze Monospace Schrift Zeige Tastatur beim Start - Zeige Wort Zähler + Zeige Wortanzahl Ausrichtung Linksbündig Zentriert diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 9c7f45ec..b4f7fc2d 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -32,7 +32,7 @@ Place cursor to the end of note Use monospaced font Show keyboard on startup - Show word counter + Show word count Alineación del texto Izquierda Centrado diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 35f79897..4ec9bc76 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -32,7 +32,7 @@ Placer le curseur à la fin de la note Use monospaced font Show keyboard on startup - Show word counter + Show word count Alignment Gauche Centre diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 654f0784..e0624eb8 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -32,7 +32,7 @@ Place cursor to the end of note Use monospaced font Show keyboard on startup - Show word counter + Show word count Igazítottság Bal Közép diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 5e97a7c6..2bfa7d47 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -32,7 +32,7 @@ Place cursor to the end of note Use monospaced font Show keyboard on startup - Show word counter + Show word count Alignment Left Center diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index a67b279c..67e011bb 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -32,7 +32,7 @@ Place cursor to the end of note Use monospaced font Show keyboard on startup - Show word counter + Show word count 重力 中央 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index f2d89cd5..21bc2f83 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -32,7 +32,7 @@ Perkelti þymeklá á áraðo pabaigà Use monospaced font Show keyboard on startup - Show word counter + Show word count Átrauka Kairëje Centre diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 68216d2c..86523ed2 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -32,7 +32,7 @@ Cursor onderaan notitie plaatsen Lettertype met vaste breedte gebruiken Toetsenbord bij start tonen - Show word counter + Show word count Uitlijning Links Midden diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 5fcaa18f..ca847cea 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -32,7 +32,7 @@ Umieszczaj kursor na końcu notatki Używaj czcionki monospace Pokazuj klawiaturę na starcie - Show word counter + Show word count Wyrównanie tekstu w notatkach Do lewej strony Do środka diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 97f29982..b97a529d 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -32,7 +32,7 @@ Place cursor to the end of note Use monospaced font Show keyboard on startup - Show word counter + Show word count Gravidade Esquerda Centro diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 2396aec6..81703167 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -32,7 +32,7 @@ Colocar cursor no fim da nota Usar letra mono-espaçada Mostrar teclado ao inciar - Show word counter + Show word count Gravidade Esquerda Centro diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 35de01d0..3ef5d19a 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -32,7 +32,7 @@ Помещать курсор в конец заметки Использовать моноширинный шрифт Показывать клавиатуру при запуске - Show word counter + Show word count Выравнивание По левому краю По центру diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 41f43636..e76c8e8b 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -32,7 +32,7 @@ Umiestniť kurzor na koniec poznámky Použiť písmo Monospace Zobraziť klávesnicu po spustení - Show word counter + Show word count Zarovnanie Vľavo Uprostred diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 2f926d48..7c1309da 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -32,7 +32,7 @@ Placera markören vid slutet av anteckningen Use monospaced font Show keyboard on startup - Show word counter + Show word count Justering Vänster Centrerad diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d1d08aa8..8e9c5cac 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -32,7 +32,7 @@ Place cursor to the end of note Use monospaced font Show keyboard on startup - Show word counter + Show word count Alignment Left Center