Merge branch 'stage' into ADFA-1414-tooltips-for-operators

Author: hal-eisen-adfa

.github/workflows/debug.yml

@@ -76,6 +76,8 @@ jobs:
     timeout-minutes: 60
     needs: check_changes
     if: needs.check_changes.outputs.must_build == 'true'
+    env:
+      SKIP_LLAMA_ASSETS: "true"
 
     steps:
 

.github/workflows/release.yml

@@ -8,7 +8,7 @@ permissions:
 on:
   schedule:
     - cron: '0 12 * * *'  # Daily at 12:00 PM UTC
-  workflow_dispatch: #
+  workflow_dispatch:
 
 env:
   GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -582,60 +582,16 @@ jobs:
 
           echo "FIREBASE_CONSOLE_URL=$FIREBASE_URL" >> $GITHUB_OUTPUT
 
-      - name: Set up SSH key
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+
+      - name: Upload APK to Cloudflare R2
         env:
-          GREENGEEKS_HOST: ${{ vars.GREENGEEKS_SSH_HOST }}
-          GREENGEEKS_KEY: ${{ secrets.GREENGEEKS_SSH_PRIVATE_KEY }}
-          GREENGEEKS_USER: ${{ vars.GREENGEEKS_SSH_USER }}
+          CLOUDFLARE_ACCOUNT_ID: ${{ vars.CLOUDFLARE_ACCOUNT_ID }}
+          CLOUDFLARE_KEY_ID: ${{ vars.CLOUDFLARE_KEY_ID }}
+          CLOUDFLARE_SECRET_ACCESS_KEY: ${{ secrets.CLOUDFLARE_SECRET_ACCESS_KEY }}
         run: |
-          mkdir -p ~/.ssh
-          if [ -z "$GREENGEEKS_HOST" ]; then
-            echo "Error: SSH_HOST variable is not set"
-            exit 1
-          fi
-          # Write the SSH key, ensuring proper formatting
-          echo "$GREENGEEKS_KEY" > ~/.ssh/id_rsa
-          # Remove any trailing newlines and ensure proper key format
-          sed -i '' -e '$ { /^$/ d; }' ~/.ssh/id_rsa 2>/dev/null || sed -i '$ { /^$/ d; }' ~/.ssh/id_rsa
-          chmod 600 ~/.ssh/id_rsa
-          # Verify key format
-          if ! grep -q "BEGIN.*PRIVATE KEY" ~/.ssh/id_rsa; then
-            echo "Error: SSH key does not appear to be in correct format"
-            exit 1
-          fi
-          # Configure SSH to use only the key file and disable other auth methods
-          cat > ~/.ssh/config <<EOF
-          Host *
-            IdentitiesOnly yes
-            PreferredAuthentications publickey
-            StrictHostKeyChecking no
-            UserKnownHostsFile ~/.ssh/known_hosts
-            PubkeyAuthentication yes
-            PasswordAuthentication no
-            ChallengeResponseAuthentication no
-            GSSAPIAuthentication no
-            GSSAPIKeyExchange no
-            GSSAPIDelegateCredentials no
-          Host $GREENGEEKS_HOST
-            User $GREENGEEKS_USER
-            IdentityFile ~/.ssh/id_rsa
-            IdentitiesOnly yes
-            PreferredAuthentications publickey
-            PubkeyAuthentication yes
-            PasswordAuthentication no
-            ChallengeResponseAuthentication no
-            GSSAPIAuthentication no
-            GSSAPIKeyExchange no
-            GSSAPIDelegateCredentials no
-            NumberOfPasswordPrompts 0
-          EOF
-          chmod 600 ~/.ssh/config
-          # Disable SSH agent completely
-          unset SSH_AUTH_SOCK
-          unset SSH_AGENT_PID
-          # Remove any default SSH keys that might interfere
-          rm -f ~/.ssh/id_ed25519 ~/.ssh/id_ecdsa ~/.ssh/id_dsa ~/.ssh/id_rsa.pub 2>/dev/null
-          ssh-keyscan -H "$GREENGEEKS_HOST" >> ~/.ssh/known_hosts 2>/dev/null
+          uv run --with boto3 scripts/cloudflare-r2-upload.py "${{ steps.find_apk.outputs.APK_PATH }}"
 
       - name: Clean up build folder after upload
         run: |
@@ -735,8 +691,26 @@ jobs:
 
           rm -f payload.json
 
+      - name: Send Telegram message
+        env:
+          TELEGRAM_TOKEN: ${{ secrets.TELEGRAM_TOKEN }}
+          TELEGRAM_EARLY_ACCESS_CHAT_ID: ${{ vars.TELEGRAM_EARLY_ACCESS_CHAT_ID }}
+          APK_PATH: ${{ steps.find_apk.outputs.APK_PATH }}
+        run: |
+          GIT_LOG=$(git log --oneline --since "24 hours ago" || true)
+          if [ -z "$GIT_LOG" ]; then
+            GIT_LOG="(no commits in the last 24 hours)"
+          fi
+          APK_FILENAME=$(basename "$APK_PATH")
+          DOWNLOAD_URL="https://download.appdevforall.org/${APK_FILENAME}"
+          MESSAGE=$(printf "Download: %s\n\n%s" "$DOWNLOAD_URL" "$GIT_LOG")
+          MESSAGE="${MESSAGE:0:4096}"
+          curl -s -X POST -H "Content-Type: application/json" \
+            -d "$(jq -n --arg chat_id "$TELEGRAM_EARLY_ACCESS_CHAT_ID" --arg text "$MESSAGE" '{chat_id: $chat_id, text: $text}')" \
+            "https://api.telegram.org/bot${TELEGRAM_TOKEN}/sendMessage"
+
       - name: Cleanup google-services.json
         if: always()
         run: |
           rm -f app/google-services.json
-          echo "google-services.json cleaned up successfully"
+          echo "google-services.json cleaned up successfully"

README.md

@@ -4,7 +4,7 @@
 
 <h2 align="center"><b>Code On The Go</b></h2>
 <p align="center">
- Code on the Go is an IDE that lets you build Android apps on Android phones, without needing a traditional computer or Internet access.</p>
+ Code on the Go is an IDE that lets you build Android apps on Android phones, without needing a traditional computer or Internet access. Code on the Go is a project of App Dev for All, a nonprofit organization committed to making computer science education and professional programming resources universally available.</p>
 <p><br>
 
 <p align="center">
@@ -104,3 +104,4 @@ along with Code On The Go.  If not, see <https://www.gnu.org/licenses/>.
 Any violations to the license can be reported either by opening an issue or writing a mail to us
 directly.
 
+

actions/src/main/java/com/itsaky/androidide/actions/ActionItem.kt

@@ -209,7 +209,10 @@ interface ActionItem {
     EDITOR_FILE_TREE("ide.editor.fileTree"),
 
     /** Location marker for action items shown in UI Designer activity's toolbar. */
-    UI_DESIGNER_TOOLBAR("ide.uidesigner.toolbar");
+    UI_DESIGNER_TOOLBAR("ide.uidesigner.toolbar"),
+
+    /** Location marker for action items shown on the main screen. */
+    MAIN_SCREEN("ide.main.screen");
 
     override fun toString(): String {
       return id

apk-viewer-plugin/build.gradle.kts

@@ -35,6 +35,8 @@ android {
         jvmTarget = "17"
     }
 
+
+
     packaging {
         resources {
             excludes += setOf(

apk-viewer-plugin/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
 
     <application
         android:label="APK Viewer"
-        android:theme="@style/Theme.AppCompat">
+        android:theme="@style/PluginTheme">
 
         <!-- Plugin metadata -->
         <meta-data
@@ -16,7 +16,7 @@
 
         <meta-data
             android:name="plugin.version"
-            android:value="1.0.1" />
+            android:value="${pluginVersion}" />
 
         <meta-data
             android:name="plugin.description"

apk-viewer-plugin/src/main/kotlin/com/example/sampleplugin/ApkViewer.kt

@@ -9,16 +9,25 @@ import com.itsaky.androidide.plugins.extensions.MenuItem
 import com.itsaky.androidide.plugins.extensions.TabItem
 import com.itsaky.androidide.plugins.extensions.EditorTabItem
 import com.itsaky.androidide.plugins.extensions.NavigationItem
+import com.itsaky.androidide.plugins.extensions.FileOpenExtension
+import com.itsaky.androidide.plugins.extensions.FileTabMenuItem
 import com.itsaky.androidide.plugins.services.IdeEditorTabService
+import com.example.sampleplugin.R
 import com.example.sampleplugin.fragments.ApkAnalyzerFragment
+import java.io.File
 
 /**
  * APK Viewer Plugin
  * Provides APK analysis functionality via main menu toolbar and bottom sheet
  */
-class ApkViewer : IPlugin, UIExtension, EditorTabExtension {
+class ApkViewer : IPlugin, UIExtension, EditorTabExtension, FileOpenExtension {
 
     private lateinit var context: PluginContext
+    private var pendingAnalysisFile: File? = null
+
+    companion object {
+        private const val TAB_ID = "apk_analyzer_main_tab"
+    }
 
     override fun initialize(context: PluginContext): Boolean {
         return try {
@@ -86,7 +95,7 @@ class ApkViewer : IPlugin, UIExtension, EditorTabExtension {
             NavigationItem(
                 id = "apk_analyzer_sidebar",
                 title = "APK Analyzer",
-                icon = android.R.drawable.ic_menu_info_details,
+                icon = R.drawable.ic_apk_analyzer,
                 isEnabled = true,
                 isVisible = true,
                 group = "tools",
@@ -101,9 +110,9 @@ class ApkViewer : IPlugin, UIExtension, EditorTabExtension {
         return listOf(
 
             EditorTabItem(
-                id = "apk_analyzer_main_tab",
+                id = TAB_ID,
                 title = "APK Analyzer",
-                icon = android.R.drawable.ic_menu_info_details,
+                icon = R.drawable.ic_apk_analyzer,
                 fragmentFactory = {
                     context.logger.debug("Creating ApkAnalyzerFragment")
                     ApkAnalyzerFragment()
@@ -120,6 +129,11 @@ class ApkViewer : IPlugin, UIExtension, EditorTabExtension {
 
     override fun onEditorTabSelected(tabId: String, fragment: Fragment) {
         context.logger.info("Editor tab selected: $tabId")
+        val file = pendingAnalysisFile ?: return
+        pendingAnalysisFile = null
+        if (tabId == TAB_ID && fragment is ApkAnalyzerFragment) {
+            fragment.analyzeFile(file)
+        }
     }
 
     override fun onEditorTabClosed(tabId: String) {
@@ -130,6 +144,44 @@ class ApkViewer : IPlugin, UIExtension, EditorTabExtension {
         return true
     }
 
+    override fun canHandleFileOpen(file: File): Boolean {
+        return file.extension.equals("apk", ignoreCase = true)
+    }
+
+    override fun handleFileOpen(file: File): Boolean {
+        pendingAnalysisFile = file
+        openApkAnalyzerTab()
+        return true
+    }
+
+    override fun onFileOpened(file: File) {
+        if (file.extension.equals("apk", ignoreCase = true)) {
+            context.logger.info("APK file opened: ${file.name}")
+        }
+    }
+
+    override fun getFileTabMenuItems(file: File): List<FileTabMenuItem> {
+        if (!file.extension.equals("apk", ignoreCase = true)) return emptyList()
+
+        return listOf(
+            FileTabMenuItem(
+                id = "apk_viewer.analyze",
+                title = "Analyze APK",
+                order = 0,
+                action = {
+                    pendingAnalysisFile = file
+                    openApkAnalyzerTab()
+                }
+            )
+        )
+    }
+
+    override fun onFileClosed(file: File) {
+        if (file.extension.equals("apk", ignoreCase = true)) {
+            context.logger.info("APK file closed: ${file.name}")
+        }
+    }
+
     private fun openApkAnalyzerTab() {
         context.logger.info("Opening APK Analyzer tab")
 
@@ -145,7 +197,7 @@ class ApkViewer : IPlugin, UIExtension, EditorTabExtension {
         }
 
         try {
-            if (editorTabService.selectPluginTab("apk_analyzer_main_tab")) {
+            if (editorTabService.selectPluginTab(TAB_ID)) {
                 context.logger.info("Successfully opened APK Analyzer tab")
             } else {
                 context.logger.warn("Failed to open APK Analyzer tab")