Skip to content

Commit

Permalink
Merge branch 'v1.3.1' into translations
Browse files Browse the repository at this point in the history
  • Loading branch information
Kara-Zor-El committed Feb 14, 2024
2 parents a9d60b2 + bdf7102 commit a2c0c86
Show file tree
Hide file tree
Showing 39 changed files with 902 additions and 818 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,8 @@ flutter_jank_metrics_01.json

# Docker related
Jellyfin/
linux/flutter/generated_plugin_registrant.cc
linux/flutter/generated_plugins.cmake
linux/flutter/generated_plugin_registrant.cc
linux/flutter/generated_plugins.cmake
sentry.json
16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -47,25 +47,25 @@ endif
.PHONY: ios_release
ios_release: create_output_dir
@echo "Building iOS release IPA..."
@flutter build ipa --release >/dev/null 2>&1
@flutter build ipa --release --dart-define-from-file=./sentry.json
@echo "Complete release IPA"
@mv build/ios/ipa/jellybook.ipa "$(OUTPUT_DIR)/JellyBook-Release.ipa"

.PHONY: ios_debug
ios_debug: create_output_dir
@echo "Building iOS debug IPA..."
@flutter build ipa --debug
@flutter build ipa --debug --dart-define-from-file=./sentry.json
@echo "Complete debug IPA"
@mv build/ios/ipa/jellybook.ipa "$(OUTPUT_DIR)/JellyBook-Debug.ipa"

.PHONY: android_release
android_release: create_output_dir
@echo "Building Android release APK..."
@flutter build apk --release
@flutter build apk --release --dart-define-from-file=./sentry.json
@echo "Complete release APK"
@mv build/app/outputs/flutter-apk/app-release.apk "$(OUTPUT_DIR)/JellyBook-Release.apk"
@echo "Building Android release APK (split by ABI)..."
@flutter build apk --split-per-abi --release
@flutter build apk --split-per-abi --release --dart-define-from-file=./sentry.json
@echo "Complete release APK (split by ABI)"
@mv build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk "$(OUTPUT_DIR)/JellyBook-Release-arm32.apk"
@mv build/app/outputs/flutter-apk/app-arm64-v8a-release.apk "$(OUTPUT_DIR)/JellyBook-Release-arm64.apk"
Expand All @@ -74,11 +74,11 @@ android_release: create_output_dir
.PHONY: android_debug
android_debug: create_output_dir
@echo "Building Android debug APK..."
@flutter build apk --debug
@flutter build apk --debug --dart-define-from-file=./sentry.json
@echo "Complete debug APK"
@mv build/app/outputs/flutter-apk/app-debug.apk "$(OUTPUT_DIR)/JellyBook-Debug.apk"
@echo "Building Android debug APK (split by ABI)..."
@flutter build apk --split-per-abi --debug
@flutter build apk --split-per-abi --debug --dart-define-from-file=./sentry.json
@echo "Complete debug APK (split by ABI)"
@mv build/app/outputs/flutter-apk/app-armeabi-v7a-debug.apk "$(OUTPUT_DIR)/JellyBook-Debug-arm32.apk"
@mv build/app/outputs/flutter-apk/app-arm64-v8a-debug.apk "$(OUTPUT_DIR)/JellyBook-Debug-arm64.apk"
Expand All @@ -87,14 +87,14 @@ android_debug: create_output_dir
.PHONY: app_bundle_release
app_bundle_release: create_output_dir
@echo "Building Android release App Bundle..."
@flutter build appbundle --release
@flutter build appbundle --release --dart-define-from-file=./sentry.json
@echo "Complete release App Bundle"
@mv build/app/outputs/bundle/release/app-release.aab "$(OUTPUT_DIR)/JellyBook-Release.aab"

.PHONY: app_bundle_debug
app_bundle_debug: create_output_dir
@echo "Building Android debug App Bundle..."
@flutter build appbundle --debug
@flutter build appbundle --debug --dart-define-from-file=./sentry.json
@echo "Complete debug App Bundle"
@mv build/app/outputs/bundle/debug/app-debug.aab "$(OUTPUT_DIR)/JellyBook-Debug.aab"

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
- [ ] Use [Tentacle](https://github.com/jmshrv/finamp/discussions/480) as new API client (must work on this first)
- [ ] Add a proper page on IzzyOnDroid using fastlane (see [here](https://github.com/JellyBookOrg/JellyBook/issues/107#issuecomment-1714632725))
- [ ] Add dynamic loading of books on library view to prevent slowdowns
- [ ] Allow user to edit metadata of books (both locally and on the server)
- [X] Allow user to edit metadata of books (both locally and on the server)
- [X] Vertical scrolling
- [X] Audiobooks
- [X] Allow local caching of current files while viewing collection when offline (proper offline support)
Expand Down
47 changes: 0 additions & 47 deletions build-android.sh

This file was deleted.

110 changes: 0 additions & 110 deletions build.sh

This file was deleted.

1 change: 1 addition & 0 deletions fastlane/metadata/android/en-US/full_description.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<p><i>JellyBook</i> is a book and comic reading app for Jellyfin. Its a app thats meant to allow you to read your files from Jellyfin on mobile. Supported file formats include:</p><ul><li><code>.cbr</code> &amp; <code>.rar</code>: cbr (Comic Book aRchive) is a proprietary file format so is not necessarily encouraged.</li><li><code>.cbz</code> &amp; <code>.zip</code>: another Comic book format</li><li><code>.pdf</code>: the Portable Document Format as you know it</li><li><code>.epub</code>: Electronic PUBlication is a wide-spread eBook format</li></ul><p>More formats will be added over time.</p>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fastlane/metadata/android/en-US/images/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions fastlane/metadata/android/en-US/short_description.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a nice way to read books and comics from Jellyfin
1 change: 1 addition & 0 deletions fastlane/metadata/android/en-US/title.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
JellyBook
40 changes: 20 additions & 20 deletions ios/Flutter/AppFrameworkInfo.plist
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>App</string>
<key>CFBundleIdentifier</key>
<string>io.flutter.flutter.app</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>App</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>MinimumOSVersion</key>
<string>11.0</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>App</string>
<key>CFBundleIdentifier</key>
<string>io.flutter.flutter.app</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>App</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>MinimumOSVersion</key>
<string>12.0</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project
# platform :ios, '11.0'
# platform :ios, '12.0'

# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
Expand Down
Loading

0 comments on commit a2c0c86

Please sign in to comment.