Imports sorted

FeodorFitsner · FeodorFitsner · commit edabac0e497c · 2022-04-17T12:22:41.000-07:00
diff --git a/client/lib/controls/create_control.dart b/client/lib/controls/create_control.dart
@@ -1,28 +1,29 @@
-import 'package:flet_view/controls/container.dart';
-import 'package:flet_view/controls/icon.dart';
-import 'package:flet_view/controls/image.dart';
-import 'package:flet_view/controls/list_view.dart';
-import 'package:flet_view/controls/snack_bar.dart';
-import 'package:flet_view/models/control_type.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_type.dart';
 import '../models/control_view_model.dart';
-import '../models/app_state.dart';
+import 'column.dart';
+import 'container.dart';
+import 'dropdown.dart';
+import 'elevated_button.dart';
 import 'grid_view.dart';
+import 'icon.dart';
 import 'icon_button.dart';
+import 'image.dart';
+import 'list_view.dart';
 import 'outlined_button.dart';
+import 'page.dart';
+import 'progress_bar.dart';
 import 'progress_ring.dart';
 import 'row.dart';
-import 'text_button.dart';
-import 'textfield.dart';
-import 'dropdown.dart';
-import 'elevated_button.dart';
-import 'page.dart';
+import 'snack_bar.dart';
 import 'stack.dart';
 import 'text.dart';
-import 'column.dart';
+import 'text_button.dart';
+import 'textfield.dart';
 
 Widget createControl(Control? parent, String id, bool parentDisabled) {
   return StoreConnector<AppState, ControlViewModel>(
@@ -48,6 +49,8 @@ Widget createControl(Control? parent, String id, bool parentDisabled) {
           return ImageControl(parent: parent, control: controlView.control);
         case ControlType.progressRing:
           return ProgressRingControl(control: controlView.control);
+        case ControlType.progressBar:
+          return ProgressBarControl(control: controlView.control);
         case ControlType.elevatedButton:
           return ElevatedButtonControl(
               parent: parent,
diff --git a/client/lib/controls/dropdown.dart b/client/lib/controls/dropdown.dart
@@ -1,13 +1,13 @@
-import 'package:flet_view/controls/create_control.dart';
 import 'package:flutter/material.dart';
-import 'package:flet_view/protocol/update_control_props_payload.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 
 import '../actions.dart';
 import '../models/app_state.dart';
 import '../models/control.dart';
 import '../models/control_children_view_model.dart';
+import '../protocol/update_control_props_payload.dart';
 import '../web_socket_client.dart';
+import 'create_control.dart';
 
 class DropdownControl extends StatefulWidget {
   final Control? parent;
diff --git a/client/lib/controls/elevated_button.dart b/client/lib/controls/elevated_button.dart
@@ -1,10 +1,10 @@
-import 'package:flet_view/controls/create_control.dart';
 import 'package:flutter/material.dart';
 
 import '../models/control.dart';
 import '../utils/colors.dart';
 import '../utils/icons.dart';
 import '../web_socket_client.dart';
+import 'create_control.dart';
 
 class ElevatedButtonControl extends StatelessWidget {
   final Control? parent;
diff --git a/client/lib/controls/grid_view.dart b/client/lib/controls/grid_view.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/widgets.dart';
+
 import '../models/control.dart';
 import '../utils/edge_insets.dart';
 import 'create_control.dart';
diff --git a/client/lib/controls/icon.dart b/client/lib/controls/icon.dart
@@ -1,9 +1,9 @@
-import 'package:flet_view/controls/create_control.dart';
-import 'package:flet_view/utils/colors.dart';
-import 'package:flet_view/utils/icons.dart';
 import 'package:flutter/widgets.dart';
 
 import '../models/control.dart';
+import '../utils/colors.dart';
+import '../utils/icons.dart';
+import 'create_control.dart';
 
 class IconControl extends StatelessWidget {
   final Control? parent;
diff --git a/client/lib/controls/icon_button.dart b/client/lib/controls/icon_button.dart
@@ -1,11 +1,11 @@
-import 'package:flet_view/controls/create_control.dart';
-import 'package:flet_view/controls/error.dart';
 import 'package:flutter/material.dart';
 
 import '../models/control.dart';
 import '../utils/colors.dart';
 import '../utils/icons.dart';
 import '../web_socket_client.dart';
+import 'create_control.dart';
+import 'error.dart';
 
 class IconButtonControl extends StatelessWidget {
   final Control? parent;
diff --git a/client/lib/controls/image.dart b/client/lib/controls/image.dart
@@ -1,12 +1,12 @@
-import 'package:flet_view/controls/create_control.dart';
-import 'package:flet_view/controls/error.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 
 import '../models/app_state.dart';
 import '../models/control.dart';
 import '../utils/borders.dart';
 import '../utils/uri.dart';
+import 'create_control.dart';
+import 'error.dart';
 
 class ImageControl extends StatelessWidget {
   final Control? parent;
diff --git a/client/lib/controls/list_view.dart b/client/lib/controls/list_view.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/widgets.dart';
+
 import '../models/control.dart';
 import '../utils/edge_insets.dart';
 import 'create_control.dart';
diff --git a/client/lib/controls/outlined_button.dart b/client/lib/controls/outlined_button.dart
@@ -1,10 +1,10 @@
-import 'package:flet_view/controls/create_control.dart';
 import 'package:flutter/material.dart';
 
 import '../models/control.dart';
 import '../utils/colors.dart';
 import '../utils/icons.dart';
 import '../web_socket_client.dart';
+import 'create_control.dart';
 
 class OutlinedButtonControl extends StatelessWidget {
   final Control? parent;
diff --git a/client/lib/controls/page.dart b/client/lib/controls/page.dart
@@ -1,12 +1,12 @@
-import 'package:flet_view/utils/colors.dart';
+import 'package:flutter/material.dart';
 
+import '../models/control.dart';
 import '../utils/alignment.dart';
+import '../utils/colors.dart';
 import '../utils/edge_insets.dart';
 import '../utils/theme.dart';
 import '../widgets/screen_size.dart';
-import 'package:flutter/material.dart';
 import 'create_control.dart';
-import '../models/control.dart';
 
 class PageControl extends StatelessWidget {
   final Control? parent;
diff --git a/client/lib/controls/progress_bar.dart b/client/lib/controls/progress_bar.dart
@@ -0,0 +1,34 @@
+import 'package:flutter/material.dart';
+
+import '../models/control.dart';
+import '../utils/colors.dart';
+import 'create_control.dart';
+
+class ProgressBarControl extends StatelessWidget {
+  final Control? parent;
+  final Control control;
+
+  const ProgressBarControl({Key? key, this.parent, required this.control})
+      : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    debugPrint("ProgressBar build: ${control.id}");
+
+    var value = control.attrDouble("value", null);
+    var barHeight = control.attrDouble("barHeight", 4)!;
+    var color = HexColor.fromString(context, control.attrString("color", "")!);
+    var bgColor =
+        HexColor.fromString(context, control.attrString("bgColor", "")!);
+
+    return constrainedControl(
+        LinearProgressIndicator(
+          value: value,
+          minHeight: barHeight,
+          color: color,
+          backgroundColor: bgColor,
+        ),
+        parent,
+        control);
+  }
+}
diff --git a/client/lib/controls/progress_ring.dart b/client/lib/controls/progress_ring.dart
@@ -1,8 +1,8 @@
-import 'package:flet_view/controls/create_control.dart';
-import 'package:flet_view/utils/colors.dart';
 import 'package:flutter/material.dart';
 
 import '../models/control.dart';
+import '../utils/colors.dart';
+import 'create_control.dart';
 
 class ProgressRingControl extends StatelessWidget {
   final Control? parent;
diff --git a/client/lib/controls/row.dart b/client/lib/controls/row.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/widgets.dart';
+
 import '../models/control.dart';
 import '../utils/alignment.dart';
 import 'create_control.dart';
diff --git a/client/lib/controls/snack_bar.dart b/client/lib/controls/snack_bar.dart
@@ -1,13 +1,13 @@
-import 'package:flet_view/controls/create_control.dart';
-import 'package:flet_view/controls/error.dart';
 import 'package:flutter/material.dart';
-import 'package:flet_view/protocol/update_control_props_payload.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 
 import '../actions.dart';
 import '../models/app_state.dart';
 import '../models/control.dart';
+import '../protocol/update_control_props_payload.dart';
 import '../web_socket_client.dart';
+import 'create_control.dart';
+import 'error.dart';
 
 class SnackBarControl extends StatefulWidget {
   final Control? parent;
diff --git a/client/lib/controls/stack.dart b/client/lib/controls/stack.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/widgets.dart';
+
 import '../models/control.dart';
 import 'create_control.dart';
 
diff --git a/client/lib/controls/text.dart b/client/lib/controls/text.dart
@@ -1,9 +1,9 @@
-import 'package:flet_view/controls/create_control.dart';
-import 'package:flet_view/utils/colors.dart';
-import 'package:flet_view/utils/text.dart';
 import 'package:flutter/material.dart';
 
 import '../models/control.dart';
+import '../utils/colors.dart';
+import '../utils/text.dart';
+import 'create_control.dart';
 
 class TextControl extends StatelessWidget {
   final Control? parent;
diff --git a/client/lib/controls/text_button.dart b/client/lib/controls/text_button.dart
@@ -1,10 +1,10 @@
-import 'package:flet_view/controls/create_control.dart';
 import 'package:flutter/material.dart';
 
 import '../models/control.dart';
 import '../utils/colors.dart';
 import '../utils/icons.dart';
 import '../web_socket_client.dart';
+import 'create_control.dart';
 
 class TextButtonControl extends StatelessWidget {
   final Control? parent;
diff --git a/client/lib/controls/textfield.dart b/client/lib/controls/textfield.dart
@@ -1,12 +1,12 @@
-import 'package:flet_view/controls/create_control.dart';
 import 'package:flutter/material.dart';
-import 'package:flet_view/protocol/update_control_props_payload.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 
 import '../actions.dart';
 import '../models/app_state.dart';
 import '../models/control.dart';
+import '../protocol/update_control_props_payload.dart';
 import '../web_socket_client.dart';
+import 'create_control.dart';
 
 class TextFieldControl extends StatefulWidget {
   final Control? parent;
diff --git a/client/lib/models/app_state.dart b/client/lib/models/app_state.dart
@@ -1,6 +1,7 @@
 import 'dart:ui';
 
 import 'package:equatable/equatable.dart';
+
 import 'control.dart';
 
 class Counter {
diff --git a/client/lib/models/control.dart b/client/lib/models/control.dart
@@ -1,5 +1,6 @@
 import 'package:equatable/equatable.dart';
-import 'package:flet_view/models/control_type.dart';
+
+import 'control_type.dart';
 
 class Control extends Equatable {
   static const reservedProps = ['i', 'p', 't', 'c', 'n'];
diff --git a/client/lib/models/page_breakpoint_view_model.dart b/client/lib/models/page_breakpoint_view_model.dart
@@ -1,5 +1,3 @@
-import 'dart:ui';
-
 import 'package:equatable/equatable.dart';
 import 'package:redux/redux.dart';
 
diff --git a/client/lib/models/page_load_view_model.dart b/client/lib/models/page_load_view_model.dart
@@ -1,10 +1,8 @@
-import 'dart:ui';
-
 import 'package:equatable/equatable.dart';
-import 'package:flet_view/models/page_size_view_model.dart';
 import 'package:redux/redux.dart';
 
 import 'app_state.dart';
+import 'page_size_view_model.dart';
 
 class PageLoadViewModel extends Equatable {
   final Uri? pageUri;
diff --git a/client/lib/protocol/page_controls_batch_payload.dart b/client/lib/protocol/page_controls_batch_payload.dart
@@ -1,4 +1,4 @@
-import 'package:flet_view/protocol/message.dart';
+import 'message.dart';
 
 class PageControlsBatchPayload {
   final List<Message> messages;
diff --git a/client/lib/utils/borders.dart b/client/lib/utils/borders.dart
@@ -1,9 +1,9 @@
 import 'dart:convert';
 
-import 'package:flet_view/utils/colors.dart';
 import 'package:flutter/material.dart';
 
 import '../models/control.dart';
+import 'colors.dart';
 
 BorderRadius? parseBorderRadius(Control control, String propName) {
   var v = control.attrString(propName, null);
diff --git a/client/lib/utils/text.dart b/client/lib/utils/text.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
 TextStyle? getTextStyle(BuildContext context, String styleName) {
diff --git a/client/lib/utils/theme.dart b/client/lib/utils/theme.dart
@@ -1,9 +1,9 @@
 import 'dart:convert';
 
-import 'package:flet_view/utils/colors.dart';
 import 'package:flutter/material.dart';
 
 import '../models/control.dart';
+import 'colors.dart';
 
 ThemeData? parseTheme(Control control, String propName) {
   var v = control.attrString(propName, null);
diff --git a/sdk/python/flet/progress_bar.py b/sdk/python/flet/progress_bar.py
@@ -1,8 +1,8 @@
 from typing import Optional
 
 from beartype import beartype
-from flet.constrained_control import ConstrainedControl
 
+from flet.constrained_control import ConstrainedControl
 from flet.control import Control, OptionalNumber
 from flet.ref import Ref
 
@@ -22,8 +22,6 @@ def __init__(
         # Specific
         #
         value: OptionalNumber = None,
-        label: str = None,
-        description: str = None,
         bar_height: OptionalNumber = None,
         color: str = None,
         bgcolor: str = None,
@@ -40,8 +38,6 @@ def __init__(
             data=data,
         )
         self.value = value
-        self.label = label
-        self.description = description
         self.bar_height = bar_height
         self.color = color
         self.bgcolor = bgcolor
@@ -59,24 +55,6 @@ def value(self):
     def value(self, value: OptionalNumber):
         self._set_attr("value", value)
 
-    # label
-    @property
-    def label(self):
-        return self._get_attr("label")
-
-    @label.setter
-    def label(self, value):
-        self._set_attr("label", value)
-
-    # description
-    @property
-    def description(self):
-        return self._get_attr("description")
-
-    @description.setter
-    def description(self, value):
-        self._set_attr("description", value)
-
     # bar_height
     @property
     def bar_height(self):

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import 'package:flutter/widgets.dart';`
	`2`	`+`
`2`	`3`	`import '../models/control.dart';`
`3`	`4`	`import '../utils/edge_insets.dart';`
`4`	`5`	`import 'create_control.dart';`