Skip to content

Commit c1dc385

Browse files
committed
Manage configuration changes in TsLanguageJava
Tested-by: Pranav Purwar <purwarpranav80@gmail.com> Signed-off-by: PranavPurwar <purwarpranav80@gmail.com> Signed-off-by: Pranav Purwar <purwarpranav80@gmail.com>
1 parent 5c02f2c commit c1dc385

File tree

251 files changed

+36625
-32
lines changed

Some content is hidden

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

251 files changed

+36625
-32
lines changed

.idea/deploymentTargetSelector.xml

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle.kts

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,12 @@ android {
7474
}
7575

7676
packagingOptions.jniLibs.apply {
77-
useLegacyPackaging = false
77+
useLegacyPackaging = true
7878
}
7979

8080
configurations.all {
8181
resolutionStrategy.force("com.squareup.okhttp3:okhttp:4.12.0")
82+
resolutionStrategy.force("androidx.window:window:1.0.0-alpha09")
8283
}
8384

8485
packaging {
@@ -177,10 +178,6 @@ configurations.all {
177178
}
178179

179180
dependencies {
180-
implementation("com.github.termux.termux-app:terminal-view:062c9771a9")
181-
implementation("com.github.termux.termux-app:terminal-emulator:062c9771a9")
182-
implementation("com.blankj:utilcodex:1.31.1")
183-
184181
implementation("com.android.tools:r8:8.3.37")
185182
implementation("com.android.tools.smali:smali-dexlib2:3.0.7")
186183

@@ -196,9 +193,9 @@ dependencies {
196193
implementation("androidx.core:core-ktx:1.13.1")
197194
implementation("androidx.core:core-splashscreen:1.1.0-rc01")
198195
implementation("androidx.documentfile:documentfile:1.1.0-alpha01")
199-
implementation("androidx.fragment:fragment-ktx:1.7.1")
200-
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.1")
201-
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.1")
196+
implementation("androidx.fragment:fragment-ktx:1.8.0")
197+
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.2")
198+
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.2")
202199
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01")
203200
implementation("androidx.viewpager2:viewpager2:1.1.0")
204201
implementation("androidx.activity:activity-ktx:1.9.0")
@@ -234,7 +231,7 @@ dependencies {
234231
implementation("org.lsposed.hiddenapibypass:hiddenapibypass:4.3")
235232
implementation("org.slf4j:slf4j-simple:2.1.0-alpha1")
236233

237-
implementation("com.google.ai.client.generativeai:generativeai:0.7.0")
234+
implementation("com.google.ai.client.generativeai:generativeai:0.8.0")
238235

239236
val shizukuVersion = "13.1.5"
240237
implementation("dev.rikka.shizuku:api:$shizukuVersion")
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// ICodeFormatterInterface.aidl
2+
package org.cosmicide;
3+
4+
// Declare any non-default types here with import statements
5+
6+
interface ICodeFormatterInterface {
7+
String formatCode(String code, int indentWidth, boolean tabIndent);
8+
9+
String formatPartialCode(String code, int indentWidth, int indentLevel, boolean tabIndent);
10+
}

app/src/main/kotlin/org/cosmicide/App.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,8 @@ class App : Application() {
137137
override fun onActivityDestroyed(p0: Activity) {}
138138
})
139139

140+
//TermuxApplication.init(this)
141+
140142
Analytics.setAnalyticsCollectionEnabled(Prefs.analyticsEnabled)
141143
}
142144

app/src/main/kotlin/org/cosmicide/editor/IdeEditor.kt

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
package org.cosmicide.editor
99

1010
import android.content.Context
11+
import android.content.res.Configuration
1112
import android.util.AttributeSet
1213
import android.view.inputmethod.EditorInfo
1314
import com.google.common.collect.ImmutableSet
@@ -16,9 +17,10 @@ import io.github.rosemoe.sora.langs.textmate.registry.ThemeRegistry
1617
import io.github.rosemoe.sora.widget.CodeEditor
1718
import io.github.rosemoe.sora.widget.component.EditorDiagnosticTooltipWindow
1819
import io.github.rosemoe.sora.widget.schemes.EditorColorScheme
20+
import org.cosmicide.common.Prefs
21+
import org.cosmicide.editor.language.TsLanguageJava
1922
import org.cosmicide.extension.setCompletionLayout
2023
import org.cosmicide.extension.setFont
21-
import org.cosmicide.common.Prefs
2224

2325
class IdeEditor @JvmOverloads constructor(
2426
context: Context,
@@ -103,4 +105,12 @@ class IdeEditor @JvmOverloads constructor(
103105
parentView.setBackgroundColor(colorScheme.getColor(EditorColorScheme.WHOLE_BACKGROUND))
104106
}
105107
}
108+
109+
override fun onConfigurationChanged(newConfig: Configuration?) {
110+
super.onConfigurationChanged(newConfig)
111+
112+
if (editorLanguage is TsLanguageJava) {
113+
(editorLanguage as TsLanguageJava).onConfigurationChanged()
114+
}
115+
}
106116
}

app/src/main/kotlin/org/cosmicide/editor/language/TsLanguageJava.kt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,19 @@ class TsLanguageJava(
6868
}
6969
}
7070

71+
fun onConfigurationChanged() {
72+
if (!completions.mInitialized) {
73+
completions.initialize(
74+
URI("file://" + project.root.absolutePath), JavaCompletionOptionsImpl(
75+
"${project.binDir.absolutePath}/autocomplete.log",
76+
Level.ALL,
77+
emptyList(),
78+
emptyList()
79+
)
80+
)
81+
completions.openFile(path, editor.text.toString())
82+
}
83+
}
7184

7285
override fun requireAutoComplete(
7386
content: ContentReference,

app/src/main/kotlin/org/cosmicide/fragment/EditorFragment.kt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -382,15 +382,6 @@ class EditorFragment : BaseBindingFragment<FragmentEditorBinding>() {
382382
true
383383
}
384384

385-
R.id.action_terminal -> {
386-
parentFragmentManager.commit {
387-
add(R.id.fragment_container, TerminalFragment())
388-
addToBackStack(null)
389-
setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
390-
}
391-
true
392-
}
393-
394385
R.id.arguments -> {
395386
val binding = TextDialogBinding.inflate(layoutInflater)
396387
MaterialAlertDialogBuilder(context).setTitle("Enter program arguments")

app/src/main/kotlin/org/cosmicide/fragment/ProjectFragment.kt

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,6 @@ class ProjectFragment : BaseBindingFragment<FragmentProjectBinding>(),
133133
}
134134
true
135135
}
136-
137-
R.id.action_terminal -> {
138-
navigateToTerminalFragment()
139-
true
140-
}
141136
else -> false
142137
}
143138
}
@@ -404,14 +399,6 @@ class ProjectFragment : BaseBindingFragment<FragmentProjectBinding>(),
404399
}
405400
}
406401

407-
private fun navigateToTerminalFragment() {
408-
parentFragmentManager.commit {
409-
add(R.id.fragment_container, TerminalFragment())
410-
addToBackStack(null)
411-
setTransition(androidx.fragment.app.FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
412-
}
413-
}
414-
415402
private fun navigateToEditorFragment(project: Project) {
416403
parentFragmentManager.commit {
417404
add(R.id.fragment_container, EditorFragment().apply {

fastlane/metadata/android/en-US/changelogs/22.txt

Whitespace-only changes.

fastlane/metadata/android/en-US/changelogs/24.txt

Whitespace-only changes.

0 commit comments

Comments
 (0)