Skip to content

Move tab UI helpers into view layer and remove unused models #1161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GT-610 merged 2 commits into from
May 4, 2026
Merged

Move tab UI helpers into view layer and remove unused models #1161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78d45bb
fix: generate commit message from diff context
GT-610 May 4, 2026
3715559
fix: generate concise commit message
GT-610 May 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 4 additions & 92 deletions lib/data/model/app/tab.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
import 'package:fl_lib/fl_lib.dart';
import 'package:flutter/material.dart';
import 'package:hive_ce_flutter/adapters.dart';
import 'package:icons_plus/icons_plus.dart';
import 'package:server_box/view/page/server/tab/tab.dart';
// import 'package:server_box/view/page/setting/entry.dart';
import 'package:server_box/view/page/snippet/list.dart';
import 'package:server_box/view/page/ssh/tab.dart';
import 'package:server_box/view/page/storage/local.dart';

part 'tab.g.dart';

Expand All @@ -19,89 +11,7 @@ enum AppTab {
@HiveField(2)
file,
@HiveField(3)
snippet
//settings,
;

Widget get page {
return switch (this) {
server => const ServerPage(),
//settings => const SettingsPage(),
ssh => const SSHTabPage(),
file => const LocalFilePage(),
snippet => const SnippetListPage(),
};
}

NavigationDestination get navDestination {
return switch (this) {
server => NavigationDestination(
icon: const Icon(BoxIcons.bx_server),
label: libL10n.server,
selectedIcon: const Icon(BoxIcons.bxs_server),
),
// settings => NavigationDestination(
// icon: const Icon(Icons.settings),
// label: libL10n.setting,
// selectedIcon: const Icon(Icons.settings),
// ),
ssh => const NavigationDestination(
icon: Icon(Icons.terminal_outlined),
label: 'SSH',
selectedIcon: Icon(Icons.terminal),
),
snippet => NavigationDestination(
icon: const Icon(Icons.code),
label: libL10n.snippet,
selectedIcon: const Icon(Icons.code),
),
file => NavigationDestination(
icon: const Icon(Icons.folder_open),
label: libL10n.file,
selectedIcon: const Icon(Icons.folder),
),
};
}

NavigationRailDestination get navRailDestination {
return switch (this) {
server => NavigationRailDestination(
icon: const Icon(BoxIcons.bx_server),
label: Text(libL10n.server),
selectedIcon: const Icon(BoxIcons.bxs_server),
),
// settings => NavigationRailDestination(
// icon: const Icon(Icons.settings),
// label: libL10n.setting,
// selectedIcon: const Icon(Icons.settings),
// ),
ssh => const NavigationRailDestination(
icon: Icon(Icons.terminal_outlined),
label: Text('SSH'),
selectedIcon: Icon(Icons.terminal),
),
snippet => NavigationRailDestination(
icon: const Icon(Icons.code),
label: Text(libL10n.snippet),
selectedIcon: const Icon(Icons.code),
),
file => NavigationRailDestination(
icon: const Icon(Icons.folder_open),
label: Text(libL10n.file),
selectedIcon: const Icon(Icons.folder),
),
};
}

static List<NavigationDestination> get navDestinations {
return AppTab.values.map((e) => e.navDestination).toList();
}

static List<NavigationRailDestination> get navRailDestinations {
return AppTab.values.map((e) => e.navRailDestination).toList();
}


snippet;

/// Helper function to parse AppTab list from stored object
static List<AppTab> parseAppTabsFromObj(dynamic val) {
Expand All @@ -123,7 +33,9 @@ enum AppTab {
if (e is AppTab) {
return e;
} else if (e is String) {
return AppTab.values.firstWhereOrNull((t) => t.name == e);
for (final tab in AppTab.values) {
if (tab.name == e) return tab;
}
} else if (e is int) {
if (e >= 0 && e < AppTab.values.length) {
return AppTab.values[e];
Expand Down
117 changes: 0 additions & 117 deletions lib/data/model/pkg/manager.dart
View file
Open in desktop

This file was deleted.

83 changes: 0 additions & 83 deletions lib/data/provider/providers.dart
View file
Open in desktop

This file was deleted.

10 changes: 6 additions & 4 deletions lib/view/page/home.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:responsive_framework/responsive_framework.dart';
import 'package:server_box/core/chan.dart';
import 'package:server_box/core/sync.dart';
import 'package:server_box/data/model/app/menu/platform.dart';
import 'package:server_box/data/model/app/tab.dart';
import 'package:server_box/data/provider/server/all.dart';
import 'package:server_box/data/res/build_data.dart';
import 'package:server_box/data/res/store.dart';
import 'package:server_box/data/res/url.dart';
import 'package:server_box/view/page/home_tab.dart';
import 'package:server_box/view/page/macos_menu_bar.dart';
import 'package:server_box/view/page/setting/entry.dart';
import 'package:wakelock_plus/wakelock_plus.dart';

Expand Down Expand Up @@ -161,9 +162,10 @@ class _HomePageState extends ConsumerState<HomePage>

if (Platform.isMacOS) {
return PlatformMenuBar(
menus: MacOSMenuBarManager.buildMenuBar(context, (int index) {
_onDestinationSelected(index);
}),
menus: MacOSMenuBarManager.buildMenuBar(
context,
_onDestinationSelected,
),
child: mainContent,
);
}
Expand Down
Loading