Legacy RDNN tracking [NOT INTENDED FOR MERGE]

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -54,7 +54,7 @@ body:
       options:
         - I installed from Flathub (all Linuxes)
         - I installed from Appcenter (elementary OS)
-        - I built it from sources (with Meson+Ninja)
+        - I built it from sources (with Meson+Ninja, or from AUR)
     validations:
       required: true
 

.github/workflows/CI.yml

@@ -15,18 +15,18 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: ghcr.io/elementary/flatpak-platform/runtime:8
+      image: ghcr.io/elementary/flatpak-platform/runtime:8.2
       options: --privileged
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Build
-        uses: flatpak/flatpak-github-actions/flatpak-builder@v6
+        uses: flatpak/flatpak-github-actions/flatpak-builder@v6.6
         with:
           bundle: jorts.flatpak
-          manifest-path: io.github.elly_code.jorts.yml
+          manifest-path: io.github.ellie_commons.jorts.yml
           run-tests: true
           repository-name: appcenter
           repository-url: https://flatpak.elementary.io/repo.flatpakrepo

.github/workflows/lint.yml

@@ -1,4 +1,4 @@
-name: "CI: Lint"
+name: "Lint"
 
 on:
   pull_request:

README.md

@@ -8,7 +8,7 @@
     <img src="https://ellie-commons.github.io/community-badge.svg" alt="Made for elementary OS">
   </a>
 
-<span align="center"> <img class="center" src="https://github.com/elly-code/jorts/blob/main/data/screenshots/spread.png" alt="Several colourful sticky notes in a spread. Most are covered in scribbles. One in forefront is blue and has the text 'Lovely little colourful squares for all of your notes! 🥰'"></span>
+<span align="center"> <img class="center" src="https://github.com/ellie-commons/jorts/blob/main/data/screenshots/spread.png" alt="Several colourful sticky notes in a spread. Most are covered in scribbles. One in forefront is blue and has the text 'Lovely little colourful squares for all of your notes! 🥰'"></span>
 </div>
 
 <br/>
@@ -17,9 +17,9 @@
 
 You can download and install Jorts from various sources:
 
-[![Get it on AppCenter](https://appcenter.elementary.io/badge.svg?new)](https://appcenter.elementary.io/io.github.elly_code.jorts) 
+[![Get it on AppCenter](https://appcenter.elementary.io/badge.svg?new)](https://appcenter.elementary.io/io.github.ellie_commons.jorts) 
 
-[<img src="https://flathub.org/assets/badges/flathub-badge-en.svg" width="160" alt="Download on Flathub">](https://flathub.org/apps/io.github.elly_code.jorts)
+[<img src="https://flathub.org/assets/badges/flathub-badge-en.svg" width="160" alt="Download on Flathub">](https://flathub.org/apps/io.github.ellie_commons.jorts)
 
 
 On Windows:
@@ -28,7 +28,7 @@ Grab the Exe installer in Release
 
 ## ❓ Questions, building, etc
 
-[Check the wiki, lol](https://github.com/elly-code/jorts/wiki/%F0%9F%8F%A1Home)
+[Check the wiki, lol](https://github.com/ellie-commons/jorts/wiki/%F0%9F%8F%A1Home)
 
 
 
@@ -50,12 +50,12 @@ On the right you can donate to various contributors:
 ## 💾 Notes Storage
 
 
-Notes are stored in `~/.var/app/io.github.elly_code.jorts/data`
+Notes are stored in `~/.var/app/io.github.ellie_commons.jorts/data`
 
 You can get it all by entering in a terminal:
 
 ```bash
-cp ~/.var/app/io.github.elly_code.jorts/data ~/
+cp ~/.var/app/io.github.ellie_commons.jorts/data ~/
 ```
 
 "saved_state.json" contains all notes in JSON format. The structure is quite simple, if not pretty.
@@ -66,7 +66,7 @@ The app reads from it only during startup (rest of the time it writes in) so you
 
 ON WINDOWS: It's in:
 
-YourUserFolder \AppData\Local\io.github.elly_code.jorts
+YourUserFolder \AppData\Local\io.github.ellie_commons.jorts
 
 AppData is a hidden folder. Either you paste the above path in the path bar, from your user folder
 Or you do a "Show hidden files"

data/jorts.desktop.in

@@ -4,8 +4,8 @@ Version=1.5
 Name=Jorts
 GenericName=Sticky notes
 Comment=Write down notes, reminders, random thoughts and other short-term informations
-Icon=io.github.elly_code.jorts
-Exec=io.github.elly_code.jorts
+Icon=io.github.ellie_commons.jorts
+Exec=io.github.ellie_commons.jorts
 Terminal=false
 Actions=NewNote;Preferences;
 Categories=Office;GTK;
@@ -16,9 +16,9 @@ SingleMainWindow=false
 [Desktop Action NewNote]
 Name=New sticky note
 Icon=list-add
-Exec=io.github.elly_code.jorts --new-note
+Exec=io.github.ellie_commons.jorts --new-note
 
 [Desktop Action Preferences]
 Name=Show Preferences
 Icon=open-menu
-Exec=io.github.elly_code.jorts --preferences
+Exec=io.github.ellie_commons.jorts --preferences

data/jorts.gresource.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/io/github/elly_code/jorts">
+  <gresource prefix="/io/github/ellie_commons/jorts">
     <file compressed="true" alias="Application.css">Application.css</file>
     <file compressed="true" alias="Themes.css">Themes.css</file>
   </gresource>

data/jorts.gschema.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schemalist>
-  <schema path="/io/github/elly_code/jorts/" id="io.github.elly_code.jorts">
+  <schema path="/io/github/ellie_commons/jorts/" id="io.github.ellie_commons.jorts">
 		<key name="scribbly-mode-active" type="b">
 			<default>false</default>
 			<summary>Change font to an illegible one</summary>

data/jorts.metainfo.xml.in

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop-application">
-    <id>io.github.elly_code.jorts</id>
+    <id>io.github.ellie_commons.jorts</id>
     <metadata_license>CC0-1.0</metadata_license>
     <project_license>GPL-3.0+</project_license>
 
@@ -18,20 +18,20 @@
         </ul>
         <p>This is a fork of an old version of "Notejot" by lainsce. The community liked it so much, we thought it would be great to revive it!</p>
     </description>
-    <launchable type="desktop-id">io.github.elly_code.jorts.desktop</launchable>
+    <launchable type="desktop-id">io.github.ellie_commons.jorts.desktop</launchable>
 
     <provides>
-        <id>io.github.ellie_commons.jorts</id>
-        <binary>io.github.ellie_commons.jorts</binary>
+        <id>io.github.elly_code.jorts</id>
+        <binary>io.github.elly_code.jorts</binary>
     </provides>
     <replaces>
-        <id>io.github.ellie_commons.jorts</id>
+        <id>io.github.elly_code.jorts</id>
     </replaces>
 
-    <developer id="io.github.elly-code">
+    <developer id="io.github.ellie-commons">
         <name>Lainsce + Stella + Charlie</name>
     </developer>
-    <project_group>elly-code</project_group>
+    <project_group>ellie-commons</project_group>
     <url type="homepage">https://github.com/elly-code/jorts</url>
     <url type="bugtracker">https://github.com/elly-code/jorts/issues</url>
     <url type="help">https://github.com/elly-code/jorts/wiki</url>
@@ -40,7 +40,7 @@
     <url type="vcs-browser">https://github.com/elly-code/jorts</url>
 
     <content_rating type="oars-1.1"/>
-    <translation type="gettext" source_locale="en_GB">io.github.elly_code.jorts</translation>
+    <translation type="gettext" source_locale="en_GB">io.github.ellie_commons.jorts</translation>
     <branding>
       <color type="primary" scheme_preference="light">#64baff</color>
       <color type="primary" scheme_preference="dark">#002e99</color>
@@ -59,7 +59,7 @@
         <keyword>elementary OS</keyword>
     </keywords>
     <suggests>
-        <id>io.github.elly_code.reminduck</id>
+        <id>io.github.ellie_commons.reminduck</id>
         <id>com.github.elfenware.badger</id>
         <id>io.github.xchan14.larawan</id>
     </suggests>
@@ -100,7 +100,11 @@
             <description>
                 <p>Organization change</p>
                 <ul>
+<<<<<<< HEAD
                     <li>From ellie-commons to elly-code</li>
+=======
+                    <li>From ellie-commons to ellie-commons</li>
+>>>>>>> 2e99b4d (use ellie-commons on this branch)
                 </ul>
                 <p>😎 Guests stars:</p>
                 <ul>

io.github.ellie_commons.jorts.flathub.yml

@@ -0,0 +1,62 @@
+id: io.github.ellie_commons.jorts
+# elementary SDK is not available on Flathub, so use the elementary BaseApp instead
+base: io.elementary.BaseApp
+base-version: 'circe-25.08'
+runtime: org.gnome.Platform
+runtime-version: '49'
+sdk: org.gnome.Sdk
+command: io.github.ellie_commons.jorts
+
+finish-args:
+  - '--share=ipc'
+  - '--device=dri'
+  - '--socket=fallback-x11'
+  - '--socket=wayland'
+
+cleanup:
+  -  '/include'
+  -  '/lib/pkgconfig'
+  -  '/man'
+  -  '/share/gtk-doc'
+  -  '/share/man'
+  -  '/share/pkgconfig'
+  -  '/share/installed-tests'
+  -  '*.la'
+  -  '*.a'
+
+modules:
+  # Needed for the Scribbly mode
+  - name: RedactedScript
+    buildsystem: simple
+    build-commands:
+     - install -Dm0644 RedactedScript-Regular.ttf -t ${FLATPAK_DEST}/share/fonts
+     - install -Dm0644 OFL.txt -t ${FLATPAK_DEST}/share/doc/redacted-font
+     - install -Dm0644 AUTHORS.txt -t ${FLATPAK_DEST}/share/doc/redacted-font
+     - install -Dm0644 README.md -t ${FLATPAK_DEST}/share/doc/redacted-font
+    sources:
+      - type: file
+        url: https://github.com/christiannaths/redacted-font/raw/63e542017bab347ba9be54d7d99b99d4754c3d97/RedactedScript/fonts/ttf/RedactedScript-Regular.ttf
+        sha256: 1ebaab9642a2f43fa33f449760469903143fd1d08b2433eb6c15e28602d9360d
+      - type: file
+        url: https://raw.githubusercontent.com/christiannaths/redacted-font/284dfb0397d1911c3388f72389f08b3c13446134/OFL.txt
+        sha256: ed836da2ff14b9b2d04001057e03c0531afdd2626bf66a612b17124589f58efa
+      - type: file
+        url: https://raw.githubusercontent.com/christiannaths/redacted-font/284dfb0397d1911c3388f72389f08b3c13446134/AUTHORS.txt
+        sha256: 84977eeb6e582a6d10bea0eda40e1c6dfdc8904309c6011932a9e2632c727043
+      - type: file
+        url: https://raw.githubusercontent.com/christiannaths/redacted-font/284dfb0397d1911c3388f72389f08b3c13446134/README.md
+        sha256: e594f7f6bf03f7b11897d219184e215466cdfb9a8268b54cb7d5a626482dd722
+
+  - name: jorts
+    buildsystem: meson
+    config-opts:
+      - -Dvariant=['default']
+    sources:
+      - type: git
+        url: https://github.com/ellie-commons/jorts.git
+        branch: legacy-rdnn
+        tag: 4.0.1-5
+        commit: 0f616bae90c1998c2bb84f0a21390f842d7f4978
+        x-checker-data:
+          type: git
+          tag-pattern: '^([\d.]+)$'

io.github.elly_code.jorts.yml → io.github.ellie_commons.jorts.yml

@@ -1,8 +1,11 @@
-id: io.github.elly_code.jorts
-runtime: io.elementary.Platform
-runtime-version: '8.2'
-sdk: io.elementary.Sdk
-command: io.github.elly_code.jorts
+id: io.github.ellie_commons.jorts
+# elementary SDK is not available on Flathub, so use the elementary BaseApp instead
+base: io.elementary.BaseApp
+base-version: 'circe-25.08'
+runtime: org.gnome.Platform
+runtime-version: '49'
+sdk: org.gnome.Sdk
+command: io.github.ellie_commons.jorts
 
 finish-args:
   - '--share=ipc'
@@ -23,7 +26,6 @@ cleanup:
 
 modules:
   # Needed for the Scribbly mode
-  # It should be present by default on elementary OS, but better not assume it is the case
   - name: RedactedScript
     buildsystem: simple
     build-commands:
@@ -50,5 +52,9 @@ modules:
     config-opts:
       - -Dvariant=['default']
     sources:
-      - type: dir
-        path: .
+      - type: git
+        url: https://github.com/elly-code/jorts.git
+        commit: b0a8091a6a466b59356b02978df7fd77689ff1e6
+        x-checker-data:
+          type: git
+          tag-pattern: '^([\d.]+)$'