Merge branch 'main' into translations

.github/workflows/autoBuilder.yml

@@ -37,39 +37,3 @@ jobs:
         run: flutter build apk --debug --split-per-abi
       - name: Build debug App Bundle
         run: flutter build appbundle --debug
-      - name: Build release APK
-        run: flutter build apk --release
-      - name: Build release APK (split-per-abi)
-        run: flutter build apk --release --split-per-abi
-      - name: Build release App Bundle
-        run: flutter build appbundle --release
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: debug-apk
-          path: build/app/outputs/apk/app-debug.apk
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: debug-split-apk
-          path: build/app/outputs/apk/app-debug-*.apk
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: debug-bundle
-          path: build/app/outputs/bundle/app-debug.aab
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: release-apk
-          path: build/app/outputs/apk/app-release.apk
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: release-split-apk
-          path: build/app/outputs/apk/app-release-*.apk
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: release-bundle
-          path: build/app/outputs/bundle/app-release.aab

README.md

@@ -6,6 +6,9 @@
   </a>
   <img alt="GitHub" src="https://img.shields.io/github/license/Kara-Zor-El/JellyBook">
   <img alt="GitHub release (latest by date including pre-releases)" src="https://img.shields.io/github/v/release/Kara-Zor-El/JellyBook?include_prereleases">
+<a href="https://apt.izzysoft.de/fdroid/index/apk/com.KaraWilson.JellyBook/">
+    <img alt="IzzyOnDroid" src="https://img.shields.io/endpoint?url=https://apt.izzysoft.de/fdroid/api/v1/shield/com.KaraWilson.JellyBook" />
+  </a>
 </div>
 <p align="center">
   <img src='./assets/images/Logo.png' width='30%' height='30%' />
@@ -14,14 +17,15 @@
 <p align="center">
   Hi, this is a passion project I am working on.
   Its an app that's meant to allow you to read your files from Jellyfin on mobile.
-  It is in a state where I do beleive it's usable for most comic reading and some books, but it still has a long way to go.
+  It is in a state where I do believe it's usable for most comic reading and some books, but it still has a long way to go.
 </p>
 
 ## :zap: Installation:
 | Platform | Link |
 | :------: | :--: |
 | **iOS** | <a href="https://testflight.apple.com/join/lEXKY4Dl"><img width='180' alt='Download on TestFlight' src='assets/githubImages/testflight-badge.png'/></a> |
-| **Android** | Download the latest release for your current platform from the releases. It will at some point be added to the Google Play store and the F-Droid store. |
+| **Google Play and Galaxy Store** | Download the latest release for your current platform from the releases. It will at some point be added to the Google Play store and may be added to the Galaxy Store |
+| **F-Droid** | <a href="https://apt.izzysoft.de/fdroid/index/apk/com.KaraWilson.JellyBook/"><img width='180' alt='Get it on IzzyOnDroid' src='assets/githubImages/IzzyOnDroid.png'/></a><p>Soon to be submitted to the F-Droid store</p> |
 
 </br>
 
@@ -78,3 +82,5 @@
 ## 🎉 Special Thanks:
  - Thank you to [u/anekdotos](https://reddit.com/u/anekdotos) on Reddit for donating to the project so it could be published on iOS
  - Thank you to Weblate for hosting translation
+ - Thank you to IzzyOnDroid for packaging and hosting the app on their repo
+ - Shout outs to my girlfriend https://github.com/tarbaII for always supporting me and helping me manage issues

build.sh

@@ -0,0 +1,110 @@
+#!/usr/bin/env bash
+# Function to display a green checkmark
+print_checkmark() {
+	tput setaf 2           # Set text color to green
+	echo -e "\xE2\x9C\x94" # Green checkmark Unicode character
+	tput sgr0              # Reset text color
+}
+
+# Function to display a progress bar
+print_progress_bar() {
+	local progress=$1
+	local length=50
+	local fill=""
+	local empty=""
+	local i
+
+	for ((i = 0; i < length * progress / 100; i++)); do fill+="█"; done
+	for ((i = 0; i < length - i; i++)); do empty+=" "; done
+
+	echo -ne "[$fill$empty] $progress%\r"
+}
+
+# Get file version
+version=$(yq eval '.version' pubspec.yaml)
+
+# Make directory
+mkdir -p $version
+
+# Build iOS
+# release
+echo "Building iOS release IPA..."
+flutter build ipa --release >/dev/null 2>&1
+print_checkmark
+# Add to the folder
+cp build/ios/ipa/jellybook.ipa $version/JellyBook-Release.ipa
+# print on the same line
+echo -ne "\rComplete release IPA\n"
+
+# debug
+echo "Building iOS debug IPA..."
+flutter build ipa --debug
+print_checkmark
+# Add to the folder
+cp build/ios/ipa/jellybook.ipa $version/JellyBook-Debug.ipa
+echo "Complete debug IPA"
+
+# Build Android
+## Apk
+# release
+echo "Building Android release APK..."
+flutter build apk --release
+print_checkmark
+# Add to the folder
+cp build/app/outputs/flutter-apk/app-release.apk $version/JellyBook-Release.apk
+
+echo "Complete release APK"
+
+# Split apk by abi
+echo "Building Android release APK (split by ABI)..."
+flutter build apk --split-per-abi --release
+cp build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk $version/JellyBook-Release-arm32.apk
+cp build/app/outputs/flutter-apk/app-arm64-v8a-release.apk $version/JellyBook-Release-arm64.apk
+cp build/app/outputs/flutter-apk/app-x86_64-release.apk $version/JellyBook-Release-x86_64.apk
+print_checkmark
+echo "Complete release APK (split by ABI)"
+
+# debug
+echo "Building Android debug APK..."
+flutter build apk --debug
+print_checkmark
+cp build/app/outputs/flutter-apk/app-debug.apk $version/JellyBook-Debug.apk
+echo "Complete debug APK"
+
+# Split apk by abi
+echo "Building Android debug APK (split by ABI)..."
+flutter build apk --split-per-abi --debug
+print_checkmark
+cp build/app/outputs/flutter-apk/app-armeabi-v7a-debug.apk $version/JellyBook-Debug-arm32.apk
+cp build/app/outputs/flutter-apk/app-arm64-v8a-debug.apk $version/JellyBook-Debug-arm64.apk
+cp build/app/outputs/flutter-apk/app-x86_64-debug.apk $version/JellyBook-Debug-x86_64.apk
+echo "Complete debug APK (split by ABI)"
+
+# Build appbundle
+# release
+echo "Building Android release App Bundle..."
+flutter build appbundle --release
+print_checkmark
+cp build/app/outputs/bundle/release/app-release.aab $version/JellyBook-Release.aab
+echo "Complete release App Bundle"
+
+# debug
+echo "Building Android debug App Bundle..."
+flutter build appbundle --debug
+print_checkmark
+cp build/app/outputs/bundle/debug/app-debug.aab $version/JellyBook-Debug.aab
+echo "Complete debug App Bundle"
+
+# Print a list of their sha1 hashes
+echo "
+<details>
+<summary>SHA1</summary>
+<ul>"
+for file in "$version"/*; do
+	hash=$(sha1sum "$file" | awk '{print $1}')
+	file=$(basename "$file")
+	echo "<li><code>$file</code>: <code>$hash</code></li>"
+done
+echo "</ul>
+</details>
+"