Type: feat

Add a ViewModel

Moving the Details to the ViewModel

Author: appleobject

app/src/androidTest/java/com/appleobject/notekeeper/NavigationTest.kt

@@ -10,19 +10,16 @@ import androidx.test.espresso.matcher.ViewMatchers.*
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.rule.ActivityTestRule
 import com.appleobject.notekeeper.model.DataManager
-import com.appleobject.notekeeper.model.NoteInfo
 import org.hamcrest.Matchers.containsString
-import org.junit.Assert.*
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
 
 @RunWith(AndroidJUnit4::class)
 class NavigationTest{
 
     @Rule @JvmField
-    val itemActivity = ActivityTestRule(ItemActivity::class.java)
+    val itemActivity = ActivityTestRule(ItemsActivity::class.java)
 
     @Test
     fun selectNoteAfterNavigationDrawerChange(){
@@ -39,7 +36,7 @@ class NavigationTest{
 
         val notePosition = 0
         onView(withId(R.id.listItems)).perform(
-            RecyclerViewActions.actionOnItemAtPosition<NoteRecyclerAdapter.ViewHolder>(notePosition, click()))
+            RecyclerViewActions.actionOnItemAtPosition<NoteRecyclerAdapter.NoteViewHolder>(notePosition, click()))
 
         val notes = DataManager.notes[notePosition]
         onView(withId(R.id.spinnerCourses)).check(matches(withSpinnerText(containsString(notes.course?.title))))

app/src/main/AndroidManifest.xml

@@ -11,7 +11,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:name=".ItemActivity"
+            android:name=".ItemsActivity"
             android:label="@string/title_activity_item"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>

…m/appleobject/notekeeper/ItemActivity.kt …/appleobject/notekeeper/ItemsActivity.ktapp/src/main/java/com/appleobject/notekeeper/ItemActivity.kt renamed to app/src/main/java/com/appleobject/notekeeper/ItemsActivity.kt app/src/main/java/com/appleobject/notekeeper/ItemActivity.kt renamed to app/src/main/java/com/appleobject/notekeeper/ItemsActivity.kt

@@ -8,17 +8,18 @@ import androidx.appcompat.app.ActionBarDrawerToggle
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.navigation.NavigationView
-import androidx.drawerlayout.widget.DrawerLayout
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import androidx.core.view.GravityCompat
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.appleobject.notekeeper.model.DataManager
-import kotlinx.android.synthetic.main.activity_item.*
+import kotlinx.android.synthetic.main.activity_items.*
 import kotlinx.android.synthetic.main.content_note_list.*
 
-class ItemActivity : AppCompatActivity() , NavigationView.OnNavigationItemSelectedListener{
+class ItemsActivity : AppCompatActivity() , NavigationView.OnNavigationItemSelectedListener{
 
     private val linearLayoutManager by lazy {
         LinearLayoutManager(this)
@@ -36,18 +37,26 @@ class ItemActivity : AppCompatActivity() , NavigationView.OnNavigationItemSelect
         CourseRecyclerAdapter(this, DataManager.courses.values.toList())
     }
 
+    private val viewModel by lazy {
+        ViewModelProviders.of(this)[ItemsActivityViewModel::class.java]
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_item)
+        setContentView(R.layout.activity_items)
         val toolbar: Toolbar = findViewById(R.id.toolbar)
         setSupportActionBar(toolbar)
 
         val fab: FloatingActionButton = findViewById(R.id.fab)
-        fab.setOnClickListener { view ->
+        fab.setOnClickListener {
             startActivity(Intent(this, NoteActivity::class.java))
         }
 
-        displayNote()
+        if (savedInstanceState != null)
+            viewModel.restoreState(savedInstanceState)
+
+
+        handleDisplaySelection(viewModel.navDrawerDisplaySelection)
 
 
         nav_view.setNavigationItemSelectedListener(this)
@@ -62,6 +71,11 @@ class ItemActivity : AppCompatActivity() , NavigationView.OnNavigationItemSelect
 
     }
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        viewModel.saveState(outState)
+    }
+
     private fun displayCourses() {
         listItems.layoutManager = coursesLayoutManager
         listItems.adapter = coursesRecyclerAdapter
@@ -98,11 +112,10 @@ class ItemActivity : AppCompatActivity() , NavigationView.OnNavigationItemSelect
 
     override fun onNavigationItemSelected(item: MenuItem): Boolean {
         when(item.itemId){
-            R.id.nav_notes ->{
-                displayNote()
-            }
+            R.id.nav_notes,
             R.id.nav_courses -> {
-                displayCourses()
+                handleDisplaySelection(item.itemId)
+                viewModel.navDrawerDisplaySelection = item.itemId
             }
             R.id.nav_share -> {
                 handleSelection("Don't you think you've shared enough..")
@@ -124,4 +137,15 @@ class ItemActivity : AppCompatActivity() , NavigationView.OnNavigationItemSelect
         return true
     }
 
+    fun handleDisplaySelection(itemId: Int){
+        when(itemId){
+            R.id.nav_notes ->{
+                displayNote()
+            }
+            R.id.nav_courses -> {
+                displayCourses()
+            }
+        }
+    }
+
 }

app/src/main/java/com/appleobject/notekeeper/ItemsActivityViewModel.kt

@@ -0,0 +1,22 @@
+package com.appleobject.notekeeper
+
+import android.os.Bundle
+import androidx.lifecycle.ViewModel
+
+class ItemsActivityViewModel: ViewModel() {
+
+    var navDrawerDisplaySelectionName =
+        "com.appleobject.notekeeper.ItemsActivityViewModel.navDrawerDisplaySelectionName"
+
+    var navDrawerDisplaySelection = R.id.nav_notes
+
+    fun saveState(outState: Bundle){
+        outState.putInt(navDrawerDisplaySelectionName, navDrawerDisplaySelection)
+    }
+
+    fun restoreState(savedInstanceState: Bundle) {
+        navDrawerDisplaySelection = savedInstanceState.getInt(navDrawerDisplaySelectionName)
+    }
+
+
+}

app/src/main/res/layout/activity_item.xml …p/src/main/res/layout/activity_items.xmlapp/src/main/res/layout/activity_item.xml renamed to app/src/main/res/layout/activity_items.xml app/src/main/res/layout/activity_item.xml renamed to app/src/main/res/layout/activity_items.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ItemActivity">
+    tools:context=".ItemsActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"