Refactor: Update colors and remove unused resources

This commit updates the colors used in the app and removes some unused resources.

Specific changes include:

-
 Updating the fill color of several icons to use `?colorOnSurfaceVariant`.
- Removing the `splash_background` color from `colors.xml`.
- Updating the status bar and navigation bar colors to use `?colorSurfaceContainerLow`.
- Adding an icon to the Git settings screen.
- Updating the background color of several layouts to use `?colorSurfaceContainerLow`.
- Updating the text appearance of several text views.
- Adding a drag handle to the new plugin item layout.

These changes improve the overall look and feel of the app and make it more consistent with Material Design 3.

Signed-off-by: Pranav Purwar <[email protected]>

Author: PranavPurwar

.idea/gradle.xml

@@ -14,15 +14,15 @@ plugins {
 
 android {
     namespace = "org.cosmicide"
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         val commit = getGitCommit()
         val GEMINI_API_KEY = "AIzaSyDR-8pmVxLaZHsQM0M5aw4gmyjxnU7ljNo"
 
         applicationId = "org.cosmicide"
         minSdk = 26
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 24
         versionName = "2.0.4"
         buildConfigField("String", "GIT_COMMIT", "\"$commit\"")
@@ -170,6 +170,7 @@ materialThemeBuilder {
     }
 
     generatePaletteAttributes = true
+    packageName = "org.cosmicide"
 }
 
 configurations.all {
@@ -178,7 +179,7 @@ configurations.all {
 }
 
 dependencies {
-    implementation("com.android.tools:r8:8.3.37")
+    implementation("com.android.tools:r8:8.5.35")
     implementation("com.android.tools.smali:smali-dexlib2:3.0.7")
 
     //noinspection GradleDependency
@@ -189,25 +190,24 @@ dependencies {
     implementation("com.github.haroldadmin:WhatTheStack:1.0.0-alpha04")
 
     implementation("androidx.appcompat:appcompat:1.7.0")
-    implementation("androidx.constraintlayout:constraintlayout:2.2.0-alpha13")
+    implementation("androidx.constraintlayout:constraintlayout:2.2.0-alpha14")
     implementation("androidx.core:core-ktx:1.13.1")
     implementation("androidx.core:core-splashscreen:1.1.0-rc01")
     implementation("androidx.documentfile:documentfile:1.1.0-alpha01")
-    implementation("androidx.fragment:fragment-ktx:1.8.0")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.2")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.2")
+    implementation("androidx.fragment:fragment-ktx:1.8.2")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.4")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.4")
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01")
     implementation("androidx.viewpager2:viewpager2:1.1.0")
-    implementation("androidx.activity:activity-ktx:1.9.0")
+    implementation("androidx.activity:activity-ktx:1.9.1")
     implementation("androidx.startup:startup-runtime:1.2.0-alpha02")
 
-    val editorVersion = "0.23.4-cac2770-SNAPSHOT"
+    val editorVersion = "0.23.4-96c0abc-SNAPSHOT"
     //noinspection GradleDependency
     implementation("io.github.Rosemoe.sora-editor:editor:$editorVersion")
     //noinspection GradleDependency
-    implementation("io.github.Rosemoe.sora-editor:language-treesitter:$editorVersion") {
-        isTransitive = false
-    }
+    implementation("io.github.Rosemoe.sora-editor:language-treesitter:$editorVersion")
+    implementation("io.github.Rosemoe.sora-editor:language-textmate:$editorVersion")
     implementation("com.itsaky.androidide.treesitter:android-tree-sitter:4.3.1")
     implementation("com.itsaky.androidide.treesitter:tree-sitter-java:4.3.1")
     implementation("com.itsaky.androidide.treesitter:tree-sitter-kotlin:4.3.1")
@@ -231,7 +231,7 @@ dependencies {
     implementation("org.lsposed.hiddenapibypass:hiddenapibypass:4.3")
     implementation("org.slf4j:slf4j-simple:2.1.0-alpha1")
 
-    implementation("com.google.ai.client.generativeai:generativeai:0.8.0")
+    implementation("com.google.ai.client.generativeai:generativeai:0.9.0")
 
     val shizukuVersion = "13.1.5"
     implementation("dev.rikka.shizuku:api:$shizukuVersion")
@@ -253,7 +253,6 @@ dependencies {
     implementation(projects.util)
     implementation(projects.jgit)
     implementation(projects.feature.treeView)
-    implementation(projects.feature.editorTextmate)
 
     // jgit uses some methods like `transferTo` are only available from Android 13 onwards
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")

feature/editor-textmate/consumer-rules.pro renamed to .kotlin/sessions/kotlin-compiler-8214769348286012165.salive

@@ -37,7 +37,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.CosmicIde.Start"
+        android:theme="@style/Theme.CosmicIde.Flamingo.Light"
         tools:targetApi="34">
 
         <provider

app/build.gradle.kts

@@ -137,8 +137,6 @@ class App : Application() {
             override fun onActivityDestroyed(p0: Activity) {}
         })
 
-        //TermuxApplication.init(this)
-
         Analytics.setAnalyticsCollectionEnabled(Prefs.analyticsEnabled)
     }
 

app/src/main/AndroidManifest.xml

@@ -12,12 +12,11 @@ import android.content.pm.PackageManager
 import android.os.Bundle
 import android.util.AttributeSet
 import android.view.View
-import android.view.ViewGroup
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.updateLayoutParams
 import androidx.fragment.app.commit
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.color.DynamicColors
@@ -64,19 +63,20 @@ class MainActivity : AppCompatActivity() {
 
         binding = ActivityMainBinding.inflate(layoutInflater)
 
+        enableEdgeToEdge()
+
         ViewCompat.setOnApplyWindowInsetsListener(binding.root) { view, windowInsets ->
             val imeInset =
                 ViewCompat.getRootWindowInsets(view)!!.getInsets(WindowInsetsCompat.Type.ime())
 
             val systemBarInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
 
-            view.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-                leftMargin = systemBarInsets.left
-                rightMargin = systemBarInsets.right
-                topMargin = systemBarInsets.top
-                bottomMargin = if (imeInset.bottom > 0) 0 else systemBarInsets.bottom
-            }
-
+            view.setPadding(
+                systemBarInsets.left,
+                systemBarInsets.top,
+                systemBarInsets.right,
+                if (imeInset.bottom > 0) 0 else systemBarInsets.bottom
+            )
 
             WindowInsetsCompat.CONSUMED
         }

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

@@ -12,6 +12,7 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import android.widget.EditText
+import android.widget.LinearLayout
 import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.result.ActivityResult
@@ -133,6 +134,7 @@ class ProjectFragment : BaseBindingFragment<FragmentProjectBinding>(),
                     }
                     true
                 }
+
                 else -> false
             }
         }
@@ -343,8 +345,14 @@ class ProjectFragment : BaseBindingFragment<FragmentProjectBinding>(),
             hint = "Enter your name"
         }
 
+        val linear = LinearLayout(requireContext()).apply {
+            orientation = LinearLayout.VERTICAL
+            setPadding(32, 16, 32, 8)
+            addView(editText)
+        }
+
         MaterialAlertDialogBuilder(requireContext()).apply {
-            setView(editText)
+            setView(linear)
             setTitle("Enter your name")
             setPositiveButton("Okay") { _, _ ->
                 val name = editText.text.toString()

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

@@ -19,6 +19,7 @@ import de.Maxr1998.modernpreferences.helpers.screen
 import de.Maxr1998.modernpreferences.helpers.subScreen
 import org.cosmicide.MainActivity
 import org.cosmicide.chat.ChatProvider
+import org.cosmicide.common.BaseBindingFragment
 import org.cosmicide.databinding.FragmentSettingsBinding
 import org.cosmicide.fragment.settings.AboutSettings
 import org.cosmicide.fragment.settings.AppearanceSettings
@@ -28,7 +29,6 @@ import org.cosmicide.fragment.settings.FormatterSettings
 import org.cosmicide.fragment.settings.GeminiSettings
 import org.cosmicide.fragment.settings.GitSettings
 import org.cosmicide.fragment.settings.PluginSettingsProvider
-import org.cosmicide.common.BaseBindingFragment
 
 /**
  * Fragment for displaying settings screen.
@@ -52,7 +52,7 @@ class SettingsFragment : BaseBindingFragment<FragmentSettingsBinding>() {
         val formatterSettings = FormatterSettings(requireActivity())
         val compilerSettings = CompilerSettings(requireActivity())
         val pluginsSettings = PluginSettingsProvider(requireActivity())
-        val gitSettings = GitSettings()
+        val gitSettings = GitSettings(requireActivity())
         val aboutSettings = AboutSettings(requireActivity())
         val geminiSettings = GeminiSettings(requireActivity())
 

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

@@ -7,14 +7,23 @@
 
 package org.cosmicide.fragment.settings
 
+import androidx.core.content.res.ResourcesCompat
+import androidx.fragment.app.FragmentActivity
 import de.Maxr1998.modernpreferences.PreferenceScreen
 import de.Maxr1998.modernpreferences.helpers.editText
+import org.cosmicide.R
 import org.cosmicide.util.PreferenceKeys
 
-class GitSettings : SettingsProvider {
+class GitSettings(private val activity: FragmentActivity) : SettingsProvider {
 
     override fun provideSettings(builder: PreferenceScreen.Builder) {
         builder.apply {
+            icon = ResourcesCompat.getDrawable(
+                activity.resources,
+                R.drawable.github,
+                activity.theme
+            )
+
             editText(PreferenceKeys.GIT_USERNAME) {
                 title = "Username"
                 defaultValue = ""
@@ -32,4 +41,4 @@ class GitSettings : SettingsProvider {
             }
         }
     }
-}
+}

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

@@ -9,9 +9,8 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="?colorOnSurfaceVariant"
         android:pathData="M313,520L509,716Q521,728 521,744Q520,760 508,772Q496,783 480,784Q464,784 452,772L188,508Q182,502 180,495Q177,488 177,480Q177,472 180,465Q182,458 188,452L452,188Q463,177 480,177Q496,177 508,188Q520,200 520,217Q520,233 508,245L313,440L760,440Q777,440 789,452Q800,463 800,480Q800,497 789,509Q777,520 760,520L313,520Z" />
-</vector>
+</vector>