fix: list of projects was not updated when creating a new project (#2)

Cosmic-Ide · Mar 11, 2023 · 02ed04f · 02ed04f
2 parents 3b53a49 + 0d49210
commit 02ed04f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/app/src/main/java/org/cosmicide/rewrite/fragment/NewProjectFragment.kt b/app/src/main/java/org/cosmicide/rewrite/fragment/NewProjectFragment.kt
@@ -5,12 +5,14 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
 import org.cosmicide.project.Java
 import org.cosmicide.project.Kotlin
 import org.cosmicide.project.Project
 import org.cosmicide.rewrite.R
 import org.cosmicide.rewrite.databinding.FragmentNewProjectBinding
+import org.cosmicide.rewrite.model.ProjectViewModel
 import org.cosmicide.rewrite.util.Constants
 import org.cosmicide.rewrite.util.FileUtil
 import java.io.File
@@ -22,6 +24,7 @@ class NewProjectFragment : Fragment() {
     // This property is only valid between onCreateView and
     // onDestroyView.
     private val binding get() = _binding!!
+    private val viewModel by activityViewModels<ProjectViewModel>()
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
@@ -57,6 +60,7 @@ class NewProjectFragment : Fragment() {
                     binding.packageName.text.toString()
                 )
             )
+            viewModel.loadProjects()
             findNavController().navigate(R.id.NewProjectFragment_to_EditorFragment, Bundle().apply {
                 putString(Constants.PROJECT_DIR, project.root.absolutePath)
             })

diff --git a/app/src/main/java/org/cosmicide/rewrite/fragment/ProjectFragment.kt b/app/src/main/java/org/cosmicide/rewrite/fragment/ProjectFragment.kt
@@ -6,7 +6,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.viewModels
+import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.snackbar.Snackbar
@@ -22,7 +22,7 @@ class ProjectFragment : Fragment(), ProjectAdapter.OnProjectEventListener {
 
     private var _binding: FragmentProjectBinding? = null
     private val projectAdapter = ProjectAdapter(this)
-    private val viewModel by viewModels<ProjectViewModel>()
+    private val viewModel by activityViewModels<ProjectViewModel>()
 
     private val binding get() = _binding!!
 

diff --git a/app/src/main/java/org/cosmicide/rewrite/model/ProjectViewModel.kt b/app/src/main/java/org/cosmicide/rewrite/model/ProjectViewModel.kt
@@ -20,16 +20,16 @@ class ProjectViewModel : ViewModel() {
     val projects: LiveData<List<Project>> = _projects
 
     init {
+        loadProjects()
+    }
+
+    fun loadProjects() {
         viewModelScope.launch(Dispatchers.IO) {
-            val projectsList = mutableListOf<Project>()
-            val projectDir = FileUtil.projectDir
-            val directories = projectDir.listFiles { file -> file.isDirectory }
-            if (directories != null) {
-                Arrays.sort(directories, Comparator.comparingLong(File::lastModified).reversed())
-                for (directory in directories) {
-                    projectsList.add(Project(directory, Java))
-                }
-            }
+            val projectsList = FileUtil.projectDir.listFiles { file -> file.isDirectory }
+                ?.sortedByDescending { it.lastModified() }
+                ?.map { Project(it, Java) }
+                ?: emptyList()
+
             withContext(Dispatchers.Main) {
                 _projects.value = projectsList
                 Log.d(TAG, "Projects: $projectsList")