Merge branch 'OSAM-21605-dark-mode-control-version-popup' into 'feat/OSAM_april_2026'

OSAM-21605-dark-mode-control-version-popup

See merge request osam/common_module_flutter!16

Author: Alberto Aguilar Garcia WORDLINE

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 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.1-dev
 
 * BREAKING CHANGES

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.2-dev")
+    implementation("com.github.AjuntamentdeBarcelona.modul_comu_osam:common:3.1.3-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 {

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.2-dev'
+  pod 'OSAMCommon', :git => 'https://github.com/AjuntamentdeBarcelona/modul_comu_osam.git', :tag => '3.1.3-dev'
 end
 
 post_install do |installer|

example/lib/data/osam/osam_repository_impl.dart

@@ -1,3 +1,4 @@
+import 'dart:ui';
 import 'package:osam_common_module_flutter/osam_common_module_flutter.dart';
 import 'package:common_module_flutter_example/data/interfaces.dart';
 import 'package:common_module_flutter_example/model/language.dart'
@@ -16,12 +17,18 @@ class OsamRepositoryImpl extends OsamRepository {
   Future<VersionControlResponse> checkForUpdates() async {
     return osamSdk.versionControl(
       language: _getLanguage(settings.getLanguage()),
+      isDarkMode:
+          PlatformDispatcher.instance.platformBrightness == Brightness.dark,
     );
   }
 
   @override
   Future<RatingControlResponse> checkRating() async {
-    return osamSdk.rating(language: _getLanguage(settings.getLanguage()));
+    return osamSdk.rating(
+      language: _getLanguage(settings.getLanguage()),
+      isDarkMode:
+          PlatformDispatcher.instance.platformBrightness == Brightness.dark,
+    );
   }
 
   Language _getLanguage(app_language.AppLanguage appLanguage) {

example/lib/main.dart

@@ -17,7 +17,15 @@ class MyApp extends StatelessWidget {
     return MaterialApp(
       debugShowCheckedModeBanner: false,
       title: 'Common Module Flutter Demo',
-      theme: ThemeData(primarySwatch: Colors.blue),
+      theme: ThemeData(
+        primarySwatch: Colors.blue,
+        brightness: Brightness.light,
+      ),
+      darkTheme: ThemeData(
+        primarySwatch: Colors.blue,
+        brightness: Brightness.dark,
+      ),
+      themeMode: ThemeMode.system,
       home: const SplashScreen(),
     );
   }

ios/Classes/SwiftCommonModuleFlutterPlugin.swift

@@ -46,8 +46,10 @@ public class SwiftCommonModuleFlutterPlugin: NSObject, FlutterPlugin {
         if call.method == "versionControl" {
             if let osamCommons = self.osamCommons {
                 let language : String = ((call.arguments as? Dictionary<String, Any>)?["language"] as? String) ?? ""
+                let isDarkMode : Bool = ((call.arguments as? Dictionary<String, Any>)?["isDarkMode"] as? Bool) ?? false
                 osamCommons.versionControl(
                     language: getLanguageFromString(langugageCode: language),
+                    isDarkMode: isDarkMode,
                     f: { versionControlResponse in
                         result(versionControlResponse.toStringResponse())
                     }
@@ -58,8 +60,10 @@ public class SwiftCommonModuleFlutterPlugin: NSObject, FlutterPlugin {
         } else if call.method == "rating" {
             if let osamCommons = self.osamCommons {
                 let language : String = ((call.arguments as? Dictionary<String, Any>)?["language"] as? String) ?? ""
+                let isDarkMode : Bool = ((call.arguments as? Dictionary<String, Any>)?["isDarkMode"] as? Bool) ?? false
                 osamCommons.rating(
                     language: getLanguageFromString(langugageCode: language),
+                    isDarkMode: isDarkMode,
                     f: { versionControlResponse in
                         result(versionControlResponse.toStringResponse())
                     }

ios/osam_common_module_flutter.podspec

@@ -15,7 +15,7 @@ A new flutter plugin project.
   s.source           = { :path => '.' }
   s.source_files = 'Classes/**/*'
   s.dependency 'Flutter'
-  s.dependency 'OSAMCommon', '~> 3.1.2-dev'
+  s.dependency 'OSAMCommon', '~> 3.1.3-dev'
   s.platform = :ios, '8.0'
 
   # Flutter.framework does not contain a i386 slice.

lib/osam_common_module_flutter.dart

@@ -8,5 +8,7 @@ export 'src/model/language.dart';
 export 'src/model/rating_control_response.dart';
 export 'src/model/subscription_response.dart';
 export 'src/model/token_response.dart';
+export 'src/model/version.dart';
 export 'src/model/version_control_response.dart';
 export 'src/osam.dart';
+export 'src/ui/ui_helper.dart';

lib/src/model/version.dart

@@ -0,0 +1,52 @@
+import 'package:osam_common_module_flutter/src/model/language.dart';
+
+class Version {
+  final LocalizedText title;
+  final LocalizedText message;
+  final LocalizedText ok;
+  final LocalizedText cancel;
+  final CheckBoxDontShowAgain checkBoxDontShowAgain;
+
+  Version({
+    required this.title,
+    required this.message,
+    required this.ok,
+    required this.cancel,
+    required this.checkBoxDontShowAgain,
+  });
+}
+
+class LocalizedText {
+  final String ca;
+  final String es;
+  final String en;
+
+  LocalizedText({
+    required this.ca,
+    required this.es,
+    required this.en,
+  });
+
+  String localize(Language language) {
+    switch (language) {
+      case Language.CA:
+        return ca;
+      case Language.ES:
+        return es;
+      case Language.EN:
+        return en;
+      default:
+        return ca;
+    }
+  }
+}
+
+class CheckBoxDontShowAgain {
+  final bool isCheckBoxVisible;
+  final LocalizedText text;
+
+  CheckBoxDontShowAgain({
+    required this.isCheckBoxVisible,
+    required this.text,
+  });
+}