@@ -12,6 +12,7 @@ import 'package:toastification/toastification.dart';
1212import 'package:trios/catalog/mod_browser_page.dart' ;
1313import 'package:trios/chipper/chipper_home.dart' ;
1414import 'package:trios/dashboard/dashboard.dart' ;
15+ import 'package:trios/hullmodViewer/hullmods_page.dart' ;
1516import 'package:trios/mod_manager/mods_grid_page.dart' ;
1617import 'package:trios/models/version.dart' ;
1718import 'package:trios/portraits/portraits_page.dart' ;
@@ -29,7 +30,6 @@ import 'package:trios/utils/extensions.dart';
2930import 'package:trios/utils/logging.dart' ;
3031import 'package:trios/utils/platform_specific.dart' ;
3132import 'package:trios/vram_estimator/vram_estimator_page.dart' ;
32- import 'package:trios/hullmodViewer/hullmods_page.dart' ;
3333import 'package:trios/weaponViewer/weapons_page.dart' ;
3434import 'package:trios/widgets/blur.dart' ;
3535import 'package:trios/widgets/changelog_viewer.dart' ;
@@ -42,14 +42,14 @@ import 'package:trios/widgets/svg_image_icon.dart';
4242import 'package:trios/widgets/tab_button.dart' ;
4343import 'package:trios/widgets/trios_app_icon.dart' ;
4444
45- import 'vmparams/vmparams_manager.dart' ;
4645import 'launcher/launcher.dart' ;
4746import 'main.dart' ;
4847import 'mod_profiles/mod_profiles_page.dart' ;
4948import 'tips/tips_page.dart' ;
5049import 'trios/app_state.dart' ;
5150import 'trios/drag_drop_handler.dart' ;
5251import 'utils/dialogs.dart' ;
52+ import 'vmparams/vmparams_manager.dart' ;
5353
5454class AppShell extends ConsumerStatefulWidget {
5555 const AppShell ({super .key, required this .child});
@@ -73,8 +73,8 @@ class _AppShellState extends ConsumerState<AppShell>
7373 3 : TriOSTools .vramEstimator,
7474 4 : TriOSTools .chipper,
7575 5 : TriOSTools .portraits,
76- 6 : TriOSTools .weapons ,
77- 7 : TriOSTools .ships ,
76+ 6 : TriOSTools .ships ,
77+ 7 : TriOSTools .weapons ,
7878 8 : TriOSTools .hullmods,
7979 9 : TriOSTools .settings,
8080 10 : TriOSTools .catalog,
@@ -240,8 +240,8 @@ class _AppShellState extends ConsumerState<AppShell>
240240 const VramEstimatorPage (),
241241 const ChipperApp (pagePadding: 8 ),
242242 const PortraitsPage (),
243- const WeaponsPage (),
244243 const ShipsPage (),
244+ const WeaponsPage (),
245245 const HullmodsPage (),
246246 const SettingsPage (pagePadding: 8.0 ),
247247 const CatalogPage (pagePadding: 8 ),
@@ -396,18 +396,6 @@ class _AppShellState extends ConsumerState<AppShell>
396396 ),
397397 ),
398398 const SizedBox (width: 4 ),
399- MovingTooltipWidget .text (
400- message: "Weapon Viewer" ,
401- child: IconButton (
402- icon: SvgImageIcon ("assets/images/icon-target.svg" ),
403- selectedIcon: SvgImageIcon (
404- "assets/images/icon-target.svg" ,
405- color: Theme .of (context).colorScheme.primary,
406- ),
407- isSelected: _currentPage == TriOSTools .weapons,
408- onPressed: () => _changeTab (TriOSTools .weapons),
409- ),
410- ),
411399 MovingTooltipWidget .text (
412400 message: "Ship Viewer" ,
413401 child: IconButton (
@@ -427,8 +415,19 @@ class _AppShellState extends ConsumerState<AppShell>
427415 ),
428416 ),
429417 MovingTooltipWidget .text (
430- message:
431- "Hullmod Viewer" ,
418+ message: "Weapon Viewer" ,
419+ child: IconButton (
420+ icon: SvgImageIcon ("assets/images/icon-target.svg" ),
421+ selectedIcon: SvgImageIcon (
422+ "assets/images/icon-target.svg" ,
423+ color: Theme .of (context).colorScheme.primary,
424+ ),
425+ isSelected: _currentPage == TriOSTools .weapons,
426+ onPressed: () => _changeTab (TriOSTools .weapons),
427+ ),
428+ ),
429+ MovingTooltipWidget .text (
430+ message: "Hullmod Viewer" ,
432431 child: IconButton (
433432 icon: SvgImageIcon (
434433 "assets/images/icon-hullmod.svg" ,
@@ -446,8 +445,7 @@ class _AppShellState extends ConsumerState<AppShell>
446445 ),
447446 ),
448447 MovingTooltipWidget .text (
449- message:
450- "Portrait Viewer & Replacer" ,
448+ message: "Portrait Viewer & Replacer" ,
451449 child: IconButton (
452450 icon: SvgImageIcon (
453451 "assets/images/icon-account-box-outline.svg" ,
@@ -1009,11 +1007,7 @@ class _FilePermissionShieldState extends ConsumerState<FilePermissionShield> {
10091007
10101008 final paths = [
10111009 for (final filePath in _vmParamsFilesThatCannotBeWritten)
1012- (
1013- description: 'vmparams file' ,
1014- isWritable: false ,
1015- path: filePath,
1016- ),
1010+ (description: 'vmparams file' , isWritable: false , path: filePath),
10171011 ];
10181012
10191013 // If all paths are writable, return an empty widget
0 commit comments