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 19e370aa..bfefb0e0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt @@ -12,6 +12,8 @@ import android.view.Gravity import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import com.simplemobiletools.commons.extensions.beGone +import com.simplemobiletools.commons.extensions.beVisible import com.simplemobiletools.notes.R import com.simplemobiletools.notes.activities.MainActivity import com.simplemobiletools.notes.extensions.* @@ -120,28 +122,23 @@ class NoteFragment : Fragment() { if (config.showWordCount) { view.notes_view.addTextChangedListener(textWatcher) - view.notes_counter.visibility = View.VISIBLE + view.notes_counter.beVisible() + view.notes_counter.setTextColor(config.textColor) setWordCounter(view.notes_view.text) - } - else { - view.notes_counter.visibility = View.GONE + } else { + view.notes_counter.beGone() } } override fun onPause() { super.onPause() saveText() - - removeTextWatcher() - } - - private fun removeTextWatcher() { view.notes_view.removeTextChangedListener(textWatcher) } private fun setWordCounter(text: Editable) { - val wordArray = text.toString().replace("\n", " ").split(" ") - notes_counter.text = wordArray.count { it.isNotEmpty() }.toString() + val words = text.toString().replace("\n", " ").split(" ") + notes_counter.text = words.count { it.isNotEmpty() }.toString() } private var textWatcher: TextWatcher = object : TextWatcher { diff --git a/app/src/main/res/layout/fragment_note.xml b/app/src/main/res/layout/fragment_note.xml index 41e23c5a..a1725e0f 100644 --- a/app/src/main/res/layout/fragment_note.xml +++ b/app/src/main/res/layout/fragment_note.xml @@ -1,5 +1,6 @@ - - + - + android:layout_alignParentRight="true" + android:padding="@dimen/small_margin" + android:textStyle="italic" + tools:text="123"/> - diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index e76c8e8b..b82d415e 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 count + Zobraziť počítadlo slov Zarovnanie Vľavo Uprostred