Compose

.ci/notify.sh

@@ -19,7 +19,7 @@ fi
 if [[ -n "${GITHUB_HEAD_REF}" ]]; then
   # this is a PR
 
-  COMMITS_INVOLVED=$(git log --oneline ^"${GITHUB_BASE_REF}" HEAD)
+  COMMITS_INVOLVED=$(git log --oneline ^"origin/${GITHUB_BASE_REF}" HEAD)
   PR_LINK_TEXT=$(cat <<EOF
 [Pull Request](${GITHUB_URL}/pull/${TRAVIS_PULL_REQUEST})
 EOF

.github/workflows/build.yml

@@ -12,19 +12,19 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
           cache: 'gradle'
       - name: Perform base checks
-        run: ./gradlew app:assembleDebug library:sourcesJar library:dokkaJar --stacktrace
+        run: ./gradlew app:assembleDebug --stacktrace
   ANDROID_UNIT_TESTS:
     name: Unit Tests
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
           cache: 'gradle'
       - name: Execute unit tests
@@ -34,11 +34,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+        with:
+          # required for telegram notifications on PRs
+          fetch-depth: 0
       - uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
           cache: 'gradle'
+
       - name: Setup custom keystore file
         run: |
           mkdir -p $HOME/.android

.jitpack.yml

@@ -0,0 +1 @@
+jdk: openjdk17

Makefile

@@ -0,0 +1,27 @@
+.PHONY: build
+
+clean:
+	./gradlew clean
+
+build:
+	./gradlew assembleDebug
+apk: build
+
+buildRelease:
+	./gradlew assembleRelease
+
+install: build
+	adb install ./app/build/outputs/apk/**/*.apk
+
+installRelease: buildRelease
+	adb install ./app/build/outputs/apk/**/*.apk
+
+run: install open
+
+runRelease: installRelease openRelease
+
+open:
+	adb shell am start -n "de.markusressel.kodeeditor.debug/de.markusressel.kodeeditor.demo.ComposeMainActivity" -a android.intent.action.MAIN -c android.intent.category.LAUNCHER
+
+openRelease:
+	adb shell am start -n "de.markusressel.kodeeditor/de.markusressel.kodeeditor.demo.ComposeMainActivity" -a android.intent.action.MAIN -c android.intent.category.LAUNCHER

README.md

@@ -1,16 +1,10 @@
-# KodeEditor
+# KodeEditor  [![codebeat badge](https://codebeat.co/badges/f7fa8602-1d15-457e-904d-cb585e984952)](https://codebeat.co/projects/github-com-markusressel-kodeeditor-master)
 A simple code editor with syntax highlighting and pinch to zoom
 
 ![Editing](https://thumbs.gfycat.com/TalkativeGrandIchthyosaurs-size_restricted.gif)
 ![Scroll and zoom](https://thumbs.gfycat.com/BouncyLividBlackbear-size_restricted.gif)
 ![Minimap](https://thumbs.gfycat.com/VigorousDimFrog-size_restricted.gif)
 
-# Build Status
-
-| Master |
-|--------|
-| [![codebeat badge](https://codebeat.co/badges/f7fa8602-1d15-457e-904d-cb585e984952)](https://codebeat.co/projects/github-com-markusressel-kodeeditor-master) |
-
 # Features
 * [x] Pinch-To-Zoom
 * [x] Line numbers

app/build.gradle.kts

@@ -0,0 +1,46 @@
+plugins {
+    id("kodeeditor.android.application")
+    id("kodeeditor.android.application.compose")
+    id("kodeeditor.android.application.flavors")
+}
+
+android {
+    namespace = "de.markusressel.kodeeditor.demo"
+
+    defaultConfig {
+        applicationId = "de.markusressel.kodeeditor"
+        versionCode = 1
+        versionName = "4.0.1"
+
+        setProperty("archivesBaseName", "KodeEditor_v${versionName}_(${versionCode})")
+    }
+}
+
+dependencies {
+    implementation(project(":library"))
+
+    // Syntax Highlighting
+    implementation(libs.kodehighlighter.markdown)
+
+    implementation(libs.kotlin.stdlib.jdk8)
+
+    implementation(libs.androidx.appcompat)
+    implementation(libs.material)
+    implementation(libs.androidx.compose.ui)
+    implementation(libs.androidx.compose.material)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.activity.compose)
+
+    implementation(libs.fuel)
+    implementation(libs.fuel.android)
+
+    implementation(libs.kotlinx.coroutines.core)
+    implementation(libs.kotlinx.coroutines.android)
+
+    debugImplementation(libs.androidx.compose.ui.tooling)
+    implementation(libs.androidx.compose.ui.tooling.preview)
+
+    testImplementation(libs.junit4)
+    androidTestImplementation(libs.androidx.test.ext.junit)
+    androidTestImplementation(libs.androidx.test.espresso.core)
+}

app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.markusressel.kodeeditor">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
@@ -13,14 +12,19 @@
         android:theme="@style/AppTheme"
         android:windowSoftInputMode="adjustResize">
         <activity
-            android:name=".MainActivity"
-            android:exported="true">
+            android:name=".ComposeMainActivity"
+            android:exported="true"
+            android:theme="@style/AppTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <activity
+            android:name=".MainActivity"
+            android:exported="false" />
     </application>
 
 </manifest>