Skip to content
This repository was archived by the owner on Jun 14, 2025. It is now read-only.

Commit ca9bf81

Browse files
committed
feat: Small improvements & deprecate custom schemes
1 parent 539bb4a commit ca9bf81

26 files changed

+15
-234
lines changed

app/build.gradle.kts

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
plugins {
99
id("com.android.application")
1010
id("org.jetbrains.kotlin.android")
11-
id("dev.rikka.tools.materialthemebuilder")
1211
id("com.google.gms.google-services")
1312
}
1413

@@ -147,32 +146,6 @@ fun getGitCommit(): String {
147146
}
148147
}
149148

150-
materialThemeBuilder {
151-
themes {
152-
for ((name, color) in listOf(
153-
"Pyro" to "#EF7A35",
154-
"indigo" to "#3F51B5",
155-
"flamingo" to "#E91E63",
156-
"mint" to "#009688",
157-
"emerald" to "#4CAF50",
158-
"azure" to "#2196F3",
159-
)) {
160-
create(name) {
161-
primaryColor = color
162-
lightThemeFormat = "Theme.CosmicIde.%s.Light"
163-
lightThemeParent = "Theme.CosmicIde"
164-
darkThemeFormat = "Theme.CosmicIde.%s.Dark"
165-
darkThemeParent = "Theme.CosmicIde"
166-
167-
isDynamicColors = false
168-
}
169-
}
170-
}
171-
172-
generatePaletteAttributes = true
173-
packageName = "org.cosmicide"
174-
}
175-
176149
configurations.all {
177150
resolutionStrategy.force("com.squareup.okhttp3:okhttp:4.12.0")
178151
resolutionStrategy.force("com.google.guava:guava:33.1.0-android")

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
android:label="@string/app_name"
3838
android:roundIcon="@mipmap/ic_launcher_round"
3939
android:supportsRtl="true"
40-
android:theme="@style/Theme.CosmicIde.Flamingo.Light"
40+
android:theme="@style/Theme.CosmicIde"
4141
tools:targetApi="34">
4242

4343
<provider

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,6 @@ class App : Application() {
292292

293293
if (Prefs.isInitialized) {
294294
applyThemeBasedOnConfiguration()
295-
setTheme(CommonUtils.getAccent(Prefs.appTheme))
296295
}
297296
}
298297

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

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -39,27 +39,9 @@ import rikka.shizuku.ShizukuProvider
3939

4040
class MainActivity : AppCompatActivity() {
4141

42-
var themeInt = 0
4342
private lateinit var binding: ActivityMainBinding
4443
val shizukuPermissionCode = 1
4544

46-
override fun onCreateView(
47-
parent: View?,
48-
name: String,
49-
context: Context,
50-
attrs: AttributeSet
51-
): View? {
52-
val accent = Prefs.appAccent
53-
54-
themeInt = CommonUtils.getAccent(accent)
55-
setTheme(themeInt)
56-
57-
if (themeInt == R.style.Theme_CosmicIde)
58-
DynamicColors.applyToActivityIfAvailable(this)
59-
60-
return super.onCreateView(parent, name, context, attrs)
61-
}
62-
6345
override fun onCreate(savedInstanceState: Bundle?) {
6446
installSplashScreen()
6547

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ class CompileInfoFragment : BaseBindingFragment<FragmentCompileInfoBinding>() {
9292
parentFragmentManager.commit {
9393
add(R.id.fragment_container, ProjectOutputFragment())
9494
addToBackStack(null)
95-
setTransition(androidx.fragment.app.FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
9695
}
9796
}
9897
}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,6 @@ class EditorFragment : BaseBindingFragment<FragmentEditorBinding>() {
386386
parentFragmentManager.commit {
387387
add(R.id.fragment_container, ChatFragment())
388388
addToBackStack(null)
389-
setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
390389
}
391390
true
392391
}
@@ -395,7 +394,6 @@ class EditorFragment : BaseBindingFragment<FragmentEditorBinding>() {
395394
parentFragmentManager.commit {
396395
add(R.id.fragment_container, GitFragment())
397396
addToBackStack(null)
398-
setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
399397
}
400398
true
401399
}
@@ -604,15 +602,13 @@ class EditorFragment : BaseBindingFragment<FragmentEditorBinding>() {
604602
parentFragmentManager.commit {
605603
add(R.id.fragment_container, CompileInfoFragment())
606604
addToBackStack(null)
607-
setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
608605
}
609606
}
610607

611608
private fun navigateToSettingsFragment() {
612609
parentFragmentManager.commit {
613610
add(R.id.fragment_container, SettingsFragment())
614611
addToBackStack(null)
615-
setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
616612
}
617613
}
618614

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ class GitFragment : BaseBindingFragment<FragmentGitBinding>() {
9696
parentFragmentManager.popBackStack()
9797
parentFragmentManager.commit {
9898
replace(R.id.fragment_container, SettingsFragment()).addToBackStack(null)
99-
setTransition(androidx.fragment.app.FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
10099
}
101100
}.setNegativeButton("No") { _, _ ->
102101
parentFragmentManager.popBackStack()

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ class InstallResourcesFragment : BaseBindingFragment<InstallResourcesFragmentBin
5252
withContext(Dispatchers.Main) {
5353
parentFragmentManager.commit {
5454
replace(R.id.fragment_container, ProjectFragment())
55-
setTransition(androidx.fragment.app.FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
5655
}
5756
}
5857
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ class NewProjectFragment : BaseBindingFragment<FragmentNewProjectBinding>() {
6868
if (success) {
6969
parentFragmentManager.commit {
7070
remove(this@NewProjectFragment)
71-
setTransition(androidx.fragment.app.FragmentTransaction.TRANSIT_FRAGMENT_CLOSE)
7271
}
7372
}
7473
}
@@ -104,7 +103,6 @@ class NewProjectFragment : BaseBindingFragment<FragmentNewProjectBinding>() {
104103
parentFragmentManager.commit {
105104
add(R.id.fragment_container, EditorFragment.newInstance(project))
106105
addToBackStack(null)
107-
setTransition(androidx.fragment.app.FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
108106
}
109107
}
110108

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ class ProjectFragment : BaseBindingFragment<FragmentProjectBinding>(),
130130
parentFragmentManager.commit {
131131
replace(R.id.fragment_container, SettingsFragment())
132132
addToBackStack(null)
133-
setTransition(androidx.fragment.app.FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
134133
}
135134
true
136135
}
@@ -262,7 +261,6 @@ class ProjectFragment : BaseBindingFragment<FragmentProjectBinding>(),
262261
setPositiveButton("Ok") { _, _ ->
263262
parentFragmentManager.commit {
264263
replace(R.id.fragment_container, SettingsFragment())
265-
setTransition(androidx.fragment.app.FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
266264
}
267265
}
268266
show()
@@ -403,7 +401,6 @@ class ProjectFragment : BaseBindingFragment<FragmentProjectBinding>(),
403401
parentFragmentManager.commit {
404402
add(R.id.fragment_container, NewProjectFragment())
405403
addToBackStack(null)
406-
setTransition(androidx.fragment.app.FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
407404
}
408405
}
409406

@@ -415,7 +412,6 @@ class ProjectFragment : BaseBindingFragment<FragmentProjectBinding>(),
415412
}
416413
})
417414
addToBackStack(null)
418-
setTransition(androidx.fragment.app.FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
419415
}
420416
}
421417
}

0 commit comments

Comments
 (0)