Set of changes proposed for 1.14.0

.gitignore

@@ -46,4 +46,5 @@ app.*.map.json
 /android/app/release
 
 lib/generated
-lib/oss_licenses.dart
+lib/oss_licenses.dart
+/pubspec.lock

README.md

@@ -21,6 +21,7 @@
 
   <h3 align="center">Just Another Workout Timer</h3>
 
+
   <p align="center">
     A simple timer for your workouts, built with Flutter!
     <br />

android/settings.gradle

@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version '8.4.1' apply false
-    id "org.jetbrains.kotlin.android" version "2.0.0" apply false
+    id "com.android.application" version '8.6.0' apply false
+    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
 }
 
 include ":app"

lib/l10n/intl_en.arb

@@ -19,6 +19,7 @@
     "duplicate": "Duplicate",
     "durationLeft": "{timeLeft} of {timeTotal} left",
     "durationWithTime": "Duration: {formattedTime}",
+    "editSetName" : "Edit set name",
     "editWorkout": "Edit workout",
     "enterWorkoutName": "Please enter a name for the workout!",
     "exercise": "Exercise",
@@ -57,7 +58,9 @@
     "settingHalfway": "Play sound or announcement halfway during exercise",
     "settings": "Settings",
     "soundOutput": "Sound output",
+    "spinnerStep": "Editor time granularity",
     "startWorkout": "Start workout",
+    "tapToEdit": "Tap to edit",
     "title": "Just Another Workout Timer",
     "tts": "Text-to-Speech (TTS)",
     "ttsLang": "TTS Language",

lib/layouts/home_page.dart

@@ -207,5 +207,10 @@ class HomePageState extends State<HomePage> {
           tooltip: S.of(context).addWorkout,
           child: const Icon(Icons.add),
         ),
+        // Empty App Bar prevents drawing under nav buttons.
+        bottomNavigationBar: const BottomAppBar(
+          elevation : 1,
+          height: 1,
+        )
       );
 }

lib/layouts/oss_license_page.dart

@@ -39,6 +39,7 @@ class OssLicensesPage extends StatelessWidget {
           isMarkdown: false,
           isSdk: false,
           dependencies: [],
+          devDependencies: []
         ),
       );
     }
@@ -54,6 +55,7 @@ class OssLicensesPage extends StatelessWidget {
         isSdk: false,
         homepage: 'https://freesound.org/people/unfa/sounds/243749/',
         dependencies: [],
+        devDependencies: []
       ),
     );
 

lib/layouts/settings_page.dart

@@ -102,6 +102,35 @@ class SettingsPageState extends State<SettingsPage> {
             subtitle: Text(S.of(context).expanded_setlist_info),
             pref: 'expanded_setlist',
           ),
+
+          PrefTitle(
+            title: Text(
+              S.of(context).editWorkout,
+            ),
+          ),
+          PrefDropdown<int>(
+            title: Text(S.of(context).spinnerStep),
+            pref: 'spinner_step',
+            items: [
+              DropdownMenuItem(
+                value: 5,
+                child: Text("5 ${S.of(context).seconds}"),
+              ),
+              DropdownMenuItem(
+                value: 10,
+                child: Text("10 ${S.of(context).seconds}"),
+              ),
+              DropdownMenuItem(
+                value: 15,
+                child: Text("15 ${S.of(context).seconds}"),
+              ),
+            ],
+          ),
+          PrefSwitch(
+            title: Text(S.of(context).tapToEdit),
+            pref: 'tap_to_edit',
+          ),
+
           PrefTitle(
             title: Text(
               S.of(context).backup,

lib/layouts/workout_builder.dart

@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:fluttertoast/fluttertoast.dart';
+import 'package:prefs/prefs.dart';
+import 'package:prompt_dialog/prompt_dialog.dart';
 import 'package:uuid/uuid.dart';
 
 import '../generated/l10n.dart';
@@ -56,7 +58,7 @@ class BuilderPageState extends State<BuilderPage> {
     var newSet = Set.fromJson(_workout.sets[index].toJson());
     newSet.id = const Uuid().v4();
     setState(() {
-      _workout.sets.insert(index, newSet);
+      _workout.sets.insert(index + 1, newSet);
       _dirty = true;
     });
   }
@@ -149,6 +151,20 @@ class BuilderPageState extends State<BuilderPage> {
     });
   }
 
+  void _editSetName(int setIndex) async {
+    var existingName = _workout.sets[setIndex].name ?? "";
+    var newName = await prompt(
+        context,
+        initialValue: existingName,
+        maxLength: 15);
+    if (newName != null && newName != existingName) {
+      setState(() {
+        _workout.sets[setIndex].name = newName.isEmpty ? null : newName;
+        _dirty = true;
+      });
+    }
+  }
+
   Widget _buildSetList() => ReorderableListView(
         onReorder: (oldIndex, newIndex) {
           if (oldIndex < newIndex) {
@@ -186,17 +202,26 @@ class BuilderPageState extends State<BuilderPage> {
                   Expanded(
                     child: ListTile(
                       title: Text(
+                        set.name ??
                         S.of(context).setIndex(_workout.sets.indexOf(set) + 1),
+                        style: const TextStyle(
+                          decoration: TextDecoration.underline,
+                        ),
                       ),
                       subtitle: Text(Utils.formatSeconds(set.duration)),
+                      onLongPress: () {
+                        _editSetName(index);
+                      },
                     ),
                   ),
                   Text(S.of(context).repetitions),
                   NumberStepper(
                     lowerLimit: 1,
                     upperLimit: 99,
                     largeSteps: false,
+                    step: 1,
                     formatNumber: false,
+                    tapToEdit: false,
                     value: set.repetitions,
                     valueChanged: (repetitions) {
                       setState(() {
@@ -232,12 +257,21 @@ class BuilderPageState extends State<BuilderPage> {
                   Row(
                     children: [
                       IconButton(
-                        icon: const Icon(Icons.delete),
-                        tooltip: S.of(context).deleteSet,
+                        icon: Icon(set.hidden ? Icons.visibility : Icons.visibility_off),
                         onPressed: () {
-                          _deleteSet(index);
+                          setState(() {
+                            set.hidden = !set.hidden;
+                            _dirty = true;
+                          });
                         },
                       ),
+                      IconButton(
+                          icon: const Icon(Icons.delete),
+                          tooltip: S.of(context).deleteSet,
+                          onPressed: () {
+                            _deleteSet(index);
+                          }
+                      ),
                       IconButton(
                         icon: const Icon(Icons.copy),
                         tooltip: S.of(context).duplicate,
@@ -264,7 +298,7 @@ class BuilderPageState extends State<BuilderPage> {
             _workout.sets[setIndex].exercises.insert(newIndex, ex);
           });
         },
-        children: set.exercises
+        children: set.hidden ? [] : set.exercises
             .asMap()
             .keys
             .map(
@@ -337,7 +371,9 @@ class BuilderPageState extends State<BuilderPage> {
                     lowerLimit: 0,
                     upperLimit: 10800,
                     largeSteps: true,
+                    step: Prefs.getInt('spinner_step', 10) ,
                     formatNumber: true,
+                    tapToEdit: Prefs.getBool('tap_to_edit', false),
                     value: _workout.sets[setIndex].exercises[exIndex].duration,
                     valueChanged: (duration) {
                       setState(() {

lib/layouts/workout_runner.dart

@@ -166,6 +166,7 @@ class WorkoutPageState extends State<WorkoutPageContent> {
                   ),
                 ),
               ),
+
               // right side of footer
               Expanded(
                 child: ListTile(
@@ -198,7 +199,15 @@ class WorkoutPageState extends State<WorkoutPageContent> {
                 child: Column(
                   children: [
                     Text(
-                      '${S.of(context).setIndex(_workout.sets.indexOf(timetable.currentSet) + 1)} - ${Utils.formatSeconds(timetable.remainingSeconds)}',
+                      timetable.currentSet.name ?? S.of(context).setIndex(_workout.sets.indexOf(timetable.currentSet) + 1),
+                      textAlign: TextAlign.center,
+                      style: const TextStyle(
+                        fontSize: 40,
+                        fontWeight: FontWeight.bold,
+                        ),
+                      ),
+                    Text(
+                      Utils.formatSeconds(timetable.remainingSeconds),
                       textAlign: TextAlign.center,
                       style: const TextStyle(
                         fontSize: 48,

lib/main.dart

@@ -31,6 +31,8 @@ void main() async {
       'tts_next_announce': true,
       'sound': 'tts',
       'expanded_setlist': false,
+      'spinner_step': 10,
+      'tap_to_edit' : false,
     },
   ).then(
     (service) => Future.wait([
@@ -49,6 +51,7 @@ void main() async {
 }
 
 class JAWTApp extends StatelessWidget {
+  // TODO this shouldn't exist in a StatelessWidget
   ThemeMode? _brightness;
 
   JAWTApp({super.key});
@@ -84,14 +87,14 @@ class JAWTApp extends StatelessWidget {
           brightness: Brightness.light,
           colorScheme: lightDynamic,
           colorSchemeSeed: lightDynamic != null ? null : Colors.blue,
-          cardTheme: const CardTheme(
+          cardTheme: const CardThemeData(
             elevation: 4,
           ),
         ),
         darkTheme: ThemeData(
           useMaterial3: true,
           brightness: Brightness.dark,
-          cardTheme: const CardTheme(elevation: 4),
+          cardTheme: const CardThemeData(elevation: 4),
           colorScheme: darkDynamic,
           colorSchemeSeed: darkDynamic != null ? null : Colors.blue,
         ),