diff --git a/lib/view/exercise_execute_by_plan_page.dart b/lib/view/exercise_execute_by_plan_page.dart index 983d86b..0988bc1 100644 --- a/lib/view/exercise_execute_by_plan_page.dart +++ b/lib/view/exercise_execute_by_plan_page.dart @@ -7,7 +7,7 @@ import 'package:aitrainer_app/treeview/tree_view.dart'; import 'package:aitrainer_app/util/trans.dart'; import 'package:aitrainer_app/widgets/app_bar_common.dart'; import 'package:aitrainer_app/widgets/bottom_nav.dart'; -import 'package:aitrainer_app/widgets/exercise_type_widget.dart'; +import 'package:aitrainer_app/widgets/treeview_parent_widget.dart'; import 'package:aitrainer_app/widgets/splash.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -136,7 +136,7 @@ class _ExerciseByPlanPage extends State with Trans { margin: const EdgeInsets.only(left: 4.0), child: TreeViewChild( startExpanded: true, - parent: ExerciseTypeWidget(exerciseTypeName: name), //_getExerciseWidget(exerciseTypeName: name), + parent: TreeviewParentWidget(text: name), children: _getChildList(list, bloc), ))); }); diff --git a/lib/view/exercise_log_page.dart b/lib/view/exercise_log_page.dart index 9c4a73a..9b393d1 100644 --- a/lib/view/exercise_log_page.dart +++ b/lib/view/exercise_log_page.dart @@ -10,7 +10,7 @@ import 'package:aitrainer_app/util/common.dart'; import 'package:aitrainer_app/util/trans.dart'; import 'package:aitrainer_app/widgets/app_bar_common.dart'; import 'package:flutter/material.dart'; -import 'package:aitrainer_app/widgets/exercise_type_widget.dart'; +import 'package:aitrainer_app/widgets/treeview_parent_widget.dart'; class ExerciseLogPage extends StatefulWidget { @override @@ -109,7 +109,7 @@ class _ExerciseLogPage extends State with Trans, Common { margin: const EdgeInsets.only(left: 4.0), child: TreeViewChild( startExpanded: true, - parent: ExerciseTypeWidget(exerciseTypeName: exerciseDate), + parent: TreeviewParentWidget(text: exerciseDate), children: _getChildList(listExercises, exerciseRepository), ) ) diff --git a/lib/view/exercise_plan_custom_page.dart b/lib/view/exercise_plan_custom_page.dart index e94e1ce..0badde8 100644 --- a/lib/view/exercise_plan_custom_page.dart +++ b/lib/view/exercise_plan_custom_page.dart @@ -8,7 +8,7 @@ import 'package:aitrainer_app/treeview/tree_view.dart'; import 'package:aitrainer_app/util/trans.dart'; import 'package:aitrainer_app/widgets/app_bar_common.dart'; import 'package:aitrainer_app/widgets/bottom_nav.dart'; -import 'package:aitrainer_app/widgets/exercise_type_widget.dart'; +import 'package:aitrainer_app/widgets/treeview_parent_widget.dart'; import 'package:aitrainer_app/widgets/splash.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -132,7 +132,7 @@ class _ExercisePlanCustomPage extends State with Trans { margin: const EdgeInsets.only(left: 4.0), child: TreeViewChild( startExpanded: true, - parent: ExerciseTypeWidget(exerciseTypeName: name), + parent: TreeviewParentWidget(text: name), children: _getChildList(list, bloc), ))); }); diff --git a/lib/view/mydevelopment_muscle_page.dart b/lib/view/mydevelopment_muscle_page.dart index 80268ef..f154432 100644 --- a/lib/view/mydevelopment_muscle_page.dart +++ b/lib/view/mydevelopment_muscle_page.dart @@ -1,6 +1,6 @@ import 'dart:collection'; import 'package:aitrainer_app/util/trans.dart'; -import 'package:aitrainer_app/widgets/exercise_type_widget.dart'; +import 'package:aitrainer_app/widgets/treeview_parent_widget.dart'; import 'package:fl_chart/fl_chart.dart'; import 'package:aitrainer_app/util/common.dart'; import 'package:aitrainer_app/bloc/development_by_muscle/development_by_muscle_bloc.dart'; @@ -223,7 +223,7 @@ class _MyDevelopmentMuscleState extends State with Comm } Widget _getExerciseWidget({@required String exerciseTypeName, List list}) { - return ExerciseTypeWidget(exerciseTypeName: exerciseTypeName); + return TreeviewParentWidget(text: exerciseTypeName); } List _getChildList(List listWorkoutTree, DevelopmentByMuscleBloc bloc) { diff --git a/lib/widgets/exercise_type_widget.dart b/lib/widgets/treeview_parent_widget.dart similarity index 68% rename from lib/widgets/exercise_type_widget.dart rename to lib/widgets/treeview_parent_widget.dart index 24251b7..15730f4 100644 --- a/lib/widgets/exercise_type_widget.dart +++ b/lib/widgets/treeview_parent_widget.dart @@ -1,16 +1,16 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -class ExerciseTypeWidget extends StatelessWidget { - final String exerciseTypeName; +class TreeviewParentWidget extends StatelessWidget { + final String text; //final DateTime lastModified; - ExerciseTypeWidget({@required this.exerciseTypeName}); + TreeviewParentWidget({@required this.text}); @override Widget build(BuildContext context) { - Widget exerciseTypeNameWidget = Text( - this.exerciseTypeName, + Widget parentWidget = Text( + this.text, style: TextStyle(fontWeight: FontWeight.w800, color: Colors.blueAccent, backgroundColor: Colors.transparent), ); @@ -22,7 +22,7 @@ class ExerciseTypeWidget extends StatelessWidget { elevation: 0.0, child: ListTile( leading: icon, - title: exerciseTypeNameWidget, + title: parentWidget, //subtitle: lastModifiedWidget, ), ); diff --git a/pubspec.yaml b/pubspec.yaml index 9823619..210c4b6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.1.0+22 +version: 1.1.0+23 environment: sdk: ">=2.7.0 <3.1.0"