Skip to content

Commit 9de53b6

Browse files
itsaky-adfaitsaky-adfa
committed
Merge branch 'stage' into feature/ADFA-186
2 parents 4ce78a9 + 774599d commit 9de53b6

63 files changed

Lines changed: 273 additions & 379 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/src/main/assets/CoGoTooltips‎

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,20 @@ class ShowTooltipAction(private val context: Context, override val order: Int) :
4141
val editor = data.getEditor()!!
4242
val cursor = editor.text.cursor
4343
val activity = data.getActivity()
44+
val category = when(editor.file!!.extension.toString()) {
45+
"java" -> "java"
46+
"kt" -> "kotlin"
47+
else -> "ide"
48+
}
4449
val word = editor.text.substring(cursor.left, cursor.right)
4550
if (cursor.isSelected) {
46-
activity?.getTooltipData(word)?.let { tooltipData ->
51+
activity?.getTooltipData(category, word)?.let { tooltipData ->
4752
TooltipUtils.showIDETooltip(
4853
context,
4954
editor,
5055
0,
5156
IDETooltipItem(
57+
tooltipCategory = category,
5258
tooltipTag = tooltipData.tooltipTag,
5359
detail = tooltipData.detail,
5460
summary = tooltipData.summary,

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,21 @@ package com.itsaky.androidide.activities
2020
import android.annotation.SuppressLint
2121
import android.content.Intent
2222
import android.content.pm.ActivityInfo
23-
import android.os.Build
2423
import android.os.Bundle
2524
import android.util.Log
2625
import androidx.activity.result.contract.ActivityResultContracts
2726
import androidx.core.content.ContextCompat
2827
import androidx.fragment.app.Fragment
29-
import com.adfa.constants.ANDROID_SDK_ZIP
30-
import com.adfa.constants.DESTINATION_ANDROID_SDK
31-
import com.adfa.constants.HOME_PATH
32-
import com.adfa.constants.LOCAL_MAVEN_CACHES_DEST
33-
import com.adfa.constants.LOCAL_SOURCE_AGP_8_0_0_CACHES
34-
import com.adfa.constants.LOCAL_MAVEN_REPO_ARCHIVE_ZIP_NAME
35-
import com.adfa.constants.LOCAL_SOURCE_ANDROID_SDK
36-
import com.adfa.constants.LOCAL_SOURCE_TERMUX_LIB_FOLDER_NAME
37-
import com.adfa.constants.MANIFEST_FILE_NAME
38-
import com.adfa.constants.TERMUX_DEBS_PATH
28+
import org.adfa.constants.ANDROID_SDK_ZIP
29+
import org.adfa.constants.DESTINATION_ANDROID_SDK
30+
import org.adfa.constants.HOME_PATH
31+
import org.adfa.constants.LOCAL_MAVEN_CACHES_DEST
32+
import org.adfa.constants.LOCAL_SOURCE_AGP_8_0_0_CACHES
33+
import org.adfa.constants.LOCAL_MAVEN_REPO_ARCHIVE_ZIP_NAME
34+
import org.adfa.constants.LOCAL_SOURCE_ANDROID_SDK
35+
import org.adfa.constants.LOCAL_SOURCE_TERMUX_LIB_FOLDER_NAME
36+
import org.adfa.constants.MANIFEST_FILE_NAME
37+
import org.adfa.constants.TERMUX_DEBS_PATH
3938
import com.blankj.utilcode.util.ResourceUtils
4039
import com.blankj.utilcode.util.ZipUtils
4140
import com.github.appintro.AppIntro2

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import androidx.appcompat.view.menu.MenuBuilder
3030
import androidx.collection.MutableIntObjectMap
3131
import androidx.core.content.res.ResourcesCompat
3232
import androidx.core.view.GravityCompat
33-
import com.adfa.constants.CONTENT_KEY
33+
import org.adfa.constants.CONTENT_KEY
3434
import com.blankj.utilcode.util.ImageUtils
3535
import com.itsaky.androidide.R.string
3636
import com.itsaky.androidide.actions.ActionData
@@ -56,7 +56,6 @@ import com.itsaky.androidide.models.OpenedFilesCache
5656
import com.itsaky.androidide.models.Range
5757
import com.itsaky.androidide.models.SaveResult
5858
import com.itsaky.androidide.projects.ProjectManagerImpl
59-
import com.itsaky.androidide.roomData.tooltips.Tooltip
6059
import com.itsaky.androidide.tasks.executeAsync
6160
import com.itsaky.androidide.ui.CodeEditorView
6261
import com.itsaky.androidide.utils.DialogUtils.newYesNoDialog
@@ -578,9 +577,9 @@ open class EditorHandlerActivity : ProjectHandlerActivity(), IEditorHandler {
578577
startActivity(intent)
579578
}
580579

581-
override suspend fun getTooltipData(word: String): IDETooltipItem? {
580+
override suspend fun getTooltipData(category: String, tag: String): IDETooltipItem? {
582581
return withContext(Dispatchers.IO) {
583-
IDEApplication.idetooltipDao.getTooltip(word)
582+
IDEApplication.idetooltipDao.getTooltip(category, tag)
584583
}
585584
}
586585

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import androidx.core.graphics.Insets
2121
import android.os.Bundle
2222
import android.view.View
2323
import android.webkit.WebViewClient
24-
import com.adfa.constants.CONTENT_KEY
24+
import org.adfa.constants.CONTENT_KEY
2525
import com.itsaky.androidide.R
2626
import com.itsaky.androidide.app.EdgeToEdgeIDEActivity
2727
import com.itsaky.androidide.databinding.ActivityFaqBinding

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import androidx.core.graphics.Insets
2121
import android.os.Bundle
2222
import android.view.View
2323
import android.webkit.WebViewClient
24-
import com.adfa.constants.CONTENT_KEY
24+
import org.adfa.constants.CONTENT_KEY
2525
import com.itsaky.androidide.R
2626
import com.itsaky.androidide.app.EdgeToEdgeIDEActivity
2727
import com.itsaky.androidide.databinding.ActivityHelpBinding

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import android.widget.CheckBox
2525
import androidx.activity.viewModels
2626
import androidx.annotation.GravityInt
2727
import androidx.appcompat.app.AlertDialog
28-
import com.adfa.constants.CONTENT_KEY
29-
import com.adfa.constants.HELP_PAGE_URL
28+
import org.adfa.constants.CONTENT_KEY
29+
import org.adfa.constants.HELP_PAGE_URL
3030
import com.blankj.utilcode.util.SizeUtils
3131
import com.blankj.utilcode.util.ThreadUtils
3232
import com.itsaky.androidide.R

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.itsaky.androidide.fragments
22

33
import android.content.Intent
44
import android.net.Uri
5-
import android.os.Build
65
import android.os.Bundle
76
import android.view.LayoutInflater
87
import android.view.View
@@ -13,7 +12,7 @@ import androidx.activity.result.contract.ActivityResultContracts
1312
import androidx.appcompat.app.AlertDialog
1413
import androidx.core.text.HtmlCompat
1514
import androidx.fragment.app.viewModels
16-
import com.adfa.constants.FEEDBACK_EMAIL
15+
import org.adfa.constants.FEEDBACK_EMAIL
1716
import com.google.android.material.progressindicator.LinearProgressIndicator
1817
import com.itsaky.androidide.R
1918
import com.itsaky.androidide.activities.MainActivity
@@ -22,7 +21,6 @@ import com.itsaky.androidide.activities.TerminalActivity
2221
import com.itsaky.androidide.adapters.MainActionsListAdapter
2322
import com.itsaky.androidide.app.BaseApplication
2423
import com.itsaky.androidide.app.BaseIDEActivity
25-
import com.itsaky.androidide.buildinfo.BuildInfo
2624
import com.itsaky.androidide.common.databinding.LayoutDialogProgressBinding
2725
import com.itsaky.androidide.databinding.FragmentMainBinding
2826
import com.itsaky.androidide.idetooltips.IDETooltipDatabase
@@ -137,14 +135,15 @@ class MainFragment : BaseFragment() {
137135
val tag = action.id.toString()
138136
CoroutineScope(Dispatchers.IO).launch {
139137
val dao = IDETooltipDatabase.getDatabase(requireContext()).idetooltipDao()
140-
val item = dao.getTooltip(tag)
138+
val item = dao.getTooltip("ide", tag)
141139
withContext((Dispatchers.Main)) {
142140
(context?.let {
143141
TooltipUtils.showIDETooltip(
144142
it,
145143
view!!,
146144
0,
147145
IDETooltipItem(
146+
tooltipCategory = "ide",
148147
tooltipTag = item?.tooltipTag ?: "",
149148
detail = item?.detail ?: "",
150149
summary = item?.summary ?: "",

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,6 @@ class TemplateDetailsFragment :
5858

5959
private val recentProjectsViewModel: RecentProjectsViewModel by activityViewModels()
6060

61-
companion object {
62-
63-
private val log = LoggerFactory.getLogger(TemplateDetailsFragment::class.java)
64-
}
6561

6662
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
6763
super.onViewCreated(view, savedInstanceState)
@@ -73,7 +69,6 @@ class TemplateDetailsFragment :
7369

7470
viewModel.creatingProject.observe(viewLifecycleOwner) {
7571
TransitionManager.beginDelayedTransition(binding.root)
76-
binding.progress.isVisible = it
7772
binding.finish.isEnabled = !it
7873
binding.previous.isEnabled = !it
7974
}
@@ -112,7 +107,6 @@ class TemplateDetailsFragment :
112107
viewModel.creatingProject.value = false
113108
if (result == null || err != null || result !is ProjectTemplateRecipeResult) {
114109
err?.printStackTrace()
115-
log.error("Failed to create project. result={}, err={}", result, err?.message)
116110
if (err != null) {
117111
flashError(err.cause?.message ?: err.message)
118112
} else {

‎app/src/main/java/com/itsaky/androidide/fragments/onboarding/IdeSetupConfigurationFragment.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ import android.view.ViewGroup
3838
import android.widget.ArrayAdapter
3939
import androidx.core.content.getSystemService
4040
import androidx.core.view.isVisible
41-
import com.adfa.constants.ARM_KEY
42-
import com.adfa.constants.V7_KEY
43-
import com.adfa.constants.V8_KEY
41+
import org.adfa.constants.ARM_KEY
42+
import org.adfa.constants.V7_KEY
43+
import org.adfa.constants.V8_KEY
4444
import com.github.appintro.SlidePolicy
4545
import com.itsaky.androidide.R
4646
import com.itsaky.androidide.databinding.LayoutOnboardngSetupConfigBinding

0 commit comments

Comments
 (0)