Fix setting clipboard

flet-dev · May 16, 2022 · 6a6ae7f · 6a6ae7f
1 parent afc67a5
commit 6a6ae7f
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 36 deletions.
diff --git a/client/lib/controls/banner.dart b/client/lib/controls/banner.dart
@@ -1,9 +1,9 @@
-import 'package:flet_view/utils/colors.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 
 import '../models/app_state.dart';
 import '../models/control.dart';
+import '../utils/colors.dart';
 import '../utils/edge_insets.dart';
 import 'create_control.dart';
 import 'error.dart';

diff --git a/client/lib/controls/clipboard.dart b/client/lib/controls/clipboard.dart
@@ -22,7 +22,10 @@ class ClipboardControl extends StatelessWidget {
       debugPrint("Clipboard JSON value: $value");
 
       var jv = json.decode(value);
-      Clipboard.setData(ClipboardData(text: jv["d"] as String?));
+      var text = jv["d"] as String?;
+      if (text != null) {
+        Clipboard.setData(ClipboardData(text: text));
+      }
     }
 
     return const SizedBox.shrink();

diff --git a/client/lib/controls/container.dart b/client/lib/controls/container.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 
 import '../models/control.dart';
 import '../utils/alignment.dart';

diff --git a/client/lib/controls/create_control.dart b/client/lib/controls/create_control.dart
@@ -1,7 +1,3 @@
-import 'card.dart';
-import 'list_tile.dart';
-import 'navigation_rail.dart';
-
 import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 
@@ -11,6 +7,7 @@ import '../models/control_type.dart';
 import '../models/control_view_model.dart';
 import 'alert_dialog.dart';
 import 'banner.dart';
+import 'card.dart';
 import 'checkbox.dart';
 import 'circle_avatar.dart';
 import 'clipboard.dart';
@@ -24,7 +21,9 @@ import 'grid_view.dart';
 import 'icon.dart';
 import 'icon_button.dart';
 import 'image.dart';
+import 'list_tile.dart';
 import 'list_view.dart';
+import 'navigation_rail.dart';
 import 'outlined_button.dart';
 import 'page.dart';
 import 'popup_menu_button.dart';
@@ -43,16 +42,6 @@ import 'text_button.dart';
 import 'textfield.dart';
 import 'vertical_divider.dart';
 
-// abstract class ControlWidget extends Widget {
-//   const ControlWidget(
-//       {Key? key,
-//       required Control parent,
-//       required Control control,
-//       required List<Control> children,
-//       required bool parentDisabled})
-//       : super(key: key);
-// }
-
 Widget createControl(Control? parent, String id, bool parentDisabled) {
   //debugPrint("createControl(): $id");
   return StoreConnector<AppState, ControlViewModel>(

diff --git a/client/lib/controls/form_field.dart b/client/lib/controls/form_field.dart
@@ -1,9 +1,9 @@
-import 'package:flet_view/controls/create_control.dart';
 import 'package:flutter/material.dart';
 
 import '../models/control.dart';
 import '../utils/edge_insets.dart';
 import '../utils/icons.dart';
+import 'create_control.dart';
 
 enum FormFieldInputBorder { outline, underline, none }
 

diff --git a/client/lib/controls/icon.dart b/client/lib/controls/icon.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 
 import '../models/control.dart';
 import '../utils/colors.dart';

diff --git a/client/lib/controls/list_view.dart b/client/lib/controls/list_view.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 
 import '../models/control.dart';
 import '../utils/edge_insets.dart';

diff --git a/client/lib/controls/navigation_rail.dart b/client/lib/controls/navigation_rail.dart
@@ -1,4 +1,3 @@
-import 'package:flet_view/utils/icons.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 
@@ -9,6 +8,7 @@ import '../models/controls_view_model.dart';
 import '../protocol/update_control_props_payload.dart';
 import '../utils/colors.dart';
 import '../utils/edge_insets.dart';
+import '../utils/icons.dart';
 import '../web_socket_client.dart';
 import 'create_control.dart';
 

diff --git a/client/lib/controls/page.dart b/client/lib/controls/page.dart
@@ -1,20 +1,17 @@
-import 'package:flet_view/controls/app_bar.dart';
-import 'package:flet_view/models/control_view_model.dart';
-
-import '../models/control_type.dart';
-import '../models/controls_view_model.dart';
-import '../utils/desktop.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 
 import '../models/app_state.dart';
 import '../models/control.dart';
-import '../models/control_children_view_model.dart';
+import '../models/control_type.dart';
+import '../models/controls_view_model.dart';
 import '../utils/alignment.dart';
 import '../utils/colors.dart';
+import '../utils/desktop.dart';
 import '../utils/edge_insets.dart';
 import '../utils/theme.dart';
 import '../widgets/screen_size.dart';
+import 'app_bar.dart';
 import 'create_control.dart';
 import 'scrollable_control.dart';
 

diff --git a/client/lib/controls/popup_menu_button.dart b/client/lib/controls/popup_menu_button.dart
@@ -1,10 +1,10 @@
-import 'package:flet_view/utils/icons.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 
 import '../models/app_state.dart';
 import '../models/control.dart';
 import '../models/controls_view_model.dart';
+import '../utils/icons.dart';
 import '../web_socket_client.dart';
 import 'create_control.dart';
 

diff --git a/client/lib/controls/radio.dart b/client/lib/controls/radio.dart
@@ -1,15 +1,15 @@
-import 'package:flet_view/controls/error.dart';
-import 'package:flet_view/models/control_ancestor_view_model.dart';
-import 'package:flet_view/models/control_type.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 
 import '../actions.dart';
 import '../models/app_state.dart';
 import '../models/control.dart';
+import '../models/control_ancestor_view_model.dart';
+import '../models/control_type.dart';
 import '../protocol/update_control_props_payload.dart';
 import '../web_socket_client.dart';
 import 'create_control.dart';
+import 'error.dart';
 
 enum LabelPosition { right, left }
 

diff --git a/client/lib/controls/radio_group.dart b/client/lib/controls/radio_group.dart
@@ -1,8 +1,8 @@
-import 'package:flet_view/controls/error.dart';
 import 'package:flutter/material.dart';
 
 import '../models/control.dart';
 import 'create_control.dart';
+import 'error.dart';
 
 class RadioGroupControl extends StatelessWidget {
   final Control? parent;

diff --git a/client/lib/controls/tabs.dart b/client/lib/controls/tabs.dart
@@ -1,4 +1,3 @@
-import 'package:flet_view/utils/icons.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 
@@ -7,6 +6,7 @@ import '../models/app_state.dart';
 import '../models/control.dart';
 import '../models/controls_view_model.dart';
 import '../protocol/update_control_props_payload.dart';
+import '../utils/icons.dart';
 import '../web_socket_client.dart';
 import 'create_control.dart';
 

diff --git a/sdk/python/playground/icons-browser.py b/sdk/python/playground/icons-browser.py
@@ -125,5 +125,5 @@ def search_click(e):
     )
 
 
-# flet.app(name="test1", port=8550, target=main, view=flet.WEB_BROWSER)
-flet.app(port=8550, target=main, view=flet.WEB_BROWSER)
+flet.app(name="test1", port=8550, target=main, view=flet.WEB_BROWSER)
+# flet.app(port=8550, target=main, view=flet.WEB_BROWSER)