Merge branch 'develop' into 'master'

Update to version 3.2.0

See merge request osam/common_module_flutter!26

Author: Alberto Aguilar Garcia WORDLINE

CHANGELOG.md

@@ -1,3 +1,29 @@
+## 8.2.0
+
+* UPDATED NATIVE LIBRARIES
+    * Updated [modul_comu_osam library](https://github.com/AjuntamentdeBarcelona/modul_comu_osam) to version 3.2.0-dev.
+* IMPROVED POPUP INTERACTION
+    * Added transparent barriers and PopScope in `AlertWrapper` and `UIHelper` to prevent background interaction while native or custom popups are being shown.
+    * Changed default language fallback to English (`en`).
+    * Refined `VersionControlResponse` handling, ensuring `DISMISSED` is returned consistently.
+
+## 8.1.8-dev
+
+* IMPLEMENTED STYLES FLEXIBILITY FOR CUSTOM POPUPS
+    * Added a parameter when building the version control popup for adding foreign styles or keeping their own.
+
+## 8.1.2-dev
+
+* IMPLEMENTED CUSTOM POPUPS
+    * Added custom Flutter popups implementation to support dark/light mode colors (#1C1C1C and #B0B0B0) as requested.
+    * Added UIHelper and OSAMDialog widget in the Flutter part.
+    * Updated example app with "Custom Flutter Popup" button to test the new UI.
+
+## 8.1.2-dev
+
+* BREAKING CHANGES
+    * Updated [modul_comu_osam library](https://github.com/AjuntamentdeBarcelona/modul_comu_osam) to version 3.0.1-dev accessible popup.
+
 ## 8.1.0
 
 * BREAKING CHANGES
@@ -105,4 +131,4 @@
 
 ## 1.0.0
 
-* First version of common module flutter (not null safety)
+* First version of common module flutter (not null safety)

README.md

@@ -5,8 +5,9 @@
 
 ---
 
-## Migrate from 6.0.0 to 8.1.0
+## Migrate from 6.0.0 to 8.2.0
 
+- Default language fallback changed from Catalan (`ca`) to English (`en`).
 - Need to use minimal Dart SDK version ^3.5.0
 - Need to use minimal Flutter version 3.24.3
 
@@ -40,7 +41,7 @@ A partir de la versió 3.0.0 la llibreria es un wrapper de la [desenvolupada en
     osam_common_module_flutter:
       git:
         url: https://github.com/AjuntamentdeBarcelona/modul_comu_osam_flutter.git
-        ref: '8.1.0'
+        ref: '8.2.0'
     ```
 
     En cas que les dependències de Firebase Analytics, Firebase Performance, Firebase Messaging i Firebase Crashlytics fallin, cal afegir aquestes aquesta configuració al pubspec:
@@ -110,7 +111,7 @@ En el Podfile del projecte d'iOS creat por Flutter haurem d'incloure el pod del
 Kotlin Multiplatform Mobile. Això es fa incloent la següent linea:
 
 ```plist
-pod 'OSAMCommon', :git => 'https://github.com/AjuntamentdeBarcelona/modul_comu_osam.git', :tag => '2.2.3'
+pod 'OSAMCommon', :git => 'https://github.com/AjuntamentdeBarcelona/modul_comu_osam.git', :tag => '3.2.0-dev'
 ```
 
 El Podfile quedaria de [la següent manera](https://github.com/AjuntamentdeBarcelona/modul_comu_osam_flutter/blob/main/example/ios/Podfile)
@@ -231,12 +232,12 @@ void _onChangeLanguageEvent(BuildContext context) async {
   if (context.mounted) {
     switch (result) {
       case AppLanguageResponse.SUCCESS:
-        _showToast(context, AppLanguageResponse.SENT.name);
+        _showToast(context, AppLanguageResponse.SUCCESS.name);
         break;
-      case LanguageInformationResponse.UNCHANGED:
-        _showToast(context, AppLanguageResponse.NOT_SENT.name);
+      case AppLanguageResponse.UNCHANGED:
+        _showToast(context, AppLanguageResponse.UNCHANGED.name);
         break;
-      case LanguageInformationResponse.ERROR:
+      case AppLanguageResponse.ERROR:
         _showToast(context, AppLanguageResponse.ERROR.name);
         break;
     }
@@ -261,10 +262,10 @@ void _onFirstTimeOrUpdateEvent(BuildContext context) async {
       case AppLanguageResponse.SUCCESS:
         _showToast(context, AppLanguageResponse.SUCCESS.name);
         break;
-      case LanguageInformationResponse.UNCHANGED:
+      case AppLanguageResponse.UNCHANGED:
         _showToast(context, AppLanguageResponse.UNCHANGED.name);
         break;
-      case LanguageInformationResponse.ERROR:
+      case AppLanguageResponse.ERROR:
         _showToast(context, AppLanguageResponse.ERROR.name);
         break;
     }
@@ -287,11 +288,11 @@ void _onSubscribeToCustomTopic(BuildContext context, String topic) async {
   final result = await DI.osamRepository.subscribeToCustomTopic(topic: topic);
   if (context.mounted) {
     switch (result) {
-      case AppLanguageResponse.ACCEPTED:
-        _showToast(context, AppLanguageResponse.ACCEPTED.name);
+      case SubscriptionResponse.accepted:
+        _showToast(context, SubscriptionResponse.accepted.name);
         break;
-      case LanguageInformationResponse.ERROR:
-        _showToast(context, AppLanguageResponse.ERROR.name);
+      case SubscriptionResponse.error:
+        _showToast(context, SubscriptionResponse.error.name);
         break;
     }
   }
@@ -313,11 +314,11 @@ void _onUnsubscribeToCustomTopic(BuildContext context, String topic) async {
   final result = await DI.osamRepository.unsubscribeToCustomTopic(topic: topic);
   if (context.mounted) {
     switch (result) {
-      case AppLanguageResponse.ACCEPTED:
-        _showToast(context, AppLanguageResponse.ACCEPTED.name);
+      case SubscriptionResponse.accepted:
+        _showToast(context, SubscriptionResponse.accepted.name);
         break;
-      case LanguageInformationResponse.ERROR:
-        _showToast(context, AppLanguageResponse.ERROR.name);
+      case SubscriptionResponse.error:
+        _showToast(context, SubscriptionResponse.error.name);
         break;
     }
   }
@@ -368,7 +369,10 @@ static _onMessagingEvent(String topic, String action) async {
 static Future<void> cacheTokenForNative() async {
   String? token = await FirebaseMessaging.instance.getToken();
   if (token != null) {
- await _prefs.setString('fcm_token', token);
+    // Save token where native side can access it, e.g. SharedPreferences
+    final prefs = await SharedPreferences.getInstance();
+    await prefs.setString('fcm_token', token);
+  }
 }
 ```
 ## Flutter app demo

android/build.gradle

@@ -49,7 +49,7 @@ android {
 
 dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0-native-mt")
-    implementation("com.github.AjuntamentdeBarcelona.modul_comu_osam:common:3.1.0")
+    implementation("com.github.AjuntamentdeBarcelona.modul_comu_osam:common:3.2.0-dev")
     implementation("com.google.code.gson:gson:2.10.1")
 
     implementation(platform("com.google.firebase:firebase-bom:33.6.0"))

android/src/main/kotlin/cat/bcn/commonmodule/flutter/osam_common_module_flutter/CommonModuleFlutterPlugin.kt

@@ -80,7 +80,8 @@ class CommonModuleFlutterPlugin : FlutterPlugin, MethodCallHandler, ActivityAwar
                 val osamCommons = this.osamCommons
                 if (osamCommons != null) {
                     val language = getLanguageFromString(call.argument("language") ?: "")
-                    osamCommons.versionControl(language) {
+                    val isDarkMode = call.argument<Boolean>("isDarkMode") ?: false
+                    osamCommons.versionControl(language, isDarkMode) {
                         result.success(it.toStringResponse())
                     }
                 } else {
@@ -91,7 +92,8 @@ class CommonModuleFlutterPlugin : FlutterPlugin, MethodCallHandler, ActivityAwar
                 val osamCommons = this.osamCommons
                 if (osamCommons != null) {
                     val language = getLanguageFromString(call.argument("language") ?: "")
-                    osamCommons.rating(language) {
+                    val isDarkMode = call.argument<Boolean>("isDarkMode") ?: false
+                    osamCommons.rating(language, isDarkMode) {
                         result.success(it.toStringResponse())
                     }
                 } else {

android/src/main/kotlin/cat/bcn/commonmodule/flutter/osam_common_module_flutter/extension/Extensions.kt

@@ -20,7 +20,7 @@ fun getLanguageFromString(languageCode: String): Language = when (languageCode)
     catalanLanguageCode -> Language.CA
     spanishLanguageCode -> Language.ES
     englishLanguageCode -> Language.EN
-    else -> Language.CA
+    else -> Language.EN
 }
 
 fun VersionControlResponse.toStringResponse(): String = when (this) {

example/ios/Podfile

@@ -32,7 +32,7 @@ target 'Runner' do
   use_modular_headers!
 
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
-  pod 'OSAMCommon', :git => 'https://github.com/AjuntamentdeBarcelona/modul_comu_osam.git', :tag => '3.1.0'
+  pod 'OSAMCommon', :git => 'https://github.com/AjuntamentdeBarcelona/modul_comu_osam.git', :tag => '3.2.0-dev'
 end
 
 post_install do |installer|

example/ios/Runner/Info.plist

@@ -49,5 +49,11 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>NSLocalNetworkUsageDescription</key>
+	<string>Allow Flutter to discover the local network for debugging.</string>
+	<key>NSBonjourServices</key>
+	<array>
+		<string>_dartobservatory._tcp</string>
+	</array>
 </dict>
 </plist>

example/ios/Runner/Runner.entitlements

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>

example/lib/actions_screen.dart

@@ -1,3 +1,4 @@
+import 'package:common_module_flutter_example/data/osam/osam_repository_impl.dart';
 import 'package:flutter/material.dart';
 import 'package:osam_common_module_flutter/osam_common_module_flutter.dart';
 
@@ -76,6 +77,10 @@ class ActionsScreenState extends State<ActionsScreen> {
   }
 
   void _onVersionControl() async {
+    if (DI.osamRepository is OsamRepositoryImpl) {
+      (DI.osamRepository as OsamRepositoryImpl)
+          .setAlertWrapper(AlertWrapper(context));
+    }
     final result = await DI.osamRepository.checkForUpdates();
 
     if (mounted) {
@@ -97,6 +102,10 @@ class ActionsScreenState extends State<ActionsScreen> {
   }
 
   void _onRating() async {
+    if (DI.osamRepository is OsamRepositoryImpl) {
+      (DI.osamRepository as OsamRepositoryImpl)
+          .setAlertWrapper(AlertWrapper(context));
+    }
     final result = await DI.osamRepository.checkRating();
 
     if (mounted) {