Skip to content

#11: Re-implementation of version tracking #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shubertm wants to merge 20 commits into
base: main
Choose a base branch
from
Open

#11: Re-implementation of version tracking #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
ab47493
Re-implementing version tracking
shubertm Feb 8, 2023
6905458
Minor fix
shubertm Feb 27, 2023
126d717
Hide and show buttons
shubertm Feb 28, 2023
9775e6a
README stub
kirillt Sep 13, 2023
b7f3a0d
Forking note
shubertm Sep 21, 2023
15c90df
Merge branch 'version-tracking-2' of https://github.com/ARK-Builders/…
shubertm Sep 21, 2023
8886ba2
Fix note saving
shubertm Sep 27, 2023
26c811e
Fix note creation
shubertm Sep 29, 2023
8dc86c0
Update ark dependencies
shubertm Nov 17, 2023
1ba11cc
Merge remote-tracking branch 'origin/main' into version-tracking-2
shubertm Nov 30, 2023
838b64c
Resolve conflicts + some refactors
shubertm Nov 30, 2023
69f56ae
Merge main + refactors
shubertm Dec 18, 2023
0e7b176
Some fixes
shubertm Dec 20, 2023
42f9cf3
Adopt ARK storage for versions
shubertm Dec 28, 2023
15add0b
Ensure compiling versions works
shubertm Aug 14, 2025
f7df0b6
Update build.yml
shubertm Aug 14, 2025
8256952
Update build.yml
shubertm Aug 14, 2025
fecaa2f
Update build.yml
shubertm Aug 14, 2025
01524d1
Merge remote-tracking branch 'refs/remotes/origin/main' into version-…
shubertm Sep 26, 2025
7654b46
Invalidate versions UI and resolve conflicts
shubertm Sep 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
132 changes: 66 additions & 66 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,81 +16,81 @@ jobs:
environment: Development
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v4

- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'adopt'
cache: gradle
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'adopt'
cache: gradle

- name: Validate Gradle wrapper
uses: gradle/actions/wrapper-validation@v3
- name: Validate Gradle wrapper
uses: gradle/actions/wrapper-validation@v3

- name: Build debug APK
run: ./gradlew assembleDebug
- name: Build debug APK
run: ./gradlew assembleDebug

build:
if: ${{ ! startsWith(github.actor, 'dependabot') }}
environment: Development
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'adopt'
cache: gradle

- name: Validate Gradle wrapper
uses: gradle/actions/wrapper-validation@v3

- name: Decrypt the keystore for signing
run: |
echo "${{ secrets.KEYSTORE_ENCRYPTED }}" > keystore.asc
gpg -d --passphrase "${{ secrets.KEYSTORE_PASSWORD }}" --batch keystore.asc > keystore.jks

- name: Build release APK
run: ./gradlew assembleRelease

- name: Upload release Github arm64-v8a APK
uses: actions/upload-artifact@v4
with:
name: release-arm64-v8a-apk-github
path: ./app/build/outputs/apk/github/release/app-github-arm64-v8a-release.apk

- name: Upload release Github armeabi-v7a APK
uses: actions/upload-artifact@v4
with:
name: release-armeabi-v7a-apk-github
path: ./app/build/outputs/apk/github/release/app-github-armeabi-v7a-release.apk

- name: Upload release Github universal APK
uses: actions/upload-artifact@v4
with:
name: release-universal-apk-github
path: ./app/build/outputs/apk/github/release/app-github-universal-release.apk

- name: Upload release GooglePlay arm64-v8a APK
uses: actions/upload-artifact@v4
with:
name: release-arm64-v8a-apk-googleplay
path: ./app/build/outputs/apk/googleplay/release/app-googleplay-arm64-v8a-release.apk

- name: Upload release GooglePlay armeabi-v7a APK
uses: actions/upload-artifact@v4
with:
name: release-armeabi-v7a-apk-googleplay
path: ./app/build/outputs/apk/googleplay/release/app-googleplay-armeabi-v7a-release.apk

- name: Upload release GooglePlay universal APK
uses: actions/upload-artifact@v4
with:
name: release-universal-apk-googleplay
path: ./app/build/outputs/apk/googleplay/release/app-googleplay-universal-release.apk
- uses: actions/checkout@v4

- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'adopt'
cache: gradle

Comment on lines +41 to +47
Copy link

@coderabbitai coderabbitai bot Aug 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Fix: setup-java v4 no longer supports distribution 'adopt'

actions/setup-java@v4 does not accept 'adopt'. Use 'temurin' for Java 17 (AdoptOpenJDK migrated to Eclipse Temurin).

Apply this diff:

-      - name: Set up JDK 17
+      - name: Set up Temurin JDK 17
         uses: actions/setup-java@v4
         with:
           java-version: '17'
-          distribution: 'adopt'
+          distribution: 'temurin'
           cache: gradle
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'adopt'
cache: gradle
- name: Set up Temurin JDK 17
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'
cache: gradle
🤖 Prompt for AI Agents 
.github/workflows/build.yml around lines 17 to 23: the workflow uses
actions/setup-java@v4 with distribution: 'adopt' which is no longer supported;
update the distribution value to 'temurin' (keeping java-version: '17' and
cache: gradle) so the setup-java step uses Eclipse Temurin for Java 17.

- name: Validate Gradle wrapper
uses: gradle/actions/wrapper-validation@v3

- name: Decrypt the keystore for signing
run: |
echo "${{ secrets.KEYSTORE_ENCRYPTED }}" > keystore.asc
gpg -d --passphrase "${{ secrets.KEYSTORE_PASSWORD }}" --batch keystore.asc > keystore.jks

- name: Build release APK
run: ./gradlew assembleRelease

- name: Upload release Github arm64-v8a APK
uses: actions/upload-artifact@v4
with:
name: release-arm64-v8a-apk-github
path: ./app/build/outputs/apk/github/release/app-github-arm64-v8a-release.apk

- name: Upload release Github armeabi-v7a APK
uses: actions/upload-artifact@v4
with:
name: release-armeabi-v7a-apk-github
path: ./app/build/outputs/apk/github/release/app-github-armeabi-v7a-release.apk

- name: Upload release Github universal APK
uses: actions/upload-artifact@v4
with:
name: release-universal-apk-github
path: ./app/build/outputs/apk/github/release/app-github-universal-release.apk

- name: Upload release GooglePlay arm64-v8a APK
uses: actions/upload-artifact@v4
with:
name: release-arm64-v8a-apk-googleplay
path: ./app/build/outputs/apk/googleplay/release/app-googleplay-arm64-v8a-release.apk

- name: Upload release GooglePlay armeabi-v7a APK
uses: actions/upload-artifact@v4
with:
name: release-armeabi-v7a-apk-googleplay
path: ./app/build/outputs/apk/googleplay/release/app-googleplay-armeabi-v7a-release.apk

- name: Upload release GooglePlay universal APK
uses: actions/upload-artifact@v4
with:
name: release-universal-apk-googleplay
path: ./app/build/outputs/apk/googleplay/release/app-googleplay-universal-release.apk

lint:
needs: build
Expand Down
3 changes: 3 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# ARK Memo: Notes App by ARK Builders

_Implementation in progress_
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ android {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
}
buildFeatures{
buildFeatures {
buildConfig true
viewBinding true
}
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
tools:ignore="ScopedStorage" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />

<application
android:name=".App"
Expand Down
7 changes: 6 additions & 1 deletion app/src/main/java/dev/arkbuilders/arkmemo/graphics/SVG.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,11 @@ class SVG {
getAttributeValue("", Attributes.VIEW_BOX),
)
}

PATH_TAG -> {
pathCount += 1
strokeColor = getAttributeValue("", Attributes.Path.STROKE)
strokeColor =
getAttributeValue("", Attributes.Path.STROKE)
fill = getAttributeValue("", Attributes.Path.FILL)
pathData = getAttributeValue("", Attributes.Path.DATA)
}
Expand Down Expand Up @@ -164,6 +166,7 @@ class SVG {
},
)
}

SVGCommand.AbsLineTo.CODE -> {
if (commandElements.size > 3) {
strokeColor = commandElements[3]
Expand All @@ -178,6 +181,7 @@ class SVG {
},
)
}

SVGCommand.AbsQuadTo.CODE -> {
if (commandElements.size > 5) {
strokeColor = commandElements[5]
Expand All @@ -192,6 +196,7 @@ class SVG {
},
)
}

else -> {}
}
}
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/dev/arkbuilders/arkmemo/models/GraphicNote.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@ data class GraphicNote(
override var pendingForDelete: Boolean = false,
var thumb: Bitmap? = null,
override var selected: Boolean = false,
override var isForked: Boolean = false,
) : Note, Parcelable
4 changes: 3 additions & 1 deletion app/src/main/java/dev/arkbuilders/arkmemo/models/Note.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
package dev.arkbuilders.arkmemo.models

import android.os.Parcelable
import dev.arkbuilders.arklib.data.index.Resource

interface Note {
interface Note : Parcelable {
val title: String
val description: String
var resource: Resource?
var pendingForDelete: Boolean
var selected: Boolean
var isForked: Boolean
}
1 change: 1 addition & 0 deletions app/src/main/java/dev/arkbuilders/arkmemo/models/TextNote.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ data class TextNote(
override var resource: Resource? = null,
override var pendingForDelete: Boolean = false,
override var selected: Boolean = false,
override var isForked: Boolean = false,
) : Note, Parcelable
10 changes: 10 additions & 0 deletions app/src/main/java/dev/arkbuilders/arkmemo/models/VersionsResult.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package dev.arkbuilders.arkmemo.models

import dev.arkbuilders.arklib.ResourceId
import dev.arkbuilders.arkmemo.repo.versions.Version

data class VersionsResult(
val versions: List<Version>,
val parents: Set<ResourceId>,
val children: List<ResourceId>,
)
1 change: 1 addition & 0 deletions app/src/main/java/dev/arkbuilders/arkmemo/models/VoiceNote.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,5 @@ class VoiceNote(
var currentPlayingPos: Int = 0,
var currentMaxAmplitude: Int = 0,
override var selected: Boolean = false,
override var isForked: Boolean = false,
) : Note, Parcelable
Loading