Merge branch 'stage' into feature/ADFA-186

Author: itsaky-adfa

app/src/main/assets/CoGoTooltips

@@ -41,14 +41,20 @@ class ShowTooltipAction(private val context: Context, override val order: Int) :
         val editor = data.getEditor()!!
         val cursor = editor.text.cursor
         val activity = data.getActivity()
+        val category = when(editor.file!!.extension.toString()) {
+            "java" -> "java"
+            "kt" -> "kotlin"
+            else -> "ide"
+        }
         val word = editor.text.substring(cursor.left, cursor.right)
         if (cursor.isSelected) {
-            activity?.getTooltipData(word)?.let { tooltipData ->
+            activity?.getTooltipData(category, word)?.let { tooltipData ->
                 TooltipUtils.showIDETooltip(
                     context,
                     editor,
                     0,
                     IDETooltipItem(
+                        tooltipCategory = category,
                         tooltipTag = tooltipData.tooltipTag,
                         detail = tooltipData.detail,
                         summary = tooltipData.summary,

app/src/main/java/com/itsaky/androidide/actions/file/ShowTooltipAction.kt

@@ -20,22 +20,21 @@ package com.itsaky.androidide.activities
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.content.pm.ActivityInfo
-import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
-import com.adfa.constants.ANDROID_SDK_ZIP
-import com.adfa.constants.DESTINATION_ANDROID_SDK
-import com.adfa.constants.HOME_PATH
-import com.adfa.constants.LOCAL_MAVEN_CACHES_DEST
-import com.adfa.constants.LOCAL_SOURCE_AGP_8_0_0_CACHES
-import com.adfa.constants.LOCAL_MAVEN_REPO_ARCHIVE_ZIP_NAME
-import com.adfa.constants.LOCAL_SOURCE_ANDROID_SDK
-import com.adfa.constants.LOCAL_SOURCE_TERMUX_LIB_FOLDER_NAME
-import com.adfa.constants.MANIFEST_FILE_NAME
-import com.adfa.constants.TERMUX_DEBS_PATH
+import org.adfa.constants.ANDROID_SDK_ZIP
+import org.adfa.constants.DESTINATION_ANDROID_SDK
+import org.adfa.constants.HOME_PATH
+import org.adfa.constants.LOCAL_MAVEN_CACHES_DEST
+import org.adfa.constants.LOCAL_SOURCE_AGP_8_0_0_CACHES
+import org.adfa.constants.LOCAL_MAVEN_REPO_ARCHIVE_ZIP_NAME
+import org.adfa.constants.LOCAL_SOURCE_ANDROID_SDK
+import org.adfa.constants.LOCAL_SOURCE_TERMUX_LIB_FOLDER_NAME
+import org.adfa.constants.MANIFEST_FILE_NAME
+import org.adfa.constants.TERMUX_DEBS_PATH
 import com.blankj.utilcode.util.ResourceUtils
 import com.blankj.utilcode.util.ZipUtils
 import com.github.appintro.AppIntro2

app/src/main/java/com/itsaky/androidide/activities/OnboardingActivity.kt

@@ -30,7 +30,7 @@ import androidx.appcompat.view.menu.MenuBuilder
 import androidx.collection.MutableIntObjectMap
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.GravityCompat
-import com.adfa.constants.CONTENT_KEY
+import org.adfa.constants.CONTENT_KEY
 import com.blankj.utilcode.util.ImageUtils
 import com.itsaky.androidide.R.string
 import com.itsaky.androidide.actions.ActionData
@@ -56,7 +56,6 @@ import com.itsaky.androidide.models.OpenedFilesCache
 import com.itsaky.androidide.models.Range
 import com.itsaky.androidide.models.SaveResult
 import com.itsaky.androidide.projects.ProjectManagerImpl
-import com.itsaky.androidide.roomData.tooltips.Tooltip
 import com.itsaky.androidide.tasks.executeAsync
 import com.itsaky.androidide.ui.CodeEditorView
 import com.itsaky.androidide.utils.DialogUtils.newYesNoDialog
@@ -578,9 +577,9 @@ open class EditorHandlerActivity : ProjectHandlerActivity(), IEditorHandler {
         startActivity(intent)
     }
 
-    override suspend fun getTooltipData(word: String): IDETooltipItem? {
+    override suspend fun getTooltipData(category: String, tag: String): IDETooltipItem? {
         return withContext(Dispatchers.IO) {
-          IDEApplication.idetooltipDao.getTooltip(word)
+          IDEApplication.idetooltipDao.getTooltip(category, tag)
         }
     }
 

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

@@ -21,7 +21,7 @@ import androidx.core.graphics.Insets
 import android.os.Bundle
 import android.view.View
 import android.webkit.WebViewClient
-import com.adfa.constants.CONTENT_KEY
+import org.adfa.constants.CONTENT_KEY
 import com.itsaky.androidide.R
 import com.itsaky.androidide.app.EdgeToEdgeIDEActivity
 import com.itsaky.androidide.databinding.ActivityFaqBinding

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

@@ -21,7 +21,7 @@ import androidx.core.graphics.Insets
 import android.os.Bundle
 import android.view.View
 import android.webkit.WebViewClient
-import com.adfa.constants.CONTENT_KEY
+import org.adfa.constants.CONTENT_KEY
 import com.itsaky.androidide.R
 import com.itsaky.androidide.app.EdgeToEdgeIDEActivity
 import com.itsaky.androidide.databinding.ActivityHelpBinding

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

@@ -25,8 +25,8 @@ import android.widget.CheckBox
 import androidx.activity.viewModels
 import androidx.annotation.GravityInt
 import androidx.appcompat.app.AlertDialog
-import com.adfa.constants.CONTENT_KEY
-import com.adfa.constants.HELP_PAGE_URL
+import org.adfa.constants.CONTENT_KEY
+import org.adfa.constants.HELP_PAGE_URL
 import com.blankj.utilcode.util.SizeUtils
 import com.blankj.utilcode.util.ThreadUtils
 import com.itsaky.androidide.R

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

@@ -2,7 +2,6 @@ package com.itsaky.androidide.fragments
 
 import android.content.Intent
 import android.net.Uri
-import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -13,7 +12,7 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
 import androidx.core.text.HtmlCompat
 import androidx.fragment.app.viewModels
-import com.adfa.constants.FEEDBACK_EMAIL
+import org.adfa.constants.FEEDBACK_EMAIL
 import com.google.android.material.progressindicator.LinearProgressIndicator
 import com.itsaky.androidide.R
 import com.itsaky.androidide.activities.MainActivity
@@ -22,7 +21,6 @@ import com.itsaky.androidide.activities.TerminalActivity
 import com.itsaky.androidide.adapters.MainActionsListAdapter
 import com.itsaky.androidide.app.BaseApplication
 import com.itsaky.androidide.app.BaseIDEActivity
-import com.itsaky.androidide.buildinfo.BuildInfo
 import com.itsaky.androidide.common.databinding.LayoutDialogProgressBinding
 import com.itsaky.androidide.databinding.FragmentMainBinding
 import com.itsaky.androidide.idetooltips.IDETooltipDatabase
@@ -137,14 +135,15 @@ class MainFragment : BaseFragment() {
         val tag = action.id.toString()
         CoroutineScope(Dispatchers.IO).launch {
             val dao = IDETooltipDatabase.getDatabase(requireContext()).idetooltipDao()
-            val item = dao.getTooltip(tag)
+            val item = dao.getTooltip("ide", tag)
             withContext((Dispatchers.Main)) {
                 (context?.let {
                     TooltipUtils.showIDETooltip(
                         it,
                         view!!,
                         0,
                         IDETooltipItem(
+                            tooltipCategory = "ide",
                             tooltipTag = item?.tooltipTag ?: "",
                             detail = item?.detail ?: "",
                             summary = item?.summary ?: "",

app/src/main/java/com/itsaky/androidide/fragments/MainFragment.kt

@@ -58,10 +58,6 @@ class TemplateDetailsFragment :
 
     private val recentProjectsViewModel: RecentProjectsViewModel by activityViewModels()
 
-    companion object {
-
-        private val log = LoggerFactory.getLogger(TemplateDetailsFragment::class.java)
-    }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -73,7 +69,6 @@ class TemplateDetailsFragment :
 
         viewModel.creatingProject.observe(viewLifecycleOwner) {
             TransitionManager.beginDelayedTransition(binding.root)
-            binding.progress.isVisible = it
             binding.finish.isEnabled = !it
             binding.previous.isEnabled = !it
         }
@@ -112,7 +107,6 @@ class TemplateDetailsFragment :
                 viewModel.creatingProject.value = false
                 if (result == null || err != null || result !is ProjectTemplateRecipeResult) {
                     err?.printStackTrace()
-                    log.error("Failed to create project. result={}, err={}", result, err?.message)
                     if (err != null) {
                         flashError(err.cause?.message ?: err.message)
                     } else {

app/src/main/java/com/itsaky/androidide/fragments/TemplateDetailsFragment.kt

@@ -38,9 +38,9 @@ import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import androidx.core.content.getSystemService
 import androidx.core.view.isVisible
-import com.adfa.constants.ARM_KEY
-import com.adfa.constants.V7_KEY
-import com.adfa.constants.V8_KEY
+import org.adfa.constants.ARM_KEY
+import org.adfa.constants.V7_KEY
+import org.adfa.constants.V8_KEY
 import com.github.appintro.SlidePolicy
 import com.itsaky.androidide.R
 import com.itsaky.androidide.databinding.LayoutOnboardngSetupConfigBinding