made changes in set filter feature

.fvm/fvm_config.json

@@ -1,4 +1,4 @@
 {
-  "flutterSdkVersion": "stable",
+  "flutterSdkVersion": "3.16.9",
   "flavors": {}
-}
+}

.vscode/git-commit.js

@@ -0,0 +1,2 @@
+const { exec } = require('child_process');
+exec('git commit -m "latest_deployment"');

.vscode/git-push.js

@@ -0,0 +1,2 @@
+const { exec } = require('child_process');
+exec('git push origin');

.vscode/git-stage.js

@@ -0,0 +1,2 @@
+const { exec } = require('child_process');
+exec('git add .');

.vscode/settings.json

@@ -0,0 +1,11 @@
+{
+    "dart.flutterSdkPath": ".fvm/flutter_sdk",
+    // Remove .fvm files from search
+    "search.exclude": {
+      "**/.fvm": true
+    },
+    // Remove from file watching
+    "files.watcherExclude": {
+      "**/.fvm": true
+    }
+  }

demo/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux

@@ -1 +1 @@
-C:/Users/manek/AppData/Local/Pub/Cache/hosted/pub.dev/url_launcher_linux-3.0.2/
+C:/Users/Administrator/AppData/Local/Pub/Cache/hosted/pub.dev/url_launcher_linux-3.1.1/

example/lib/main.dart

@@ -13,6 +13,7 @@ class MyApp extends StatelessWidget {
     return MaterialApp(
       title: 'PlutoGrid Example',
       theme: ThemeData(
+        useMaterial3: false,
         primarySwatch: Colors.blue,
       ),
       home: const PlutoGridExamplePage(),
@@ -35,12 +36,12 @@ class _PlutoGridExamplePageState extends State<PlutoGridExamplePage> {
     PlutoColumn(
       title: 'Id',
       field: 'id',
-      type: PlutoColumnType.text(),
+      type: PlutoColumnType.duration(),
     ),
     PlutoColumn(
       title: 'Name',
       field: 'name',
-      type: PlutoColumnType.text(),
+      type: PlutoColumnType.duration(),
     ),
     PlutoColumn(
       title: 'Age',
@@ -95,8 +96,8 @@ class _PlutoGridExamplePageState extends State<PlutoGridExamplePage> {
   final List<PlutoRow> rows = [
     PlutoRow(
       cells: {
-        'id': PlutoCell(value: 'user1'),
-        'name': PlutoCell(value: 'Mike'),
+        'id': PlutoCell(value: 'user 113'),
+        'name': PlutoCell(value: '1111 days'),
         'age': PlutoCell(value: 20),
         'role': PlutoCell(value: 'Programmer'),
         'joined': PlutoCell(value: '2021-01-01'),
@@ -106,8 +107,8 @@ class _PlutoGridExamplePageState extends State<PlutoGridExamplePage> {
     ),
     PlutoRow(
       cells: {
-        'id': PlutoCell(value: 'user2'),
-        'name': PlutoCell(value: 'Jack'),
+        'id': PlutoCell(value: 'user 212'),
+        'name': PlutoCell(value: '210 days'),
         'age': PlutoCell(value: 25),
         'role': PlutoCell(value: 'Designer'),
         'joined': PlutoCell(value: '2021-02-01'),
@@ -117,8 +118,8 @@ class _PlutoGridExamplePageState extends State<PlutoGridExamplePage> {
     ),
     PlutoRow(
       cells: {
-        'id': PlutoCell(value: 'user3'),
-        'name': PlutoCell(value: 'Suzi'),
+        'id': PlutoCell(value: 'user 312'),
+        'name': PlutoCell(value: '2111210 days'),
         'age': PlutoCell(value: 40),
         'role': PlutoCell(value: 'Owner'),
         'joined': PlutoCell(value: '2021-03-01'),

example/windows/runner/Runner.rc

@@ -60,14 +60,14 @@ IDI_APP_ICON            ICON                    "resources\\app_icon.ico"
 // Version
 //
 
-#ifdef FLUTTER_BUILD_NUMBER
-#define VERSION_AS_NUMBER FLUTTER_BUILD_NUMBER
+#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD)
+#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD
 #else
-#define VERSION_AS_NUMBER 1,0,0
+#define VERSION_AS_NUMBER 1,0,0,0
 #endif
 
-#ifdef FLUTTER_BUILD_NAME
-#define VERSION_AS_STRING #FLUTTER_BUILD_NAME
+#if defined(FLUTTER_VERSION)
+#define VERSION_AS_STRING FLUTTER_VERSION
 #else
 #define VERSION_AS_STRING "1.0.0"
 #endif

lib/src/helper/filter_helper.dart

@@ -3,8 +3,9 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:pluto_grid/pluto_grid.dart';
 
-typedef SetFilterPopupHandler = void Function(
-    PlutoGridStateManager? stateManager);
+import '../ui/columns/pluto_column_title.dart';
+
+typedef SetFilterPopupHandler = void Function(PlutoGridStateManager? stateManager);
 
 class FilterHelper {
   /// A value to identify all column searches when searching filters.
@@ -41,10 +42,8 @@ class FilterHelper {
   }) {
     return PlutoRow(
       cells: {
-        filterFieldColumn:
-            PlutoCell(value: columnField ?? filterFieldAllColumns),
-        filterFieldType:
-            PlutoCell(value: filterType ?? const PlutoFilterTypeContains()),
+        filterFieldColumn: PlutoCell(value: columnField ?? filterFieldAllColumns),
+        filterFieldType: PlutoCell(value: filterType ?? const PlutoFilterTypeContains()),
         filterFieldValue: PlutoCell(value: filterValue ?? ''),
       },
     );
@@ -97,8 +96,7 @@ class FilterHelper {
               flag,
               compareByFilterType(
                 filterType: filterType!,
-                base: row!.cells[e.cells[filterFieldColumn]!.value]!.value
-                    .toString(),
+                base: row!.cells[e.cells[filterFieldColumn]!.value]!.value.toString(),
                 search: e.cells[filterFieldValue]!.value.toString(),
                 column: foundColumn,
               ),
@@ -139,9 +137,7 @@ class FilterHelper {
         columnField = allField;
       }
 
-      final String filterType =
-          (row.cells[FilterHelper.filterFieldType]!.value as PlutoFilterType)
-              .title;
+      final String filterType = (row.cells[FilterHelper.filterFieldType]!.value as PlutoFilterType).title;
 
       final filterValue = row.cells[FilterHelper.filterFieldValue]!.value;
 
@@ -171,8 +167,7 @@ class FilterHelper {
     }
 
     for (var row in filteredRows) {
-      if (row!.cells[filterFieldColumn]!.value == filterFieldAllColumns ||
-          row.cells[filterFieldColumn]!.value == column.field) {
+      if (row!.cells[filterFieldColumn]!.value == filterFieldAllColumns || row.cells[filterFieldColumn]!.value == column.field) {
         return true;
       }
     }
@@ -447,8 +442,7 @@ class FilterPopupState {
     required List<PlutoColumn> columns,
   }) {
     Map<String, String> columnMap = {
-      FilterHelper.filterFieldAllColumns:
-          configuration.localeText.filterAllColumns,
+      FilterHelper.filterFieldAllColumns: configuration.localeText.filterAllColumns,
     };
 
     columns.where((element) => element.enableFilterMenuItem).forEach((element) {
@@ -523,36 +517,54 @@ class PlutoGridFilterPopupHeader extends StatelessWidget {
   }
 
   void handleClearButton() {
-    if (stateManager!.rows.isEmpty) {
-      Navigator.of(stateManager!.gridFocusNode.context!).pop();
-    } else {
-      stateManager!.removeRows(stateManager!.rows);
-    }
+    stateManager!.removeRows(stateManager!.rows);
   }
 
   @override
   Widget build(BuildContext context) {
-    return SingleChildScrollView(
-      scrollDirection: Axis.horizontal,
+    Size size = MediaQuery.sizeOf(context);
+    return SizedBox(
+      width: size.width,
       child: Row(
         children: [
-          IconButton(
-            icon: const Icon(Icons.add),
-            color: configuration!.style.iconColor,
-            iconSize: configuration!.style.iconSize,
-            onPressed: handleAddButton,
+          Row(
+            children: [
+              IconButton(
+                icon: const Icon(Icons.add),
+                color: configuration!.style.iconColor,
+                iconSize: configuration!.style.iconSize,
+                onPressed: handleAddButton,
+              ),
+              IconButton(
+                icon: const Icon(Icons.remove),
+                color: configuration!.style.iconColor,
+                iconSize: configuration!.style.iconSize,
+                onPressed: handleRemoveButton,
+              ),
+              InkWell(
+                onTap: handleClearButton,
+                child: const Text(
+                  'Clear Filter',
+                  style: TextStyle(color: Colors.blue),
+                ),
+              ),
+            ],
           ),
-          IconButton(
-            icon: const Icon(Icons.remove),
-            color: configuration!.style.iconColor,
-            iconSize: configuration!.style.iconSize,
-            onPressed: handleRemoveButton,
+          const SizedBox(
+            width: 370,
           ),
-          IconButton(
-            icon: const Icon(Icons.clear_sharp),
-            color: Colors.red,
-            iconSize: configuration!.style.iconSize,
-            onPressed: handleClearButton,
+          ElevatedButton(
+            style: ButtonStyle(
+              backgroundColor: MaterialStateProperty.all<Color>(Colors.redAccent),
+            ),
+            onPressed: () {
+              Navigator.of(stateManager!.gridFocusNode.context!).pop();
+              isFiltered = false;
+            },
+            child: const Text(
+              'Close',
+              style: TextStyle(color: Colors.white),
+            ),
           ),
         ],
       ),