1) Modified some low level widgets to allow more design freedom

2) Corrected flutter template files for windows - bug removed..
jvxgit · Jun 4, 2024 · 063dcea · 063dcea
1 parent 9288fd7
commit 063dcea
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 13 deletions.
diff --git a/flutter/ayf_pack/images/ayf-icons.vsdx b/flutter/ayf_pack/images/ayf-icons.vsdx
diff --git a/flutter/ayf_pack/lib/component-grid-widget/ayf_property_gridview.dart b/flutter/ayf_pack/lib/component-grid-widget/ayf_property_gridview.dart
@@ -352,6 +352,7 @@ class _AudYoFloPropertyShowState extends State<AudYoFloPropertyShow> {
                   selLstBe: selLst,
                   height: 40,
                   offset: nOpts.selIdx,
+                  numCharsMax: 20,
                 );
 
                 contentWidget = newWidget;

diff --git a/flutter/ayf_pack/lib/helpers/ayf_helper_lib.dart b/flutter/ayf_pack/lib/helpers/ayf_helper_lib.dart
@@ -257,16 +257,34 @@ void decodeDeviceChannel(
   }
 }
 
-String limitString(String txt, int numCharsMax) {
+enum ayfShortenTextOption {
+  AYF_SHORTEN_TEXT_FRONT,
+  AYF_SHORTEN_TEXT_BACK,
+  AYF_SHORTEN_TEXT_MIDDLE
+}
+
+String limitString(String txt, int numCharsMax,
+    {ayfShortenTextOption shortenOption =
+        ayfShortenTextOption.AYF_SHORTEN_TEXT_MIDDLE}) {
   String retVal = txt;
   int numCharsUse = numCharsMax - 4;
   numCharsUse = max(2, numCharsUse);
   int numCharsStart = numCharsUse ~/ 2;
+  switch (shortenOption) {
+    case ayfShortenTextOption.AYF_SHORTEN_TEXT_FRONT:
+      numCharsStart = 1;
+      break;
+    case ayfShortenTextOption.AYF_SHORTEN_TEXT_BACK:
+      numCharsStart = numCharsUse;
+      break;
+    default:
+      break;
+  }
   int numCharsStop = numCharsUse - numCharsStart;
+
   if (txt.length > numCharsMax) {
-    retVal = txt.substring(0, numCharsStart - 1) +
-        "...." +
-        txt.substring(txt.length - numCharsStop - 1);
+    retVal =
+        "${txt.substring(0, numCharsStart - 1)}....${txt.substring(txt.length - numCharsStop - 1)}";
   }
 
   return retVal;

diff --git a/flutter/ayf_pack/lib/simple-widgets/ayf_prop_list_combobox.dart b/flutter/ayf_pack/lib/simple-widgets/ayf_prop_list_combobox.dart
@@ -23,16 +23,17 @@ class AudYoFloPropListComboBoxWidget extends StatelessWidget {
   final AyfPropertyReportLevel reportSet;
   final bool invalidatePropOnSet;
   final double height;
-  final int numCharsMax = 25;
+  final int numCharsMax;
   final String prefix;
   final int offset;
+  final ayfShortenTextOption textOpt;
 
   /* This combobox can be used to control backend and local 
     properties. There should always be either selLstBe or 
     selLstLo. It constructs the combobox with all options and
     then waits for a selection.
     In  reportSet the report type is specified.*/
-  AudYoFloPropListComboBoxWidget(
+  const AudYoFloPropListComboBoxWidget(
       {this.selLstBe,
       this.selLstLo,
       this.strLstBe,
@@ -41,7 +42,9 @@ class AudYoFloPropListComboBoxWidget extends StatelessWidget {
       this.invalidatePropOnSet = true,
       this.height = 40,
       this.prefix = ' ',
-      this.offset = 0});
+      this.offset = 0,
+      this.numCharsMax = 20,
+      this.textOpt = ayfShortenTextOption.AYF_SHORTEN_TEXT_FRONT});
 
   @override
   Widget build(BuildContext context) {
@@ -119,7 +122,7 @@ class AudYoFloPropListComboBoxWidget extends StatelessWidget {
                     .map<DropdownMenuItem<AudYoFloPropLstSelEntry>>(
                         (AudYoFloPropLstSelEntry value) {
                   String txt = value.txt;
-                  txt = limitString(txt, numCharsMax);
+                  txt = limitString(txt, numCharsMax, shortenOption: textOpt);
                   txt = prefix + txt;
                   Widget cW = Text(txt);
                   if (value.isSel) {
@@ -171,12 +174,14 @@ class AudYoFloPropListComboBoxWidget extends StatelessWidget {
 
                           // We need to propagate the updated property to the
                           // higher level widget to refresh the property in cache
-                          theBeCache!.triggerSetProperties(cpId, propContents,
+                          theBeCache.triggerSetProperties(cpId, propContents,
                               report: reportSet,
-                              invalidateProperty: invalidatePropOnSet);
+                              invalidateProperty: invalidatePropOnSet,
+                              offset: offset);
                         } else if (selLstLo != null) {
                           applyChangeSelectionList(selLstLo!.selection,
-                              newValue.posi, selLstLo!.decTp);
+                              newValue.posi, selLstLo!.decTp,
+                              offset: offset);
                           theUiModel!.reportSetProperty(selLstLo!);
                         }
                       }

diff --git a/flutter/ayf_pack/lib/sub-widgets/ayf_active_textfield.dart b/flutter/ayf_pack/lib/sub-widgets/ayf_active_textfield.dart
@@ -70,7 +70,17 @@ class _AudYoFloActiveTextFieldStates extends State<AudYoFloActiveTextField> {
         onTap: () {
           //myNode.requestFocus();
         },
-        decoration: const InputDecoration(border: OutlineInputBorder()),
+        decoration: InputDecoration(
+          // Here I have tested a lot. If the text is too wide, it disappears!
+          // We can avoid this by re-defining the default EdgeInsets. We need the left border inset however, to look nice.
+          // isDense: true,
+          contentPadding: const EdgeInsets.fromLTRB(5, 0, 0, 0),
+          filled: true,
+          fillColor: Colors.white,
+          border: OutlineInputBorder(
+              gapPadding: 12, borderRadius: BorderRadius.circular(12)),
+        ),
+        //decoration: const InputDecoration(border: OutlineInputBorder()),
       ),
       onFocusChange: (value) {
         if (!value) {

diff --git a/flutter/project_templates/windows/ayfcorepack/CMakeLists.txt b/flutter/project_templates/windows/ayfcorepack/CMakeLists.txt
@@ -90,6 +90,7 @@ target_include_directories(${PLUGIN_NAME} PRIVATE
 	"${AYF_SDK_PATH}/flutter/project_templates/common"
 	"${AYF_SDK_PATH}/flutter/project_templates/windows/ayfcorepack"
 	"${AYF_SDK_PATH}/include/${AYF_PROJECT}/include"
+	"${CMAKE_CURRENT_SOURCE_DIR}"
 )
 
 target_link_directories(${PLUGIN_NAME} PRIVATE 

diff --git a/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/CMakeLists.txt b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/windows/CMakeLists.txt
@@ -75,7 +75,8 @@ target_compile_definitions(${PLUGIN_NAME} PRIVATE "FLUTTER_PLUGIN_IMPL;AYF_PROJE
 # Source include directories and library dependencies. Add any plugin-specific
 # dependencies here.
 target_include_directories(${PLUGIN_NAME} INTERFACE
-  "${CMAKE_CURRENT_SOURCE_DIR}/include")
+	"${CMAKE_CURRENT_SOURCE_DIR}/include"
+	)
 
 # target_link_libraries(${PLUGIN_NAME} PRIVATE flutter flutter_wrapper_plugin)
 
@@ -90,6 +91,7 @@ target_include_directories(${PLUGIN_NAME} PRIVATE
 	"${AYF_SDK_PATH}/flutter/project_templates/common"
 	"${AYF_SDK_PATH}/flutter/project_templates/windows/ayfcorepack"
 	"${AYF_SDK_PATH}/include/${AYF_PROJECT}/include"
+	"${CMAKE_CURRENT_SOURCE_DIR}"
 )
 
 target_link_directories(${PLUGIN_NAME} PRIVATE