Merge pull request #390 from Ariemeth/reposition_unit_in_group

Add ability to move units up and down in the group lists

lib/models/combatGroups/group.dart

@@ -145,6 +145,30 @@ class Group extends ChangeNotifier {
     notifyListeners();
   }
 
+  bool moveUnitUpInList(Unit unit) {
+    final index = _units.indexOf(unit);
+    if (index <= 0) {
+      return false;
+    }
+
+    _units.removeAt(index);
+    _units.insert(index - 1, unit);
+    notifyListeners();
+    return true;
+  }
+
+  bool moveUnitDownInList(Unit unit) {
+    final index = _units.indexOf(unit);
+    if (index < 0 || index >= _units.length - 1) {
+      return false;
+    }
+
+    _units.removeAt(index);
+    _units.insert(index + 1, unit);
+    notifyListeners();
+    return true;
+  }
+
   List<Unit> allUnits() {
     return _units.toList();
   }

lib/screens/roster/combatGroup/combat_group.dart

@@ -10,6 +10,7 @@ import 'package:gearforce/screens/upgrades/unit_upgrade_button.dart';
 import 'package:gearforce/widgets/unit_text_cell.dart';
 
 const double _sectionheight = 320;
+const double _movementIconCellWidth = 36;
 
 class CombatGroupWidget extends StatefulWidget {
   CombatGroupWidget(this.roster, {required this.name});
@@ -129,10 +130,18 @@ class _CombatGroupWidgetState extends State<CombatGroupWidget> {
 
   List<DataColumn> _generateTableHeading() {
     return <DataColumn>[
+      DataColumn(
+        label: Container(
+          width: _movementIconCellWidth,
+          child: UnitTextCell.columnTitle(
+            '',
+          ),
+        ),
+      ),
       DataColumn(
         label: Container(
           alignment: Alignment.centerLeft,
-          width: 160,
+          width: 180,
           child: UnitTextCell.columnTitle(
             "Model",
             textAlignment: TextAlign.left,
@@ -166,7 +175,7 @@ class _CombatGroupWidgetState extends State<CombatGroupWidget> {
       ),
       DataColumn(
         label: Container(
-          width: 92,
+          width: 60,
           child: UnitTextCell.columnTitle(
             'Rank',
           ),
@@ -182,9 +191,9 @@ class _CombatGroupWidgetState extends State<CombatGroupWidget> {
       ),
       DataColumn(
         label: Container(
-          width: 65,
+          width: 40,
           child: UnitTextCell.columnTitle(
-            'Veteran',
+            'Vet',
           ),
         ),
       ),
@@ -217,6 +226,40 @@ class _CombatGroupWidgetState extends State<CombatGroupWidget> {
     for (var i = 0; i < units.length; i++) {
       var unit = units[i];
       final canBeCommand = ruleSet.canBeCommand(unit);
+      var movementCell = DataCell(Column(
+        children: [
+          SizedBox(
+            width: _movementIconCellWidth,
+            height: 24.0,
+            child: IconButton(
+              onPressed: unit == units.firstOrNull
+                  ? null
+                  : () => group.moveUnitUpInList(unit),
+              icon: const Icon(
+                size: 15.0,
+                Icons.arrow_upward,
+                color: Colors.blueAccent,
+              ),
+              splashRadius: 20.0,
+            ),
+          ),
+          SizedBox(
+            width: _movementIconCellWidth,
+            height: 24.0,
+            child: IconButton(
+              onPressed: unit == units.lastOrNull
+                  ? null
+                  : () => group.moveUnitDownInList(unit),
+              icon: const Icon(
+                size: 15.0,
+                Icons.arrow_downward,
+                color: Colors.blueAccent,
+              ),
+              splashRadius: 20.0,
+            ),
+          ),
+        ],
+      ));
       var nameCell = DataCell(
         UnitTextCell.content(
           unit.name,
@@ -345,6 +388,7 @@ class _CombatGroupWidgetState extends State<CombatGroupWidget> {
       );
 
       var dataRow = DataRow(cells: [
+        movementCell,
         nameCell,
         tvCell,
         actionCell,

lib/screens/roster/roster.dart

@@ -21,7 +21,7 @@ import 'package:url_launcher/url_launcher_string.dart';
 const double _leftPanelWidth = 670.0;
 const double _titleHeight = 40.0;
 const double _menuTitleHeight = 50.0;
-const String _version = '1.5.0';
+const String _version = '1.6.0';
 const String _bugEmailAddress = '[email protected]';
 const String _dp9URL = 'https://www.dp9.com/';
 const String _sourceCodeURL = 'https://github.com/Ariemeth/gearforce-flutter';

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 
-version: 1.5.0
+version: 1.6.0
 environment:
   sdk: ">=3.0.0"