wger-project/flutter
1
0
Fork 0
mirror of https://github.com/wger-project/flutter.git synced 2026-02-18 00:17:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge problems

Browse Source
This commit is contained in:
Roland Geider
2024-01-09 15:56:57 +01:00
parent d51b6d7d87
commit cd1caa0126
3 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/widgets/workouts/day.dart
View File

@@ -131,16 +131,14 @@ class _WorkoutDayWidgetState extends State<WorkoutDayWidget> {
child: Column(
children: [
if (set.comment != '') MutedText(set.comment),
...set.settingsFiltered
.map(
(setting) => SettingWidget(
set: set,
setting: setting,
expanded: _expanded,
toggle: _toggleExpanded,
),
)
,
...set.settingsFiltered.map(
(setting) => SettingWidget(
set: set,
setting: setting,
expanded: _expanded,
toggle: _toggleExpanded,
),
),
const Divider(),
],
),

14
lib/widgets/workouts/gym_mode.dart
View File

@@ -59,7 +59,7 @@ class _GymModeState extends State<GymMode> {
var _totalElements = 1;
/// Map with the first (navigation) page for each exercise
final Map<ExerciseBase, int> _exercisePages = {};
final Map<Exercise, int> _exercisePages = {};
final PageController _controller = PageController(
initialPage: 0,
);
@@ -169,7 +169,7 @@ class _GymModeState extends State<GymMode> {
class StartPage extends StatelessWidget {
final PageController _controller;
final Day _day;
final Map<ExerciseBase, int> _exercisePages;
final Map<Exercise, int> _exercisePages;
const StartPage(this._controller, this._day, this._exercisePages);
@@ -235,7 +235,7 @@ class LogPage extends StatefulWidget {
final Exercise _exerciseBase;
final WorkoutPlan _workoutPlan;
final double _ratioCompleted;
final Map<ExerciseBase, int> _exercisePages;
final Map<Exercise, int> _exercisePages;
final Log _log = Log.empty();
LogPage(
@@ -664,7 +664,7 @@ class ExerciseOverview extends StatelessWidget {
final PageController _controller;
final Exercise _exerciseBase;
final double _ratioCompleted;
final Map<ExerciseBase, int> _exercisePages;
final Map<Exercise, int> _exercisePages;
const ExerciseOverview(
this._controller,
@@ -726,7 +726,7 @@ class SessionPage extends StatefulWidget {
final WorkoutPlan _workoutPlan;
final PageController _controller;
final TimeOfDay _start;
final Map<ExerciseBase, int> _exercisePages;
final Map<Exercise, int> _exercisePages;
const SessionPage(
this._workoutPlan,
@@ -933,7 +933,7 @@ class _SessionPageState extends State<SessionPage> {
class TimerWidget extends StatefulWidget {
final PageController _controller;
final double _ratioCompleted;
final Map<ExerciseBase, int> _exercisePages;
final Map<Exercise, int> _exercisePages;
const TimerWidget(
this._controller,
@@ -1064,7 +1064,7 @@ class NavigationFooter extends StatelessWidget {
class NavigationHeader extends StatelessWidget {
final PageController _controller;
final String _title;
final Map<ExerciseBase, int> exercisePages;
final Map<Exercise, int> exercisePages;
const NavigationHeader(
this._title,

8
pubspec.lock
View File

@@ -389,10 +389,10 @@ packages:
dependency: "direct main"
description:
name: fl_chart
sha256: "6b9eb2b3017241d05c482c01f668dd05cc909ec9a0114fdd49acd958ff2432fa"
sha256: fe6fec7d85975a99c73b9515a69a6e291364accfa0e4a5b3ce6de814d74b9a1c
url: "https://pub.dev"
source: hosted
version: "0.64.0"
version: "0.66.0"
flex_color_scheme:
dependency: "direct main"
description:
@@ -880,10 +880,10 @@ packages:
dependency: "direct main"
description:
name: package_info_plus
sha256: "7e76fad405b3e4016cd39d08f455a4eb5199723cf594cd1b8916d47140d93017"
sha256: "88bc797f44a94814f2213db1c9bd5badebafdfb8290ca9f78d4b9ee2a3db4d79"
url: "https://pub.dev"
source: hosted
version: "4.2.0"
version: "5.0.1"
package_info_plus_platform_interface:
dependency: transitive
description: