From 774fa95e1b2bc22f449b7fc59c4d7a77aa7c68e5 Mon Sep 17 00:00:00 2001 From: Vishesh Handa <me@vhanda.in> Date: Fri, 2 Jul 2021 08:33:32 +0200 Subject: [PATCH] Revert "macos: Remove the ugly title bar of the window" This reverts commit bdf284311caa2f1a4d8b86c170251406fc661fbd. The title bar cannot be clicked and dragged with this change. It's super annoying. --- lib/app.dart | 20 +---------- macos/Flutter/GeneratedPluginRegistrant.swift | 2 -- macos/Podfile.lock | 6 ---- macos/Runner/MainFlutterWindow.swift | 8 +---- pubspec.lock | 35 ------------------- pubspec.yaml | 1 - 6 files changed, 2 insertions(+), 70 deletions(-) diff --git a/lib/app.dart b/lib/app.dart index 7e74fc49..abc0e01f 100644 --- a/lib/app.dart +++ b/lib/app.dart @@ -4,7 +4,6 @@ import 'dart:io' show Platform; import 'package:flutter/foundation.dart' as foundation; import 'package:flutter/material.dart'; -import 'package:bitsdojo_window/bitsdojo_window.dart'; import 'package:device_info/device_info.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization_loader/easy_localization_loader.dart'; @@ -314,7 +313,7 @@ class _JournalAppState extends State<JournalApp> { ); */ - var app = MaterialApp( + return MaterialApp( key: const ValueKey("App"), navigatorKey: _navigatorKey, title: 'GitJournal', @@ -344,23 +343,6 @@ class _JournalAppState extends State<JournalApp> { return r; }, ); - - if (Platform.isLinux || Platform.isWindows) { - return WindowBorder( - color: app.theme!.primaryColor, - child: app, - ); - } - if (Platform.isMacOS) { - return Container( - color: app.theme!.primaryColor, - child: Padding( - padding: const EdgeInsets.fromLTRB(0, 24.0, 0, 0), - child: app, - ), - ); - } - return app; } } diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 35fb3ab4..ec4de3d3 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -5,7 +5,6 @@ import FlutterMacOS import Foundation -import bitsdojo_window_macos import connectivity_macos import package_info import package_info_plus_macos @@ -16,7 +15,6 @@ import sqflite import url_launcher_macos func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { - BitsdojoWindowPlugin.register(with: registry.registrar(forPlugin: "BitsdojoWindowPlugin")) ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin")) FLTPackageInfoPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlugin")) FLTPackageInfoPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlugin")) diff --git a/macos/Podfile.lock b/macos/Podfile.lock index 1cc053e5..3747eb1b 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -1,6 +1,4 @@ PODS: - - bitsdojo_window_macos (0.0.1): - - FlutterMacOS - connectivity_macos (0.0.1): - FlutterMacOS - Reachability @@ -31,7 +29,6 @@ PODS: - FlutterMacOS DEPENDENCIES: - - bitsdojo_window_macos (from `Flutter/ephemeral/.symlinks/plugins/bitsdojo_window_macos/macos`) - connectivity_macos (from `Flutter/ephemeral/.symlinks/plugins/connectivity_macos/macos`) - FlutterMacOS (from `Flutter/ephemeral`) - package_info (from `Flutter/ephemeral/.symlinks/plugins/package_info/macos`) @@ -49,8 +46,6 @@ SPEC REPOS: - Sentry EXTERNAL SOURCES: - bitsdojo_window_macos: - :path: Flutter/ephemeral/.symlinks/plugins/bitsdojo_window_macos/macos connectivity_macos: :path: Flutter/ephemeral/.symlinks/plugins/connectivity_macos/macos FlutterMacOS: @@ -71,7 +66,6 @@ EXTERNAL SOURCES: :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos SPEC CHECKSUMS: - bitsdojo_window_macos: 7e9b1bbb09bdce418d9657ead7fc9d824203ff0d connectivity_macos: 9f30e9d0e67a0bc08a0c563ee82310b51ca6e818 FlutterMacOS: 57701585bf7de1b3fc2bb61f6378d73bbdea8424 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a diff --git a/macos/Runner/MainFlutterWindow.swift b/macos/Runner/MainFlutterWindow.swift index 31291da4..2722837e 100644 --- a/macos/Runner/MainFlutterWindow.swift +++ b/macos/Runner/MainFlutterWindow.swift @@ -1,13 +1,7 @@ import Cocoa import FlutterMacOS -import bitsdojo_window_macos - -class MainFlutterWindow: BitsdojoWindow { - - override func bitsdojo_window_configure() -> UInt { - return BDW_CUSTOM_FRAME - } +class MainFlutterWindow: NSWindow { override func awakeFromNib() { let flutterViewController = FlutterViewController.init() let windowFrame = self.frame diff --git a/pubspec.lock b/pubspec.lock index 6a6744e2..20e9f068 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -64,41 +64,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.0.0" - bitsdojo_window: - dependency: "direct main" - description: - name: bitsdojo_window - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.1+1" - bitsdojo_window_linux: - dependency: transitive - description: - name: bitsdojo_window_linux - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.1" - bitsdojo_window_macos: - dependency: transitive - description: - name: bitsdojo_window_macos - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.0" - bitsdojo_window_platform_interface: - dependency: transitive - description: - name: bitsdojo_window_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.0" - bitsdojo_window_windows: - dependency: transitive - description: - name: bitsdojo_window_windows - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.0" boolean_selector: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 8248771d..d395aa9b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -77,7 +77,6 @@ dependencies: yaml_serializer: ^0.0.11 collection: ^1.15.0-nullsafety.4 flex_color_scheme: ^2.1.1 - bitsdojo_window: ^0.1.1+1 dev_dependencies: #flutter_driver: