Skip to content

Offline gym log for Android. No account, no ads, no internet.

Add to routine from the exercise preview

InlitX18a3415d06ef
diff --git a/lib/screens/routine_edit_screen.dart b/lib/screens/routine_edit_screen.dart
index b05cf96..1781949 100644
--- a/lib/screens/routine_edit_screen.dart
+++ b/lib/screens/routine_edit_screen.dart
@@ -204,6 +204,7 @@ class _RoutineEditScreenState extends State<RoutineEditScreen> {
cursorColor: gc.accent,
textCapitalization: TextCapitalization.words,
onChanged: (v) => fit.renameRoutine(_id, v),
+ onTapOutside: (_) => FocusScope.of(context).unfocus(),
decoration: InputDecoration(
isCollapsed: true,
border: InputBorder.none,
@@ -690,11 +691,14 @@ class _RoutineEditScreenState extends State<RoutineEditScreen> {
);
}
+ void _preview(Exercise ex) => showExercisePreview(context, ex,
+ added: () => fit.routineHas(_id, ex.id), onAdd: () => fit.toggleRoutineExercise(_id, ex.id));
+
Widget _pickRow(GymColors gc, Exercise ex) {
final inRoutine = fit.routineHas(_id, ex.id);
return GestureDetector(
onTap: () => fit.toggleRoutineExercise(_id, ex.id),
- onLongPress: () => showExercisePreview(context, ex),
+ onLongPress: () => _preview(ex),
behavior: HitTestBehavior.opaque,
child: Container(
margin: const EdgeInsets.only(bottom: 8),
@@ -706,7 +710,7 @@ class _RoutineEditScreenState extends State<RoutineEditScreen> {
),
child: Row(children: [
GestureDetector(
- onTap: () => showExercisePreview(context, ex),
+ onTap: () => _preview(ex),
child: SizedBox(width: 44, child: ExerciseMedia(ex: ex, height: 44, radius: 10)),
),
const SizedBox(width: 12),
diff --git a/lib/widgets/exercise_preview.dart b/lib/widgets/exercise_preview.dart
index b1e2845..0662a08 100644
--- a/lib/widgets/exercise_preview.dart
+++ b/lib/widgets/exercise_preview.dart
@@ -14,21 +14,26 @@ import '../theme/app_theme.dart';
import 'exercise_media.dart';
import 'glass.dart';
import 'shimmer.dart';
+import 'svg_icon.dart';
import 'ui_kit.dart';
-Future<void> showExercisePreview(BuildContext context, Exercise ex, {bool suggestions = false}) {
+Future<void> showExercisePreview(BuildContext context, Exercise ex,
+ {bool suggestions = false, ValueGetter<bool>? added, VoidCallback? onAdd}) {
HapticFeedback.selectionClick();
+ FocusManager.instance.primaryFocus?.unfocus();
return showAppDialog<void>(
context: context,
- builder: (_) => _ExercisePreview(ex: ex, suggestions: suggestions),
+ builder: (_) => _ExercisePreview(ex: ex, suggestions: suggestions, added: added, onAdd: onAdd),
);
}
class _ExercisePreview extends StatefulWidget {
- const _ExercisePreview({required this.ex, required this.suggestions});
+ const _ExercisePreview({required this.ex, required this.suggestions, this.added, this.onAdd});
final Exercise ex;
final bool suggestions;
+ final ValueGetter<bool>? added;
+ final VoidCallback? onAdd;
@override
State<_ExercisePreview> createState() => _ExercisePreviewState();
@@ -109,13 +114,15 @@ class _ExercisePreviewState extends State<_ExercisePreview> {
: _VideoStage(controller: video),
Positioned(
top: 10,
- right: 10,
+ left: widget.onAdd == null ? null : 10,
+ right: widget.onAdd == null ? 10 : null,
child: RoundAction(
label: MaterialLocalizations.of(context).closeButtonLabel,
onTap: () => Navigator.of(context).pop(),
child: Icon(PhosphorIconsBold.x, size: 15, color: gc.text),
),
),
+ if (widget.onAdd != null) Positioned(top: 10, right: 10, child: _addButton(gc)),
]),
Padding(
padding: const EdgeInsets.fromLTRB(8, 20, 8, 0),
@@ -166,6 +173,21 @@ class _ExercisePreviewState extends State<_ExercisePreview> {
);
}
+ Widget _addButton(GymColors gc) {
+ final on = widget.added?.call() ?? false;
+ return RoundAction(
+ label: on ? t.removeFromRoutine : t.addToRoutine,
+ filled: on,
+ onTap: () {
+ HapticFeedback.selectionClick();
+ widget.onAdd!();
+ },
+ child: on
+ ? SvgPathIcon(Ic.checkBold, size: 14, color: gc.onEmber)
+ : Icon(PhosphorIconsBold.plus, size: 15, color: gc.text),
+ );
+ }
+
Widget _suggestRow(GymColors gc) => GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () => fit.toggleSuggest(ex.id),