chore: note refactored

app/src/main/java/com/sduduzog/slimlauncher/ui/main/HomeFragment.kt

@@ -137,17 +137,17 @@ class HomeFragment : BaseFragment(), OnLaunchAppListener {
                 ?.getBoolean(getString(R.string.prefs_settings_key_time_format), true)
         val date = Date()
         if (twenty4Hour as Boolean) {
-            val fWatchTime = SimpleDateFormat("h:mm", Locale.ENGLISH)
-            val fWatchTimeAP = SimpleDateFormat("aa", Locale.ENGLISH)
+            val fWatchTime = SimpleDateFormat("h:mm", Locale.ROOT)
+            val fWatchTimeAP = SimpleDateFormat("aa", Locale.ROOT)
             home_fragment_time.text = fWatchTime.format(date)
             home_fragment_time_format.text = fWatchTimeAP.format(date)
             home_fragment_time_format.visibility = View.VISIBLE
         } else {
-            val fWatchTime = SimpleDateFormat("H:mm", Locale.ENGLISH)
+            val fWatchTime = SimpleDateFormat("H:mm", Locale.ROOT)
             home_fragment_time.text = fWatchTime.format(date)
             home_fragment_time_format.visibility = View.GONE
         }
-        val fWatchDate = SimpleDateFormat("EEE, MMM dd", Locale.ENGLISH)
+        val fWatchDate = SimpleDateFormat("EEE, MMM dd", Locale.ROOT)
         home_fragment_date.text = fWatchDate.format(date)
     }
 

app/src/main/java/com/sduduzog/slimlauncher/ui/main/NoteFragment.kt

@@ -19,7 +19,6 @@ class NoteFragment : BaseFragment() {
 
     override fun getFragmentView(): ViewGroup = note_fragment
     private lateinit var viewModel: MainViewModel
-    private lateinit var note: Note
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
@@ -28,8 +27,7 @@ class NoteFragment : BaseFragment() {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
-        note.title?.let { if (it.isNotBlank()) note_fragment_title.text = it }
-        note_fragment_body.text = note.body
+
         activity?.let {
             viewModel = ViewModelProviders.of(it).get(MainViewModel::class.java)
         } ?: throw Error("This is just dumb")
@@ -41,13 +39,18 @@ class NoteFragment : BaseFragment() {
         }
         viewModel.notes.observe(this, Observer {
             it?.let { notes ->
-                note = notes.first { note.id == id }
-                val bundle = Bundle()
-                bundle.putSerializable(getString(R.string.nav_key_note), note)
-                note_fragment_edit.setOnClickListener(Navigation.createNavigateOnClickListener(R.id.action_noteFragment_to_editNoteFragment, bundle))
+                notes.firstOrNull { n -> n.id == id }?.let { note -> loadNote(note) }
             }
         })
     }
 
+    private fun loadNote(note: Note) {
+        note.title?.let { title -> if (title.isNotBlank()) note_fragment_title.text = title }
+        note_fragment_body.text = note.body
+        val bundle = Bundle()
+        bundle.putSerializable(getString(R.string.nav_key_note), note)
+        note_fragment_edit.setOnClickListener(Navigation.createNavigateOnClickListener(R.id.action_noteFragment_to_editNoteFragment, bundle))
+    }
+
     override fun onBack(): Boolean = false
 }

app/src/main/java/com/sduduzog/slimlauncher/ui/main/TasksFragment.kt

@@ -1,11 +1,9 @@
 package com.sduduzog.slimlauncher.ui.main
 
-import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.view.inputmethod.InputMethodManager
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
 import com.sduduzog.slimlauncher.R
@@ -58,9 +56,6 @@ class TasksFragment : BaseFragment() {
             tasks.filter { !it.isCompleted }.forEach { it.sortingIndex = count++ }
             viewModel.update(*tasks.toTypedArray())
         }
-        if (tasks_fragment_input.requestFocus()) {
-            val imm = activity!!.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-            imm.showSoftInput(tasks_fragment_input, InputMethodManager.SHOW_IMPLICIT)
-        }
+
     }
 }

app/src/main/java/com/sduduzog/slimlauncher/ui/notes/EditNoteFragment.kt

@@ -62,6 +62,10 @@ class EditNoteFragment : BaseFragment() {
                 Navigation.findNavController(edit_note_fragment).navigate(R.id.action_editNoteFragment_to_noteFragment, bundle)
             }
         }
+        if (edit_note_fragment_body.requestFocus()) {
+            val imm = activity!!.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+            imm.showSoftInput(edit_note_fragment_body, InputMethodManager.SHOW_IMPLICIT)
+        }
     }
 
     private fun hash(input: String): String {
@@ -85,6 +89,9 @@ class EditNoteFragment : BaseFragment() {
         }
         val currentDigest = hash(title + body)
         if (initialDigest == currentDigest) return null
+        note.title = title.trim()
+        note.body = body.trim()
+        note.edited = timestamp
         viewModel.update(note)
         return note.id
     }