Skip to content
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.

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

Version 1.2.1 #120

Merged
merged 43 commits into from
Sep 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
73b694f
fix up data fetching
Kara-Zor-El Aug 13, 2023
0325dc9
Translated using Weblate (Chinese (Simplified))
TnZzZHlp Aug 13, 2023
9736975
Update jellybook_epub_view
Kara-Zor-El Aug 15, 2023
07ea9e4
Update .gitignore
Kara-Zor-El Aug 15, 2023
768b806
Update deps
Kara-Zor-El Aug 15, 2023
b021ea2
organize translations
Kara-Zor-El Aug 15, 2023
16b3018
optimize offline book reader
Kara-Zor-El Aug 15, 2023
6776740
Silly issue from a silly girl
Kara-Zor-El Aug 15, 2023
cfc6026
display row next when tablet
Kara-Zor-El Aug 15, 2023
ff9e34f
Implement audiobook playback speed setting
Mystery14 Aug 16, 2023
a792c95
Translated using Weblate (French)
pm09sx Aug 16, 2023
3e5a904
Translated using Weblate (English (Pirate))
creeperwithrabies Aug 20, 2023
88d77aa
Translated using Weblate (Spanish (American))
Aug 19, 2023
ec840bb
Merge branch 'main' into feature/audiobook-playback-speed
Kara-Zor-El Aug 21, 2023
5ba9a94
Merge branch '1.2.1' into feature/audiobook-playback-speed
Kara-Zor-El Aug 21, 2023
a66b779
make it com.KaraWilson.JellyBook for releases
Kara-Zor-El Aug 21, 2023
e686dfb
Merge branch '1.2.1' into feature/audiobook-playback-speed
Kara-Zor-El Aug 21, 2023
dfb7c6d
Translated using Weblate (English)
weblate Aug 21, 2023
783fb0e
Update Translations and added strings
Kara-Zor-El Aug 21, 2023
7a2e119
Merge branch '1.2.1' into translations
Kara-Zor-El Aug 21, 2023
aea1916
Merge pull request #111 from Kara-Zor-El/translations
Kara-Zor-El Aug 21, 2023
ccf3243
Merge branch '1.2.1' into feature/audiobook-playback-speed
Kara-Zor-El Aug 21, 2023
cf222e7
Redesign playback speed dialog box
Mystery14 Aug 21, 2023
8e9e816
Add text localization
Mystery14 Aug 21, 2023
dd9d3ba
Translated using Weblate (Spanish)
gallegonovato Aug 24, 2023
fa8400a
Translated using Weblate (Polish)
Aug 24, 2023
68d2cc2
Translated using Weblate (Portuguese)
alison2033 Aug 24, 2023
5136e1c
Minor changes to audio player
Kara-Zor-El Sep 5, 2023
e660502
Merge pull request #114 from Kara-Zor-El/feature/audiobook-playback-s…
Kara-Zor-El Sep 5, 2023
80f48ac
Merge pull request #112 from weblate/weblate-JellyBook-jellybook-app
Kara-Zor-El Sep 5, 2023
4d63825
Merge branch '1.2.1' into translations
Kara-Zor-El Sep 5, 2023
6bf8e7a
Merge pull request #115 from Kara-Zor-El/translations
Kara-Zor-El Sep 5, 2023
9e4fd1a
Translated using Weblate (English)
weblate Sep 5, 2023
a3d37a9
Merge pull request #116 from weblate/weblate-JellyBook-jellybook-app
Kara-Zor-El Sep 5, 2023
c964056
Merge pull request #117 from Kara-Zor-El/translations
Kara-Zor-El Sep 5, 2023
8710a89
Translated using Weblate (Japanese)
kuragehimekurara1 Sep 6, 2023
3ca7bdc
Translated using Weblate (Polish)
kacperhaha Sep 5, 2023
f542fa8
Translated using Weblate (Spanish)
gallegonovato Sep 8, 2023
b410311
Translated using Weblate (Portuguese)
alison2033 Sep 8, 2023
d83429e
Translated using Weblate (Chinese (Simplified))
TnZzZHlp Sep 9, 2023
170c22e
Merge pull request #118 from weblate/weblate-JellyBook-jellybook-app
Kara-Zor-El Sep 10, 2023
488e2de
Merge branch '1.2.1' into translations
Kara-Zor-El Sep 10, 2023
bfe69ef
Merge pull request #119 from Kara-Zor-El/translations
Kara-Zor-El Sep 10, 2023
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,5 @@ libisar.so
android/app/build.gradle
android/app/src/main/AndroidManifest.xml
sha1sums.txt
crash.dump
flutter_jank_metrics_01.json
24 changes: 17 additions & 7 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ if (flutterVersionName == null) {
flutterVersionName = '1.0'
}

def keystoreProperties = new Properties()
def keystorePropertiesFile = rootProject.file('key.properties')
if (keystorePropertiesFile.exists()) {
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
}

apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
Expand All @@ -47,21 +53,25 @@ android {
}

defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.example.jellybook"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
applicationId "com.KaraWilson.JellyBook"
minSdkVersion 19
targetSdkVersion flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
}
signingConfigs {
release {
keyAlias keystoreProperties['keyAlias']
keyPassword keystoreProperties['keyPassword']
storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
storePassword keystoreProperties['storePassword']
}
}

buildTypes {
release {
// TODO: Add your own signing config for the release build.
// Signing with the debug keys for now, so `flutter run --release` works.
signingConfig signingConfigs.debug
signingConfig signingConfigs.release
// signingConfig signingConfigs.debug
// minifyEnabled false
// shrinkResources false
}
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/debug/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.jellybook">
package="com.KaraWilson.JellyBook">
<!-- The INTERNET permission is required for development. Specifically,
the Flutter tool needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.jellybook">
package="com.KaraWilson.JellyBook">
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.jellybook
package com.KaraWilson.JellyBook

import io.flutter.embedding.android.FlutterActivity

Expand Down
2 changes: 1 addition & 1 deletion android/app/src/profile/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.jellybook">
package="com.KaraWilson.JellyBook">
<!-- The INTERNET permission is required for development. Specifically,
the Flutter tool needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
buildscript {
ext.kotlin_version = '1.7.20'
ext.kotlin_version = '1.9.0'
repositories {
google()
mavenCentral()
Expand Down
2 changes: 1 addition & 1 deletion ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
audioplayers_darwin: 877d9a4d06331c5c374595e46e16453ac7eafa40
connectivity_plus: 413a8857dd5d9f1c399a39130850d02fe0feaf7e
connectivity_plus: 07c49e96d7fc92bc9920617b83238c4d178b446a
device_info_plus: 7545d84d8d1b896cb16a4ff98c19f07ec4b298ea
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
flutter_background_service_ios: e30e0d3ee69e4cee66272d0c78eacd48c2e94aac
Expand Down
2 changes: 1 addition & 1 deletion ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
97C146E61CF9000F007C117D /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1300;
LastUpgradeCheck = 1430;
ORGANIZATIONNAME = "";
TargetAttributes = {
97C146ED1CF9000F007C117D = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1300"
LastUpgradeVersion = "1430"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
72 changes: 37 additions & 35 deletions ios/Runner/Info-Debug.plist
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSBonjourServices</key>
<array>
<string>_dartobservatory._tcp</string>
</array>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>CADisableMinimumFrameDurationOnPhone</key>
<true/>
<key>CFBundleDevelopmentRegion</key>
Expand All @@ -20,43 +14,33 @@
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>jellybook</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>$(FLUTTER_BUILD_NAME)</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(FLUTTER_BUILD_NUMBER)</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>CFBundleLocalizations</key>
<array>
<string>en</string>
<string>afh</string>
<string>ar</string>
<string>ca</string>
<string>ar</string>
<string>cs</string>
<string>cs</string>
<string>da</string>
<string>en_pirate</string>
<string>es</string>
<string>eu</string>
<string>fr</string>
<string>fr</string>
<string>hr</string>
<string>hu</string>
<string>id</string>
<string>it</string>
<string>ja</string>
<string>kk</string>
<string>ko</string>
<string>de</string>
<string>en_pirate</string>
<string>es</string>
<string>es_US</string>
<string>eu</string>
<string>fr</string>
<string>he</string>
<string>hr</string>
<string>hu</string>
<string>id</string>
<string>it</string>
<string>ja</string>
<string>kk</string>
<string>ko</string>
<string>lb</string>
<string>nb</string>
<string>nl</string>
<string>nn</string>
<string>nl</string>
<string>pl</string>
<string>lb</string>
<string>pt</string>
<string>ro</string>
<string>ru</string>
Expand All @@ -71,10 +55,28 @@
<string>zh</string>
<string>zh_CHT</string>
</array>
<key>UIApplicationSupportsIndirectInputEvents</key>
<key>CFBundleName</key>
<string>jellybook</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>$(FLUTTER_BUILD_NAME)</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(FLUTTER_BUILD_NUMBER)</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>LSSupportsOpeningDocumentsInPlace</key>
<true/>
<key>NSBonjourServices</key>
<array>
<string>_dartobservatory._tcp</string>
</array>
<key>UIApplicationSupportsIndirectInputEvents</key>
<true/>
<key>UIFileSharingEnabled</key>
<true/>
<key>UILaunchStoryboardName</key>
Expand Down
10 changes: 9 additions & 1 deletion lib/l10n/app_en.arb
Original file line number Diff line number Diff line change
Expand Up @@ -179,5 +179,13 @@
"read": "Read",
"@read": {},
"inker": "Inker",
"@inker": {}
"@inker": {},
"playbackSpeed": "Playback Speed",
"@playbackSpeed": {},
"currentSpeed": "Current Speed:",
"@currentSpeed": {},
"speedMultiplier": "x",
"@speedMultiplier": {},
"verticalSeamless": "Seamless Vertical Scrolling",
"@verticalSeamless": {}
}
64 changes: 61 additions & 3 deletions lib/l10n/app_en@pirate.arb
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
"@downloadExplanation": {},
"downloadRequired": "Plunderin' Needed",
"@downloadRequired": {},
"unsupportedFileType": "File Type not be supportin'",
"unsupportedFileType": "I don't like the cut of yer jib",
"@unsupportedFileType": {},
"unsupportedFileTypeExplanation": "JellyBook be not supportin' this file type. Please download a different file",
"@unsupportedFileTypeExplanation": {},
"loadingComic": "Hoist the colors! We be loadin' yer comic/book",
"loadingComic": "Hoist the colors! We be loadin' yer treasure map",
"@loadingComic": {},
"downloadFirst": "Ye need to download the comic first",
"@downloadFirst": {},
Expand Down Expand Up @@ -107,5 +107,63 @@
"version": "Version: ",
"@version": {},
"selectCategories": "Select Ye Categories",
"@selectCategories": {}
"@selectCategories": {},
"selectAudioFile": "Select chantey",
"@selectAudioFile": {},
"noAudiobooksDownloaded": "No chanteys remembered",
"@noAudiobooksDownloaded": {},
"pleaseDownloadAudiobookFirst": "Remember a chantey first",
"@pleaseDownloadAudiobookFirst": {},
"systemTheme": "The Sea Sailed",
"@systemTheme": {},
"lightTheme": "Salty",
"@lightTheme": {},
"darkTheme": "The Black Spot",
"@darkTheme": {},
"amoledTheme": "Reef Sails",
"@amoledTheme": {},
"licenses": "Letters Of Marque",
"@licenses": {},
"noHttp": "Yer maps plotted course be lacking a protocol, me hearty",
"@noHttp": {},
"noDot": "Yer maps plotted course be lacking a cannonball, me hearty.",
"@noDot": {},
"noSlash": "Yer maps plotted course be lacking a cutlass, me hearty",
"@noSlash": {},
"invalidUrl": "Yer maps plotted course has us marooned, check it and raise anchor.",
"@invalidUrl": {},
"credits": "No Prey, No Pay",
"@credits": {},
"penciller": "Scribe",
"@penciller": {},
"writer": "Eunuch",
"@writer": {},
"colorist": "Hoist em'",
"@colorist": {},
"lookupMissingImages": "Recover the maps to the lost gold of Cortez himself",
"@lookupMissingImages": {},
"readingDirection": "Plotted Course",
"@readingDirection": {},
"ltr": "Port to Starboard",
"@ltr": {},
"rtl": "Starboard to Port",
"@rtl": {},
"vertical": "Mizzenmast",
"@vertical": {},
"invalidCredentials": "Ye scurvy dog, be ye so loaded to the gunwall as to forget yer name or the secret code",
"@invalidCredentials": {},
"serverNotFound": "Yer ship cannot be found\nCheck yer maps plotted course",
"@serverNotFound": {},
"proxyAuthRequired": "Pieces of eight required\nCheck the pirates code",
"@proxyAuthRequired": {},
"requestTimeout": "We are becalmed\nCheck the pirates code",
"@requestTimeout": {},
"dontBrewCoffee": "I am disinclined to acquiesce to your request",
"@dontBrewCoffee": {},
"serverError": "Yer ship has been cursed\nCheck the pirates code",
"@serverError": {},
"badGateway": "Bad travelling\nCheck the pirates code",
"@badGateway": {},
"downloadFailed": "Arr, yer attempt to plunder the treasure has resulted in folly. Replot yer course later.",
"@downloadFailed": {}
}
10 changes: 9 additions & 1 deletion lib/l10n/app_es.arb
Original file line number Diff line number Diff line change
Expand Up @@ -179,5 +179,13 @@
"imprint": "Impresión",
"@imprint": {},
"inker": "Tinta",
"@inker": {}
"@inker": {},
"playbackSpeed": "Velocidad de la reproducción",
"@playbackSpeed": {},
"currentSpeed": "Velocidad actual:",
"@currentSpeed": {},
"speedMultiplier": "x",
"@speedMultiplier": {},
"verticalSeamless": "Desplazamiento vertical fluido",
"@verticalSeamless": {}
}
Loading