Development (#110)

Author: LuisReyes98

.fvmrc

@@ -1,4 +1,4 @@
 {
-  "flutter": "3.35.2",
+  "flutter": "3.38.6",
   "flavors": {}
 }

CHANGELOG.md

@@ -1,5 +1,34 @@
 # Changelog
 
+## 7.5.7
+- Added `focusNode` prop to `ThemedNumberInput` to allow external focus node management.
+
+## 7.5.6
+- Add `onLongPress` with `customLongPressDuration` in `ThemedButton`
+
+## 7.5.5
+- Added `itemsLength` parameter to `deleteConfirmationDialog` utility to show the number of items being deleted in the confirmation dialog.
+
+## 7.5.4
+- Critical fix on `ThemedTable2` Select All checkbox, fixed an issue where selecting all items selected everything avaiable even when filtering with the search bar.
+
+## 7.5.3
+
+- Changed `customSort` signature on `ThemedColumn2` to include the `ascending` parameter to allow more complex sorting algorithms.
+
+## 7.5.2
+- Fixed `ThemedMapToolbar` zoom in and zoom out buttons doing the opposite action.
+
+## 7.5.1+1
+- Minor state validation on `ThemedTable2` setState call on search.
+
+## 7.5.1
+- Fixed `ThemedTable2` search debounce not working as expected.
+
+## 7.5.0+1
+
+- Hotfix regarding of a bug on `ThemedTable2` where the loading indicator was not being removed after filtering and sorting when the items list is empty.
+
 ## 7.5.0
 
 - Updated constraint of Dart SDK to `>=3.10.0 <4.0.0`

example/lib/views/table/src/table2.dart

@@ -39,7 +39,7 @@ class _InfinityTableViewState extends State<InfinityTableView> {
   Asset _generateAsset(int index) {
     return Asset(
       id: (index + 1).toString(),
-      name: (index == 2) ? "Asset asdasfasfasf ${index + 1}" : "Other Asset ${index + 1}",
+      name: (index == 2) ? "Asset LOREM ${index + 1}" : "Other Asset ${index + 1}",
       plate: 'PLATE${index + 1} testestes',
       vin: 'VIN${index + 1}',
       mode: AssetMode.single,
@@ -54,6 +54,7 @@ class _InfinityTableViewState extends State<InfinityTableView> {
       body: ThemedTable2<Asset>(
         items: _items,
         actionsCount: 3,
+        canSearch: true,
         multiselectActions: [
           ThemedActionButton(
             icon: LayrzIcons.faSolidLayerGroup,
@@ -87,7 +88,7 @@ class _InfinityTableViewState extends State<InfinityTableView> {
           ThemedColumn2(
             headerText: 'Plate',
             valueBuilder: (item) => item.plate ?? 'N/A',
-            customSort: (a, b) {
+            customSort: (a, b, ascending) {
               return (a.plate ?? '').compareTo(b.plate ?? '');
             },
             onTap: (item) async {

example/pubspec.lock

@@ -374,7 +374,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "7.5.0"
+    version: "7.5.5"
   leak_tracker:
     dependency: transitive
     description:

lib/src/buttons/buttons.dart

@@ -1,5 +1,6 @@
 library;
 
+import 'dart:async';
 import 'dart:math';
 
 import 'package:flutter/material.dart';

lib/src/buttons/src/button.dart

@@ -111,6 +111,13 @@ class ThemedButton extends StatefulWidget {
   /// By default uses the `Theme.of(context).inputDecorationTheme.fillColor`
   final Color? loadingForegroundColor;
 
+  /// [onLongPressDuration] is used to set the duration to trigger a long press.
+  final Duration customLongPressDuration;
+
+  /// [onLongPress] is called when the button is long pressed.
+  /// This callback is only available when the button is not disabled.
+  final VoidCallback? onLongPress;
+
   /// [ThemedButton] is a widget that displays a button with a custom label.
   const ThemedButton({
     super.key,
@@ -136,12 +143,15 @@ class ThemedButton extends StatefulWidget {
     this.iconSeparatorSize = 8,
     this.loadingBackgroundColor,
     this.loadingForegroundColor,
+    this.customLongPressDuration = const Duration(milliseconds: 500),
+    this.onLongPress,
   }) : assert(label != null || labelText != null, "You must provide a label or labelText, not both or none."),
        assert(height >= 30, "Height must be greater than 30u"),
        assert(iconSize >= 0, "Icon size must be greater than 0"),
        assert(iconSize <= height, "Icon size must be less than or equal to height"),
        assert(fontSize >= 0, "Font size must be greater than 0"),
-       assert(fontSize <= height, "Font size must be less than or equal to height");
+       assert(fontSize <= height, "Font size must be less than or equal to height"),
+       assert(!(onTap != null && onLongPress != null), "You must provide either onTap or onLongPress, not both.");
 
   factory ThemedButton.save({
     bool isMobile = false,
@@ -463,6 +473,15 @@ class _ThemedButtonState extends State<ThemedButton> {
   /// [iconSeparatorSize] is used to know the size of the icon separator.
   double get iconSeparatorSize => widget.iconSeparatorSize;
 
+  /// [_longPressTimer] is used to handle the long press event.
+  Timer? _longPressTimer;
+
+  /// [longPressTriggered] is used to know if the long press event was triggered.
+  bool longPressTriggered = false;
+
+  /// [customLongPressDuration] is used to set the duration to trigger a long press.
+  Duration get customLongPressDuration => widget.customLongPressDuration;
+
   WidgetSpan get iconSeparator => WidgetSpan(
     alignment: .middle,
     child: SizedBox(width: iconSeparatorSize),
@@ -601,6 +620,37 @@ class _ThemedButtonState extends State<ThemedButton> {
     );
   }
 
+  /// [_handleTapDown] is used to handle the tap down event.
+  /// This method starts the long press timer.
+  void _handleTapDown(TapDownDetails details) {
+    if (isDisabled || widget.onLongPress == null) return;
+    longPressTriggered = false;
+    _longPressTimer = Timer(customLongPressDuration, () {
+      longPressTriggered = true;
+      widget.onLongPress?.call();
+    });
+  }
+
+  /// [_handleTapUp] is used to handle the tap up event.
+  /// This method cancels the long press timer.
+  void _handleTapUp(TapUpDetails details) {
+    _longPressTimer?.cancel();
+    _longPressTimer = null;
+  }
+
+  /// [_handleTapCancel] is used to handle the tap cancel event.
+  /// This method cancels the long press timer.
+  void _handleTapCancel() {
+    _longPressTimer?.cancel();
+    _longPressTimer = null;
+  }
+
+  @override
+  void dispose() {
+    _longPressTimer?.cancel();
+    super.dispose();
+  }
+
   /// [_buildFilledTonal] is used to build a filled tonal button.
   /// This button is used when the [style] is [.filledTonal].
   Widget _buildFilledTonal() {
@@ -617,6 +667,9 @@ class _ThemedButtonState extends State<ThemedButton> {
         color: Colors.transparent,
         child: InkWell(
           onTap: isDisabled ? null : onTap,
+          onTapDown: widget.onLongPress != null ? _handleTapDown : null,
+          onTapUp: widget.onLongPress != null ? _handleTapUp : null,
+          onTapCancel: widget.onLongPress != null ? _handleTapCancel : null,
           child: Padding(
             padding: padding,
             child: _buildLoadingOrChild(

lib/src/inputs/src/general/number_input.dart

@@ -81,6 +81,9 @@ class ThemedNumberInput extends StatefulWidget {
   /// [hidePrefixSuffixActions] is the state of the input to hide the prefix and suffix actions. on the input
   final bool hidePrefixSuffixActions;
 
+  /// [focusNode] is the focus node of the input.
+  final FocusNode? focusNode;
+
   /// [ThemedNumberInput] is the constructor of the input.
   /// Simplifies (I hope so) the creation of an input using the standard format of Layrz.
   const ThemedNumberInput({
@@ -110,6 +113,7 @@ class ThemedNumberInput extends StatefulWidget {
     this.suffixText,
     this.prefixText,
     this.hidePrefixSuffixActions = false,
+    this.focusNode,
   }) : assert(
          (label == null && labelText != null) || (label != null && labelText == null),
          'You must provide either a labelText or a label, but not both.',
@@ -250,6 +254,7 @@ class _ThemedNumberInputState extends State<ThemedNumberInput> {
         widget.onChanged?.call(castedValue);
       },
       onSubmitted: widget.onSubmitted,
+      focusNode: widget.focusNode,
     );
   }
 }

lib/src/map/src/layers/toolbar.dart

@@ -237,7 +237,8 @@ class _ThemedMapToolbarState extends State<ThemedMapToolbar> {
             icon: LayrzIcons.solarBoldAddSquare,
             isDisabled: value >= widget.maxZoom,
             onTap: () async {
-              double newZoom = (value - 1).clamp(widget.minZoom, widget.maxZoom);
+              // Increase zoom by 1
+              double newZoom = (value + 1).clamp(widget.minZoom, widget.maxZoom);
               debugPrint('layrz_theme/ThemedMapToolbar/ZoomOut: Zoom to $newZoom');
               await widget.animatedMapController.animatedZoomTo(newZoom);
               _zoomListenable.value = newZoom;
@@ -283,7 +284,8 @@ class _ThemedMapToolbarState extends State<ThemedMapToolbar> {
             icon: LayrzIcons.solarBoldMinusSquare,
             isDisabled: value <= widget.minZoom,
             onTap: () async {
-              double newZoom = (value + 1).clamp(widget.minZoom, widget.maxZoom);
+              // reduce zoom by 1
+              double newZoom = (value - 1).clamp(widget.minZoom, widget.maxZoom);
               debugPrint('layrz_theme/ThemedMapToolbar/ZoomOut: Zoom to $newZoom');
               await widget.animatedMapController.animatedZoomTo(newZoom);
               _zoomListenable.value = newZoom;

lib/src/scaffolds/src/utilities.dart

@@ -19,11 +19,23 @@ Future<bool> deleteConfirmationDialog({
   String? customContent,
   String? customConfirm,
   String? customDismiss,
+  int? itemsLength,
 }) async {
   LayrzAppLocalizations? i18n = .maybeOf(context);
 
   String title = '';
   String content = '';
+  String? countInfo;
+
+  if (itemsLength != null) {
+    countInfo =
+        i18n?.tc(
+          'actions.confirmation.countInfo',
+          itemsLength,
+          {'count': itemsLength},
+        ) ??
+        ((itemsLength > 1) ? 'Deleting $itemsLength items.' : 'Deleting $itemsLength item.');
+  }
 
   if (isMultiple) {
     title = i18n?.t('actions.confirmationMultiple.title') ?? 'Are you sure that you want to delete these items?';
@@ -78,6 +90,15 @@ Future<bool> deleteConfirmationDialog({
                 textAlign: .justify,
                 maxLines: 10,
               ),
+              if (countInfo != null) ...[
+                const SizedBox(height: 5),
+
+                Text(
+                  countInfo,
+                  textAlign: .justify,
+                  maxLines: 10,
+                ),
+              ],
               const SizedBox(height: 20),
               Row(
                 mainAxisAlignment: .spaceBetween,

lib/src/table2/src/column.dart

@@ -24,7 +24,7 @@ class ThemedColumn2<T> {
   final CellTap<T>? onTap;
 
   /// [customSort] is a function that takes two items and returns an integer for custom sorting
-  int Function(T a, T b)? customSort;
+  int Function(T a, T b, bool ascending)? customSort;
 
   /// [ThemedColumn2] is the new implementation of ThemedColumn with enhanced features
   ///