Merge pull request #185 from AssistantNMS/develop

🔖 2.9.0
AssistantNMS · Feb 16, 2023 · 34356d1 · 34356d1
2 parents e8d5f29 + aabb246
commit 34356d1
Show file tree

Hide file tree

Showing 32 changed files with 547 additions and 399 deletions.
diff --git a/.githooks/commit-msg b/.githooks/commit-msg
diff --git a/assets/data/meta.json b/assets/data/meta.json
@@ -1,5 +1,5 @@
 {
   "GameVersion": "4.08",
   "GameBuildNumber": 10044304,
-  "GeneratedDate": "2023-02-05"
+  "GeneratedDate": "2023-02-16"
 }
diff --git a/assets/data/social.json b/assets/data/social.json
@@ -1,52 +1,52 @@
 [
-    {
-        "name": "Discord",
-        "icon": "discord.png",
-        "link": "https://assistantapps.com/discord"
-    },
-    {
-        "name": "NoMansSky.Social",
-        "icon": "mastodon.png",
-        "link": "https://nomanssky.social"
-    },
-    {
-        "name": "Twitter",
-        "icon": "twitter.png",
-        "link": "https://twitter.com/AssistantNMS"
-    },
-    {
-        "name": "Github Organisation",
-        "icon": "github.png",
-        "link": "https://github.com/AssistantNMS"
-    },
-    {
-        "name": "Github Roadmap",
-        "icon": "github.png",
-        "link": "https://github.com/orgs/AssistantNMS/projects/3/views/4"
-    },
-    {
-        "name": "Youtube",
-        "icon": "youtube.png",
-        "link": "https://www.youtube.com/channel/UCpKNMVk7ZWvBk-psQQZqz5w"
-    },
-    {
-        "name": "Reddit",
-        "icon": "reddit.png",
-        "link": "https://www.reddit.com/r/AssistantNMS"
-    },
-    {
-        "name": "Instagram",
-        "icon": "instagram.png",
-        "link": "https://www.instagram.com/AssistantNMS/"
-    },
-    {
-        "name": "Facebook",
-        "icon": "facebook.png",
-        "link": "https://www.facebook.com/AssistantNMS"
-    },
-    {
-        "name": "Steam",
-        "icon": "steam.png",
-        "link": "https://steamcommunity.com/groups/AssistantNMS"
-    }
+  {
+    "name": "Discord",
+    "icon": "discord.png",
+    "link": "https://assistantapps.com/discord"
+  },
+  {
+    "name": "NoMansSky.Social",
+    "icon": "mastodon.png",
+    "link": "https://nomanssky.social"
+  },
+  {
+    "name": "Twitter",
+    "icon": "twitter.png",
+    "link": "https://twitter.com/AssistantNMS"
+  },
+  {
+    "name": "Github Organisation",
+    "icon": "github.png",
+    "link": "https://github.com/AssistantNMS"
+  },
+  {
+    "name": "Github Roadmap",
+    "icon": "github.png",
+    "link": "https://github.com/orgs/AssistantNMS/projects/3/views/4"
+  },
+  {
+    "name": "Youtube",
+    "icon": "youtube.png",
+    "link": "https://www.youtube.com/channel/UCpKNMVk7ZWvBk-psQQZqz5w"
+  },
+  {
+    "name": "Reddit",
+    "icon": "reddit.png",
+    "link": "https://www.reddit.com/r/AssistantNMS"
+  },
+  {
+    "name": "Instagram",
+    "icon": "instagram.png",
+    "link": "https://www.instagram.com/AssistantNMS/"
+  },
+  {
+    "name": "Facebook",
+    "icon": "facebook.png",
+    "link": "https://www.facebook.com/AssistantNMS"
+  },
+  {
+    "name": "Steam",
+    "icon": "steam.png",
+    "link": "https://steamcommunity.com/groups/AssistantNMS"
+  }
 ]
diff --git a/installers/assistantNMS.iss b/installers/assistantNMS.iss
@@ -2,10 +2,10 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Assistant for No Man's Sky"
-#define MyAppVersion "2.8.1"
+#define MyAppVersion "2.9.0"
 #define MyAppPublisher "AssistantApps"
 #define MyAppURL "https://nmsassistant.com/"
-#define MyAppExeName "nmstest.exe"
+#define MyAppExeName "assistantnms_app.exe"
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
@@ -54,8 +54,8 @@ Source: "C:\Development\Projects\AssistantNMS\assistantnms_app\build\windows\run
 Source: "C:\Development\Projects\AssistantNMS\assistantnms_app\build\windows\runner\Release\dynamic_color_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Development\Projects\AssistantNMS\assistantnms_app\build\windows\runner\Release\flutter_secure_storage_windows_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Development\Projects\AssistantNMS\assistantnms_app\build\windows\runner\Release\flutter_windows.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Development\Projects\AssistantNMS\assistantnms_app\build\windows\runner\Release\nmstest.exp"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Development\Projects\AssistantNMS\assistantnms_app\build\windows\runner\Release\nmstest.lib"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Development\Projects\AssistantNMS\assistantnms_app\build\windows\runner\Release\assistantnms_app.exp"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Development\Projects\AssistantNMS\assistantnms_app\build\windows\runner\Release\assistantnms_app.lib"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Development\Projects\AssistantNMS\assistantnms_app\build\windows\runner\Release\platform_device_id_windows_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Development\Projects\AssistantNMS\assistantnms_app\build\windows\runner\Release\url_launcher_windows_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Development\Projects\AssistantNMS\assistantnms_app\build\windows\runner\Release\flutter_localization_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion

diff --git a/lib/assistant_apps_settings.dart b/lib/assistant_apps_settings.dart
@@ -1,3 +1,3 @@
 const assistantAppsApiUrl = 'https://api.assistantapps.com';
 const assistantAppsAppGuid = '589405b4-e40f-4cd9-b793-6bf37944ee09';
-const currentWhatIsNewGuid = 'b9e743bc-b092-42f6-b144-5fdf43edc654';
+const currentWhatIsNewGuid = '6744cdfd-32e4-4723-a561-9531db8f76af';
diff --git a/lib/components/currency_text.dart b/lib/components/currency_text.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 
 import '../helpers/currency_helper.dart';
+import '../helpers/theme_helper.dart';
 
 class CurrencyText extends StatelessWidget {
   final TextStyle? style;
@@ -23,7 +24,10 @@ class CurrencyText extends StatelessWidget {
     return Text(
       currencyFormat(numberString, addDecimal: addDecimal),
       textAlign: textAlign,
-      style: style,
+      style: style ??
+          getThemeBodyLarge(context)?.copyWith(
+            color: Colors.black,
+          ),
       overflow: overflow,
     );
   }

diff --git a/lib/components/tilePresenters/friend_code_tile_presenter.dart b/lib/components/tilePresenters/friend_code_tile_presenter.dart
@@ -6,21 +6,23 @@ import 'package:flutter/services.dart';
 
 import '../../contracts/generated/friend_code_view_model.dart';
 
-Widget friendCodeTilePresenter(BuildContext context,
-    BuildContext scaffoldContext, FriendCodeViewModel friendCode) {
+Widget friendCodeTilePresenter(
+  BuildContext context,
+  FriendCodeViewModel friendCode,
+) {
   String imagePath = 'link.png';
   if (friendCode.platformType == 1) imagePath = 'platformPc.png';
   if (friendCode.platformType == 2) imagePath = 'platformPs4.png';
   if (friendCode.platformType == 3) imagePath = 'platformXb1.png';
 
-  var onTap = () {
+  onTap() {
     Clipboard.setData(ClipboardData(text: friendCode.code));
     getSnackbar().showSnackbar(
-      scaffoldContext,
+      context,
       LocaleKey.friendCodeCopied,
       description: friendCode.code,
     );
-  };
+  }
 
   return genericListTileWithSubtitle(
     context,
@@ -32,7 +34,7 @@ Widget friendCodeTilePresenter(BuildContext context,
       overflow: TextOverflow.ellipsis,
     ),
     trailing: IconButton(
-      icon: const Icon(Icons.copy),
+      icon: Icon(Icons.copy, color: getTheme().getSecondaryColour(context)),
       onPressed: onTap,
     ),
     onTap: onTap,

diff --git a/lib/components/tilePresenters/generic_tile_presenter.dart b/lib/components/tilePresenters/generic_tile_presenter.dart
@@ -22,35 +22,43 @@ Widget genericTileWithBackgroundColourPresenter(
     imageBackgroundColour: genericItem.colour,
     name: genericItem.name,
     onTap: onTap ??
-        () async => await getNavigation().navigateAwayFromHomeAsync(
-              context,
-              navigateTo: (context) => GenericPage(
-                genericItem.id,
-                itemDetails: genericItem,
-              ),
+        () {
+          getNavigation().navigateAwayFromHomeAsync(
+            context,
+            navigateTo: (context) => GenericPage(
+              genericItem.id,
+              itemDetails: genericItem,
             ),
+          );
+        },
   );
 }
 
 Widget genericTilePresenter(
-    BuildContext context, GenericPageItem genericItem, bool isHero,
-    {void Function()? onTap}) {
+  BuildContext context,
+  GenericPageItem genericItem,
+  bool isHero, {
+  void Function()? onTap,
+}) {
   String itemIcon = (genericItem.icon.isEmpty)
       ? getPath().unknownImagePath
       : genericItem.icon;
+
   return genericListTile(
     context,
     leadingImage: itemIcon,
     leadingImageHero: isHero ? gameItemIconHero(genericItem) : null,
     name: genericItem.name,
     onTap: onTap ??
-        () async => await getNavigation().navigateAwayFromHomeAsync(
-              context,
-              navigateTo: (context) => GenericPage(
-                genericItem.id,
-                itemDetails: genericItem,
-              ),
+        () {
+          getNavigation().navigateAwayFromHomeAsync(
+            context,
+            navigateTo: (context) => GenericPage(
+              genericItem.id,
+              itemDetails: genericItem,
             ),
+          );
+        },
   );
 }
 

diff --git a/lib/components/tilePresenters/required_item_tile_presenter.dart b/lib/components/tilePresenters/required_item_tile_presenter.dart
@@ -145,8 +145,12 @@ Widget genericHomeTileWithRequiredItemsAndBackgroundColourPresenter(
     builder: (BuildContext context,
         AsyncSnapshot<List<RequiredItemDetails>> snapshot) {
       return genericHomeTileWithRequiredItemsBody(
-          context, genericItem, isHero, snapshot,
-          displayBackgroundColour: true);
+        context,
+        genericItem,
+        isHero,
+        snapshot,
+        displayBackgroundColour: true,
+      );
     },
   );
 }

diff --git a/lib/components/tilePresenters/timer_tile_presenter.dart b/lib/components/tilePresenters/timer_tile_presenter.dart
@@ -10,6 +10,25 @@ Widget timerTilePresenter(
   void Function(TimerItem) onEdit,
   void Function(String) onDelete,
 ) {
+  DateTime tweakedStart = (DateTime(
+    timer.startDate.year,
+    timer.startDate.month,
+    timer.startDate.day,
+    timer.startDate.hour,
+    timer.startDate.minute,
+    timer.startDate.second,
+    timer.startDate.millisecond,
+  ));
+  DateTime tweakedEnd = (DateTime(
+    timer.completionDate.year,
+    timer.completionDate.month,
+    timer.completionDate.day,
+    timer.completionDate.hour,
+    timer.completionDate.minute,
+    timer.completionDate.second,
+    timer.completionDate.millisecond,
+  ));
+
   return genericListTileWithSubtitle(
     context,
     leadingImage: timer.icon,
@@ -18,8 +37,8 @@ Widget timerTilePresenter(
       padding: const EdgeInsets.only(top: 4.0, bottom: 4.0),
       child: getProgressbarFromDates(
         context,
-        timer.startDate,
-        timer.completionDate,
+        tweakedStart,
+        tweakedEnd,
         animation: false,
       ),
     ),

diff --git a/lib/constants/app_available_languages.dart b/lib/constants/app_available_languages.dart
@@ -1,33 +1,33 @@
-
 import 'package:assistantapps_flutter_common/assistantapps_flutter_common.dart';
 
 List<LocalizationMap> supportedLanguageMaps = [
-      LocalizationMap(LocaleKey.english, 'en', 'gb', percentageComplete: 100),
-    LocalizationMap(LocaleKey.dutch, 'nl', 'nl', percentageComplete: 67),
-    LocalizationMap(LocaleKey.german, 'de', 'de', percentageComplete: 100),
-    LocalizationMap(LocaleKey.french, 'fr', 'fr', percentageComplete: 100),
-    LocalizationMap(LocaleKey.italian, 'it', 'it', percentageComplete: 100),
-    LocalizationMap(LocaleKey.russian, 'ru', 'ru', percentageComplete: 100),
-    LocalizationMap(LocaleKey.polish, 'pl', 'pl', percentageComplete: 100),
-    LocalizationMap(LocaleKey.brazilianPortuguese, 'pt-br', 'br', percentageComplete: 100),
-    LocalizationMap(LocaleKey.portuguese, 'pt', 'pt', percentageComplete: 24),
-    LocalizationMap(LocaleKey.norwegian, 'no', 'no', percentageComplete: 77),
-    LocalizationMap(LocaleKey.romanian, 'ro', 'ro', percentageComplete: 37),
-    LocalizationMap(LocaleKey.spanish, 'es', 'es', percentageComplete: 100),
-    LocalizationMap(LocaleKey.czech, 'cs', 'cz', percentageComplete: 94),
-    LocalizationMap(LocaleKey.turkish, 'tr', 'tr', percentageComplete: 89),
-    LocalizationMap(LocaleKey.hungarian, 'hu', 'hu', percentageComplete: 99),
-    LocalizationMap(LocaleKey.simplifiedChinese, 'zh-hans', 'cn', percentageComplete: 98),
-    LocalizationMap(LocaleKey.traditionalChinese, 'zh-hant', 'cn', percentageComplete: 48),
-    LocalizationMap(LocaleKey.arabic, 'ar', 'ae', percentageComplete: 11),
-    LocalizationMap(LocaleKey.vietnamese, 'vi-vn', 'vn', percentageComplete: 89),
-    LocalizationMap(LocaleKey.urdu, 'ur', 'pk', percentageComplete: 7),
-    LocalizationMap(LocaleKey.filipino, 'ph', 'ph', percentageComplete: 0),
-    LocalizationMap(LocaleKey.indonesian, 'id', 'id', percentageComplete: 87),
-    LocalizationMap(LocaleKey.malaysian, 'ms', 'my', percentageComplete: 87),
-    LocalizationMap(LocaleKey.tagalog, 'tl', 'ph', percentageComplete: 0),
-    LocalizationMap(LocaleKey.japanese, 'ja', 'jp', percentageComplete: 6),
-    LocalizationMap(LocaleKey.afrikaans, 'af', 'za', percentageComplete: 29),
-
+  LocalizationMap(LocaleKey.english, 'en', 'gb', percentageComplete: 100),
+  LocalizationMap(LocaleKey.dutch, 'nl', 'nl', percentageComplete: 67),
+  LocalizationMap(LocaleKey.german, 'de', 'de', percentageComplete: 100),
+  LocalizationMap(LocaleKey.french, 'fr', 'fr', percentageComplete: 100),
+  LocalizationMap(LocaleKey.italian, 'it', 'it', percentageComplete: 100),
+  LocalizationMap(LocaleKey.russian, 'ru', 'ru', percentageComplete: 100),
+  LocalizationMap(LocaleKey.polish, 'pl', 'pl', percentageComplete: 100),
+  LocalizationMap(LocaleKey.brazilianPortuguese, 'pt-br', 'br',
+      percentageComplete: 100),
+  LocalizationMap(LocaleKey.portuguese, 'pt', 'pt', percentageComplete: 24),
+  LocalizationMap(LocaleKey.norwegian, 'no', 'no', percentageComplete: 77),
+  LocalizationMap(LocaleKey.romanian, 'ro', 'ro', percentageComplete: 37),
+  LocalizationMap(LocaleKey.spanish, 'es', 'es', percentageComplete: 100),
+  LocalizationMap(LocaleKey.czech, 'cs', 'cz', percentageComplete: 94),
+  LocalizationMap(LocaleKey.turkish, 'tr', 'tr', percentageComplete: 89),
+  LocalizationMap(LocaleKey.hungarian, 'hu', 'hu', percentageComplete: 99),
+  LocalizationMap(LocaleKey.simplifiedChinese, 'zh-hans', 'cn',
+      percentageComplete: 98),
+  LocalizationMap(LocaleKey.traditionalChinese, 'zh-hant', 'cn',
+      percentageComplete: 48),
+  LocalizationMap(LocaleKey.arabic, 'ar', 'ae', percentageComplete: 11),
+  LocalizationMap(LocaleKey.vietnamese, 'vi-vn', 'vn', percentageComplete: 89),
+  LocalizationMap(LocaleKey.urdu, 'ur', 'pk', percentageComplete: 7),
+  LocalizationMap(LocaleKey.filipino, 'ph', 'ph', percentageComplete: 0),
+  LocalizationMap(LocaleKey.indonesian, 'id', 'id', percentageComplete: 87),
+  LocalizationMap(LocaleKey.malaysian, 'ms', 'my', percentageComplete: 87),
+  LocalizationMap(LocaleKey.tagalog, 'tl', 'ph', percentageComplete: 0),
+  LocalizationMap(LocaleKey.japanese, 'ja', 'jp', percentageComplete: 6),
+  LocalizationMap(LocaleKey.afrikaans, 'af', 'za', percentageComplete: 29),
 ];
-
diff --git a/lib/contracts/data/quicksilver_store_item.dart b/lib/contracts/data/quicksilver_store_item.dart
@@ -31,4 +31,4 @@ class QuicksilverStoreItem {
         "Tier": tier,
         "ItemId": itemId,
       };
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,4 +31,4 @@ class QuicksilverStoreItem { @@
             "Tier": tier,
             "ItemId": itemId,
           };
-    }
+    }