Merge branch 'develop' into chore/SubplansLinkShare

Author: tentamdin

ios/Podfile.lock

@@ -365,18 +365,18 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   airbridge-ios-sdk: 6049688ddcfafa85da5ab35b943430c3309ca97b
-  airbridge_flutter_sdk: 31632f81cacf04d55acc4e6ef17f536e389a8d0c
-  app_links: 3dbc685f76b1693c66a6d9dd1e9ab6f73d97dc0a
-  audio_service: aa99a6ba2ae7565996015322b0bb024e1d25c6fd
-  audio_session: 9bb7f6c970f21241b19f5a3658097ae459681ba0
+  airbridge_flutter_sdk: 79d47074aae010182e265e9bdac9c904d9a01f4d
+  app_links: 585674be3c6661708e6cd794ab4f39fb9d8356f9
+  audio_service: cab6c1a0eaf01b5a35b567e11fa67d3cc1956910
+  audio_session: 19e9480dbdd4e5f6c4543826b2e8b0e4ab6145fe
   Auth0: 2876d0c36857422eda9cb580a6cc896c7d14cb36
-  auth0_flutter: 031042ca6cf84f1b21611062b33ea7ec4bf3bc52
-  connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
+  auth0_flutter: 0f4846524696ef8441bcb96ceab7bfdbe31b8a05
+  connectivity_plus: 2a701ffec2c0ae28a48cf7540e279787e77c447d
   Firebase: a8539b633d474fbeb654c7043f9c1649e274045b
-  firebase_analytics: 5e356f558625ce2d8b21deff00946b56d6e8d0d5
-  firebase_core: fc23178af8ea070194d09031ae4198a9608a3d22
-  firebase_crashlytics: 344bb168f55aee1086c6cdd0b105a9db018cd344
-  firebase_messaging: 870b2939a7f7cc52bc38ca0250127c45b42f4bad
+  firebase_analytics: 444603cf97c21326b60115cd18d28f4a56bd78f6
+  firebase_core: 2f51bd38a4e012634cf229f81dc9e2506df32f1c
+  firebase_crashlytics: 251d4c57b75af742297bb7a39d50b40b9caf88cc
+  firebase_messaging: c8d9730ad2cf85f50f1e16be82ffebcb9a20a792
   FirebaseAnalytics: 9c9fa7915fc52ea03077000d5a7b6a8947b2d76e
   FirebaseCore: 2e86a4ea1684d4381707069e4a6d89ac808e901e
   FirebaseCoreExtension: 10d2a627977b39418759ad88ada80fbbd34f1c4f
@@ -387,18 +387,18 @@ SPEC CHECKSUMS:
   FirebaseRemoteConfigInterop: 7e3d57ce4b1e958bb1d15403faa7178f46bbb5b7
   FirebaseSessions: acfe7eadca47cda94ac86592737204581bb1abf6
   Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
-  flutter_image_compress_common: 1697a328fd72bfb335507c6bca1a65fa5ad87df1
-  flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99
-  flutter_local_notifications: a5a732f069baa862e728d839dd2ebb904737effb
-  flutter_secure_storage_darwin: acdb3f316ed05a3e68f856e0353b133eec373a23
-  flutter_timezone: 7c838e17ffd4645d261e87037e5bebf6d38fe544
+  flutter_image_compress_common: ec1d45c362c9d30a3f6a0426c297f47c52007e3e
+  flutter_inappwebview_ios: 6f63631e2c62a7c350263b13fa5427aedefe81d4
+  flutter_local_notifications: ff50f8405aaa0ccdc7dcfb9022ca192e8ad9688f
+  flutter_secure_storage_darwin: 557817588b80e60213cbecb573c45c76b788018d
+  flutter_timezone: ac3da59ac941ff1c98a2e1f0293420e020120282
   GoogleAdsOnDeviceConversion: 80ce443fa1b4b5750913d53a04ecda644ff57744
   GoogleAppMeasurement: a6d37949071d456e9147dac6789c4342e0e7a8c5
   GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
   GoogleUtilities: 4f2618a4a1e762a1ee134a1e2323bba9843e06da
-  image_gallery_saver_plus: e597bf65a7846979417a3eae0763b71b6dfec6c3
-  image_picker_ios: e0ece4aa2a75771a7de3fa735d26d90817041326
-  just_audio: 4e391f57b79cad2b0674030a00453ca5ce817eed
+  image_gallery_saver_plus: 782ade975fe6a4600b53e7c1983e3a2979d1e9e5
+  image_picker_ios: 4f2f91b01abdb52842a8e277617df877e40f905b
+  just_audio: a42c63806f16995daf5b219ae1d679deb76e6a79
   JWTDecode: 7dae24cb9bf9b608eae61e5081029ec169bb5527
   libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
   Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d
@@ -413,12 +413,12 @@ SPEC CHECKSUMS:
   PromisesSwift: 217dea0fd5d2ad65222a109c48698add13cc1c5b
   SDWebImage: e9fc87c1aab89a8ab1bbd74eba378c6f53be8abf
   SDWebImageWebPCoder: 0e06e365080397465cc73a7a9b472d8a3bd0f377
-  share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
-  shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
+  share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f
+  shared_preferences_foundation: 5086985c1d43c5ba4d5e69a4e8083a389e2909e6
   SimpleKeychain: 768cf43ae778b1c21816e94dddf01bb8ee96a075
-  sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
-  url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b
-  webview_flutter_wkwebview: 8ebf4fded22593026f7dbff1fbff31ea98573c8d
+  sqflite_darwin: 5a7236e3b501866c1c9befc6771dfd73ffb8702d
+  url_launcher_ios: bb13df5870e8c4234ca12609d04010a21be43dfa
+  webview_flutter_wkwebview: 29eb20d43355b48fe7d07113835b9128f84e3af4
 
 PODFILE CHECKSUM: d93c32cc7d677c987ce520e85932c4ff335f3ec2
 

ios/Runner.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 60;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -294,7 +294,7 @@
 			);
 			mainGroup = 97C146E51CF9000F007C117D;
 			packageReferences = (
-				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */,
+				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */,
 			);
 			productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
 			projectDirPath = "";
@@ -338,14 +338,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
@@ -375,14 +371,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
@@ -1566,7 +1558,7 @@
 /* End XCConfigurationList section */
 
 /* Begin XCLocalSwiftPackageReference section */
-		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = {
+		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = {
 			isa = XCLocalSwiftPackageReference;
 			relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
 		};

lib/core/config/app_feature_flags.dart

@@ -5,5 +5,4 @@ class AppFeatureFlags {
   /// When true, the app shows only the Coming Soon page.
   /// Set to false to restore normal app behavior.
   static const bool kComingSoonMode = false;
-  static const bool kSchedulePlanNotifications = true;
 }

lib/core/config/router/app_router.dart

@@ -219,14 +219,12 @@ final appRouterProvider = Provider<GoRouter>((ref) {
                 builder: (context, state) {
                   final id = state.pathParameters['id'] ?? '';
                   final extra = state.extra as Map<String, dynamic>?;
-                  final series = extra?['series'] as Series?;
                   final groupId = extra?['groupId'] as String?;
                   final groupType = extra?['groupType'] as GroupType?;
                   final isGroupEnrolled =
                       extra?['isGroupEnrolled'] as bool? ?? false;
                   return SeriesDetailScreen(
                     seriesId: id,
-                    series: series,
                     groupId: groupId,
                     groupType: groupType,
                     isGroupEnrolled: isGroupEnrolled,
@@ -240,9 +238,8 @@ final appRouterProvider = Provider<GoRouter>((ref) {
                     // stays on one navigator.
                     parentNavigatorKey: rootNavigatorKey,
                     builder: (context, state) {
-                      final extra = state.extra as Map<String, dynamic>?;
-                      final series = extra?['series'] as Series;
-                      return SeriesInfoScreen(series: series);
+                      final id = state.pathParameters['id'] ?? '';
+                      return SeriesInfoScreen(seriesId: id);
                     },
                   ),
                 ],
@@ -448,13 +445,15 @@ final appRouterProvider = Provider<GoRouter>((ref) {
           final plan = extra?['plan'] as UserPlansModel?;
           final selectedDay = extra?['selectedDay'] as int?;
           final startDate = extra?['startDate'] as DateTime?;
+          final seriesId = extra?['seriesId'] as String?;
           if (plan == null) {
             throw Exception('Missing required parameters');
           }
           return PlanDetails(
             plan: plan,
             selectedDay: selectedDay ?? 1,
             startDate: startDate ?? DateTime.now(),
+            seriesId: seriesId,
           );
         },
       ),
@@ -496,13 +495,15 @@ final appRouterProvider = Provider<GoRouter>((ref) {
               final plan = extra?['plan'] as UserPlansModel?;
               final selectedDay = extra?['selectedDay'] as int?;
               final startDate = extra?['startDate'] as DateTime?;
+              final seriesId = extra?['seriesId'] as String?;
               if (plan == null) {
                 throw Exception('Missing required parameters');
               }
               return PlanDetails(
                 plan: plan,
                 selectedDay: selectedDay ?? 1,
                 startDate: startDate ?? DateTime.now(),
+                seriesId: seriesId,
               );
             },
           ),

lib/core/di/core_providers.dart

@@ -86,11 +86,6 @@ final errorInterceptorProvider = Provider<ErrorInterceptor>((ref) {
   return ErrorInterceptor(ref.watch(loggerProvider));
 });
 
-/// Provider for CacheInterceptor
-final cacheInterceptorProvider = Provider<CacheInterceptor>((ref) {
-  return CacheInterceptor(ref.watch(loggerProvider));
-});
-
 /// Provider for TimezoneInterceptor (adds X-Timezone to all requests)
 final timezoneInterceptorProvider = Provider<TimezoneInterceptor>((ref) {
   return TimezoneInterceptor(ref.watch(loggerProvider));

lib/core/l10n/app_bo.arb

@@ -556,7 +556,7 @@
   "read_full_text": "ཆ་ཚང་ཀློག",
   "reader_source_label": "ཡོང་ཁུངས།",
   "reader_license_label": "ཆོག་མཆན།",
-  "series_stats": "ཐུན་འཆར་ {planCount} · ཉིན་ {totalDays}",
+  "series_stats": "{planCount} ལེའུ · ཉིན་ {totalDays}",
   "force_update_title": "གསར་བསྒྱུར་དགོས་མཁོ།",
   "force_update_message": "མཉེན་ཆས་ཀྱི་པར་གཞི་གསར་པ་ཞིག་ཡོད་པས། མུ་མཐུད་སྤྱོད་རོགས་གནང་བར་གསར་བསྒྱུར་མཛད་རོགས།",
   "force_update_button": "གསར་བསྒྱུར།",
@@ -581,6 +581,10 @@
   "edit_profile_take_photo": "འདྲ་པར་རྒྱོབ།",
   "edit_profile_offline": "ཁྱེད་རང་དྲ་ཐོག་མིན། དྲ་རྒྱ་དང་སྦྲེལ་ཏེ་བསྐྱར་དུ་ཚོད་ལྟ་བྱོས།",
   "edit_profile_save_failed": "ཁྱེད་ཀྱི་བཟོ་བཅོས་ཉར་ཚགས་བྱེད་མ་ཐུབ། བསྐྱར་དུ་ཚོད་ལྟ་བྱོས།",
+  "edit_profile_traditions": "ཆོས་བརྒྱུད།",
+  "edit_profile_choose_traditions": "ཁྱེད་ཀྱི་ཆོས་བརྒྱུད་འདེམས་རོགས།",
+  "edit_profile_tradition_remove_failed": "ཆོས་བརྒྱུད་བསུབ་མ་ཐུབ། བསྐྱར་དུ་ཚོད་ལྟ་བྱོས།",
+  "edit_profile_tradition_save_failed": "ཆོས་བརྒྱུད་ཉར་ཚགས་བྱེད་མ་ཐུབ། བསྐྱར་དུ་ཚོད་ལྟ་བྱོས།",
   "username_label": "སྤྱོད་མིང་།",
   "username_taken": "མིང་འདི་གཞན་གྱིས་བེད་སྤྱོད་ཟིན་འདུག",
   "username_available_label": "ཐོབ་རུང་: ",

lib/core/l10n/app_en.arb

@@ -266,7 +266,7 @@
   "my_groups": "My groups",
   "see_all": "See all",
   "connect_groups_load_error": "Unable to load groups.\nCheck your connection and try again",
-  "connect_groups_empty_title": "No groups yet",
+  "connect_groups_empty_title": "No more groups",
   "connect_groups_empty_subtitle": "Congratulations, you've joined all our groups! Check back soon. New ones are on the way",
   "search_groups": "Search groups",
   "search_for_groups": "Search for groups",
@@ -623,7 +623,7 @@
   "read_full_text": "Read full text",
   "reader_source_label": "Source",
   "reader_license_label": "License",
-  "series_stats": "{planCount} PLANS · {totalDays} DAYS",
+  "series_stats": "{planCount} CHAPTERS · {totalDays} DAYS",
   "@series_stats": {
     "placeholders": {
       "planCount": {
@@ -658,6 +658,10 @@
   "edit_profile_take_photo": "Take a photo",
   "edit_profile_offline": "You're offline. Connect to the internet and try again",
   "edit_profile_save_failed": "Couldn't save your changes. Please try again",
+  "edit_profile_traditions": "Traditions",
+  "edit_profile_choose_traditions": "Choose your traditions",
+  "edit_profile_tradition_remove_failed": "Couldn't remove tradition. Please try again",
+  "edit_profile_tradition_save_failed": "Couldn't save traditions. Please try again",
   "username_label": "Username",
   "username_taken": "Someone already used this name",
   "username_available_label": "Available: ",

lib/core/l10n/app_hi.arb

@@ -612,7 +612,7 @@
   "read_full_text": "पूरा पाठ पढ़ें",
   "reader_source_label": "स्रोत",
   "reader_license_label": "लाइसेंस",
-  "series_stats": "{planCount} योजनाएँ · {totalDays} दिन",
+  "series_stats": "{planCount} अध्याय · {totalDays} दिन",
   "@series_stats": {
     "placeholders": {
       "planCount": {
@@ -647,6 +647,10 @@
   "edit_profile_take_photo": "फ़ोटो लें",
   "edit_profile_offline": "आप ऑफ़लाइन हैं। इंटरनेट से कनेक्ट करें और फिर से प्रयास करें",
   "edit_profile_save_failed": "आपके बदलाव सेव नहीं हो सके। कृपया फिर से प्रयास करें",
+  "edit_profile_traditions": "परंपराएँ",
+  "edit_profile_choose_traditions": "अपनी परंपराएँ चुनें",
+  "edit_profile_tradition_remove_failed": "परंपरा हटाई नहीं जा सकी। कृपया फिर से प्रयास करें",
+  "edit_profile_tradition_save_failed": "परंपराएँ सेव नहीं हो सकीं। कृपया फिर से प्रयास करें",
   "username_label": "यूज़रनेम",
   "username_taken": "यह नाम पहले से किसी ने ले लिया है",
   "username_available_label": "उपलब्ध: ",

lib/core/l10n/app_mn.arb

@@ -612,7 +612,7 @@
   "read_full_text": "Бүтэн бичвэрийг унших",
   "reader_source_label": "Эх сурвалж",
   "reader_license_label": "Лиценз",
-  "series_stats": "{planCount} ТӨЛӨВЛӨГӨӨ · {totalDays} ӨДӨР",
+  "series_stats": "{planCount} БҮЛЭГ · {totalDays} ӨДӨР",
   "@series_stats": {
     "placeholders": {
       "planCount": {
@@ -647,6 +647,10 @@
   "edit_profile_take_photo": "Зураг авах",
   "edit_profile_offline": "Та офлайн байна. Интернэтэд холбогдоод дахин оролдоно уу",
   "edit_profile_save_failed": "Таны өөрчлөлтийг хадгалж чадсангүй. Дахин оролдоно уу",
+  "edit_profile_traditions": "Уламжлал",
+  "edit_profile_choose_traditions": "Уламжлалаа сонгоно уу",
+  "edit_profile_tradition_remove_failed": "Уламжлалыг устгаж чадсангүй. Дахин оролдоно уу",
+  "edit_profile_tradition_save_failed": "Уламжлалыг хадгалж чадсангүй. Дахин оролдоно уу",
   "username_label": "Хэрэглэгчийн нэр",
   "username_taken": "Энэ нэрийг хэн нэгэн аль хэдийн ашигласан байна",
   "username_available_label": "Боломжтой: ",

lib/core/l10n/app_ne.arb

@@ -612,7 +612,7 @@
   "read_full_text": "पूरा पाठ पढ्नुहोस्",
   "reader_source_label": "स्रोत",
   "reader_license_label": "लाइसेन्स",
-  "series_stats": "{planCount} योजना · {totalDays} दिन",
+  "series_stats": "{planCount} अध्याय · {totalDays} दिन",
   "@series_stats": {
     "placeholders": {
       "planCount": {
@@ -647,6 +647,10 @@
   "edit_profile_take_photo": "फोटो खिच्नुहोस्",
   "edit_profile_offline": "तपाईं अफलाइन हुनुहुन्छ। इन्टरनेटमा जडान गरी फेरि प्रयास गर्नुहोस्",
   "edit_profile_save_failed": "तपाईंका परिवर्तनहरू सेभ गर्न सकिएन। कृपया फेरि प्रयास गर्नुहोस्",
+  "edit_profile_traditions": "परम्पराहरू",
+  "edit_profile_choose_traditions": "आफ्ना परम्पराहरू छान्नुहोस्",
+  "edit_profile_tradition_remove_failed": "परम्परा हटाउन सकिएन। कृपया फेरि प्रयास गर्नुहोस्",
+  "edit_profile_tradition_save_failed": "परम्पराहरू सेभ गर्न सकिएन। कृपया फेरि प्रयास गर्नुहोस्",
   "username_label": "प्रयोगकर्ता नाम",
   "username_taken": "यो नाम कसैले पहिले नै प्रयोग गरिसकेको छ",
   "username_available_label": "उपलब्ध: ",