Ship Viewer now has three options for showing spoilers

Author: wispborne

changelog.md

@@ -12,12 +12,14 @@
   - Export grid data (mods, ships, weapons) to csv.
   - You may now set custom paths for more game folders: executable, mods, saves, and game data (core).
     - NOT FINISHED in prerelease version.
+  - Ship Viewer now has three options for showing spoilers; none, "show CODEX_UNLOCKABLE", and show all spoilers including <ultra redacted>.
 - Fixed
   - Ship Viewer filters not working.
   - Custom launcher files are no longer hardcoded to use the game folder as their working directory.
     - This fixes Fast Rendering, which launches using a .bat in the `starsector-core` folder.
 - Changed
   - Cleaned up search bar positioning on Ships and Weapons pages.
+  - CODEX_UNLOCKABLE ships are now hidden by default on the Ship Viewer.
 
 # 1.2.3
 - Fixed

lib/catalog/mod_browser_page.dart

@@ -24,7 +24,7 @@ import 'package:trios/widgets/tristate_icon_button.dart';
 
 import '../main.dart';
 import '../trios/download_manager/downloader.dart';
-import '../widgets/MultiSplitViewMixin.dart';
+import '../widgets/multi_split_mixin_view.dart';
 import '../widgets/moving_tooltip.dart';
 import 'mod_browser_manager.dart';
 

lib/mod_manager/homebrew_grid/wispgrid_header_row_view.dart

@@ -10,7 +10,7 @@ import 'package:trios/mod_manager/homebrew_grid/wispgrid_group.dart';
 import 'package:trios/thirdparty/dartx/function.dart';
 import 'package:trios/thirdparty/flutter_context_menu/flutter_context_menu.dart';
 import 'package:trios/utils/extensions.dart';
-import 'package:trios/widgets/MultiSplitViewMixin.dart';
+import 'package:trios/widgets/multi_split_mixin_view.dart';
 import 'package:trios/widgets/hoverable_widget.dart';
 import 'package:trios/widgets/moving_tooltip.dart';
 

lib/portraits/portraits_page.dart

@@ -18,7 +18,7 @@ import 'package:trios/trios/constants.dart';
 import 'package:trios/utils/extensions.dart';
 import 'package:trios/utils/logging.dart';
 import 'package:trios/utils/search.dart';
-import 'package:trios/widgets/MultiSplitViewMixin.dart';
+import 'package:trios/widgets/multi_split_mixin_view.dart';
 import 'package:trios/widgets/blur.dart';
 import 'package:trios/widgets/expanding_constrained_aligned_widget.dart';
 import 'package:trios/widgets/moving_tooltip.dart';

lib/shipViewer/ships_page.dart

@@ -11,6 +11,7 @@ import 'package:trios/shipViewer/filter_widget.dart';
 import 'package:trios/shipViewer/models/shipGpt.dart';
 import 'package:trios/shipViewer/ship_manager.dart';
 import 'package:trios/shipViewer/ships_page_controller.dart';
+import 'package:trios/themes/theme.dart';
 import 'package:trios/themes/theme_manager.dart' show ThemeManager;
 import 'package:trios/thirdparty/flutter_context_menu/flutter_context_menu.dart';
 import 'package:trios/trios/app_state.dart';
@@ -24,8 +25,9 @@ import 'package:trios/widgets/export_to_csv_dialog.dart';
 import 'package:trios/widgets/moving_tooltip.dart';
 import 'package:trios/widgets/text_trios.dart';
 import 'package:trios/widgets/toolbar_checkbox_button.dart';
+import 'package:trios/widgets/trios_dropdown_menu.dart';
 
-import '../widgets/MultiSplitViewMixin.dart';
+import '../widgets/multi_split_mixin_view.dart';
 
 class ShipsPage extends ConsumerStatefulWidget {
   const ShipsPage({super.key});
@@ -151,15 +153,41 @@ class _ShipsPageState extends ConsumerState<ShipsPage>
                   ),
                 ),
                 const SizedBox(width: 8),
-                MovingTooltipWidget.text(
-                  message:
-                      "Show ships with 'HIDE_IN_CODEX' or certain ultra-redacted vanilla tags.",
-                  warningLevel: TooltipWarningLevel.error,
-                  child: TriOSToolbarCheckboxButton(
-                    text: "Show Spoilers",
-                    value: controllerState.showSpoilers,
-                    onChanged: (value) => controller.toggleShowSpoilers(),
-                  ),
+                TriOSDropdownMenu<SpoilerLevel>(
+                  initialSelection: controllerState.spoilerLevelToShow,
+                  onSelected: (level) {
+                    if (level == null) return;
+                    controller.setShowSpoilers(level);
+                  },
+                  dropdownMenuEntries: [
+                    DropdownMenuEntry(
+                      value: SpoilerLevel.showNone,
+                      label: "No Spoilers",
+                      labelWidget: MovingTooltipWidget.text(
+                        message: "No spoilers shown at all.",
+                        child: Text("No Spoilers"),
+                      ),
+                    ),
+                    DropdownMenuEntry(
+                      value: SpoilerLevel.showSlightSpoilers,
+                      label: "Slight spoilers",
+                      labelWidget: MovingTooltipWidget.text(
+                        warningLevel: TooltipWarningLevel.warning,
+                        message: "Shows CODEX_UNLOCKABLE ships.",
+                        child: Text("Slight spoilers"),
+                      ),
+                    ),
+                    DropdownMenuEntry(
+                      value: SpoilerLevel.showAllSpoilers,
+                      label: "Show all spoilers",
+                      labelWidget: MovingTooltipWidget.text(
+                        warningLevel: TooltipWarningLevel.error,
+                        message:
+                            "Show all spoilers, including HIDE_IN_CODEX and certain ultra-redacted vanilla tagged ships",
+                        child: Text("Show all spoilers"),
+                      ),
+                    ),
+                  ],
                 ),
                 const SizedBox(width: 8),
                 TriOSToolbarCheckboxButton(

lib/shipViewer/ships_page_controller.dart

@@ -15,7 +15,7 @@ import 'package:trios/utils/extensions.dart';
 /// State class for the ships page controller
 class ShipsPageState {
   final bool showEnabled;
-  final bool showSpoilers;
+  final SpoilerLevel spoilerLevelToShow;
   final bool splitPane;
   final bool showFilters;
   final List<GridFilter<Ship>> filterCategories;
@@ -31,7 +31,7 @@ class ShipsPageState {
 
   const ShipsPageState({
     this.showEnabled = false,
-    this.showSpoilers = false,
+    this.spoilerLevelToShow = SpoilerLevel.showNone,
     this.splitPane = false,
     this.showFilters = false,
     this.filterCategories = const [],
@@ -46,7 +46,7 @@ class ShipsPageState {
 
   ShipsPageState copyWith({
     bool? showEnabled,
-    bool? showSpoilers,
+    SpoilerLevel? spoilerLevelToShow,
     bool? splitPane,
     bool? showFilters,
     List<GridFilter<Ship>>? filterCategories,
@@ -60,7 +60,7 @@ class ShipsPageState {
   }) {
     return ShipsPageState(
       showEnabled: showEnabled ?? this.showEnabled,
-      showSpoilers: showSpoilers ?? this.showSpoilers,
+      spoilerLevelToShow: spoilerLevelToShow ?? this.spoilerLevelToShow,
       splitPane: splitPane ?? this.splitPane,
       showFilters: showFilters ?? this.showFilters,
       filterCategories: filterCategories ?? this.filterCategories,
@@ -76,8 +76,11 @@ class ShipsPageState {
   }
 }
 
+enum SpoilerLevel { showNone, showSlightSpoilers, showAllSpoilers }
+
 /// Controller for the ships page using AutoDisposeNotifier (synchronous)
 class ShipsPageController extends AutoDisposeNotifier<ShipsPageState> {
+  final slightSpoilerTags = ["codex_unlockable"];
   final spoilerTags = ["threat", "dweller"];
 
   @override
@@ -185,7 +188,7 @@ class ShipsPageController extends AutoDisposeNotifier<ShipsPageState> {
     ships = _filterByEnabled(ships, mods, currentState.showEnabled);
 
     // Apply spoiler filter
-    ships = _filterBySpoilers(ships, currentState.showSpoilers);
+    ships = _filterBySpoilers(ships, currentState.spoilerLevelToShow);
 
     // Store ships before grid filters for filter panel
     final shipsBeforeGridFilter = ships.toList();
@@ -225,9 +228,9 @@ class ShipsPageController extends AutoDisposeNotifier<ShipsPageState> {
   }
 
   /// Toggle show spoilers filter
-  void toggleShowSpoilers() {
+  void setShowSpoilers(SpoilerLevel spoilerLevelToShow) {
     final mods = ref.read(AppState.mods);
-    final updatedState = state.copyWith(showSpoilers: !state.showSpoilers);
+    final updatedState = state.copyWith(spoilerLevelToShow: spoilerLevelToShow);
     final processedState = _processAllFilters(updatedState, mods);
 
     state = processedState;
@@ -301,17 +304,26 @@ class ShipsPageController extends AutoDisposeNotifier<ShipsPageState> {
   }
 
   /// Filter ships based on spoiler settings
-  List<Ship> _filterBySpoilers(List<Ship> ships, bool showSpoilers) {
-    if (showSpoilers) return ships;
+  List<Ship> _filterBySpoilers(
+    List<Ship> ships,
+    SpoilerLevel spoilerLevelToShow,
+  ) {
+    if (spoilerLevelToShow == SpoilerLevel.showAllSpoilers) return ships;
 
     return ships.where((ship) {
       final hints = ship.hints.orEmpty().map((h) => h.toLowerCase());
       final tags = ship.tags.orEmpty().map((t) => t.toLowerCase());
 
       final hidden = hints.contains('hide_in_codex');
+      final isSlightSpoiler = tags.any(slightSpoilerTags.contains);
       final isSpoiler = tags.any(spoilerTags.contains);
 
-      return !hidden && !isSpoiler;
+      if (spoilerLevelToShow == SpoilerLevel.showSlightSpoilers) {
+        return !hidden && !isSpoiler;
+      }
+
+      // Show no spoilers
+      return !hidden && !isSlightSpoiler && !isSpoiler;
     }).toList();
   }
 

lib/weaponViewer/weapons_page.dart

@@ -28,7 +28,7 @@ import 'package:trios/widgets/moving_tooltip.dart';
 import 'package:trios/widgets/text_trios.dart';
 import 'package:trios/widgets/toolbar_checkbox_button.dart';
 
-import '../widgets/MultiSplitViewMixin.dart';
+import '../widgets/multi_split_mixin_view.dart';
 
 class WeaponsPage extends ConsumerStatefulWidget {
   const WeaponsPage({super.key});

lib/widgets/checkbox_with_label.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:trios/themes/theme_manager.dart';
 import 'package:trios/widgets/blur.dart';
 import 'package:trios/widgets/conditional_wrap.dart';
 
@@ -88,7 +89,7 @@ class CheckboxWithLabel extends StatelessWidget {
           onChanged(!value!);
         }
       },
-      borderRadius: BorderRadius.circular(14),
+      borderRadius: BorderRadius.circular(ThemeManager.cornerRadius),
       child: Padding(
         padding: const EdgeInsets.only(right: 7),
         child: Row(

lib/widgets/MultiSplitViewMixin.dart lib/widgets/multi_split_mixin_view.dartlib/widgets/MultiSplitViewMixin.dart renamed to lib/widgets/multi_split_mixin_view.dart

@@ -0,0 +1,88 @@
+import 'package:flutter/material.dart';
+
+/// A themed, generic dropdown menu used across TriOS.
+/// Mirrors the compact toolbar style used in the app (dense, rounded, no filter/search).
+class TriOSDropdownMenu<T> extends StatelessWidget {
+  final T? initialSelection;
+  final ValueChanged<T?>? onSelected;
+  final List<DropdownMenuEntry<T>> dropdownMenuEntries;
+
+  // Optional overrides
+  final double height;
+  final double borderRadius;
+  final EdgeInsetsGeometry contentPadding;
+  final TextStyle? textStyle;
+  final bool enabled;
+
+  const TriOSDropdownMenu({
+    super.key,
+    required this.dropdownMenuEntries,
+    this.initialSelection,
+    this.onSelected,
+    this.height = 30,
+    this.borderRadius = 10,
+    this.contentPadding = const EdgeInsets.symmetric(horizontal: 16),
+    this.textStyle,
+    this.enabled = true,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+
+    return DropdownMenu<T>(
+      enabled: enabled,
+      initialSelection: initialSelection,
+      onSelected: onSelected,
+      enableFilter: false,
+      enableSearch: false,
+      requestFocusOnTap: false,
+      textStyle: textStyle ?? theme.textTheme.labelLarge,
+      trailingIcon: Transform.translate(
+        offset: const Offset(3, -6),
+        child: const Icon(Icons.arrow_drop_down),
+      ),
+      selectedTrailingIcon: Transform.translate(
+        offset: const Offset(3, -6),
+        child: const Icon(Icons.arrow_drop_up),
+      ),
+      inputDecorationTheme: InputDecorationTheme(
+        isDense: true,
+        contentPadding: contentPadding,
+        constraints: BoxConstraints.tight(Size.fromHeight(height)),
+        enabledBorder: OutlineInputBorder(
+          borderRadius: BorderRadius.circular(borderRadius),
+          borderSide: BorderSide(color: theme.colorScheme.outlineVariant),
+        ),
+        disabledBorder: OutlineInputBorder(
+          borderRadius: BorderRadius.circular(borderRadius),
+          borderSide: BorderSide(
+            color: theme.colorScheme.outlineVariant.withOpacity(0.4),
+          ),
+        ),
+        focusedBorder: OutlineInputBorder(
+          borderRadius: BorderRadius.circular(borderRadius),
+          borderSide: BorderSide(color: theme.colorScheme.primary),
+        ),
+      ),
+      dropdownMenuEntries: dropdownMenuEntries
+          .map(
+            (e) => DropdownMenuEntry<T>(
+              value: e.value,
+              label: e.label,
+              labelWidget: e.labelWidget,
+              leadingIcon: e.leadingIcon,
+              // Keep per-entry text style aligned with the menu style by default
+              style:
+                  e.style ??
+                  ButtonStyle(
+                    textStyle: WidgetStatePropertyAll(
+                      textStyle ?? theme.textTheme.labelLarge,
+                    ),
+                  ),
+            ),
+          )
+          .toList(),
+    );
+  }
+}