Skip to content
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.

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

fix: upgrade and fix dependencies #9

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions lib/src/plugins/file_manager/navigation_breadcrumbs.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import 'package:fluent_ui/fluent_ui.dart';
import 'package:flutter/material.dart';

class NavigationBreadcrumbs extends StatelessWidget {
const NavigationBreadcrumbs({
Expand Down
11 changes: 8 additions & 3 deletions lib/src/plugins/terminal/terminal_menu.dart
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,15 @@ class TerminalContextMenuState extends ConsumerState<TerminalContextMenu>

Future<void> _handleSelectAll() async {
terminalController.setSelection(
BufferRangeLine(
CellOffset(0, terminal.buffer.height - terminal.viewHeight),
CellOffset(terminal.viewWidth, terminal.buffer.height - 1),
terminal.buffer.createAnchor(
0,
terminal.buffer.height - terminal.viewHeight,
),
terminal.buffer.createAnchor(
terminal.viewWidth,
terminal.buffer.height - 1,
),
mode: SelectionMode.line,
);
}

Expand Down
84 changes: 49 additions & 35 deletions lib/src/ui/pages/host_edit_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,12 @@ class _HostEditFormState extends ConsumerState<SSHHostEditForm> {
onChanged: (value) {},
),
const FluentFormDivider(),
TextFormBox(
header: 'Label',
initialValue: record.name,
onSaved: (value) => record.name = value!,
InfoLabel(
label: 'Label',
child: TextFormBox(
initialValue: record.name,
onSaved: (value) => record.name = value!,
)
),
],
),
Expand All @@ -138,43 +140,55 @@ class _HostEditFormState extends ConsumerState<SSHHostEditForm> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
TextFormBox(
header: 'Host',
initialValue: record.host,
placeholder: 'example.com / 1.2.3.4',
validator: (value) {
if (value == null || value.isEmpty) return 'Host is required';
return isHostOrIP(value) ? null : 'Invalid host or IP';
},
onSaved: (value) => record.host = value!,
InfoLabel(
label: 'Host',
child: TextFormBox(
initialValue: record.host,
placeholder: 'example.com / 1.2.3.4',
validator: (value) {
if (value == null || value.isEmpty) {
return 'Host is required';
}
return isHostOrIP(value) ? null : 'Invalid host or IP';
},
onSaved: (value) => record.host = value!,
)
),
const FluentFormDivider(),
TextFormBox(
header: 'Port',
initialValue: record.port.toString(),
validator: (value) {
if (value == null || value.isEmpty) return 'Port is required';
return isPort(value) ? null : 'Invalid port';
},
inputFormatters: [
FilteringTextInputFormatter.digitsOnly,
],
onSaved: (value) => record.port = int.parse(value!),
InfoLabel(
label: 'Port',
child: TextFormBox(
initialValue: record.port.toString(),
validator: (value) {
if (value == null || value.isEmpty) {
return 'Port is required';
}
return isPort(value) ? null : 'Invalid port';
},
inputFormatters: [
FilteringTextInputFormatter.digitsOnly,
],
onSaved: (value) => record.port = int.parse(value!),
)
),
const FluentFormDivider(),
TextFormBox(
header: 'User',
initialValue: record.username,
placeholder: 'root',
onSaved: (value) => record.username = value,
InfoLabel(
label: 'User',
child: TextFormBox(
initialValue: record.username,
placeholder: 'root',
onSaved: (value) => record.username = value,
)
),
const FluentFormDivider(),
TextFormBox(
header: 'Password',
placeholder: '',
initialValue: record.password,
obscureText: true,
onSaved: (value) => record.password = value,
InfoLabel(
label: 'User',
child: TextFormBox(
placeholder: '',
initialValue: record.password,
obscureText: true,
onSaved: (value) => record.password = value,
)
),
],
),
Expand Down
2 changes: 1 addition & 1 deletion lib/src/ui/platform_menu.dart
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class _GlobalPlatformMenuState extends ConsumerState<GlobalPlatformMenu> {
@override
Widget build(BuildContext context) {
return PlatformMenuBar(
menus: <MenuItem>[
menus: <PlatformMenuItem>[
PlatformMenu(
label: 'TerminalStudio',
menus: [
Expand Down
4 changes: 2 additions & 2 deletions lib/src/ui/shared/fluent_form.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ class FluentFormDivider extends StatelessWidget {

@override
Widget build(BuildContext context) {
return Column(
children: const [
return const Column(
children: [
SizedBox(height: 8),
Divider(),
SizedBox(height: 8),
Expand Down
2 changes: 0 additions & 2 deletions lib/src/ui/tabs/code_editor_tab.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// Import the language & theme
import 'package:fluent_ui/fluent_ui.dart';
import 'package:flutter_highlight/themes/github.dart';
import 'package:highlight/highlight.dart';
import 'package:code_text_field/code_text_field.dart';
import 'package:flex_tabs/flex_tabs.dart';
Expand All @@ -23,7 +22,6 @@ class CodeEditorTab extends TabItem {
codeController.value = CodeController(
text: content,
language: _detectLanguage(content),
theme: githubTheme,
);
}
}
Expand Down
11 changes: 4 additions & 7 deletions lib/src/ui/tabs/devtools_tab.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:flex_tabs/flex_tabs.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:macos_ui/macos_ui.dart';
import 'package:fluent_ui/fluent_ui.dart';
import 'package:terminal_studio/src/core/state/database.dart';
import 'package:terminal_studio/src/ui/tabs/playground.dart';
import 'package:xterm/xterm.dart';
Expand Down Expand Up @@ -40,18 +40,15 @@ class _DevToolsTabViewState extends ConsumerState<DevToolsTabView> {
Wrap(
spacing: 8,
children: [
PushButton(
buttonSize: ButtonSize.large,
Button(
onPressed: _openAddHostTab,
child: const Text('Add SSH host'),
),
PushButton(
buttonSize: ButtonSize.large,
Button(
onPressed: _clearHosts,
child: const Text('Clear SSH hosts'),
),
PushButton(
buttonSize: ButtonSize.large,
Button(
onPressed: () => tab.replace(PlaygroundTab()),
child: const Text('Playground'),
),
Expand Down
4 changes: 2 additions & 2 deletions lib/src/ui/tabs/playground.dart
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ class _PlaygroundViewState extends State<PlaygroundView> {

@override
Widget build(BuildContext context) {
return Stack(
children: const [
return const Stack(
children: [
SizedBox(
width: 300,
height: 300,
Expand Down
2 changes: 1 addition & 1 deletion lib/src/ui/tabs/plugin_tab.dart
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class _PluginTabViewState extends ConsumerState<PluginTabView> {

@override
void initState() {
SchedulerBinding.instance!.addPostFrameCallback((_) {
SchedulerBinding.instance.addPostFrameCallback((_) {
ref.read(connectorProvider(plugin.hostSpec)).connect();
});
super.initState();
Expand Down
8 changes: 5 additions & 3 deletions macos/Flutter/GeneratedPluginRegistrant.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,18 @@
import FlutterMacOS
import Foundation

import flutter_acrylic
import appkit_ui_element_colors
import macos_ui
import path_provider_macos
import macos_window_utils
import path_provider_foundation
import screen_retriever
import url_launcher_macos
import window_manager

func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
FlutterAcrylicPlugin.register(with: registry.registrar(forPlugin: "FlutterAcrylicPlugin"))
AppkitUiElementColorsPlugin.register(with: registry.registrar(forPlugin: "AppkitUiElementColorsPlugin"))
MacOSUiPlugin.register(with: registry.registrar(forPlugin: "MacOSUiPlugin"))
MacOSWindowUtilsPlugin.register(with: registry.registrar(forPlugin: "MacOSWindowUtilsPlugin"))
PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
ScreenRetrieverPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverPlugin"))
UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
Expand Down
2 changes: 1 addition & 1 deletion macos/Podfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
platform :osx, '10.11'
platform :osx, '11.0'

# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
Expand Down
37 changes: 22 additions & 15 deletions macos/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
PODS:
- flutter_acrylic (0.1.0):
- appkit_ui_element_colors (1.0.0):
- FlutterMacOS
- flutter_pty (0.0.1):
- FlutterMacOS
- FlutterMacOS (1.0.0)
- macos_ui (0.1.0):
- FlutterMacOS
- path_provider_macos (0.0.1):
- macos_window_utils (1.0.0):
- FlutterMacOS
- path_provider_foundation (0.0.1):
- Flutter
- FlutterMacOS
- screen_retriever (0.0.1):
- FlutterMacOS
Expand All @@ -16,26 +19,29 @@ PODS:
- FlutterMacOS

DEPENDENCIES:
- flutter_acrylic (from `Flutter/ephemeral/.symlinks/plugins/flutter_acrylic/macos`)
- appkit_ui_element_colors (from `Flutter/ephemeral/.symlinks/plugins/appkit_ui_element_colors/macos`)
- flutter_pty (from `Flutter/ephemeral/.symlinks/plugins/flutter_pty/macos`)
- FlutterMacOS (from `Flutter/ephemeral`)
- macos_ui (from `Flutter/ephemeral/.symlinks/plugins/macos_ui/macos`)
- path_provider_macos (from `Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos`)
- macos_window_utils (from `Flutter/ephemeral/.symlinks/plugins/macos_window_utils/macos`)
- path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`)
- screen_retriever (from `Flutter/ephemeral/.symlinks/plugins/screen_retriever/macos`)
- url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`)
- window_manager (from `Flutter/ephemeral/.symlinks/plugins/window_manager/macos`)

EXTERNAL SOURCES:
flutter_acrylic:
:path: Flutter/ephemeral/.symlinks/plugins/flutter_acrylic/macos
appkit_ui_element_colors:
:path: Flutter/ephemeral/.symlinks/plugins/appkit_ui_element_colors/macos
flutter_pty:
:path: Flutter/ephemeral/.symlinks/plugins/flutter_pty/macos
FlutterMacOS:
:path: Flutter/ephemeral
macos_ui:
:path: Flutter/ephemeral/.symlinks/plugins/macos_ui/macos
path_provider_macos:
:path: Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos
macos_window_utils:
:path: Flutter/ephemeral/.symlinks/plugins/macos_window_utils/macos
path_provider_foundation:
:path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin
screen_retriever:
:path: Flutter/ephemeral/.symlinks/plugins/screen_retriever/macos
url_launcher_macos:
Expand All @@ -44,15 +50,16 @@ EXTERNAL SOURCES:
:path: Flutter/ephemeral/.symlinks/plugins/window_manager/macos

SPEC CHECKSUMS:
flutter_acrylic: c3df24ae52ab6597197837ce59ef2a8542640c17
appkit_ui_element_colors: 39bb2d80be3f19b152ccf4c70d5bbe6cba43d74a
flutter_pty: 41b6f848ade294be726a6b94cdd4a67c3bc52f59
FlutterMacOS: ae6af50a8ea7d6103d888583d46bd8328a7e9811
macos_ui: 125c911559d646194386d84c017ad6819122e2db
path_provider_macos: 3c0c3b4b0d4a76d2bf989a913c2de869c5641a19
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
macos_ui: 6229a8922cd97bafb7d9636c8eb8dfb0744183ca
macos_window_utils: 933f91f64805e2eb91a5bd057cf97cd097276663
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
screen_retriever: 59634572a57080243dd1bf715e55b6c54f241a38
url_launcher_macos: 597e05b8e514239626bcf4a850fcf9ef5c856ec3
url_launcher_macos: 5f437abeda8c85500ceb03f5c1938a8c5a705399
window_manager: 3a1844359a6295ab1e47659b1a777e36773cd6e8

PODFILE CHECKSUM: 6eac6b3292e5142cfc23bdeb71848a40ec51c14c
PODFILE CHECKSUM: 8d40c19d3cbdb380d870685c3a564c989f1efa52

COCOAPODS: 1.11.3
COCOAPODS: 1.15.2
Loading