Skip to content

Commit

Permalink
🔖 2.27.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Khaoz-Topsy committed Sep 6, 2024
1 parent 8fd62ef commit 96ef784
Show file tree
Hide file tree
Showing 20 changed files with 363 additions and 335 deletions.
34 changes: 17 additions & 17 deletions .metadata
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
# This file tracks properties of this Flutter project.
# Used by Flutter tool to assess capabilities and perform upgrades etc.
#
# This file should be version controlled.
# This file should be version controlled and should not be manually edited.

version:
revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
channel: master
revision: "4cf269e36de2573851eaef3c763994f8f9be494d"
channel: "stable"

project_type: app

# Tracks metadata for the flutter migrate command
migration:
platforms:
- platform: root
create_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
base_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
- platform: android
create_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
base_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
- platform: ios
create_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
base_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
- platform: linux
create_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
base_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
- platform: macos
create_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
base_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
- platform: web
create_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
base_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
- platform: windows
create_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
base_revision: cef9cc717b3a4fc9f164e7dce7bbb85514fe9790
create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d

# User provided section

Expand Down
2 changes: 1 addition & 1 deletion installers/assistantNMS.iss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

#define MyAppName "Assistant for No Man's Sky"
#define MyAppVersion "2.27.0"
#define MyAppVersion "2.27.1"
#define MyAppPublisher "AssistantApps"
#define MyAppURL "https://nmsassistant.com/"
#define MyAppExeName "assistantnms_app.exe"
Expand Down
4 changes: 4 additions & 0 deletions lib/components/tilePresenters/generic_tile_presenter.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Widget genericTileWithBackgroundColourPresenter(
BuildContext context,
GenericPageItem genericItem,
bool isHero, {
bool? removeContentPadding,
void Function()? onTap,
}) {
String itemIcon = (genericItem.icon.isEmpty)
Expand All @@ -19,6 +20,7 @@ Widget genericTileWithBackgroundColourPresenter(
context,
leadingImage: itemIcon,
leadingImageHero: isHero ? gameItemIconHero(genericItem) : null,
removeContentPadding: removeContentPadding,
imageBackgroundColour: genericItem.colour,
name: genericItem.name,
onTap: onTap ??
Expand All @@ -38,6 +40,7 @@ Widget genericTilePresenter(
BuildContext context,
GenericPageItem genericItem,
bool isHero, {
bool? removeContentPadding,
void Function()? onTap,
}) {
String itemIcon = (genericItem.icon.isEmpty)
Expand All @@ -48,6 +51,7 @@ Widget genericTilePresenter(
context,
leadingImage: itemIcon,
leadingImageHero: isHero ? gameItemIconHero(genericItem) : null,
removeContentPadding: removeContentPadding,
name: genericItem.name,
onTap: onTap ??
() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Widget majorUpdateTilePresenter(
children: [
backgroundImgSource,
Container(
color: const Color.fromRGBO(0, 0, 0, 0.45),
color: const Color.fromRGBO(0, 0, 0, 1),
child: Column(children: [
GenericItemName(updateNewItems.title),
]),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ Widget genericHomeTileWithRequiredItemsPresenter(
BuildContext context,
GenericPageItem genericItem,
bool isHero, {
bool? removeContentPadding,
void Function()? onTap,
}) {
return CachedFutureBuilder<List<RequiredItemDetails>>(
Expand All @@ -127,6 +128,7 @@ Widget genericHomeTileWithRequiredItemsPresenter(
genericItem,
isHero,
data,
removeContentPadding: removeContentPadding,
);
},
);
Expand All @@ -136,6 +138,7 @@ Widget genericHomeTileWithRequiredItemsAndBackgroundColourPresenter(
BuildContext context,
GenericPageItem genericItem,
bool isHero, {
bool? removeContentPadding,
void Function()? onTap,
}) {
return CachedFutureBuilder<List<RequiredItemDetails>>(
Expand All @@ -159,6 +162,7 @@ Widget genericHomeTileWithRequiredItemsBody(
bool isHero,
List<RequiredItemDetails> snapshot, {
bool displayBackgroundColour = false,
bool? removeContentPadding,
void Function()? onTap,
}) {
if (snapshot.isEmpty) {
Expand All @@ -168,12 +172,14 @@ Widget genericHomeTileWithRequiredItemsBody(
genericItem,
isHero,
onTap: onTap,
removeContentPadding: removeContentPadding,
);
} else {
genericTilePresenter(
context,
genericItem,
isHero,
removeContentPadding: removeContentPadding,
onTap: onTap,
);
}
Expand Down
27 changes: 9 additions & 18 deletions lib/components/tilePresenters/tech_tree_tile_presenter.dart
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,14 @@ Widget techTreeNodeTilePresenter(
}

Widget techTreeTilePresenter(BuildContext context, String name) {
return Row(
children: [
const SizedBox(
child: null,
height: 50,
width: 50,
),
Padding(
padding: const EdgeInsets.only(left: 8),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(name, maxLines: 2),
Container(height: 4),
],
),
),
],
return Padding(
padding: const EdgeInsets.only(left: 8),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(name, maxLines: 2),
Container(height: 4),
],
),
);
}
6 changes: 3 additions & 3 deletions lib/env/app_version_num.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
const appsBuildNum = 341;
const appsBuildName = '2.27.0';
const appsCommit = '0cd5a1f1fcb77a0bf67cdc50240bd11689806b65';
const appsBuildNum = 342;
const appsBuildName = '2.27.1';
const appsCommit = '8fd62ef90ab7144cad1d016ec4fd3c7a84c2d538';
5 changes: 3 additions & 2 deletions lib/helpers/generic_helper.dart
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ List<Widget> getConsumableRewards(
Widget Function(BuildContext, GenericPageItem, {void Function()? onTap})
getListItemDisplayer(
bool genericTileIsCompact, bool displayGenericItemColour,
{bool isHero = false}) {
{bool isHero = false, bool? removeContentPadding}) {
var presenterWithIsHero = displayGenericItemColour
? genericHomeTileWithRequiredItemsAndBackgroundColourPresenter
: genericHomeTileWithRequiredItemsPresenter;
Expand All @@ -342,7 +342,8 @@ Widget Function(BuildContext, GenericPageItem, {void Function()? onTap})
: genericTilePresenter;
}
return (BuildContext ctx, GenericPageItem item, {void Function()? onTap}) =>
presenterWithIsHero(ctx, item, isHero, onTap: onTap);
presenterWithIsHero(ctx, item, isHero,
removeContentPadding: removeContentPadding, onTap: onTap);
}

Widget getFavouriteStar(
Expand Down
1 change: 1 addition & 0 deletions lib/pages/generic/select_generic_item_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class SelectGenericItemPage extends StatelessWidget {
var presenter = getListItemDisplayer(
viewModel.genericTileIsCompact,
viewModel.displayGenericItemColour,
removeContentPadding: true,
);
return SearchableList<GenericPageItem>(
() => getAllFromLocaleKeys(context, getAllItemsLocaleKeys),
Expand Down
1 change: 1 addition & 0 deletions lib/pages/homepage/all_items_page_component.dart
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ class AllItemsPageComponent extends StatelessWidget {
viewModel.genericTileIsCompact,
viewModel.displayGenericItemColour,
isHero: true,
removeContentPadding: true,
),
listItemSearch: search,
key: Key(renderKey),
Expand Down
1 change: 1 addition & 0 deletions lib/pages/inventory/add_edit_inventory_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ class _AddEditInventoryState extends State<AddEditInventoryPage> {
selectedImageIndex = selectedIndex;
});
}),
numberOfColumns: 6,
));

return listWithScrollbar(
Expand Down
36 changes: 20 additions & 16 deletions lib/pages/inventory/inventory_list_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -125,26 +125,30 @@ class _InventoryListState extends State<InventoryListPage> {
);
widgets.add(const EmptySpace3x());
} else {
widgets.add(Padding(
child: Card(
child: InkWell(
child: Padding(
child: Center(
child: Icon(
Icons.search,
color: getTheme().getSecondaryColour(context),
if (viewModel.containers.length > 2) {
widgets.add(Padding(
child: Card(
child: InkWell(
child: Padding(
child: Center(
child: Icon(
Icons.search,
color: getTheme().getSecondaryColour(context),
),
),
padding: const EdgeInsets.all(12),
),
onTap: () async => await getNavigation().navigateAsync<Inventory>(
context,
navigateTo: (context) => SearchAllInventoriesPage(),
),
padding: const EdgeInsets.all(12),
),
onTap: () async => await getNavigation().navigateAsync<Inventory>(
context,
navigateTo: (context) => SearchAllInventoriesPage(),
),
),
),
padding: const EdgeInsets.only(top: 4, bottom: 0),
));
padding: const EdgeInsets.only(top: 4, bottom: 0),
));
} else {
widgets.add(const EmptySpace1x());
}
widgets.addAll(getContainers(viewModel));
}

Expand Down
4 changes: 2 additions & 2 deletions lib/pages/portal/add_portal_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ class _PortalPageState extends State<AddPortalPage> {
ElevatedButton(
style: ButtonStyle(
backgroundColor:
MaterialStateProperty.all<Color>(Colors.red[400]!),
WidgetStateProperty.all<Color>(Colors.red[400]!),
),
onPressed: disableEditBtns
? null
Expand All @@ -230,7 +230,7 @@ class _PortalPageState extends State<AddPortalPage> {
ElevatedButton(
style: ButtonStyle(
backgroundColor:
MaterialStateProperty.all<Color>(Colors.red[800]!),
WidgetStateProperty.all<Color>(Colors.red[800]!),
),
onPressed: disableEditBtns
? null
Expand Down
8 changes: 4 additions & 4 deletions lib/pages/portal/portal_converter_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -248,8 +248,8 @@ class _PortalConverterPageState extends State<PortalConverterPage> {
const SizedBox(width: 10),
ElevatedButton(
style: ButtonStyle(
backgroundColor: MaterialStateProperty.all<Color>(
Colors.red[400]!),
backgroundColor:
WidgetStateProperty.all<Color>(Colors.red[400]!),
),
onPressed: disableEditBtns
? null
Expand All @@ -265,8 +265,8 @@ class _PortalConverterPageState extends State<PortalConverterPage> {
const SizedBox(width: 5),
ElevatedButton(
style: ButtonStyle(
backgroundColor: MaterialStateProperty.all<Color>(
Colors.red[800]!),
backgroundColor:
WidgetStateProperty.all<Color>(Colors.red[800]!),
),
onPressed: disableEditBtns
? null
Expand Down
4 changes: 2 additions & 2 deletions lib/pages/title/title_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,10 @@ class _TitlePageViewState extends State<TitlePageView>
Widget build(BuildContext context) {
String title = getTranslations().fromKey(LocaleKey.titles);
int ownedItems = viewModel.owned.length;
String owned = ownedItems > 0 ? ownedItems.toString() : '...';
String owned = ownedItems > 0 ? ownedItems.toString() : '0';
String numTiles = titleDataWithOwned.isNotEmpty
? titleDataWithOwned.length.toString()
: '...';
: '.';
List<TitleDataWithOwned> filtered = titleDataWithOwned
.where(
(item) => (viewModel.hideCompleted == false || item.isOwned == false),
Expand Down
6 changes: 2 additions & 4 deletions lib/services/base/theme_service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class ThemeService implements IThemeService {

@override
Color getBackgroundColour(BuildContext context) =>
getTheme(context).colorScheme.background;
getTheme(context).colorScheme.surface;

@override
Color getScaffoldBackgroundColour(BuildContext context) =>
Expand Down Expand Up @@ -75,9 +75,7 @@ class ThemeService implements IThemeService {

@override
Color getCardBackgroundColour(BuildContext context) => lighten(
getDynamicTheme(Brightness.dark, defaultFontFamily)
.colorScheme
.background,
getDynamicTheme(Brightness.dark, defaultFontFamily).colorScheme.surface,
0.25,
);

Expand Down
1 change: 1 addition & 0 deletions lib/theme/themes.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ ThemeData darkThemeM3(String fontFamily) {
return base.copyWith(
brightness: Brightness.dark,
primaryColor: darkColorScheme.primary,
scaffoldBackgroundColor: const Color.fromARGB(255, 20, 20, 20),
textTheme: base.textTheme.apply(fontFamily: fontFamily),
primaryTextTheme: base.primaryTextTheme.apply(fontFamily: fontFamily),
pageTransitionsTheme: const PageTransitionsTheme(builders: {
Expand Down
Loading

0 comments on commit 96ef784

Please sign in to comment.