Support for macos!

Author: javaherisaber

.gitignore

@@ -5,9 +5,11 @@
 *.swp
 .DS_Store
 .atom/
+.build/
 .buildlog/
 .history
 .svn/
+.swiftpm/
 migrate_working_dir/
 
 # IntelliJ related

ios/Flutter/Debug.xcconfig

@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"

ios/Flutter/Release.xcconfig

@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"

ios/Podfile

@@ -0,0 +1,43 @@
+# Uncomment this line to define a global platform for your project
+# platform :ios, '12.0'
+
+# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
+ENV['COCOAPODS_DISABLE_STATS'] = 'true'
+
+project 'Runner', {
+  'Debug' => :debug,
+  'Profile' => :release,
+  'Release' => :release,
+}
+
+def flutter_root
+  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
+  unless File.exist?(generated_xcode_build_settings_path)
+    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
+  end
+
+  File.foreach(generated_xcode_build_settings_path) do |line|
+    matches = line.match(/FLUTTER_ROOT\=(.*)/)
+    return matches[1].strip if matches
+  end
+  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
+end
+
+require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
+
+flutter_ios_podfile_setup
+
+target 'Runner' do
+  use_frameworks!
+
+  flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
+  target 'RunnerTests' do
+    inherit! :search_paths
+  end
+end
+
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    flutter_additional_ios_build_settings(target)
+  end
+end

lib/bloc.dart

@@ -77,11 +77,11 @@ class AppBloc with AppSystemTray {
 
   void onAddLeakItemClick() async {
     if (_leakInput == null || _leakInput?.trim().isEmpty == true) {
-      WinToast.instance().showToast(type: ToastType.text01, title: 'No input entered!');
+      _showToast('No input entered!');
       return;
     }
     if ((await AppSharedPreferences.leakChecklist).contains(_leakInput)) {
-      WinToast.instance().showToast(type: ToastType.text01, title: 'Repetitive input not allowed!');
+      _showToast('Repetitive input not allowed!');
       return;
     }
     await AppSharedPreferences.addToLeakChecklist(_leakInput!);
@@ -224,6 +224,10 @@ class AppBloc with AppSystemTray {
   }
 
   Future<void> _checkProxySettings() async {
+    if (Platform.isMacOS) {
+      // todo: implement macOS
+      return;
+    }
     final localNetwork = await AppCmd.getLocalNetworkInfo();
     _localNetwork.value = localNetwork;
     final proxyResult = await AppCmd.getProxySettings();
@@ -259,12 +263,20 @@ class AppBloc with AppSystemTray {
     }
 
     if (remaining < 1073741824 && lowBalanceToastCount < 2) {
-      WinToast.instance().showToast(type: ToastType.text01, title: 'Less than 1 GB is left in your kerio account!');
+      _showToast('Less than 1 GB is left in your kerio account!');
       await AppSharedPreferences.setKerioLowBalanceToastCount(lowBalanceToastCount + 1);
       await AppSharedPreferences.setKerioLowBalanceToastDate(today.toIso8601String());
     }
   }
 
+  void _showToast(String title) {
+    if (Platform.isMacOS) {
+      // todo: implement macOS
+      return;
+    }
+    WinToast.instance().showToast(type: ToastType.text01, title: title);
+  }
+
   void _checkNetworkConnectivity() async {
     final result = await (Connectivity().checkConnectivity());
     if (result == ConnectivityResult.none) {

lib/main.dart

@@ -40,6 +40,10 @@ Future<void> initSingleInstance() async {
 }
 
 Future<void> initWinToast() async {
+  if (Platform.isMacOS) {
+    // todo: implement macos
+    return Future.value();
+  }
   await WinToast.instance().initialize(
     appName: 'IRNet',
     productName: 'IRNet',

lib/utils/system_tray.dart

@@ -30,7 +30,7 @@ mixin AppSystemTray {
 
   Future<void> initSystemTray() async {
     await _systemTray.initSystemTray(
-      title: "system tray",
+      title: null,
       iconPath: 'assets/loading.ico',
     );
     final Menu menu = Menu();

lib/views/kerio_login.dart

@@ -246,6 +246,7 @@ class _KerioLoginViewState extends State<KerioLoginView> {
         final value = snapshot.data ?? false;
         return CheckboxListTile(
           title: const Text('Auto?'),
+          contentPadding: const EdgeInsets.symmetric(horizontal: 16),
           value: value,
           onChanged: (enabled) async {
             await AppSharedPreferences.setKerioAutoLogin(enabled ?? false);

lib/views/options.dart

@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:launch_at_startup/launch_at_startup.dart';
 
@@ -32,7 +34,9 @@ class _AppOptionsState extends State<AppOptions> {
         final value = snapshot.data ?? false;
         return CheckboxListTile(
           title: const Text('Launch on windows startup?'),
+          contentPadding: const EdgeInsets.symmetric(horizontal: 16),
           value: value,
+          enabled: !Platform.isMacOS, // todo: implement macos
           onChanged: (enabled) {
             if (enabled == true) {
               LaunchAtStartup.instance.enable();
@@ -53,6 +57,7 @@ class _AppOptionsState extends State<AppOptions> {
         final value = snapshot.data ?? false;
         return CheckboxListTile(
           title: const Text('Show leak detection on system tray icon?'),
+          contentPadding: const EdgeInsets.symmetric(horizontal: 16),
           value: value,
           onChanged: (enabled) async {
             await AppSharedPreferences.setShowLeakInSysTray(enabled ?? false);

macos/Flutter/Flutter-Debug.xcconfig

@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "ephemeral/Flutter-Generated.xcconfig"