Merge pull request #301 from Manuito83/develop

Merge for v3.6.4

Author: Manuito83

android/app/build.gradle

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

ios/Runner.xcodeproj/project.pbxproj

@@ -549,7 +549,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 470;
+				CURRENT_PROJECT_VERSION = 471;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = 53KVJRJS99;
 				ENABLE_BITCODE = NO;
@@ -567,7 +567,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 3.6.3;
+				MARKETING_VERSION = 3.6.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.manuito.tornpda;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -698,7 +698,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 470;
+				CURRENT_PROJECT_VERSION = 471;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = 53KVJRJS99;
 				ENABLE_BITCODE = NO;
@@ -716,7 +716,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 3.6.3;
+				MARKETING_VERSION = 3.6.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.manuito.tornpda;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -739,7 +739,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 470;
+				CURRENT_PROJECT_VERSION = 471;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = 53KVJRJS99;
 				ENABLE_BITCODE = NO;
@@ -757,7 +757,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 3.6.3;
+				MARKETING_VERSION = 3.6.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.manuito.tornpda;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

lib/main.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.3';
-const String androidCompilation = '470';
-const String iosCompilation = '470';
+const String appVersion = '3.6.4';
+const String androidCompilation = '471';
+const String iosCompilation = '471';
 
 // TODO (App release)
 // Note: if using Windows and calling HTTP functions, we need to change the URL in [firebase_functions.dart]

lib/pages/settings_page.dart

@@ -1069,7 +1069,7 @@ class SettingsPageState extends State<SettingsPage> {
               Padding(
                 padding: const EdgeInsets.symmetric(horizontal: 20),
                 child: Text(
-                  "This will allow you to backup your main app settings (e.g.: scripts, shortcuts, etc.) locally so"
+                  "This will allow you to backup your main app settings (e.g.: scripts, shortcuts, etc.) locally so "
                   "that you can later restore them if needed or share them across different devices",
                   style: TextStyle(
                     color: Colors.grey[600],

lib/providers/war_controller.dart

@@ -283,7 +283,7 @@ class WarController extends GetxController {
         _assignSpiedStats(member);
 
         member.statsEstimated = StatsCalculator.calculateStats(
-          criminalRecordTotal: updatedTarget.personalstats!.networth!.total,
+          criminalRecordTotal: updatedTarget.personalstats?.criminalOffenses?.total,
           level: updatedTarget.level,
           networth: updatedTarget.personalstats!.networth!.total,
           rank: updatedTarget.rank,

lib/utils/changelog.dart

@@ -51,11 +51,12 @@ class ChangeLogState extends State<ChangeLog> {
   void _createItems() {
     final itemList = <ChangeLogItem>[];
 
-    // v3.6.3 - Build 470 - 12/12/2024
+    // v3.6.4 - Build 471 - 14/12/2024
     itemList.add(
       ChangeLogItem()
-        ..version = 'Torn PDA v3.6.3'
-        ..date = '25 DEC 2024'
+        ..version = 'Torn PDA v3.6.4'
+        ..date = '15 DEC 2024'
+        ..infoString = 'Hotfix: resolved incorrect estimated stats calculation in the War section'
         ..features = [
           "Fixed player profile widget",
           "Fixed chat notifications in split screen",