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: failed ssh np desktop connect to c daemons #1562

Draft
wants to merge 3 commits into
base: trunk
Choose a base branch
from
Draft
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
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class _HomeScreenImportDialogState extends State<HomeScreenImportDialog> {
}
},
style: Theme.of(context).elevatedButtonTheme.style!.copyWith(
backgroundColor: MaterialStateProperty.all(Colors.black),
backgroundColor: WidgetStateProperty.all(Colors.black),
),
child: Text(
strings.submit,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class _HomeScreenImportDialogState extends State<HomeScreenImportDialog> {
}
},
style: Theme.of(context).elevatedButtonTheme.style!.copyWith(
backgroundColor: MaterialStateProperty.all(Colors.black),
backgroundColor: WidgetStateProperty.all(Colors.black),
),
child: Text(
strings.submit,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ class _ImportProfileActionState extends ConsumerState<ImportProfileAction> {
Widget build(BuildContext context) {
return FilledButton(
style: Theme.of(context).filledButtonTheme.style!.copyWith(
backgroundColor: MaterialStateProperty.all<Color>(Colors.white),
foregroundColor: MaterialStateProperty.all<Color>(kPrimaryColor),
backgroundColor: WidgetStateProperty.all<Color>(Colors.white),
foregroundColor: WidgetStateProperty.all<Color>(kPrimaryColor),
),
onPressed: () {
HomeScreenActionCallbacks.import(ref, context);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@ class ProfileDeleteDialog extends ConsumerWidget {
children: [
TextSpan(
text: strings.note,
style: Theme.of(context)
.textTheme
.bodySmall!
.copyWith(fontWeight: FontWeight.w700),
style: Theme.of(context).textTheme.bodySmall!.copyWith(fontWeight: FontWeight.w700),
),
TextSpan(
text: strings.noteMessage,
Expand All @@ -47,27 +44,20 @@ class ProfileDeleteDialog extends ConsumerWidget {
OutlinedButton(
onPressed: () => Navigator.of(context).pop(false),
child: Text(strings.cancelButton,
style: Theme.of(context)
.textTheme
.bodySmall!
.copyWith(decoration: TextDecoration.underline)),
style: Theme.of(context).textTheme.bodySmall!.copyWith(decoration: TextDecoration.underline)),
),
ElevatedButton(
onPressed: () async {
await ref
.read(configFamilyController(profileName).notifier)
.deleteConfig(context: context);
await ref.read(configFamilyController(profileName).notifier).deleteConfig(context: context);
if (context.mounted) Navigator.of(context).pop();
},
style: Theme.of(context).elevatedButtonTheme.style!.copyWith(
backgroundColor: MaterialStateProperty.all(Colors.black),
backgroundColor: WidgetStateProperty.all(Colors.black),
),
child: Text(
strings.deleteButton,
style: Theme.of(context)
.textTheme
.bodySmall!
.copyWith(fontWeight: FontWeight.w700, color: Colors.white),
style:
Theme.of(context).textTheme.bodySmall!.copyWith(fontWeight: FontWeight.w700, color: Colors.white),
),
)
],
Expand Down
18 changes: 9 additions & 9 deletions packages/dart/sshnp_flutter/lib/src/utility/app_theme.dart
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class AppTheme {
primary: kPrimaryColor,
),
checkboxTheme: CheckboxThemeData(
fillColor: MaterialStateColor.resolveWith(
fillColor: WidgetStateColor.resolveWith(
(states) {
return Colors.black;
},
Expand All @@ -93,13 +93,13 @@ class AppTheme {
textTheme: lightTextTheme,
elevatedButtonTheme: ElevatedButtonThemeData(
style: ButtonStyle(
shape: MaterialStateProperty.all<RoundedRectangleBorder>(
shape: WidgetStateProperty.all<RoundedRectangleBorder>(
RoundedRectangleBorder(
borderRadius: BorderRadius.circular(18.0),
),
),
backgroundColor: MaterialStateProperty.all<Color>(const Color(0xFF12DE26)),
foregroundColor: MaterialStateProperty.all<Color>(const Color(0xFFFFFFFF)),
backgroundColor: WidgetStateProperty.all<Color>(const Color(0xFF12DE26)),
foregroundColor: WidgetStateProperty.all<Color>(const Color(0xFFFFFFFF)),
),
),
dialogTheme: const DialogTheme(
Expand Down Expand Up @@ -130,9 +130,9 @@ class AppTheme {
return ThemeData(
visualDensity: VisualDensity.adaptivePlatformDensity,
useMaterial3: true,
colorScheme: const ColorScheme.dark().copyWith(primary: kPrimaryColor, background: kBackGroundColorDark),
colorScheme: const ColorScheme.dark().copyWith(primary: kPrimaryColor, surface: kBackGroundColorDark),
checkboxTheme: CheckboxThemeData(
fillColor: MaterialStateColor.resolveWith(
fillColor: WidgetStateColor.resolveWith(
(states) {
return Colors.black;
},
Expand All @@ -143,7 +143,7 @@ class AppTheme {
textTheme: darkTextTheme,
elevatedButtonTheme: ElevatedButtonThemeData(
style: ButtonStyle(
shape: MaterialStateProperty.all<RoundedRectangleBorder>(
shape: WidgetStateProperty.all<RoundedRectangleBorder>(
RoundedRectangleBorder(
side: const BorderSide(
width: 1,
Expand All @@ -152,8 +152,8 @@ class AppTheme {
borderRadius: BorderRadius.circular(Sizes.p3),
),
),
backgroundColor: MaterialStateProperty.all<Color>(const Color(0xFF2F2F2F)),
foregroundColor: MaterialStateProperty.all<Color>(const Color(0xFF707070)),
backgroundColor: WidgetStateProperty.all<Color>(const Color(0xFF2F2F2F)),
foregroundColor: WidgetStateProperty.all<Color>(const Color(0xFF707070)),
),
),
dialogTheme: const DialogTheme(
Expand Down
9 changes: 8 additions & 1 deletion packages/dart/sshnp_flutter/macos/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ PODS:
- FlutterMacOS
- url_launcher_macos (0.0.1):
- FlutterMacOS
- webview_flutter_wkwebview (0.0.1):
- Flutter
- FlutterMacOS
- window_manager (0.2.0):
- FlutterMacOS

Expand All @@ -46,6 +49,7 @@ DEPENDENCIES:
- share_plus (from `Flutter/ephemeral/.symlinks/plugins/share_plus/macos`)
- shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`)
- url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`)
- webview_flutter_wkwebview (from `Flutter/ephemeral/.symlinks/plugins/webview_flutter_wkwebview/darwin`)
- window_manager (from `Flutter/ephemeral/.symlinks/plugins/window_manager/macos`)

EXTERNAL SOURCES:
Expand Down Expand Up @@ -77,6 +81,8 @@ EXTERNAL SOURCES:
:path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin
url_launcher_macos:
:path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos
webview_flutter_wkwebview:
:path: Flutter/ephemeral/.symlinks/plugins/webview_flutter_wkwebview/darwin
window_manager:
:path: Flutter/ephemeral/.symlinks/plugins/window_manager/macos

Expand All @@ -94,7 +100,8 @@ SPEC CHECKSUMS:
screen_retriever: 59634572a57080243dd1bf715e55b6c54f241a38
share_plus: 76dd39142738f7a68dd57b05093b5e8193f220f7
shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
url_launcher_macos: d2691c7dd33ed713bf3544850a623080ec693d95
url_launcher_macos: 5f437abeda8c85500ceb03f5c1938a8c5a705399
webview_flutter_wkwebview: 0982481e3d9c78fd5c6f62a002fcd24fc791f1e4
window_manager: 3a1844359a6295ab1e47659b1a777e36773cd6e8

PODFILE CHECKSUM: 9ebaf0ce3d369aaa26a9ea0e159195ed94724cf3
Expand Down
2 changes: 1 addition & 1 deletion packages/dart/sshnp_flutter/macos/Runner/AppDelegate.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Cocoa
import FlutterMacOS

@NSApplicationMain
@main
class AppDelegate: FlutterAppDelegate {
override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
return true
Expand Down
Loading
Loading