fix: fix fvm check (#331)

* fix: fix fvm check * refactor(fvm): delete fvm check code --------- Co-authored-by: Eduardo M. <contact@eduardom.dev>
fluttertools · Sep 4, 2024 · f5c0ad7 · f5c0ad7
1 parent d928785
commit f5c0ad7
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 42 deletions.
diff --git a/lib/src/modules/compatibility_checks/compat.dialog.dart b/lib/src/modules/compatibility_checks/compat.dialog.dart
@@ -99,8 +99,5 @@ String _genCommand(CompatibilityCheck check) {
   if (!check.git) {
     command += gitInstallCmd;
   }
-  if (!check.fvm) {
-    command += fvmInstallCmd;
-  }
   return command;
 }
diff --git a/lib/src/modules/compatibility_checks/compat.dto.dart b/lib/src/modules/compatibility_checks/compat.dto.dart
@@ -5,9 +5,6 @@ class CompatibilityCheck {
   /// Git Install Status
   bool git;
 
-  /// FVM Install Status
-  bool fvm;
-
   /// Cohocolately Install Status
   bool choco;
 
@@ -19,7 +16,6 @@ class CompatibilityCheck {
   /// Constructor
   CompatibilityCheck({
     required this.git,
-    required this.fvm,
     required this.choco,
     required this.brew,
     this.waiting = false,
@@ -30,7 +26,6 @@ class CompatibilityCheck {
     return CompatibilityCheck(
       brew: false,
       choco: false,
-      fvm: false,
       git: false,
       waiting: true,
     );
@@ -49,7 +44,6 @@ class CompatibilityCheck {
   }) {
     return CompatibilityCheck(
       git: git ?? this.git,
-      fvm: fvm ?? this.fvm,
       choco: choco ?? this.choco,
       brew: brew ?? this.brew,
     );
@@ -58,7 +52,6 @@ class CompatibilityCheck {
   Map<String, dynamic> toMap() {
     return {
       'git': git,
-      'fvm': fvm,
       'choco': choco,
       'brew': brew,
     };
@@ -67,7 +60,6 @@ class CompatibilityCheck {
   factory CompatibilityCheck.fromMap(Map<String, dynamic> map) {
     return CompatibilityCheck(
       git: map['git'] ?? false,
-      fvm: map['fvm'] ?? false,
       choco: map['choco'] ?? false,
       brew: map['brew'] ?? false,
     );
@@ -80,7 +72,7 @@ class CompatibilityCheck {
 
   @override
   String toString() {
-    return 'CompatibilityCheck(git: $git, fvm: $fvm, choco: $choco, brew: $brew)';
+    return 'CompatibilityCheck(git: $git, choco: $choco, brew: $brew)';
   }
 
   @override
@@ -89,13 +81,12 @@ class CompatibilityCheck {
 
     return other is CompatibilityCheck &&
         other.git == git &&
-        other.fvm == fvm &&
         other.choco == choco &&
         other.brew == brew;
   }
 
   @override
   int get hashCode {
-    return git.hashCode ^ fvm.hashCode ^ choco.hashCode ^ brew.hashCode;
+    return git.hashCode ^ choco.hashCode ^ brew.hashCode;
   }
 }
diff --git a/lib/src/modules/compatibility_checks/compat.provider.dart b/lib/src/modules/compatibility_checks/compat.provider.dart
@@ -21,11 +21,9 @@ class CompatStateNotifier extends StateNotifier<CompatibilityCheck> {
     final chocoState = Platform.isWindows ? await isChocoInstalled() : false;
     final brewState =
         Platform.isLinux || Platform.isMacOS ? await isBrewInstalled() : false;
-    final fvmState = await isFvmInstalled();
     final gitState = await isGitInstalled();
     state = CompatibilityCheck(
       git: gitState,
-      fvm: fvmState,
       choco: chocoState,
       brew: brewState,
     );

diff --git a/lib/src/modules/compatibility_checks/compat.screen.dart b/lib/src/modules/compatibility_checks/compat.screen.dart
@@ -74,16 +74,6 @@ class CompatCheckScreen extends ConsumerWidget {
                           const SizedBox(
                             height: 15,
                           ),
-                          Row(
-                            mainAxisSize: MainAxisSize.max,
-                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                            children: [
-                              const Heading("FVM"),
-                              Icon(provider.fvm
-                                  ? Icons.check_circle_outline_rounded
-                                  : Icons.error_outline_rounded)
-                            ],
-                          ),
                           const SizedBox(
                             height: 5,
                           ),

diff --git a/lib/src/modules/compatibility_checks/compat.utils.dart b/lib/src/modules/compatibility_checks/compat.utils.dart
@@ -20,13 +20,6 @@ Future<bool> isBrewInstalled() async {
   return false;
 }
 
-Future<bool> isFvmInstalled() async {
-  final fvmRes = await which("git");
-  if (fvmRes != null) {
-    return true;
-  }
-  return false;
-}
 
 Future<bool> isGitInstalled() async {
   final gitRes = await which("git");
@@ -51,8 +44,4 @@ const chocoInstallCmd =
     'Set-ExecutionPolicy AllSigned\nSet-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString(\'https://community.chocolatey.org/install.ps1\'))\n';
 
 final gitInstallCmd =
-    Platform.isWindows ? "choco install git -yf\n" : "brew install git\n";
-
-final fvmInstallCmd = Platform.isWindows
-    ? "choco install fvm -y\n"
-    : "brew tap leoafarias/fvm\nbrew install fvm\n";
+    Platform.isWindows ? "choco install git -yf\n" : "brew install git\n";
diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc
@@ -12,7 +12,6 @@
 #include <screen_retriever/screen_retriever_plugin.h>
 #include <url_launcher_windows/url_launcher_windows.h>
 #include <window_manager/window_manager_plugin.h>
-#include <window_size/window_size_plugin.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
   BitsdojoWindowPluginRegisterWithRegistrar(
@@ -27,6 +26,4 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
       registry->GetRegistrarForPlugin("UrlLauncherWindows"));
   WindowManagerPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("WindowManagerPlugin"));
-  WindowSizePluginRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("WindowSizePlugin"));
 }
diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake
@@ -9,7 +9,6 @@ list(APPEND FLUTTER_PLUGIN_LIST
   screen_retriever
   url_launcher_windows
   window_manager
-  window_size
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST