fix(projects): introduce workspace API and remove 'Project' model

Author: itsaky

core/app/src/main/java/com/itsaky/androidide/actions/etc/FindInProjectAction.kt

@@ -47,8 +47,8 @@ class FindInProjectAction() : EditorActivityAction() {
         return
       }
 
-    val project = IProjectManager.getInstance().rootProject
-    if (project == null || project.subProjects.isEmpty()) {
+    val project = IProjectManager.getInstance().getWorkspace()
+    if (project == null || project.getSubProjects().isEmpty()) {
       markInvisible()
       return
     }

core/app/src/main/java/com/itsaky/androidide/actions/etc/LaunchAppAction.kt

@@ -26,6 +26,7 @@ import com.itsaky.androidide.actions.EditorActivityAction
 import com.itsaky.androidide.actions.markInvisible
 import com.itsaky.androidide.actions.openApplicationModuleChooser
 import com.itsaky.androidide.projects.IProjectManager
+import com.itsaky.androidide.projects.android.androidAppProjects
 import com.itsaky.androidide.utils.IntentUtils
 import com.itsaky.androidide.utils.flashError
 import org.slf4j.LoggerFactory
@@ -58,8 +59,11 @@ class LaunchAppAction(context: Context, override val order: Int) : EditorActivit
 
     visible = true
 
-    val projectManager = IProjectManager.getInstance()
-    enabled = projectManager.getAndroidAppModules().isNotEmpty()
+    enabled = IProjectManager.getInstance()
+      .getWorkspace()
+      ?.androidAppProjects()
+      ?.iterator()
+      ?.hasNext() == true
   }
 
   override suspend fun execAction(data: ActionData) {

core/app/src/main/java/com/itsaky/androidide/actions/internalActionUtils.kt

@@ -41,8 +41,12 @@ inline fun openApplicationModuleChooser(data: ActionData,
  */
 inline fun openApplicationModuleChooser(context: Context,
   crossinline callback: (AndroidModule) -> Unit) {
-  val projectManager = IProjectManager.getInstance()
-  val applications = projectManager.getAndroidAppModules()
+  val applications = IProjectManager.getInstance()
+    .getWorkspace()
+    ?.androidProjects()
+    ?.filter(AndroidModule::isApplication)
+    ?.toList() ?: emptyList()
+
   if (applications.isEmpty()) {
     flashError(R.string.msg_launch_failure_no_app_module)
     ILogger.ROOT.error("Cannot run application. No application modules found in project.")
@@ -61,7 +65,8 @@ inline fun openApplicationModuleChooser(context: Context,
     context,
     context.getString(R.string.title_choose_application),
     applications.map { it.path }.toTypedArray(),
-    0) { selection ->
+    0
+  ) { selection ->
     val app = applications[selection]
     ILogger.ROOT.info("Selected application: '{}'", app.path)
     callback(app)

core/app/src/main/java/com/itsaky/androidide/actions/sidebar/TerminalSidebarAction.kt

@@ -58,7 +58,7 @@ class TerminalSidebarAction(context: Context, override val order: Int) : Abstrac
         )
         putExtra(
           TERMUX_ACTIVITY.EXTRA_SESSION_NAME,
-          IProjectManager.getInstance().rootProject?.rootProject?.name
+          IProjectManager.getInstance().getWorkspace()?.getRootProject()?.name
         )
         putExtra(TERMUX_ACTIVITY.EXTRA_FAILSAFE_SESSION, isFailsafe)
       }

core/app/src/main/java/com/itsaky/androidide/activities/MainActivity.kt

@@ -32,7 +32,7 @@ import com.itsaky.androidide.activities.editor.EditorActivityKt
 import com.itsaky.androidide.app.EdgeToEdgeIDEActivity
 import com.itsaky.androidide.databinding.ActivityMainBinding
 import com.itsaky.androidide.preferences.internal.GeneralPreferences
-import com.itsaky.androidide.projects.internal.ProjectManagerImpl
+import com.itsaky.androidide.projects.IProjectManager
 import com.itsaky.androidide.resources.R.string
 import com.itsaky.androidide.templates.ITemplateProvider
 import com.itsaky.androidide.utils.DialogUtils
@@ -196,7 +196,7 @@ class MainActivity : EdgeToEdgeIDEActivity() {
   }
 
   internal fun openProject(root: File) {
-    ProjectManagerImpl.getInstance().projectPath = root.absolutePath
+    IProjectManager.getInstance().openProject(root)
     startActivity(Intent(this, EditorActivityKt::class.java))
   }
 

core/app/src/main/java/com/itsaky/androidide/activities/editor/BaseEditorActivity.kt

@@ -84,7 +84,6 @@ import com.itsaky.androidide.models.Range
 import com.itsaky.androidide.models.SearchResult
 import com.itsaky.androidide.preferences.internal.BuildPreferences
 import com.itsaky.androidide.projects.IProjectManager
-import com.itsaky.androidide.projects.internal.ProjectManagerImpl
 import com.itsaky.androidide.tasks.cancelIfActive
 import com.itsaky.androidide.ui.CodeEditorView
 import com.itsaky.androidide.ui.ContentTranslatingDrawerLayout
@@ -325,9 +324,8 @@ abstract class BaseEditorActivity : EdgeToEdgeIDEActivity(), TabLayout.OnTabSele
     registerLanguageServers()
 
     if (savedInstanceState != null && savedInstanceState.containsKey(KEY_PROJECT_PATH)) {
-      ProjectManagerImpl.getInstance().projectPath = savedInstanceState.getString(
-        KEY_PROJECT_PATH
-      )!!
+      IProjectManager.getInstance()
+        .openProject(savedInstanceState.getString(KEY_PROJECT_PATH)!!)
     }
 
     onBackPressedDispatcher.addCallback(this, onBackPressedCallback)

core/app/src/main/java/com/itsaky/androidide/activities/editor/ProjectHandlerActivity.kt

@@ -39,9 +39,9 @@ import com.itsaky.androidide.lookup.Lookup
 import com.itsaky.androidide.lsp.IDELanguageClientImpl
 import com.itsaky.androidide.lsp.java.utils.CancelChecker
 import com.itsaky.androidide.preferences.internal.GeneralPreferences
-import com.itsaky.androidide.projects.internal.ProjectManagerImpl
 import com.itsaky.androidide.projects.GradleProject
 import com.itsaky.androidide.projects.builder.BuildService
+import com.itsaky.androidide.projects.internal.ProjectManagerImpl
 import com.itsaky.androidide.services.builder.GradleBuildService
 import com.itsaky.androidide.services.builder.GradleBuildServiceConnnection
 import com.itsaky.androidide.services.builder.gradleDistributionParams
@@ -320,7 +320,8 @@ abstract class ProjectHandlerActivity : BaseEditorActivity() {
     // use the default variant selections
     if (currentVariants == null) {
       log.debug(
-        "No variant selection information available. Default build variants will be selected.")
+        "No variant selection information available. Default build variants will be selected."
+      )
       initializeProject(emptyMap())
       return
     }
@@ -355,7 +356,7 @@ abstract class ProjectHandlerActivity : BaseEditorActivity() {
    */
   fun initializeProject(buildVariants: Map<String, String>) {
     val manager = ProjectManagerImpl.getInstance()
-    val projectDir = File(manager.projectPath)
+    val projectDir = manager.projectDir
     if (!projectDir.exists()) {
       log.error("GradleProject directory does not exist. Cannot initialize project")
       return
@@ -471,7 +472,8 @@ abstract class ProjectHandlerActivity : BaseEditorActivity() {
           if (pid != metadata.pid) {
             log.warn(
               "Tooling server pid mismatch. Expected: {}, Actual: {}. Replacing memory watcher...",
-              pid, metadata.pid)
+              pid, metadata.pid
+            )
             memoryUsageWatcher.watchProcess(metadata.pid, PROC_GRADLE_TOOLING)
             resetMemUsageChart()
           }
@@ -495,7 +497,7 @@ abstract class ProjectHandlerActivity : BaseEditorActivity() {
     editorActivityScope.launch(Dispatchers.IO) {
       manager.setupProject()
       manager.notifyProjectUpdate()
-      updateBuildVariants(manager.androidBuildVariants)
+      updateBuildVariants(manager.requireWorkspace().getAndroidVariantSelections())
 
       com.itsaky.androidide.tasks.runOnUiThread {
         postProjectInit(true, null)
@@ -552,15 +554,15 @@ abstract class ProjectHandlerActivity : BaseEditorActivity() {
 
   protected open fun createFindInProjectDialog(): AlertDialog? {
     val manager = ProjectManagerImpl.getInstance()
-    if (manager.rootProject == null) {
+    if (manager.getWorkspace() == null) {
       log.warn("No root project model found. Is the project initialized?")
       flashError(getString(string.msg_project_not_initialized))
       return null
     }
 
     val moduleDirs =
       try {
-        manager.rootProject!!.subProjects.stream().map(GradleProject::projectDir)
+        manager.getWorkspace()!!.getSubProjects().stream().map(GradleProject::projectDir)
           .collect(Collectors.toList())
       } catch (e: Throwable) {
         flashError(getString(string.msg_no_modules))
@@ -655,13 +657,13 @@ abstract class ProjectHandlerActivity : BaseEditorActivity() {
     val manager = ProjectManagerImpl.getInstance()
     GeneralPreferences.lastOpenedProject = manager.projectDirPath
     try {
-      val project = manager.rootProject
-      if (project == null) {
+      val workspace = manager.getWorkspace()
+      if (workspace == null) {
         log.warn("GradleProject not initialized. Skipping initial setup...")
         return
       }
 
-      var projectName = project.rootProject.name
+      var projectName = workspace.getRootProject().name
       if (projectName.isEmpty()) {
         projectName = manager.projectDir.name
       }

core/app/src/main/java/com/itsaky/androidide/fragments/RunTasksDialogFragment.kt

@@ -177,10 +177,10 @@ class RunTasksDialogFragment : BottomSheetDialogFragment() {
     viewModel.displayedChild = CHILD_LOADING
 
     executeAsync({
-      val project = IProjectManager.getInstance().rootProject
+      val workspace = IProjectManager.getInstance().getWorkspace()
         ?: return@executeAsync emptyList<Checkable<GradleTask>>()
 
-      return@executeAsync project.subProjects
+      return@executeAsync workspace.getSubProjects()
         .flatMap<GradleProject, GradleTask> { it.tasks }
         .map<GradleTask, Checkable<GradleTask>> {
           Checkable<GradleTask>(false, it)

core/app/src/main/java/com/itsaky/androidide/indexing/platform/PlatformIndexService.kt

@@ -19,7 +19,7 @@ package com.itsaky.androidide.indexing.platform
 
 import com.google.auto.service.AutoService
 import com.itsaky.androidide.indexing.IIndexService
-import com.itsaky.androidide.projects.Project
+import com.itsaky.androidide.projects.IWorkspace
 import org.slf4j.LoggerFactory
 import java.io.File
 
@@ -36,9 +36,9 @@ internal class PlatformIndexService : IIndexService {
   override val displayName: String
     get() = "Android Platform Indexing Service"
 
-  override fun scanFiles(project: Project): Collection<File> {
+  override fun scanFiles(workspace: IWorkspace): Collection<File> {
     return mutableListOf<File>().apply {
-      project.findAndroidModules().forEach { androidModule ->
+      workspace.androidProjects().forEach { androidModule ->
         add(androidModule.getPlatformDir()?.also {
           log.debug("Adding {} to the list of indexable paths", it)
         } ?: return@forEach)
@@ -47,7 +47,7 @@ internal class PlatformIndexService : IIndexService {
   }
 
   override suspend fun indexFiles(
-    project: Project,
+    workspace: IWorkspace,
     files: Collection<File>
   ) {
   }

core/indexing-api/src/main/java/com/itsaky/androidide/indexing/IIndexService.kt

@@ -17,7 +17,7 @@
 
 package com.itsaky.androidide.indexing
 
-import com.itsaky.androidide.projects.Project
+import com.itsaky.androidide.projects.IWorkspace
 import kotlinx.coroutines.Deferred
 import java.io.File
 
@@ -36,16 +36,16 @@ interface IIndexService {
   /**
    * Called to scan files that need to be indexed by this index service.
    *
-   * @param project The root project model which can be used to query the project properties.
+   * @param workspace The root workspace model which can be used to query the workspace properties.
    * @return A [Deferred] collection of files that need to be indexed.
    */
-  fun scanFiles(project: Project): Collection<File>
+  fun scanFiles(workspace: IWorkspace): Collection<File>
 
   /**
    * Called to index the given files.
    *
-   * @param project The root project model which can be used to query the project properties.
+   * @param workspace The root workspace model which can be used to query the workspace properties.
    * @param files The files to index.
    */
-  suspend fun indexFiles(project: Project, files: Collection<File>)
+  suspend fun indexFiles(workspace: IWorkspace, files: Collection<File>)
 }