v1.0.0+gh.r3

Author: Mohammed-Baqer-null

.github/workflows/asm_build.yml

@@ -1,4 +1,4 @@
-name: Build Rv2
+name: Build Android Code Studio
 
 on:
   push:
@@ -23,7 +23,7 @@ on:
 
 jobs:
   build_release_apk:
-    name: Build Release APK
+    name: Build Debug APK
     runs-on: ubuntu-latest
     steps:
       - name: Cancel previous runs

.gitignore

@@ -5,6 +5,7 @@ clear_runs.py
 autopush.sh
 server
 java/lsp/src/main/java/com/tom/rv2ide/lsp/clang
+local.properties
 
 # Crowdin
 crowdin.properties

composite-builds/build-logic/common/src/main/java/com/tom/rv2ide/build/config/ProjectConfig.kt

@@ -63,7 +63,7 @@ val Project.projectVersionCode: Int
   get() {
 
     // I don't like this being hardcoded here, so change it if you want.
-    val baseVersionCode = System.getenv("PROJECT_CONFIG_KT_BASE_VERSION_CODE")?.toIntOrNull() ?: 1021
+    val baseVersionCode = System.getenv("PROJECT_CONFIG_KT_BASE_VERSION_CODE")?.toIntOrNull() ?: 1022
     // Default value (1020) is used if not specified. The middle digit (e.g., 10<2>0) represents the revision version, such as 1.0.0+gh.r0<2>.
 
     val versionCode = baseVersionCode

composite-builds/build-logic/plugins/src/main/java/com/tom/rv2ide/plugins/AndroidIDEAssetsPlugin.kt

@@ -53,8 +53,8 @@ class AndroidIDEAssetsPlugin : Plugin<Project> {
           }
 
       androidComponentsExtension.onVariants { variant ->
-        val variantNameCapitalized = variant.name.capitalized()
-
+        val variantNameCapitalized = variant.name.replaceFirstChar { it.uppercase() }
+        
         // variant.sources.jniLibs?.addGeneratedSourceDirectory(setupAapt2TaskTaskProvider,
         // SetupAapt2Task::outputDirectory)
 

composite-builds/build-logic/plugins/src/main/java/com/tom/rv2ide/plugins/conf/AndroidModuleConf.kt

@@ -39,7 +39,7 @@ import org.gradle.api.provider.Provider
  * For example, if the base version code of the IDE is 270 (for v2.7.0), then for arm64-v8a flavor,
  * the version code will be `100 * 270 + 1` i.e. `27001`
  */
-internal val flavorsAbis = mapOf("arm64-v8a" to 1, "armeabi-v7a" to 2)
+internal val flavorsAbis = mapOf("arm64-v8a" to 1, "armeabi-v7a" to 1)
 
 fun Project.configureAndroidModule(coreLibDesugDep: Provider<MinimalExternalModuleDependency>) {
   val isAppModule = plugins.hasPlugin("com.android.application")
@@ -198,4 +198,5 @@ private fun Project.configureCoreLibDesugaring(
   if (coreLibDesugaringEnabled) {
     project.dependencies.add("coreLibraryDesugaring", coreLibDesugDep)
   }
+
 }

core/app/build.gradle.kts

@@ -42,6 +42,12 @@ buildscript {
   }
 }
 
+tasks.configureEach {
+    if (name.contains("desugar", ignoreCase = true)) {
+        enabled = false
+    }
+}
+
 configurations.all {
   resolutionStrategy {
     force("com.google.guava:guava:32.1.3-android")
@@ -63,25 +69,28 @@ android {
     applicationId = BuildConfig.packageName
     vectorDrawables.useSupportLibrary = true
   }
+  
+  experimentalProperties["android.experimental.enableGlobalSynthetics"] = true
+  
 
-signingConfigs {
-    create("custom") {
-        val keyStorePath = "${rootProject.projectDir}/signing/signing-key.jks"
-        val keyStoreFile = file(keyStorePath)
-        
-        val signing_storePassword = System.getenv("SIGNING_STORE_PASSWORD") ?: ""
-        val signing_keyPassword = System.getenv("SIGNING_KEY_PASSWORD") ?: ""
-        
-        storeFile = keyStoreFile
-        storePassword = signing_storePassword
-        keyAlias = "AndroidCS"
-        keyPassword = signing_keyPassword
-    }
-}
+  signingConfigs {
+      create("custom") {
+          val keyStorePath = "${rootProject.projectDir}/signing/signing-key.jks"
+          val keyStoreFile = file(keyStorePath)
+          
+          val signing_storePassword = System.getenv("SIGNING_STORE_PASSWORD") ?: ""
+          val signing_keyPassword = System.getenv("SIGNING_KEY_PASSWORD") ?: ""
+          
+          storeFile = keyStoreFile
+          storePassword = signing_storePassword
+          keyAlias = "AndroidCS"
+          keyPassword = signing_keyPassword
+      }
+  }
 
   androidResources { generateLocaleConfig = true }
 
-  buildFeatures { 
+  buildFeatures {
     aidl = true
     dataBinding = true
   }
@@ -96,7 +105,7 @@ signingConfigs {
       signingConfig = signingConfigs.getByName("custom")
     }
   }
-
+  
   lint {
     abortOnError = false
     disable.addAll(arrayOf("VectorPath", "NestedWeights", "ContentDescription", "SmallSp"))
@@ -180,9 +189,12 @@ dependencies {
 
   // external deps here
   implementation("com.github.Dimezis:BlurView:version-3.2.0")
+  implementation("androidx.security:security-crypto:1.1.0-alpha06")
   implementation(projects.external.acsprovider)
   implementation(projects.external.atc) 
   implementation(libs.external.customizable.cardview)
+  implementation(projects.external.logwire)
+	implementation(libs.external.seasonal.effects)
 
   // Annotation processors
   kapt(libs.common.glide.ap)
@@ -262,6 +274,7 @@ dependencies {
   implementation(projects.event.eventbusAndroid)
   implementation(projects.event.eventbusEvents)
   implementation(projects.java.javacServices)
+  implementation(projects.java.lspSetup)
   implementation(projects.java.lsp)
   implementation(projects.logging.idestats)
   implementation(projects.logging.logsender)

core/app/proguard-rules.pro

@@ -147,4 +147,9 @@
 -dontwarn org.ietf.jgss.GSSException
 -dontwarn org.ietf.jgss.GSSManager
 -dontwarn org.ietf.jgss.GSSName
--dontwarn org.ietf.jgss.Oid
+-dontwarn org.ietf.jgss.Oid
+
+-keep class * extends java.lang.Record { *; }
+-keepclassmembers class * extends java.lang.Record {
+    <init>(...);
+}

core/app/src/main/AndroidManifest.xml

@@ -19,6 +19,7 @@
   <uses-permission
     android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
     tools:ignore="ScopedStorage" />
+  <uses-permission android:name="android.permission.READ_LOGS" />
   <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
   <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
   <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
@@ -31,8 +32,7 @@
     android:enableOnBackInvokedCallback="true"
     android:extractNativeLibs="true"
     android:hardwareAccelerated="true"
-    android:icon="@mipmap/ic_launcher"
-    android:roundIcon="@mipmap/ic_launcher"
+    android:icon="@drawable/ic_acside"
     android:label="@string/app_name"
     android:largeHeap="true"
     android:name=".app.IDEApplication"
@@ -41,6 +41,7 @@
     android:resizeableActivity="false"
     android:supportsRtl="true"
     android:theme="@style/Theme.AndroidIDE"
+    android:networkSecurityConfig="@xml/network_security_config"
     tools:ignore="DiscouragedApi,MediaCapabilities,UnusedAttribute">
     <activity
       android:exported="true"
@@ -76,6 +77,7 @@
     <activity android:name=".activities.AboutActivity" />
     <activity android:name=".activities.ContributorsActivity" />
     <activity android:name=".activities.IDEConfigurations" />
+    <activity android:name=".activities.ActivityM3Icons" />
 
     <activity
       android:name=".activities.TerminalActivity"
@@ -96,6 +98,16 @@
       android:exported="false"
       android:theme="@style/Theme.AndroidIDE" />
 
+    <activity
+      android:name=".activities.FileBrowserActivity"
+      android:exported="false"
+      android:theme="@style/Theme.AndroidIDE" />
+
+    <activity
+      android:name=".activities.NCrashHandlerActivity"
+      android:exported="false"
+      android:theme="@style/Theme.AndroidIDE" />
+
     <provider
       android:authorities="com.tom.rv2ide.documents"
       android:exported="true"
@@ -142,13 +154,26 @@
       android:name=".services.builder.GradleBuildService" />
 
     <service
-      android:exported="true"
-      android:name=".services.log.LogReceiverService"
-      android:permission="com.tom.rv2ide.permission.BIND_LOG_SERVICE">
-      <intent-filter>
-        <action android:name="com.tom.rv2ide.LOG_SERVICE_ACTION" />
-      </intent-filter>
+      android:name="com.termux.app.TermuxService"
+      android:enabled="true"
+      android:exported="false"
+      android:stopWithTask="true" />
+
+    <service
+      android:name="io.github.mohammedbaqernull.logger.service.LogReceiverService"
+      android:enabled="true"
+      android:exported="true">
     </service>
+
+    <!-- <service -->
+    <!-- android:exported="true" -->
+    <!-- android:name=".services.log.LogReceiverService" -->
+    <!-- android:permission="com.tom.rv2ide.permission.BIND_LOG_SERVICE"> -->
+    <!-- <intent-filter> -->
+    <!-- <action android:name="com.tom.rv2ide.LOG_SERVICE_ACTION" /> -->
+    <!-- </intent-filter> -->
+    <!-- </service> -->
+
     <service
       android:enabled="false"
       android:exported="false"

core/app/src/main/assets/icons.zip

@@ -0,0 +1,119 @@
+/*
+ *  This file is part of AndroidCodeStudio.
+ *
+ *  AndroidCodeStudio is 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.
+ *
+ *  AndroidCodeStudio 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 AndroidCodeStudio.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+package com.tom.rv2ide.actions.etc
+
+import android.content.Context
+import androidx.core.content.ContextCompat
+import androidx.lifecycle.lifecycleScope
+import com.tom.rv2ide.actions.ActionData
+import com.tom.rv2ide.actions.ActionItem
+import com.tom.rv2ide.actions.ActionMenu
+import com.tom.rv2ide.actions.EditorActivityAction
+import com.tom.rv2ide.editor.schemes.IDEColorSchemeProvider
+import com.tom.rv2ide.preferences.internal.EditorPreferences
+import com.tom.rv2ide.resources.R
+import com.tom.rv2ide.tasks.launchAsyncWithProgress
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import com.tom.rv2ide.editor.schemes.IDEColorScheme
+import com.tom.rv2ide.editor.ui.IDEEditor
+
+/**
+ * @author Mohammed-baqer-null @ https://github.com/Mohammed-baqer-null
+ */
+
+class ColorSchemeMenu(context: Context, override val order: Int) :
+    EditorActivityAction(), ActionMenu {
+
+    override val children: MutableSet<ActionItem> = mutableSetOf()
+    override val id: String = "ide.editor.color.scheme"
+
+    init {
+        label = context.getString(R.string.idepref_editor_colorScheme)
+        icon = ContextCompat.getDrawable(context, R.drawable.ic_color_scheme)
+        val schemes = IDEColorSchemeProvider.list()
+        schemes.forEachIndexed { index, scheme ->
+            addAction(ColorSchemeAction(context, scheme, index))
+        }
+        addAction(ReloadColorSchemesAction(context, schemes.size))
+    }
+
+    override fun prepare(data: ActionData) {
+        super<EditorActivityAction>.prepare(data)
+        super<ActionMenu>.prepare(data)
+        val currentScheme = EditorPreferences.colorScheme
+        children.forEach { item ->
+            if (item is ColorSchemeAction) {
+                item.visible = true
+            }
+        }
+        
+      if (!visible) {
+        return
+      }
+      
+      val editor = data.get(IDEEditor::class.java)
+      if (editor == null) {
+        visible = false
+        enabled = false
+        return
+      }
+      
+      if (!editor.isEditable) {
+        visible = false
+        enabled = false
+        return
+      }
+      
+      visible = true
+      enabled = true
+    }
+}
+
+class ColorSchemeAction(
+    context: Context,
+    private val scheme: IDEColorScheme,
+    override val order: Int
+) : EditorActivityAction() {
+
+    override val id: String = "ide.editor.colorScheme.${scheme.key}"
+    override var requiresUIThread: Boolean = true
+
+    init {
+        label = scheme.name
+    }
+
+    override suspend fun execAction(data: ActionData): Boolean {
+        EditorPreferences.colorScheme = scheme.key
+        
+        val context = data.requireActivity()
+        context.lifecycleScope.launchAsyncWithProgress(
+            context = Dispatchers.Default,
+            configureFlashbar = { builder, _ -> 
+                builder.message(R.string.please_wait) 
+            },
+        ) { flashbar, _ ->
+            IDEColorSchemeProvider.reload()
+            withContext(Dispatchers.Main) { 
+                flashbar.dismiss()
+            }
+        }
+        
+        return true
+    }
+}