瀏覽代碼

chore: linked notes back

beautusg 7 年之前
父節點
當前提交
5bbe8365d2

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

@@ -55,8 +55,8 @@ class HomeFragment : BaseFragment(), OnLaunchAppListener {
         })
 
         setEventListeners()
-
         home_fragment_options.setOnClickListener(Navigation.createNavigateOnClickListener(R.id.action_homeFragment_to_optionsFragment))
+        home_fragment_notes.setOnClickListener(Navigation.createNavigateOnClickListener(R.id.action_homeFragment_to_notesListFragment))
     }
 
     override fun onStart() {

+ 9 - 7
app/src/main/java/com/sduduzog/slimlauncher/ui/main/notes/NoteFragment.kt

@@ -7,18 +7,19 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
-import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProviders
-import com.sduduzog.slimlauncher.Observer
 import com.sduduzog.slimlauncher.R
 import com.sduduzog.slimlauncher.data.Note
+import com.sduduzog.slimlauncher.ui.BaseFragment
 import com.sduduzog.slimlauncher.ui.main.DoubleClickListener
 import kotlinx.android.synthetic.main.note_fragment.*
 import java.security.MessageDigest
 import java.util.*
 
 
-class NoteFragment : Fragment(), Observer {
+class NoteFragment : BaseFragment() {
+
+    override fun getFragmentView(): View = note_fragment
 
     private lateinit var note: Note
     private lateinit var viewModel: NotesViewModel
@@ -71,10 +72,6 @@ class NoteFragment : Fragment(), Observer {
         })
     }
 
-    override fun update(on: String) {
-        saveNote()
-    }
-
     private fun editBody() {
         textBody.visibility = View.GONE
         bodyEditText.visibility = View.VISIBLE
@@ -105,4 +102,9 @@ class NoteFragment : Fragment(), Observer {
         md.update(bytes)
         return String(md.digest())
     }
+
+    override fun onBack(): Boolean {
+        saveNote()
+        return false
+    }
 }

+ 2 - 1
app/src/main/java/com/sduduzog/slimlauncher/ui/main/notes/NotesListFragment.kt

@@ -7,6 +7,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
+import androidx.navigation.Navigation
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
 import com.sduduzog.slimlauncher.R
@@ -24,7 +25,7 @@ class NotesListFragment : Fragment() {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
-//        fab_add_note.setOnClickListener(Navigation.createNavigateOnClickListener(R.id.action_openNoteFragment))
+        fab_add_note.setOnClickListener(Navigation.createNavigateOnClickListener(R.id.action_notesListFragment_to_noteFragment))
         fab_add_note.setOnLongClickListener {
             Log.d("NoteListFragment", "Long press")
             true

+ 17 - 0
app/src/main/res/navigation/nav_graph.xml

@@ -13,6 +13,9 @@
         <action
             android:id="@+id/action_homeFragment_to_optionsFragment"
             app:destination="@id/optionsFragment" />
+        <action
+            android:id="@+id/action_homeFragment_to_notesListFragment"
+            app:destination="@id/notesListFragment" />
     </fragment>
     <fragment
         android:id="@+id/optionsFragment"
@@ -37,5 +40,19 @@
         android:name="com.sduduzog.slimlauncher.ui.options.AddAppFragment"
         android:label="add_app_fragment"
         tools:layout="@layout/add_app_fragment" />
+    <fragment
+        android:id="@+id/notesListFragment"
+        android:name="com.sduduzog.slimlauncher.ui.main.notes.NotesListFragment"
+        android:label="notes_list_fragment"
+        tools:layout="@layout/notes_list_fragment" >
+        <action
+            android:id="@+id/action_notesListFragment_to_noteFragment"
+            app:destination="@id/noteFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/noteFragment"
+        android:name="com.sduduzog.slimlauncher.ui.main.notes.NoteFragment"
+        android:label="note_fragment"
+        tools:layout="@layout/note_fragment" />
 
 </navigation>