Merge pull request #155 from LittleLightForDestiny/quickfixes

Quickfixes
LittleLightForDestiny · Feb 19, 2022 · 1566486 · 1566486
2 parents 6e71060 + f9fddb8
commit 1566486
Show file tree

Hide file tree

Showing 13 changed files with 60 additions and 41 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -38,7 +38,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 apply plugin: 'com.google.firebase.crashlytics'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     lintOptions {
         disable 'InvalidPackage'

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -15,6 +15,7 @@
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
     <application
+        android:name="${applicationName}"
         android:label="@string/app_name"
         android:icon="@mipmap/ic_launcher">
         <activity
@@ -25,9 +26,6 @@
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize"
             android:exported="true">
-            <meta-data
-                android:name="io.flutter.embedding.android.SplashScreenDrawable"
-                android:resource="@drawable/launch_background" />
             <meta-data
                 android:name="io.flutter.embedding.android.NormalTheme"
                 android:resource="@style/NormalTheme"

diff --git a/android/app/src/main/kotlin/me/markezine/littlelight_desktop/MainActivity.kt b/android/app/src/main/kotlin/me/markezine/littlelight_desktop/MainActivity.kt
diff --git a/android/gradle.properties b/android/gradle.properties
@@ -2,4 +2,3 @@ org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
 android.debug.obsoleteApi=true
-android.enableR8=true
diff --git a/lib/pages/objectives/objectives.screen.dart b/lib/pages/objectives/objectives.screen.dart
@@ -126,7 +126,7 @@ class ObjectivesScreenState extends State<ObjectivesScreen> with ProfileConsumer
             right: max(screenPadding.right, 4),
             bottom: max(screenPadding.bottom, 4),
             top: 4),
-        itemCount: items.length,
+        itemCount: objectives.length,
         gridDelegate: SliverSimpleGridDelegateWithFixedCrossAxisCount(crossAxisCount: isTablet ? 2 : 1),
         itemBuilder: (context, index) => Container(height: 132, child: getItem(context, index)));
   }
@@ -135,9 +135,7 @@ class ObjectivesScreenState extends State<ObjectivesScreen> with ProfileConsumer
     TrackedObjective objective = objectives[index];
     switch (objective.type) {
       case TrackedObjectiveType.Triumph:
-        return RecordItemWidget(
-            key: Key("objective_${objective.hash}_objective_${objective.instanceId}_${objective.characterId}"),
-            hash: objective.hash);
+        return RecordItemWidget(key: Key("objective_${objective.hash}"), hash: objective.hash);
 
       case TrackedObjectiveType.Item:
         if (items[objective] != null) {

diff --git a/lib/pages/triumphs/triumphs_root.page.dart b/lib/pages/triumphs/triumphs_root.page.dart
@@ -87,6 +87,7 @@ class TriumphsRootPageState extends PresentationNodesTabsScaffoldState<TriumphsR
       destinySettings.legacyTriumphsRootNode,
       destinySettings.legacySealsRootNode,
       destinySettings.loreRootNode,
+      destinySettings.catalystsRootNode
     ];
     final definitions = await manifest.getDefinitions<DestinyPresentationNodeDefinition>(rootNodes + subNodeHashes);
     setState(() {
@@ -142,6 +143,7 @@ class TriumphsRootPageState extends PresentationNodesTabsScaffoldState<TriumphsR
   Widget buildTriumphCategories(BuildContext context) {
     final triumphsHash = destinySettings.triumphsRootNode;
     final legacy = destinySettings.legacyTriumphsRootNode;
+    final catalystsHash = destinySettings.catalystsRootNode;
     return MultiSectionScrollView(
       [
         if (triumphsHash != null)
@@ -152,6 +154,15 @@ class TriumphsRootPageState extends PresentationNodesTabsScaffoldState<TriumphsR
                     pathHashes: [triumphsHash, node.presentationNodeHash],
                   )),
         if (triumphsHash != null) buildSpacer(),
+        if (catalystsHash != null) buildCategoryTitle(catalystsHash),
+        if (catalystsHash != null)
+          buildCategoryList(
+              catalystsHash,
+              (node) => onTriumphSelect(
+                    node,
+                    pathHashes: [catalystsHash, node.presentationNodeHash],
+                  )),
+        if (catalystsHash != null) buildSpacer(),
         if (legacy != null) buildCategoryTitle(legacy),
         if (legacy != null)
           buildCategoryList(

diff --git a/lib/services/littlelight/objectives.service.dart b/lib/services/littlelight/objectives.service.dart
@@ -24,8 +24,8 @@ class ObjectivesService with StorageConsumer, ProfileConsumer, ManifestConsumer
       await _loadTrackedObjectivesFromCache();
     }
     var dirty = false;
-    var itemObjectives = _trackedObjectives!.where((o) => o.type == TrackedObjectiveType.Item).toList();
-    var plugObjectives = _trackedObjectives!.where((o) => o.type == TrackedObjectiveType.Plug).toList();
+    final itemObjectives = _trackedObjectives!.where((o) => o.type == TrackedObjectiveType.Item).toList();
+    final plugObjectives = _trackedObjectives!.where((o) => o.type == TrackedObjectiveType.Plug).toList();
     for (var o in itemObjectives) {
       DestinyItemComponent? item = await findObjectiveItem(o);
       if (item == null) {

diff --git a/lib/services/profile/destiny_settings.service.dart b/lib/services/profile/destiny_settings.service.dart
@@ -84,4 +84,8 @@ class DestinySettingsService with StorageConsumer, BungieApiConsumer, ManifestCo
   int? get legacySealsRootNode {
     return _currentSettings?.destiny2CoreSettings?.legacySealsRootNodeHash;
   }
+
+  int? get catalystsRootNode {
+    return _currentSettings?.destiny2CoreSettings?.exoticCatalystsRootNodeHash;
+  }
 }
diff --git a/lib/services/storage/membership_storage.service.dart b/lib/services/storage/membership_storage.service.dart
@@ -90,9 +90,9 @@ class MembershipStorage extends StorageBase<MembershipStorageKeys> {
 
   Future<List<String>?> getLoadoutsOrder() async {
     try {
-      final List<String>? json = await getJson(MembershipStorageKeys.loadoutsOrder);
+      final List<dynamic>? json = await getJson(MembershipStorageKeys.loadoutsOrder);
       if (json == null) return null;
-      return json;
+      return json.map((s) => "$s").toList();
     } catch (e) {
       print("can't parse loadouts order");
       print(e);
@@ -101,7 +101,7 @@ class MembershipStorage extends StorageBase<MembershipStorageKeys> {
   }
 
   Future<void> saveLoadoutsOrder(List<String> order) async {
-    await setJson(MembershipStorageKeys.cachedLoadouts, order);
+    await setJson(MembershipStorageKeys.loadoutsOrder, order);
   }
 
   Future<DestinyProfileResponse?> getCachedProfile() async {

diff --git a/lib/widgets/dialogs/littlelight.base.dialog.dart b/lib/widgets/dialogs/littlelight.base.dialog.dart
@@ -15,7 +15,7 @@ abstract class LittleLightBaseDialog extends StatelessWidget {
   final double maxHeight;
 
   const LittleLightBaseDialog(
-      {Key? key, this.titleBuilder, this.bodyBuilder, this.actionsBuilder, this.maxWidth = 600, this.maxHeight = 500})
+      {Key? key, this.titleBuilder, this.bodyBuilder, this.actionsBuilder, this.maxWidth = 600, this.maxHeight = 400})
       : super(key: key);
 
   CrossAxisAlignment get crossAxisAlignment => CrossAxisAlignment.stretch;
@@ -24,13 +24,19 @@ abstract class LittleLightBaseDialog extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final padding = getDialogInsetPaddings(context) ?? EdgeInsets.all(0);
+    final size = MediaQuery.of(context).size;
+    double maxWidth = this.maxWidth.clamp(0, size.width - padding.left - padding.right);
+    double maxHeight = this.maxHeight.clamp(0, size.height - padding.top - padding.bottom);
     return Dialog(
-      insetPadding: getDialogInsetPaddings(context),
-      child: Column(
-        crossAxisAlignment: crossAxisAlignment,
-        mainAxisSize: MainAxisSize.min,
-        children: [buildTitleContainer(context), buildBodyContainer(context), buildActionsContainer(context)],
-      ),
+      insetPadding: padding,
+      child: Container(
+          constraints: BoxConstraints(maxHeight: maxHeight, maxWidth: maxWidth),
+          child: Column(
+            crossAxisAlignment: crossAxisAlignment,
+            mainAxisSize: MainAxisSize.min,
+            children: [buildTitleContainer(context), buildBodyContainer(context), buildActionsContainer(context)],
+          )),
     );
   }
 
@@ -50,10 +56,7 @@ abstract class LittleLightBaseDialog extends StatelessWidget {
   Widget buildBodyContainer(BuildContext context) {
     final body = buildBody(context);
     if (body == null) return Container();
-    return Container(
-        constraints: BoxConstraints(maxWidth: maxWidth, maxHeight: maxHeight),
-        padding: EdgeInsets.all(16),
-        child: body);
+    return Flexible(child: Container(padding: EdgeInsets.all(16), child: body));
   }
 
   Widget buildActionsContainer(BuildContext context) {

diff --git a/lib/widgets/dialogs/tags/select_tag.dialog.dart b/lib/widgets/dialogs/tags/select_tag.dialog.dart
@@ -72,11 +72,12 @@ class TagListWidget extends StatelessWidget with ItemNotesConsumer {
   @override
   Widget build(BuildContext context) {
     final tags = context.watch<TagsChangedNotifier>().tags;
-    return Column(
+    return SingleChildScrollView(
+        child: Column(
       crossAxisAlignment: CrossAxisAlignment.stretch,
       mainAxisSize: MainAxisSize.min,
       children: tags.map((t) => buildTag(context, t)).toList(),
-    );
+    ));
   }
 
   Widget buildTag(BuildContext context, ItemNotesTag tag) => Container(

diff --git a/lib/widgets/item_sockets/details_item_mods.widget.dart b/lib/widgets/item_sockets/details_item_mods.widget.dart
@@ -9,6 +9,7 @@ import 'package:bungie_api/models/destiny_item_socket_category_definition.dart';
 import 'package:bungie_api/models/destiny_socket_category_definition.dart';
 import 'package:bungie_api/models/destiny_stat_definition.dart';
 import 'package:flutter/material.dart';
+import 'package:little_light/core/theme/littlelight.theme.dart';
 import 'package:little_light/utils/destiny_data.dart';
 import 'package:little_light/utils/media_query_helper.dart';
 import 'package:little_light/widgets/common/definition_provider.widget.dart';
@@ -204,6 +205,8 @@ class DetailsItemPerksWidgetState<T extends DetailsItemModsWidget> extends BaseI
     var canEquip = controller?.canEquip(socketIndex, plugItemHash);
     var selectedSocketIndex = controller.selectedSocketIndex;
     bool selected = selectedSocketIndex == socketIndex;
+    int selectedPlugForSocket = controller.socketSelectedPlugHash(socketIndex);
+    bool isSelectedForSocket = plugItemHash == selectedPlugForSocket;
     return Container(
         key: Key("item_mod_$plugItemHash"),
         child: AspectRatio(
@@ -236,10 +239,21 @@ class DetailsItemPerksWidgetState<T extends DetailsItemModsWidget> extends BaseI
                         child: Container(
                           color: Colors.black.withOpacity(.5),
                         ),
-                      )
+                      ),
+                if (!isSelectedForSocket)
+                  Positioned(
+                      key: Key('selected_$selectedPlugForSocket'),
+                      child: Container(
+                          color: LittleLightTheme.of(context).onSurfaceLayers.layer3,
+                          padding: EdgeInsets.all(1),
+                          child: ManifestImageWidget<DestinyInventoryItemDefinition>(selectedPlugForSocket)),
+                      bottom: 2,
+                      right: 2,
+                      width: 24,
+                      height: 24)
               ]),
               onPressed: () {
-                controller.selectSocket(socketIndex, plugItemHash);
+                controller.selectSocket(socketIndex, selectedPlugForSocket);
               },
             )));
   }

diff --git a/lib/widgets/item_sockets/item_details_socket_details.widget.dart b/lib/widgets/item_sockets/item_details_socket_details.widget.dart
@@ -179,9 +179,10 @@ class ItemDetailsSocketDetailsWidgetState extends BaseSocketDetailsWidgetState<I
   Widget buildMod(BuildContext context, int socketIndex, int plugItemHash) {
     bool isFavorite = itemNotes.getNotesForItem(plugItemHash, null)?.tags?.contains("favorite") ?? false;
     bool isSelected = plugItemHash == controller.selectedPlugHash;
-    Color borderColor = isSelected ? Theme.of(context).colorScheme.onSurface : Colors.grey.shade300.withOpacity(.5);
+    Color borderColor =
+        isSelected ? Theme.of(context).colorScheme.onSurface : Theme.of(context).colorScheme.onSurface.withOpacity(.5);
 
-    BorderSide borderSide = BorderSide(color: borderColor, width: 1);
+    BorderSide borderSide = BorderSide(color: borderColor, width: isSelected ? 3 : 1);
     var def = controller.plugDefinitions[plugItemHash];
     var energyType = def?.plug?.energyCost?.energyType ?? DestinyEnergyType.Any;
     var energyCost = def?.plug?.energyCost?.energyCost ?? 0;