From 406ed9a1a8eefe2c03e0e86cb80e851ba98b5343 Mon Sep 17 00:00:00 2001 From: Captured-Heart Date: Sun, 23 Feb 2025 15:03:52 +0100 Subject: [PATCH 1/3] removed the windows resize on the main.app, added it to the init stateon my_app.dart --- lib/main.dart | 14 +++++++------- lib/my_app.dart | 22 +++++++++++++++++++++- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index d67d794..ec78046 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -5,11 +5,11 @@ import 'package:socket_probe/my_app.dart'; void main() { runApp(const MyApp()); - doWhenWindowReady(() { - final win = appWindow; - win.minSize = const Size(1024, 768); - win.size = const Size(1024, 768); - win.alignment = Alignment.center; - win.show(); - }); + // doWhenWindowReady(() { + // final win = appWindow; + // win.minSize = const Size(1024, 768); + // win.size = const Size(1024, 768); + // win.alignment = Alignment.center; + // win.show(); + // }); } diff --git a/lib/my_app.dart b/lib/my_app.dart index 20a540f..d518323 100644 --- a/lib/my_app.dart +++ b/lib/my_app.dart @@ -1,3 +1,4 @@ +import 'package:bitsdojo_window/bitsdojo_window.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:socket_probe/common/themes/app_theme.dart'; @@ -8,9 +9,28 @@ import 'package:socket_probe/features/event_sockets/bloc/event_sockets_bloc.dart import 'package:socket_probe/features/navigation/bloc/navigation_cubit.dart'; import 'package:socket_probe/features/wsprotocol/bloc/wsprotocol_bloc.dart'; -class MyApp extends StatelessWidget { +class MyApp extends StatefulWidget { const MyApp({super.key}); + @override + State createState() => _MyAppState(); +} + +class _MyAppState extends State { + @override + void initState() { + super.initState(); + WidgetsBinding.instance.addPostFrameCallback((_) { + doWhenWindowReady(() { + final win = appWindow; + win.minSize = const Size(1024, 768); + win.size = const Size(1024, 768); + win.alignment = Alignment.center; + win.show(); + }); + }); + } + @override Widget build(BuildContext context) { return MultiBlocProvider( From ac986d38375e3196ff9c00e509bf854afe0bb29d Mon Sep 17 00:00:00 2001 From: Captured-Heart Date: Sun, 23 Feb 2025 15:04:18 +0100 Subject: [PATCH 2/3] changed column to listview to allow for scrollable and avoid overflow --- .../dashboard/presentation/screens/dashboard_view.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/features/dashboard/presentation/screens/dashboard_view.dart b/lib/features/dashboard/presentation/screens/dashboard_view.dart index e0ad36d..add30e5 100644 --- a/lib/features/dashboard/presentation/screens/dashboard_view.dart +++ b/lib/features/dashboard/presentation/screens/dashboard_view.dart @@ -15,8 +15,8 @@ class _DashboardViewState extends State { final size = MediaQuery.sizeOf(context); return DefaultTabController( length: 2, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + child: ListView( + // crossAxisAlignment: CrossAxisAlignment.start, children: [ const SizedBox(height: 20), Container( From 69c9cfa6c98ea0cf71b743309f01f1b6d96adf02 Mon Sep 17 00:00:00 2001 From: Captured-Heart Date: Sun, 23 Feb 2025 15:05:05 +0100 Subject: [PATCH 3/3] gitignore and vsCode settings --- .gitignore | 5 +++++ .vscode/settings.json | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 79c113f..b2052a8 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,8 @@ app.*.map.json /android/app/debug /android/app/profile /android/app/release + +# FVM Version Cache +.fvm/ +.fvmrc +.vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json index f4607f2..e2b1de3 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,4 @@ { - "dart.lineLength": 120 -} + "dart.lineLength": 120, + "dart.flutterSdkPath": ".fvm/versions/3.27.1" +} \ No newline at end of file