diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 115e5a8c8..85eae54bc 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -15,7 +15,6 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> with AnalyticsConsumer, @override void initState() { super.initState(); - SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge); - SystemChrome.setSystemUIOverlayStyle( - SystemUiOverlayStyle( - systemNavigationBarColor: Colors.black.withOpacity(0.002), - ), - ); LittleLightNavigatorKeyContainer.navigatorKey = GlobalKey(); unilinks?.addListener(updateUnilinks); + updateSystemOverlay(); + } + + void updateSystemOverlay() async { + await Future.delayed(Duration(milliseconds: 10)); + SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(systemNavigationBarColor: Colors.transparent)); + SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge); } @override diff --git a/lib/modules/equipment/widgets/equipment_character_landscape_tab_content.widget.dart b/lib/modules/equipment/widgets/equipment_character_landscape_tab_content.widget.dart index 47d0d9382..723cc0003 100644 --- a/lib/modules/equipment/widgets/equipment_character_landscape_tab_content.widget.dart +++ b/lib/modules/equipment/widgets/equipment_character_landscape_tab_content.widget.dart @@ -62,6 +62,8 @@ class EquipmentCharacterLandscapeTabContentWidget extends StatelessWidget { currencies: currencies, ), ), + ...buildSingleColumnSections(context, InventoryBucket.lostItems, constraints, omitEmpty: true), + ...buildSingleColumnSections(context, InventoryBucket.engrams, constraints, omitEmpty: true), buildMultiColumnSection(context, [InventoryBucket.subclass, InventoryBucket.helmet], constraints), buildMultiColumnSection( context, [InventoryBucket.kineticWeapons, InventoryBucket.gauntlets], constraints), @@ -109,12 +111,16 @@ class EquipmentCharacterLandscapeTabContentWidget extends StatelessWidget { List buildSingleColumnSections( BuildContext context, int bucketHash, - BoxConstraints constraints, - ) { + BoxConstraints constraints, { + bool omitEmpty = false, + }) { final bucketContent = buckets[bucketHash]; if (bucketContent == null) return []; final equipped = bucketContent.equipped; final unequipped = bucketContent.unequipped; + if (omitEmpty && equipped == null && unequipped.isEmpty) { + return []; + } final defaultDisplayType = _defaultDisplayTypes[bucketHash] ?? BucketDisplayType.Medium; final displayType = bucketOptionsState(context).getDisplayTypeForItemSection( "$bucketHash", diff --git a/lib/modules/settings/pages/about/about.screen.dart b/lib/modules/settings/pages/about/about.screen.dart index a0d9c334e..dd5533058 100644 --- a/lib/modules/settings/pages/about/about.screen.dart +++ b/lib/modules/settings/pages/about/about.screen.dart @@ -61,7 +61,7 @@ class _AboutScreenState extends State with StorageConsumer, LittleL final info = await PackageInfo.fromPlatform(); packageVersion = info.version; appName = info.appName; - if (Platform.isIOS) { + if (Platform.isIOS || Platform.isMacOS) { final lastUpdated = globalStorage.lastUpdated; final now = DateTime.now(); if (lastUpdated == null || now.difference(lastUpdated).inDays < 3) { diff --git a/lib/pages/main.screen.dart b/lib/pages/main.screen.dart index 9b0709ef1..7bfbf459e 100644 --- a/lib/pages/main.screen.dart +++ b/lib/pages/main.screen.dart @@ -1,6 +1,4 @@ -import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; import 'package:little_light/core/blocs/offline_mode/offline_mode.bloc.dart'; import 'package:little_light/core/blocs/user_settings/user_settings.bloc.dart'; import 'package:little_light/modules/collections/pages/home/collections_home.page.dart'; diff --git a/lib/shared/widgets/selection/selected_items.widget.dart b/lib/shared/widgets/selection/selected_items.widget.dart index c0e7f728b..761ddcc01 100644 --- a/lib/shared/widgets/selection/selected_items.widget.dart +++ b/lib/shared/widgets/selection/selected_items.widget.dart @@ -1,11 +1,10 @@ -import 'package:collection/collection.dart'; import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:little_light/core/blocs/inventory/inventory.bloc.dart'; import 'package:little_light/core/blocs/language/language.consumer.dart'; -import 'package:little_light/models/item_info/destiny_item_info.dart'; import 'package:little_light/core/blocs/selection/selection.bloc.dart'; import 'package:little_light/core/theme/littlelight.theme.dart'; +import 'package:little_light/models/item_info/destiny_item_info.dart'; import 'package:little_light/shared/widgets/loading/default_loading_shimmer.dart'; import 'package:little_light/shared/widgets/selection/selected_item_instance.widget.dart'; import 'package:little_light/shared/widgets/selection/selected_item_thumb.widget.dart';