Fix: Various API and localization related work

JellyBookOrg · Jul 15, 2024 · 44eda2f · 44eda2f
1 parent eea78fd
commit 44eda2f
Show file tree

Hide file tree

Showing 32 changed files with 504 additions and 148 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,6 @@
-[submodule "submodules/jellyfin_api"]
-	path = submodules/jellyfin_api
-	url = https://github.com/Kara-Zor-El/jellyfin_api
 [submodule "submodules/jellybook_epub_view"]
 	path = submodules/jellybook_epub_view
 	url = https://github.com/Kara-Zor-El/jellybook_epub_view
+[submodule "submodules/tentacle"]
+	path = submodules/tentacle
+	url = https://github.com/TentacleOrg/Tentacle
diff --git a/README.md b/README.md
@@ -42,6 +42,9 @@
 | **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> |
 | **Other Platforms** | If you would like to see this app on your platform, please open an issue and I will see what I can do. |
 
+> [!NOTE]
+> Any distribution platforms listed above I consider official and trusted. Any sources not listed above are not official and may contain malware and are to be used at your own risk.
+
 </br>
 
 ## :camera: Screenshots (and videos):

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -3,6 +3,7 @@ PODS:
     - Flutter
   - connectivity_plus (0.0.1):
     - Flutter
+    - FlutterMacOS
     - ReachabilitySwift
   - device_info_plus (0.0.1):
     - Flutter
@@ -26,14 +27,14 @@ PODS:
     - Flutter
   - permission_handler_apple (9.3.0):
     - Flutter
-  - ReachabilitySwift (5.0.0)
-  - Sentry/HybridSDK (8.20.0):
-    - SentryPrivate (= 8.20.0)
+  - ReachabilitySwift (5.2.1)
+  - Sentry/HybridSDK (8.21.0):
+    - SentryPrivate (= 8.21.0)
   - sentry_flutter (0.0.1):
     - Flutter
     - FlutterMacOS
-    - Sentry/HybridSDK (= 8.20.0)
-  - SentryPrivate (8.20.0)
+    - Sentry/HybridSDK (= 8.21.0)
+  - SentryPrivate (8.21.0)
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
@@ -43,15 +44,15 @@ PODS:
   - unrar_file (0.0.1):
     - Flutter
     - UnrarKit
-  - UnrarKit (2.9):
-    - UnrarKit/unrar-lib (= 2.9)
-  - UnrarKit/unrar-lib (2.9)
+  - UnrarKit (2.10):
+    - UnrarKit/unrar-lib (= 2.10)
+  - UnrarKit/unrar-lib (2.10)
   - url_launcher_ios (0.0.1):
     - Flutter
 
 DEPENDENCIES:
   - audioplayers_darwin (from `.symlinks/plugins/audioplayers_darwin/ios`)
-  - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
+  - connectivity_plus (from `.symlinks/plugins/connectivity_plus/darwin`)
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - Flutter (from `Flutter`)
   - flutter_background_service_ios (from `.symlinks/plugins/flutter_background_service_ios/ios`)
@@ -80,7 +81,7 @@ EXTERNAL SOURCES:
   audioplayers_darwin:
     :path: ".symlinks/plugins/audioplayers_darwin/ios"
   connectivity_plus:
-    :path: ".symlinks/plugins/connectivity_plus/ios"
+    :path: ".symlinks/plugins/connectivity_plus/darwin"
   device_info_plus:
     :path: ".symlinks/plugins/device_info_plus/ios"
   Flutter:
@@ -116,27 +117,27 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   audioplayers_darwin: 877d9a4d06331c5c374595e46e16453ac7eafa40
-  connectivity_plus: bf0076dd84a130856aa636df1c71ccaff908fa1d
+  connectivity_plus: e2dad488011aeb593e219360e804c43cc1af5770
   device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_background_service_ios: e30e0d3ee69e4cee66272d0c78eacd48c2e94aac
   flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
-  image_picker_ios: 99dfe1854b4fa34d0364e74a78448a0151025425
+  image_picker_ios: b545a5f16c0fa88e3ecbbce3ed4de45567a8ec18
   isar_flutter_libs: b69f437aeab9c521821c3f376198c4371fa21073
   open_filex: 6e26e659846ec990262224a12ef1c528bb4edbe4
   package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
   path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
   pdfx: 7b876b09de8b7a0bf444a4f82b439ffcff4ee1ec
-  permission_handler_apple: 036b856153a2b1f61f21030ff725f3e6fece2b78
-  ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
-  Sentry: a8d7b373b9f9868442b02a0c425192f693103cbf
-  sentry_flutter: 03e7660857a8cdb236e71456a7e8447b65c8a788
-  SentryPrivate: 006b24af16828441f70e2ab6adf241bd0a8ad130
+  permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
+  ReachabilitySwift: 5ae15e16814b5f9ef568963fb2c87aeb49158c66
+  Sentry: ebc12276bd17613a114ab359074096b6b3725203
+  sentry_flutter: dff1df05dc39c83d04f9330b36360fc374574c5e
+  SentryPrivate: d651efb234cf385ec9a1cdd3eff94b5e78a0e0fe
   shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
   sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
   unrar_file: ead248ffb2e777cb67f083bc1bb1fb45d4157dbd
-  UnrarKit: 99e3f0222a98a212188e1a6975dcf5aa798d26dd
-  url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812
+  UnrarKit: 62f535c7a34ec52d2514b9b148f33dcfa9a9dc39
+  url_launcher_ios: 6116280ddcfe98ab8820085d8d76ae7449447586
 
 PODFILE CHECKSUM: 261aa5270d0bfaacfc50eed5f8260a8d156ff8c5
 

diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -140,6 +140,7 @@
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 				4703B9E427D52C737F4084E3 /* [CP] Embed Pods Frameworks */,
+				2FA329B8FEA619317B636C63 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -199,6 +200,23 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
+		2FA329B8FEA619317B636C63 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;

diff --git a/lib/l10n/app_cs.arb b/lib/l10n/app_cs.arb
@@ -207,5 +207,7 @@
   "yes": "Ano",
   "@yes": {},
   "no": "Ne",
-  "@no": {}
+  "@no": {},
+  "giveFeedback": "Zpětná vazba",
+  "@giveFeedback": {}
 }
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
@@ -207,5 +207,7 @@
   "yes": "Yes",
   "@yes": {},
   "no": "No",
-  "@no": {}
+  "@no": {},
+  "giveFeedback": "Give Feedback",
+  "@giveFeedback": {}
 }
diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arb
@@ -207,5 +207,7 @@
   "yes": "Sí",
   "@yes": {},
   "no": "No",
-  "@no": {}
+  "@no": {},
+  "giveFeedback": "Opinar",
+  "@giveFeedback": {}
 }
diff --git a/lib/l10n/app_hr.arb b/lib/l10n/app_hr.arb
@@ -136,7 +136,7 @@
   "@dontBrewCoffee": {},
   "refresh": "Aktualiziraj",
   "@refresh": {},
-  "lightTheme": "Svjetla",
+  "lightTheme": "Svijetla",
   "@lightTheme": {},
   "downloadingFile": "Preuzimanje datoteke:",
   "@downloadingFile": {},
@@ -205,5 +205,9 @@
   "yes": "Da",
   "@yes": {},
   "no": "Ne",
-  "@no": {}
+  "@no": {},
+  "sentryExplanation": "Aktiviraj zapisivanje pomoću Sentry platforme za brzo dijagnosticiranje i rješavanje problema! To nam omogućuje praćenje grešaka u stvarnom vremenu bez ugrožavanja tvoje privatnosti. Pomogni podržati razvoj JellyBooka uključivanjem zapisivanja.",
+  "@sentryExplanation": {},
+  "giveFeedback": "Pošalji povratnu informaciju",
+  "@giveFeedback": {}
 }
diff --git a/lib/l10n/app_id.arb b/lib/l10n/app_id.arb
@@ -115,5 +115,27 @@
   "invalidCredentials": "Nama pengguna atau sandi salah",
   "@invalidCredentials": {},
   "serverNotFound": "Server tidak ditemukan\nHarap periksa URL-nya",
-  "@serverNotFound": {}
+  "@serverNotFound": {},
+  "systemTheme": "Sistem",
+  "@systemTheme": {},
+  "lightTheme": "Terang",
+  "@lightTheme": {},
+  "darkTheme": "Gelap",
+  "@darkTheme": {},
+  "amoledTheme": "Amoled",
+  "@amoledTheme": {},
+  "licenses": "Lisensi",
+  "@licenses": {},
+  "pageLoginAddress": "Alamat Web",
+  "@pageLoginAddress": {},
+  "reading": "Bacaan",
+  "@reading": {},
+  "requestTimeout": "Batas waktu permintaan habis \nSilakan periksa log server",
+  "@requestTimeout": {},
+  "badGateway": "Gateway buruk \nSilakan periksa log server",
+  "@badGateway": {},
+  "proxyAuthRequired": "Diperlukan autentikasi proxy \nSilakan periksa log server",
+  "@proxyAuthRequired": {},
+  "serverError": "Server error\nSilakan periksa log server",
+  "@serverError": {}
 }
diff --git a/lib/l10n/app_pt.arb b/lib/l10n/app_pt.arb
@@ -199,5 +199,13 @@
   "rating": "Avaliação: ",
   "@rating": {},
   "saveToDevice": "Gravar no dispositivo",
-  "@saveToDevice": {}
+  "@saveToDevice": {},
+  "useSentry": "Usar Sentinela",
+  "@useSentry": {},
+  "yes": "Sim",
+  "@yes": {},
+  "no": "Não",
+  "@no": {},
+  "sentryExplanation": "Ative o registro do Sentinela para diagnosticar e corrigir problemas rapidamente! Isso nos fornece rastreamento de erros em tempo real sem comprometer sua privacidade. Por favor, ajude a apoiar o desenvolvimento do JellyBook ativando o registro.",
+  "@sentryExplanation": {}
 }