Merge pull request #300 from Manuito83/develop

Merge for v3.6.3

Author: Manuito83

android/app/build.gradle

@@ -16,12 +16,12 @@ if (localPropertiesFile.exists()) {
 
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
-    flutterVersionCode = '467'
+    flutterVersionCode = '470'
 }
 
 def flutterVersionName = localProperties.getProperty('flutter.versionName')
 if (flutterVersionName == null) {
-    flutterVersionName = '3.6.2'
+    flutterVersionName = '3.6.3'
 }
 
 def keystoreProperties = new Properties()

ios/Runner.xcodeproj/project.pbxproj

@@ -672,7 +672,7 @@ class DrawerPageState extends State<DrawerPage> with WidgetsBindingObserver, Aut
           logToUser(
             "Deep link browser opens\n\n$url",
             duration: 3,
-            color: Colors.blue.shade600,
+            backgroundcolor: Colors.blue.shade600,
             borderColor: Colors.blue.shade800,
           );
 

lib/drawer.dart

@@ -68,9 +68,9 @@ import 'package:wakelock_plus/wakelock_plus.dart';
 import 'package:workmanager/workmanager.dart';
 
 // TODO (App release)
-const String appVersion = '3.6.2';
-const String androidCompilation = '467';
-const String iosCompilation = '467';
+const String appVersion = '3.6.3';
+const String androidCompilation = '470';
+const String iosCompilation = '470';
 
 // TODO (App release)
 // Note: if using Windows and calling HTTP functions, we need to change the URL in [firebase_functions.dart]
@@ -553,6 +553,13 @@ class MyAppState extends State<MyApp> with WidgetsBindingObserver {
       if (!splitNowActive && splitUserEnabled && screenIsWide) {
         _webViewProvider.webViewSplitActive = true;
         _webViewProvider.browserForegroundWithSplitTransition();
+
+        // Chat notifications should be omitted when switching into splitview
+        //   (note: the case where we are no longer in splitiew is handled below,
+        //    by notifying the webviewProvider with true/false which in turns
+        //    will update the Sendbird Controller with the right value)
+        SendbirdController sb = Get.find<SendbirdController>();
+        sb.webviewInForeground = true;
       } else if (splitNowActive && (!splitUserEnabled || !screenIsWide)) {
         _webViewProvider.webViewSplitActive = false;
         if (_webViewProvider.splitScreenRevertsToApp) {
@@ -682,14 +689,21 @@ Future<void> _shouldSyncDeviceTheme(WidgetsBinding widgetsBinding) async {
   }
 }
 
-logToUser(String? message, {int duration = 3, Color? color, Color? borderColor}) {
+logToUser(
+  String? message, {
+  int duration = 3,
+  Color? textColor,
+  Color? backgroundcolor,
+  Color? borderColor,
+}) {
   log(message.toString());
   if (message == null) return;
-  color ??= Colors.red.shade600;
+  backgroundcolor ??= Colors.red.shade600;
   borderColor ??= Colors.red.shade800;
+  textColor ??= Colors.white;
   if (logAndShowToUser) {
     toastification.showCustom(
-      autoCloseDuration: const Duration(seconds: 3),
+      autoCloseDuration: Duration(seconds: duration),
       alignment: Alignment.bottomCenter,
       builder: (BuildContext context, ToastificationItem holder) {
         return Center(
@@ -698,15 +712,15 @@ logToUser(String? message, {int duration = 3, Color? color, Color? borderColor})
               child: Container(
                 decoration: BoxDecoration(
                   borderRadius: BorderRadius.circular(8),
-                  color: color,
+                  color: backgroundcolor,
                   border: Border.all(color: borderColor!, width: 2),
                 ),
-                padding: const EdgeInsets.all(16),
-                margin: const EdgeInsets.all(8),
+                padding: const EdgeInsets.all(8),
+                margin: const EdgeInsets.all(2),
                 child: Column(
                   children: [
-                    Text("Debug Message\n", style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold)),
-                    Text(message.toString(), maxLines: 10, style: TextStyle(color: Colors.white)),
+                    Text("Debug Message\n", style: TextStyle(color: textColor, fontWeight: FontWeight.bold)),
+                    Text(message.toString(), maxLines: 10, style: TextStyle(color: textColor)),
                   ],
                 ),
               )),

lib/main.dart

@@ -929,7 +929,7 @@ class ForeignStockPageState extends State<ForeignStockPage> {
         logToUser(
           apiReturn.providersMessage,
           duration: 4,
-          color: Colors.blue.shade600,
+          backgroundcolor: Colors.blue.shade600,
           borderColor: Colors.blue.shade800,
         );
       }

lib/pages/travel/foreign_stock_page.dart

@@ -1,3 +1,5 @@
+import 'dart:developer';
+
 import 'package:get/get.dart';
 import 'package:torn_pda/utils/shared_prefs.dart';
 
@@ -17,21 +19,25 @@ class PeriodicExecutionController extends GetxController {
     bool executeImmediately = false,
     bool overwrite = false,
   }) async {
-    // If overwrite is enabled, remove the existing task
-    if (_tasks.containsKey(taskName) && overwrite) {
-      await cancelTask(taskName); // Remove the existing task
-    }
+    try {
+// If overwrite is enabled, remove the existing task
+      if (_tasks.containsKey(taskName) && overwrite) {
+        await cancelTask(taskName); // Remove the existing task
+      }
 
-    // Ensure the taskName is unique
-    if (_tasks.containsKey(taskName)) {
-      throw Exception('Task with name "$taskName" already exists');
-    }
+      // Ensure the taskName is unique
+      if (_tasks.containsKey(taskName)) {
+        throw Exception('Task with name "$taskName" already exists');
+      }
 
-    _tasks[taskName] = _TaskDetails(task, intervalInHours);
+      _tasks[taskName] = _TaskDetails(task, intervalInHours);
 
-    if (executeImmediately) {
-      await task();
-      await _updateLastExecutionTime(taskName);
+      if (executeImmediately) {
+        await task();
+        await _updateLastExecutionTime(taskName);
+      }
+    } catch (e) {
+      log("$e", name: "Periodic Execution Controller");
     }
   }
 
@@ -57,13 +63,17 @@ class PeriodicExecutionController extends GetxController {
 
   /// Cancels a task by its name and removes its execution state
   Future<void> cancelTask(String taskName) async {
-    if (!_tasks.containsKey(taskName)) {
-      throw Exception('Task "$taskName" is not registered');
-    }
+    try {
+      if (!_tasks.containsKey(taskName)) {
+        throw Exception('Task "$taskName" is not registered');
+      }
 
-    _tasks.remove(taskName);
+      _tasks.remove(taskName);
 
-    await Prefs().removeLastExecutionTime(taskName);
+      await Prefs().removeLastExecutionTime(taskName);
+    } catch (e) {
+      log("$e", name: "Periodic Execution Controller");
+    }
   }
 
   /// Updates the last execution time for a given task

lib/providers/periodic_execution_controller.dart

@@ -178,7 +178,7 @@ class SendbirdController extends GetxController {
       );
 
       if (regStatus == PushTokenRegistrationStatus.success) {
-        logToUser("Successfully registered user FCM token with Sendbird!");
+        log("Successfully registered user FCM token with Sendbird!");
 
         // Ensure it's not just mentions
         await SendbirdChat.setPushTriggerOption(PushTriggerOption.all);

lib/providers/sendbird_controller.dart

@@ -51,11 +51,22 @@ class ChangeLogState extends State<ChangeLog> {
   void _createItems() {
     final itemList = <ChangeLogItem>[];
 
-    // v3.6.2 - Build 467 - 87/11/2024
+    // v3.6.3 - Build 470 - 12/12/2024
+    itemList.add(
+      ChangeLogItem()
+        ..version = 'Torn PDA v3.6.3'
+        ..date = '25 DEC 2024'
+        ..features = [
+          "Fixed player profile widget",
+          "Fixed chat notifications in split screen",
+        ],
+    );
+
+    // v3.6.2 - Build 467 - 07/11/2024
     itemList.add(
       ChangeLogItem()
         ..version = 'Torn PDA v3.6.2'
-        ..date = '9 DEC 2024'
+        ..date = '09 DEC 2024'
         ..infoString = 'Hotfix: resolved an issue affecting the reordering of tabs'
         ..features = [
           "Added channel info to chat notifications",