Skip to content

Commit 71df262

Browse files
jatezzzjatezzz
committed
Merge remote-tracking branch 'origin/fix/ADFA-608' into fix/ADFA-608
2 parents 4d98e75 + 9192fa9 commit 71df262

File tree

49 files changed

+206
-327
lines changed

Some content is hidden

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

49 files changed

+206
-327
lines changed

‎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: 1 addition & 2 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

‎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: 1 addition & 3 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
@@ -14,7 +13,7 @@ import androidx.activity.result.contract.ActivityResultContracts
1413
import androidx.appcompat.app.AlertDialog
1514
import androidx.core.text.HtmlCompat
1615
import androidx.fragment.app.viewModels
17-
import com.adfa.constants.FEEDBACK_EMAIL
16+
import org.adfa.constants.FEEDBACK_EMAIL
1817
import com.google.android.material.progressindicator.LinearProgressIndicator
1918
import com.itsaky.androidide.R
2019
import com.itsaky.androidide.activities.MainActivity
@@ -23,7 +22,6 @@ import com.itsaky.androidide.activities.TerminalActivity
2322
import com.itsaky.androidide.adapters.MainActionsListAdapter
2423
import com.itsaky.androidide.app.BaseApplication
2524
import com.itsaky.androidide.app.BaseIDEActivity
26-
import com.itsaky.androidide.buildinfo.BuildInfo
2725
import com.itsaky.androidide.common.databinding.LayoutDialogProgressBinding
2826
import com.itsaky.androidide.databinding.FragmentMainBinding
2927
import com.itsaky.androidide.idetooltips.IDETooltipDatabase

‎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

‎app/src/main/java/com/itsaky/androidide/services/builder/GradleBuildService.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import android.content.Intent
2525
import android.os.IBinder
2626
import android.text.TextUtils
2727
import androidx.core.app.NotificationManagerCompat
28-
import com.adfa.constants.GRADLE_FOLDER_NAME
29-
import com.adfa.constants.TOML_FILE_NAME
28+
import org.adfa.constants.GRADLE_FOLDER_NAME
29+
import org.adfa.constants.TOML_FILE_NAME
3030
import com.blankj.utilcode.util.ResourceUtils
3131
import com.blankj.utilcode.util.ZipUtils
3232
import com.itsaky.androidide.BuildConfig
@@ -374,7 +374,7 @@ class GradleBuildService : Service(), BuildService, IToolingApiClient,
374374
* we will add more than 1 supported gradle versions.
375375
*/
376376
val propertiesFile = files.first { it.name.contains("properties") }
377-
val path = File(projectDir.absolutePath + File.separator +GRADLE_FOLDER_NAME +File.separator + TOML_FILE_NAME)
377+
val path = File(projectDir.absolutePath + File.separator + GRADLE_FOLDER_NAME +File.separator + TOML_FILE_NAME)
378378
val isTomlProject = path.exists()
379379
println("hz path $path")
380380
println("hz build $isTomlProject")

‎app/src/main/java/com/itsaky/androidide/utils/TemplateRecipeExecutor.kt‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,8 @@
1717

1818
package com.itsaky.androidide.utils
1919

20-
import com.adfa.constants.GRADLE_WRAPPER_PART_FILE_NAME
21-
import com.adfa.constants.GRADLE_ZIP_FILE_NAME
22-
import com.adfa.constants.LOCAL_AGP_8_0_0_CACHES_DEST
23-
import com.adfa.constants.LOCAL_MAVEN_CACHES_DEST
24-
import com.adfa.constants.LOCAL_MAVEN_REPO_ARCHIVE_ZIP_NAME
20+
import org.adfa.constants.LOCAL_MAVEN_CACHES_DEST
21+
import org.adfa.constants.LOCAL_MAVEN_REPO_ARCHIVE_ZIP_NAME
2522
import com.blankj.utilcode.util.ResourceUtils
2623
import com.blankj.utilcode.util.ZipUtils
2724
import com.itsaky.androidide.app.IDEApplication

‎common/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ dependencies {
1414
api(libs.common.editor)
1515
api(libs.common.lang3)
1616
api(libs.common.utilcode)
17+
api(libs.composite.constants)
1718
api(libs.google.guava)
1819
api(libs.google.material)
1920

@@ -36,7 +37,6 @@ dependencies {
3637
api(projects.logger)
3738
api(projects.resources)
3839
api(projects.subprojects.flashbar)
39-
api(projects.constants)
4040
implementation(libs.monitor)
4141

4242
testImplementation(libs.tests.junit)

0 commit comments

Comments
 (0)