Skip to content

Commit 6a6ae7f

Browse files
committed
Fix setting clipboard
1 parent afc67a5 commit 6a6ae7f

File tree

14 files changed

+22
-36
lines changed

14 files changed

+22
-36
lines changed

client/lib/controls/banner.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import 'package:flet_view/utils/colors.dart';
21
import 'package:flutter/material.dart';
32
import 'package:flutter_redux/flutter_redux.dart';
43

54
import '../models/app_state.dart';
65
import '../models/control.dart';
6+
import '../utils/colors.dart';
77
import '../utils/edge_insets.dart';
88
import 'create_control.dart';
99
import 'error.dart';

client/lib/controls/clipboard.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ class ClipboardControl extends StatelessWidget {
2222
debugPrint("Clipboard JSON value: $value");
2323

2424
var jv = json.decode(value);
25-
Clipboard.setData(ClipboardData(text: jv["d"] as String?));
25+
var text = jv["d"] as String?;
26+
if (text != null) {
27+
Clipboard.setData(ClipboardData(text: text));
28+
}
2629
}
2730

2831
return const SizedBox.shrink();

client/lib/controls/container.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import 'package:flutter/material.dart';
2-
import 'package:flutter/widgets.dart';
32

43
import '../models/control.dart';
54
import '../utils/alignment.dart';

client/lib/controls/create_control.dart

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
import 'card.dart';
2-
import 'list_tile.dart';
3-
import 'navigation_rail.dart';
4-
51
import 'package:flutter/material.dart';
62
import 'package:flutter_redux/flutter_redux.dart';
73

@@ -11,6 +7,7 @@ import '../models/control_type.dart';
117
import '../models/control_view_model.dart';
128
import 'alert_dialog.dart';
139
import 'banner.dart';
10+
import 'card.dart';
1411
import 'checkbox.dart';
1512
import 'circle_avatar.dart';
1613
import 'clipboard.dart';
@@ -24,7 +21,9 @@ import 'grid_view.dart';
2421
import 'icon.dart';
2522
import 'icon_button.dart';
2623
import 'image.dart';
24+
import 'list_tile.dart';
2725
import 'list_view.dart';
26+
import 'navigation_rail.dart';
2827
import 'outlined_button.dart';
2928
import 'page.dart';
3029
import 'popup_menu_button.dart';
@@ -43,16 +42,6 @@ import 'text_button.dart';
4342
import 'textfield.dart';
4443
import 'vertical_divider.dart';
4544

46-
// abstract class ControlWidget extends Widget {
47-
// const ControlWidget(
48-
// {Key? key,
49-
// required Control parent,
50-
// required Control control,
51-
// required List<Control> children,
52-
// required bool parentDisabled})
53-
// : super(key: key);
54-
// }
55-
5645
Widget createControl(Control? parent, String id, bool parentDisabled) {
5746
//debugPrint("createControl(): $id");
5847
return StoreConnector<AppState, ControlViewModel>(

client/lib/controls/form_field.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import 'package:flet_view/controls/create_control.dart';
21
import 'package:flutter/material.dart';
32

43
import '../models/control.dart';
54
import '../utils/edge_insets.dart';
65
import '../utils/icons.dart';
6+
import 'create_control.dart';
77

88
enum FormFieldInputBorder { outline, underline, none }
99

client/lib/controls/icon.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import 'package:flutter/material.dart';
2-
import 'package:flutter/widgets.dart';
32

43
import '../models/control.dart';
54
import '../utils/colors.dart';

client/lib/controls/list_view.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import 'package:flutter/material.dart';
2-
import 'package:flutter/widgets.dart';
32

43
import '../models/control.dart';
54
import '../utils/edge_insets.dart';

client/lib/controls/navigation_rail.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import 'package:flet_view/utils/icons.dart';
21
import 'package:flutter/material.dart';
32
import 'package:flutter_redux/flutter_redux.dart';
43

@@ -9,6 +8,7 @@ import '../models/controls_view_model.dart';
98
import '../protocol/update_control_props_payload.dart';
109
import '../utils/colors.dart';
1110
import '../utils/edge_insets.dart';
11+
import '../utils/icons.dart';
1212
import '../web_socket_client.dart';
1313
import 'create_control.dart';
1414

client/lib/controls/page.dart

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
1-
import 'package:flet_view/controls/app_bar.dart';
2-
import 'package:flet_view/models/control_view_model.dart';
3-
4-
import '../models/control_type.dart';
5-
import '../models/controls_view_model.dart';
6-
import '../utils/desktop.dart';
71
import 'package:flutter/material.dart';
82
import 'package:flutter_redux/flutter_redux.dart';
93

104
import '../models/app_state.dart';
115
import '../models/control.dart';
12-
import '../models/control_children_view_model.dart';
6+
import '../models/control_type.dart';
7+
import '../models/controls_view_model.dart';
138
import '../utils/alignment.dart';
149
import '../utils/colors.dart';
10+
import '../utils/desktop.dart';
1511
import '../utils/edge_insets.dart';
1612
import '../utils/theme.dart';
1713
import '../widgets/screen_size.dart';
14+
import 'app_bar.dart';
1815
import 'create_control.dart';
1916
import 'scrollable_control.dart';
2017

client/lib/controls/popup_menu_button.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import 'package:flet_view/utils/icons.dart';
21
import 'package:flutter/material.dart';
32
import 'package:flutter_redux/flutter_redux.dart';
43

54
import '../models/app_state.dart';
65
import '../models/control.dart';
76
import '../models/controls_view_model.dart';
7+
import '../utils/icons.dart';
88
import '../web_socket_client.dart';
99
import 'create_control.dart';
1010

0 commit comments

Comments
 (0)