Merge pull request #22 from raj457036/v0.1.24

V0.1.24

Author: raj457036

lib/pages/settings/pages/custom_exclusion_rule/tabs/app_exclusion.dart

@@ -33,17 +33,20 @@ class AppExclusionTab extends StatelessWidget {
 
   Future<Iterable<AppInfo>> selectApp() async {
     final List<String> ext;
+    String? initialDirectory;
     if (Platform.isMacOS) {
       ext = ["app"];
     } else if (Platform.isWindows) {
       ext = ["exe"];
+      initialDirectory = r"C:\Program Files";
     } else {
       ext = ["bin"];
     }
     final result = await FilePicker.platform.pickFiles(
       type: FileType.custom,
       allowedExtensions: ext,
       allowMultiple: true,
+      initialDirectory: initialDirectory,
     );
 
     windowManager.focus();

lib/pages/settings/pages/custom_exclusion_rule/tabs/url_text_exclusion.dart

@@ -5,6 +5,7 @@ import 'package:copycat_base/db/exclusion_rules/exclusion_rules.dart';
 import 'package:copycat_base/l10n/l10n.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:universal_io/io.dart';
 
 class UrlTextExclusionTab extends StatefulWidget {
   const UrlTextExclusionTab({super.key});
@@ -69,8 +70,11 @@ class _UrlTextExclusionTabState extends State<UrlTextExclusionTab> {
             controller: controller,
             decoration: InputDecoration(
               border: const UnderlineInputBorder(),
-              hintText: context.locale.excludeUrlInputHint,
+              hintText: !Platform.isMacOS
+                  ? context.locale.featureNotSupported
+                  : context.locale.excludeUrlInputHint,
             ),
+            enabled: Platform.isMacOS,
             onSubmitted: (value) => addEntry(context, value),
           ),
         ),

lib/pages/settings/pages/exclusion_rules.dart

@@ -8,6 +8,7 @@ import 'package:copycat_base/db/exclusion_rules/exclusion_rules.dart';
 import 'package:copycat_base/l10n/l10n.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:universal_io/io.dart';
 
 class ExclusionRulesPage extends StatelessWidget {
   const ExclusionRulesPage({super.key});
@@ -151,18 +152,19 @@ class ExclusionRulesPage extends StatelessWidget {
                     //         }
                     //       : null,
                     // ),
-                    SwitchListTile(
-                      title: Text(context.locale.sensitiveUrls),
-                      value: state.sensitiveUrls,
-                      onChanged: enable
-                          ? (value) {
-                              updateExclusionRules(
-                                context,
-                                state.copyWith(sensitiveUrls: value),
-                              );
-                            }
-                          : null,
-                    ),
+                    if (Platform.isMacOS)
+                      SwitchListTile(
+                        title: Text(context.locale.sensitiveUrls),
+                        value: state.sensitiveUrls,
+                        onChanged: enable
+                            ? (value) {
+                                updateExclusionRules(
+                                  context,
+                                  state.copyWith(sensitiveUrls: value),
+                                );
+                              }
+                            : null,
+                      ),
                   ],
                 ),
               ),

packages/copycat_base

@@ -43,16 +43,17 @@ class WindowsActivityObserver implements PlatformActivityObserverInterface {
       );
     }
     if (!_cache.containsKey('GetUrl')) {
-      futures.add(
-        rootBundle
-            .loadString('packages/focus_window/window_utils/GetUrl.ps1')
-            .then((value) async {
-          final tempDir = await getTemporaryDirectory();
-          final file = File(p.join(tempDir.path, '._gu.ps1'));
-          await file.writeAsString(value);
-          _cache['GetUrl'] = file.path;
-        }),
-      );
+      //! BUG: Causing keyboard keys to be pressed automatically
+      // futures.add(
+      //   rootBundle
+      //       .loadString('packages/focus_window/window_utils/GetUrl.ps1')
+      //       .then((value) async {
+      //     final tempDir = await getTemporaryDirectory();
+      //     final file = File(p.join(tempDir.path, '._gu.ps1'));
+      //     await file.writeAsString(value);
+      //     _cache['GetUrl'] = file.path;
+      //   }),
+      // );
     }
 
     await Future.wait(futures);
@@ -92,10 +93,11 @@ class WindowsActivityObserver implements PlatformActivityObserverInterface {
 
     var activity = ActivityInfo.fromJson(result);
 
-    if (activity.title != _lastActivity?.title) {
-      final url = await getUrl(activity.appFileName, activity.title);
-      activity = activity.copyWith(url: url);
-    }
+    // TODO: Work on getting the url in windows
+    // if (activity.title != _lastActivity?.title) {
+    //   final url = await getUrl(activity.appFileName, activity.title);
+    //   activity = activity.copyWith(url: url);
+    // }
 
     _lastActivity = activity;
 

packages/focus_window/lib/platform/windows.dart

@@ -1,7 +1,7 @@
 name: clipboard
 description: "CopyCat Clipboard: One Clipboard, Limitless Productivity"
 publish_to: 'none'
-version: 0.1.26+57
+version: 0.1.27+58
 
 environment:
   sdk: '>=3.3.3 <4.0.0'

pubspec.yaml

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "CopyCat Clipboard"
-#define MyAppVersion "0.1.26+57"
+#define MyAppVersion "0.1.27+58"
 #define MyAppPublisher "Entility Studio"
 #define MyAppExeName "Clipboard.exe"
 #define MyAppAssocName MyAppName + ""