diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f099547f5..0a17b753f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -8,7 +8,6 @@ plugins { id("com.android.application") id("org.jetbrains.kotlin.android") - id("dev.rikka.tools.materialthemebuilder") id("com.google.gms.google-services") } @@ -147,32 +146,6 @@ fun getGitCommit(): String { } } -materialThemeBuilder { - themes { - for ((name, color) in listOf( - "Pyro" to "#EF7A35", - "indigo" to "#3F51B5", - "flamingo" to "#E91E63", - "mint" to "#009688", - "emerald" to "#4CAF50", - "azure" to "#2196F3", - )) { - create(name) { - primaryColor = color - lightThemeFormat = "Theme.CosmicIde.%s.Light" - lightThemeParent = "Theme.CosmicIde" - darkThemeFormat = "Theme.CosmicIde.%s.Dark" - darkThemeParent = "Theme.CosmicIde" - - isDynamicColors = false - } - } - } - - generatePaletteAttributes = true - packageName = "org.cosmicide" -} - configurations.all { resolutionStrategy.force("com.squareup.okhttp3:okhttp:4.12.0") resolutionStrategy.force("com.google.guava:guava:33.1.0-android") diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7e06d4965..8aeb598cf 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -37,7 +37,7 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/Theme.CosmicIde.Flamingo.Light" + android:theme="@style/Theme.CosmicIde" tools:targetApi="34"> <provider diff --git a/app/src/main/kotlin/org/cosmicide/MainActivity.kt b/app/src/main/kotlin/org/cosmicide/MainActivity.kt index 0d26efe52..5251660e7 100644 --- a/app/src/main/kotlin/org/cosmicide/MainActivity.kt +++ b/app/src/main/kotlin/org/cosmicide/MainActivity.kt @@ -39,27 +39,9 @@ import rikka.shizuku.ShizukuProvider class MainActivity : AppCompatActivity() { - var themeInt = 0 private lateinit var binding: ActivityMainBinding val shizukuPermissionCode = 1 - override fun onCreateView( - parent: View?, - name: String, - context: Context, - attrs: AttributeSet - ): View? { - val accent = Prefs.appAccent - - themeInt = CommonUtils.getAccent(accent) - setTheme(themeInt) - - if (themeInt == R.style.Theme_CosmicIde) - DynamicColors.applyToActivityIfAvailable(this) - - return super.onCreateView(parent, name, context, attrs) - } - override fun onCreate(savedInstanceState: Bundle?) { installSplashScreen() diff --git a/app/src/main/kotlin/org/cosmicide/fragment/CompileInfoFragment.kt b/app/src/main/kotlin/org/cosmicide/fragment/CompileInfoFragment.kt index a623e766d..9e9b3da04 100644 --- a/app/src/main/kotlin/org/cosmicide/fragment/CompileInfoFragment.kt +++ b/app/src/main/kotlin/org/cosmicide/fragment/CompileInfoFragment.kt @@ -92,7 +92,6 @@ class CompileInfoFragment : BaseBindingFragment<FragmentCompileInfoBinding>() { parentFragmentManager.commit { add(R.id.fragment_container, ProjectOutputFragment()) addToBackStack(null) - setTransition(androidx.fragment.app.FragmentTransaction.TRANSIT_FRAGMENT_OPEN) } } } diff --git a/app/src/main/kotlin/org/cosmicide/fragment/EditorFragment.kt b/app/src/main/kotlin/org/cosmicide/fragment/EditorFragment.kt index a8a760268..cc9706067 100644 --- a/app/src/main/kotlin/org/cosmicide/fragment/EditorFragment.kt +++ b/app/src/main/kotlin/org/cosmicide/fragment/EditorFragment.kt @@ -386,7 +386,6 @@ class EditorFragment : BaseBindingFragment<FragmentEditorBinding>() { parentFragmentManager.commit { add(R.id.fragment_container, ChatFragment()) addToBackStack(null) - setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN) } true } @@ -395,7 +394,6 @@ class EditorFragment : BaseBindingFragment<FragmentEditorBinding>() { parentFragmentManager.commit { add(R.id.fragment_container, GitFragment()) addToBackStack(null) - setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN) } true } @@ -604,7 +602,6 @@ class EditorFragment : BaseBindingFragment<FragmentEditorBinding>() { parentFragmentManager.commit { add(R.id.fragment_container, CompileInfoFragment()) addToBackStack(null) - setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN) } } @@ -612,7 +609,6 @@ class EditorFragment : BaseBindingFragment<FragmentEditorBinding>() { parentFragmentManager.commit { add(R.id.fragment_container, SettingsFragment()) addToBackStack(null) - setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN) } } diff --git a/app/src/main/kotlin/org/cosmicide/fragment/GitFragment.kt b/app/src/main/kotlin/org/cosmicide/fragment/GitFragment.kt index 02089bb55..2ba96390a 100644 --- a/app/src/main/kotlin/org/cosmicide/fragment/GitFragment.kt +++ b/app/src/main/kotlin/org/cosmicide/fragment/GitFragment.kt @@ -96,7 +96,6 @@ class GitFragment : BaseBindingFragment<FragmentGitBinding>() { parentFragmentManager.popBackStack() parentFragmentManager.commit { replace(R.id.fragment_container, SettingsFragment()).addToBackStack(null) - setTransition(androidx.fragment.app.FragmentTransaction.TRANSIT_FRAGMENT_OPEN) } }.setNegativeButton("No") { _, _ -> parentFragmentManager.popBackStack() diff --git a/app/src/main/kotlin/org/cosmicide/fragment/InstallResourcesFragment.kt b/app/src/main/kotlin/org/cosmicide/fragment/InstallResourcesFragment.kt index 575794eae..57893281b 100644 --- a/app/src/main/kotlin/org/cosmicide/fragment/InstallResourcesFragment.kt +++ b/app/src/main/kotlin/org/cosmicide/fragment/InstallResourcesFragment.kt @@ -52,7 +52,6 @@ class InstallResourcesFragment : BaseBindingFragment<InstallResourcesFragmentBin withContext(Dispatchers.Main) { parentFragmentManager.commit { replace(R.id.fragment_container, ProjectFragment()) - setTransition(androidx.fragment.app.FragmentTransaction.TRANSIT_FRAGMENT_OPEN) } } } diff --git a/app/src/main/kotlin/org/cosmicide/fragment/NewProjectFragment.kt b/app/src/main/kotlin/org/cosmicide/fragment/NewProjectFragment.kt index fc0dcd76a..936be78c8 100644 --- a/app/src/main/kotlin/org/cosmicide/fragment/NewProjectFragment.kt +++ b/app/src/main/kotlin/org/cosmicide/fragment/NewProjectFragment.kt @@ -68,7 +68,6 @@ class NewProjectFragment : BaseBindingFragment<FragmentNewProjectBinding>() { if (success) { parentFragmentManager.commit { remove(this@NewProjectFragment) - setTransition(androidx.fragment.app.FragmentTransaction.TRANSIT_FRAGMENT_CLOSE) } } } @@ -104,7 +103,6 @@ class NewProjectFragment : BaseBindingFragment<FragmentNewProjectBinding>() { parentFragmentManager.commit { add(R.id.fragment_container, EditorFragment.newInstance(project)) addToBackStack(null) - setTransition(androidx.fragment.app.FragmentTransaction.TRANSIT_FRAGMENT_OPEN) } } diff --git a/app/src/main/kotlin/org/cosmicide/fragment/ProjectFragment.kt b/app/src/main/kotlin/org/cosmicide/fragment/ProjectFragment.kt index 237797a88..f95065fc5 100644 --- a/app/src/main/kotlin/org/cosmicide/fragment/ProjectFragment.kt +++ b/app/src/main/kotlin/org/cosmicide/fragment/ProjectFragment.kt @@ -130,7 +130,6 @@ class ProjectFragment : BaseBindingFragment<FragmentProjectBinding>(), parentFragmentManager.commit { replace(R.id.fragment_container, SettingsFragment()) addToBackStack(null) - setTransition(androidx.fragment.app.FragmentTransaction.TRANSIT_FRAGMENT_OPEN) } true } @@ -262,7 +261,6 @@ class ProjectFragment : BaseBindingFragment<FragmentProjectBinding>(), setPositiveButton("Ok") { _, _ -> parentFragmentManager.commit { replace(R.id.fragment_container, SettingsFragment()) - setTransition(androidx.fragment.app.FragmentTransaction.TRANSIT_FRAGMENT_OPEN) } } show() @@ -403,7 +401,6 @@ class ProjectFragment : BaseBindingFragment<FragmentProjectBinding>(), parentFragmentManager.commit { add(R.id.fragment_container, NewProjectFragment()) addToBackStack(null) - setTransition(androidx.fragment.app.FragmentTransaction.TRANSIT_FRAGMENT_OPEN) } } @@ -415,7 +412,6 @@ class ProjectFragment : BaseBindingFragment<FragmentProjectBinding>(), } }) addToBackStack(null) - setTransition(androidx.fragment.app.FragmentTransaction.TRANSIT_FRAGMENT_OPEN) } } } diff --git a/app/src/main/kotlin/org/cosmicide/fragment/ProjectOutputFragment.kt b/app/src/main/kotlin/org/cosmicide/fragment/ProjectOutputFragment.kt index a17c280b5..17982911c 100644 --- a/app/src/main/kotlin/org/cosmicide/fragment/ProjectOutputFragment.kt +++ b/app/src/main/kotlin/org/cosmicide/fragment/ProjectOutputFragment.kt @@ -46,7 +46,6 @@ class ProjectOutputFragment : BaseBindingFragment<FragmentCompileInfoBinding>() if (isRunning) { parentFragmentManager.commit { replace(R.id.fragment_container, ProjectOutputFragment()) - setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE) } } text.insert(text.cursor.rightLine, text.cursor.rightColumn, "--- Stopped ---\n") @@ -57,7 +56,6 @@ class ProjectOutputFragment : BaseBindingFragment<FragmentCompileInfoBinding>() R.id.cancel -> { parentFragmentManager.commit { remove(this@ProjectOutputFragment) - setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE) } true } @@ -74,7 +72,6 @@ class ProjectOutputFragment : BaseBindingFragment<FragmentCompileInfoBinding>() binding.toolbar.setNavigationOnClickListener { parentFragmentManager.commit { remove(this@ProjectOutputFragment) - setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE) } } diff --git a/app/src/main/kotlin/org/cosmicide/fragment/settings/AboutSettings.kt b/app/src/main/kotlin/org/cosmicide/fragment/settings/AboutSettings.kt index ae8c45ad3..136ea18fa 100644 --- a/app/src/main/kotlin/org/cosmicide/fragment/settings/AboutSettings.kt +++ b/app/src/main/kotlin/org/cosmicide/fragment/settings/AboutSettings.kt @@ -238,7 +238,6 @@ class AboutSettings(private val activity: FragmentActivity) : SettingsProvider { activity.supportFragmentManager.commit { replace(R.id.fragment_container, InstallResourcesFragment()) - setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE) } } } diff --git a/app/src/main/kotlin/org/cosmicide/fragment/settings/PluginSettingsProvider.kt b/app/src/main/kotlin/org/cosmicide/fragment/settings/PluginSettingsProvider.kt index fc0737e3f..ae6f975ab 100644 --- a/app/src/main/kotlin/org/cosmicide/fragment/settings/PluginSettingsProvider.kt +++ b/app/src/main/kotlin/org/cosmicide/fragment/settings/PluginSettingsProvider.kt @@ -39,7 +39,6 @@ class PluginSettingsProvider(private val activity: FragmentActivity) : SettingsP activity.supportFragmentManager.commit { add(R.id.fragment_container, PluginListFragment()) addToBackStack(null) - setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN) } true } @@ -52,7 +51,6 @@ class PluginSettingsProvider(private val activity: FragmentActivity) : SettingsP activity.supportFragmentManager.commit { add(R.id.fragment_container, PluginsFragment()) addToBackStack(null) - setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN) } true } diff --git a/app/src/main/kotlin/org/cosmicide/util/CommonUtils.kt b/app/src/main/kotlin/org/cosmicide/util/CommonUtils.kt index a72714dcf..749ff592b 100644 --- a/app/src/main/kotlin/org/cosmicide/util/CommonUtils.kt +++ b/app/src/main/kotlin/org/cosmicide/util/CommonUtils.kt @@ -66,18 +66,6 @@ object CommonUtils { .usePlugin(HtmlPlugin.create()) .build() - fun getAccent(accent: String): Int { - return when (accent) { - "default" -> R.style.Theme_CosmicIde - "pyro" -> R.style.Theme_CosmicIde_Pyro - "indigo" -> R.style.Theme_CosmicIde_Indigo - "flamingo" -> R.style.Theme_CosmicIde_Flamingo - "mint" -> R.style.Theme_CosmicIde_Mint - "emerald" -> R.style.Theme_CosmicIde_Emerald - else -> R.style.Theme_CosmicIde - } - } - fun Activity.isShizukuGranted(): Boolean { if (Shizuku.pingBinder().not()) { Log.d("Shizuku", "Shizuku not installed") diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 261468cb4..9b641dc8c 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -4,15 +4,8 @@ ~ Cosmic IDE is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. ~ You should have received a copy of the GNU General Public License along with Cosmic IDE. If not, see <https://www.gnu.org/licenses/>. --> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/fragment_container" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?colorSurfaceContainerLow" - android:orientation="vertical"> - - <androidx.fragment.app.FragmentContainerView - android:id="@+id/fragment_container" - android:layout_width="match_parent" - android:layout_height="match_parent" /> -</LinearLayout> + android:background="?colorSurfaceContainerLow" /> diff --git a/app/src/main/res/values-night/themes_custom.xml b/app/src/main/res/values-night/themes_custom.xml deleted file mode 100644 index 006dee5ad..000000000 --- a/app/src/main/res/values-night/themes_custom.xml +++ /dev/null @@ -1,49 +0,0 @@ -<!-- - ~ This file is part of Cosmic IDE. - ~ Cosmic IDE is a free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - ~ Cosmic IDE is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - ~ You should have received a copy of the GNU General Public License along with Cosmic IDE. If not, see <https://www.gnu.org/licenses/>. - --> - -<resources> - - <style name="Theme.CosmicIde.Pyro" parent="Theme.CosmicIde.Pyro.Dark"> - <item name="fontFamily">@font/inter</item> - <item name="android:fontFamily">@font/inter</item> - - <item name="android:statusBarColor">?colorSurfaceContainerLow</item> - <item name="android:navigationBarColor">?colorSurfaceContainerLow</item> - </style> - - <style name="Theme.CosmicIde.Indigo" parent="Theme.CosmicIde.Indigo.Dark"> - <item name="fontFamily">@font/inter</item> - <item name="android:fontFamily">@font/inter</item> - - <item name="android:statusBarColor">?colorSurfaceContainerLow</item> - <item name="android:navigationBarColor">?colorSurfaceContainerLow</item> - </style> - - <style name="Theme.CosmicIde.Flamingo" parent="Theme.CosmicIde.Flamingo.Dark"> - <item name="fontFamily">@font/inter</item> - <item name="android:fontFamily">@font/inter</item> - - <item name="android:statusBarColor">?colorSurfaceContainerLow</item> - <item name="android:navigationBarColor">?colorSurfaceContainerLow</item> - </style> - - <style name="Theme.CosmicIde.Mint" parent="Theme.CosmicIde.Mint.Dark"> - <item name="fontFamily">@font/inter</item> - <item name="android:fontFamily">@font/inter</item> - - <item name="android:statusBarColor">?colorSurfaceContainerLow</item> - <item name="android:navigationBarColor">?colorSurfaceContainerLow</item> - </style> - - <style name="Theme.CosmicIde.Emerald" parent="Theme.CosmicIde.Emerald.Dark"> - <item name="fontFamily">@font/inter</item> - <item name="android:fontFamily">@font/inter</item> - - <item name="android:statusBarColor">?colorSurfaceContainerLow</item> - <item name="android:navigationBarColor">?colorSurfaceContainerLow</item> - </style> -</resources> diff --git a/app/src/main/res/values-v27/themes.xml b/app/src/main/res/values-v27/themes.xml index a493c29b1..2dda81c74 100644 --- a/app/src/main/res/values-v27/themes.xml +++ b/app/src/main/res/values-v27/themes.xml @@ -4,9 +4,7 @@ ~ Cosmic IDE is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. ~ You should have received a copy of the GNU General Public License along with Cosmic IDE. If not, see <https://www.gnu.org/licenses/>. --> - <resources xmlns:tools="http://schemas.android.com/tools"> - <style name="Theme.CosmicIde.BaseV27" parent="Theme.CosmicIde.Base"> <item name="android:enforceNavigationBarContrast" tools:targetApi="q">false</item> <item name="android:navigationBarColor">@android:color/transparent</item> diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml index 93b53c083..f2d2c551b 100644 --- a/app/src/main/res/values-v31/themes.xml +++ b/app/src/main/res/values-v31/themes.xml @@ -14,9 +14,11 @@ <style name="Theme.CosmicIde" parent="Theme.CosmicIde.BaseV31" /> <style name="Theme.CosmicIde.Start" parent="Theme.SplashScreen"> + <!-- Android framework --> + <item name="android:navigationBarColor">@color/logo_background</item> + <item name="android:statusBarColor">@color/logo_background</item> + <item name="windowSplashScreenBackground">@color/logo_background</item> - <item name="android:splashScreenTheme">@style/Theme.CosmicIde.Flamingo</item> - <item name="windowSplashScreenIconBackgroundColor">?attr/colorSurface</item> - <item name="postSplashScreenTheme">@style/Theme.CosmicIde.Pyro</item> + <item name="postSplashScreenTheme">@style/Theme.CosmicIde</item> </style> </resources> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index a1de986fc..39565f67e 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -4,12 +4,9 @@ ~ Cosmic IDE is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. ~ You should have received a copy of the GNU General Public License along with Cosmic IDE. If not, see <https://www.gnu.org/licenses/>. --> - <resources> - <style name="Widget.CosmicIde.ListItemCard" parent="Widget.Material3.CardView.Filled"> <item name="android:layout_marginHorizontal">16dp</item> <item name="android:layout_marginVertical">8dp</item> </style> - </resources> diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index f248b7262..4fc08379a 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -4,20 +4,17 @@ ~ Cosmic IDE is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. ~ You should have received a copy of the GNU General Public License along with Cosmic IDE. If not, see <https://www.gnu.org/licenses/>. --> - <resources> - - <style name="Theme.CosmicIde.Base" parent="Theme.Material3.DayNight.NoActionBar"> - <item name="android:fontFamily">@font/inter</item> + <style name="Theme.CosmicIde.Base" parent="Theme.Material3.DynamicColors.DayNight.NoActionBar"> + <!-- Android framework --> <item name="android:overScrollMode">never</item> + <item name="android:navigationBarColor">@android:color/transparent</item> <item name="android:statusBarColor">@android:color/transparent</item> - <item name="android:navigationBarColor"> - @android:color/transparent - </item> + <!-- Font --> + <item name="android:fontFamily">@font/inter</item> <item name="fontFamily">@font/inter</item> </style> <style name="Theme.CosmicIde" parent="Theme.CosmicIde.Base" /> - </resources> diff --git a/app/src/main/res/values/themes_custom.xml b/app/src/main/res/values/themes_custom.xml deleted file mode 100644 index 5e6b73834..000000000 --- a/app/src/main/res/values/themes_custom.xml +++ /dev/null @@ -1,49 +0,0 @@ -<!-- - ~ This file is part of Cosmic IDE. - ~ Cosmic IDE is a free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - ~ Cosmic IDE is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - ~ You should have received a copy of the GNU General Public License along with Cosmic IDE. If not, see <https://www.gnu.org/licenses/>. - --> - -<resources> - - <style name="Theme.CosmicIde.Pyro" parent="Theme.CosmicIde.Pyro.Light"> - <item name="fontFamily">@font/inter</item> - <item name="android:fontFamily">@font/inter</item> - - <item name="android:statusBarColor">?colorSurfaceContainerLow</item> - <item name="android:navigationBarColor">?colorSurfaceContainerLow</item> - </style> - - <style name="Theme.CosmicIde.Indigo" parent="Theme.CosmicIde.Indigo.Light"> - <item name="fontFamily">@font/inter</item> - <item name="android:fontFamily">@font/inter</item> - - <item name="android:statusBarColor">?colorSurfaceContainerLow</item> - <item name="android:navigationBarColor">?colorSurfaceContainerLow</item> - </style> - - <style name="Theme.CosmicIde.Flamingo" parent="Theme.CosmicIde.Flamingo.Light"> - <item name="fontFamily">@font/inter</item> - <item name="android:fontFamily">@font/inter</item> - - <item name="android:statusBarColor">?colorSurfaceContainerLow</item> - <item name="android:navigationBarColor">?colorSurfaceContainerLow</item> - </style> - - <style name="Theme.CosmicIde.Mint" parent="Theme.CosmicIde.Mint.Light"> - <item name="fontFamily">@font/inter</item> - <item name="android:fontFamily">@font/inter</item> - - <item name="android:statusBarColor">?colorSurfaceContainerLow</item> - <item name="android:navigationBarColor">?colorSurfaceContainerLow</item> - </style> - - <style name="Theme.CosmicIde.Emerald" parent="Theme.CosmicIde.Emerald.Light"> - <item name="fontFamily">@font/inter</item> - <item name="android:fontFamily">@font/inter</item> - - <item name="android:statusBarColor">?colorSurfaceContainerLow</item> - <item name="android:navigationBarColor">?colorSurfaceContainerLow</item> - </style> -</resources> diff --git a/build.gradle.kts b/build.gradle.kts index 93c88c125..b04e83107 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,6 @@ plugins { id("com.android.library") version "8.6.0" apply false id("org.jetbrains.kotlin.android") version "2.0.0" apply false id("org.jetbrains.kotlin.jvm") version "2.0.0" apply false - id("dev.rikka.tools.materialthemebuilder") version "1.4.1" apply false } buildscript { diff --git a/common/src/main/java/org/cosmicide/common/BaseBindingFragment.kt b/common/src/main/java/org/cosmicide/common/BaseBindingFragment.kt index 574a91faf..45d8334bf 100644 --- a/common/src/main/java/org/cosmicide/common/BaseBindingFragment.kt +++ b/common/src/main/java/org/cosmicide/common/BaseBindingFragment.kt @@ -30,7 +30,7 @@ abstract class BaseBindingFragment<T : ViewBinding> : Fragment() { @CallSuper override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - // applyTransitions() + applyTransitions() if (isBackHandled.not()) { requireActivity().onBackPressedDispatcher.addCallback(this) { diff --git a/common/src/main/java/org/cosmicide/common/Prefs.kt b/common/src/main/java/org/cosmicide/common/Prefs.kt index 2a129ce10..cc3764c79 100644 --- a/common/src/main/java/org/cosmicide/common/Prefs.kt +++ b/common/src/main/java/org/cosmicide/common/Prefs.kt @@ -33,9 +33,6 @@ object Prefs { val appTheme: String get() = prefs.getString("app_theme", "auto") ?: "auto" - val appAccent: String - get() = prefs.getString("app_accent", "default") ?: "default" - val useFastJarFs: Boolean get() = prefs.getBoolean("use_fastjarfs", true)