wt1.1.2c rename to TreeviewParentWidget
This commit is contained in:
parent
88f6f15b21
commit
0cdc3a9d24
@ -7,7 +7,7 @@ import 'package:aitrainer_app/treeview/tree_view.dart';
|
|||||||
import 'package:aitrainer_app/util/trans.dart';
|
import 'package:aitrainer_app/util/trans.dart';
|
||||||
import 'package:aitrainer_app/widgets/app_bar_common.dart';
|
import 'package:aitrainer_app/widgets/app_bar_common.dart';
|
||||||
import 'package:aitrainer_app/widgets/bottom_nav.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:aitrainer_app/widgets/splash.dart';
|
||||||
import 'package:flutter/cupertino.dart';
|
import 'package:flutter/cupertino.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
@ -136,7 +136,7 @@ class _ExerciseByPlanPage extends State<ExerciseByPlanPage> with Trans {
|
|||||||
margin: const EdgeInsets.only(left: 4.0),
|
margin: const EdgeInsets.only(left: 4.0),
|
||||||
child: TreeViewChild(
|
child: TreeViewChild(
|
||||||
startExpanded: true,
|
startExpanded: true,
|
||||||
parent: ExerciseTypeWidget(exerciseTypeName: name), //_getExerciseWidget(exerciseTypeName: name),
|
parent: TreeviewParentWidget(text: name),
|
||||||
children: _getChildList(list, bloc),
|
children: _getChildList(list, bloc),
|
||||||
)));
|
)));
|
||||||
});
|
});
|
||||||
|
@ -10,7 +10,7 @@ import 'package:aitrainer_app/util/common.dart';
|
|||||||
import 'package:aitrainer_app/util/trans.dart';
|
import 'package:aitrainer_app/util/trans.dart';
|
||||||
import 'package:aitrainer_app/widgets/app_bar_common.dart';
|
import 'package:aitrainer_app/widgets/app_bar_common.dart';
|
||||||
import 'package:flutter/material.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 {
|
class ExerciseLogPage extends StatefulWidget {
|
||||||
@override
|
@override
|
||||||
@ -109,7 +109,7 @@ class _ExerciseLogPage extends State<ExerciseLogPage> with Trans, Common {
|
|||||||
margin: const EdgeInsets.only(left: 4.0),
|
margin: const EdgeInsets.only(left: 4.0),
|
||||||
child: TreeViewChild(
|
child: TreeViewChild(
|
||||||
startExpanded: true,
|
startExpanded: true,
|
||||||
parent: ExerciseTypeWidget(exerciseTypeName: exerciseDate),
|
parent: TreeviewParentWidget(text: exerciseDate),
|
||||||
children: _getChildList(listExercises, exerciseRepository),
|
children: _getChildList(listExercises, exerciseRepository),
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -8,7 +8,7 @@ import 'package:aitrainer_app/treeview/tree_view.dart';
|
|||||||
import 'package:aitrainer_app/util/trans.dart';
|
import 'package:aitrainer_app/util/trans.dart';
|
||||||
import 'package:aitrainer_app/widgets/app_bar_common.dart';
|
import 'package:aitrainer_app/widgets/app_bar_common.dart';
|
||||||
import 'package:aitrainer_app/widgets/bottom_nav.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:aitrainer_app/widgets/splash.dart';
|
||||||
import 'package:flutter/cupertino.dart';
|
import 'package:flutter/cupertino.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
@ -132,7 +132,7 @@ class _ExercisePlanCustomPage extends State<ExercisePlanCustomPage> with Trans {
|
|||||||
margin: const EdgeInsets.only(left: 4.0),
|
margin: const EdgeInsets.only(left: 4.0),
|
||||||
child: TreeViewChild(
|
child: TreeViewChild(
|
||||||
startExpanded: true,
|
startExpanded: true,
|
||||||
parent: ExerciseTypeWidget(exerciseTypeName: name),
|
parent: TreeviewParentWidget(text: name),
|
||||||
children: _getChildList(list, bloc),
|
children: _getChildList(list, bloc),
|
||||||
)));
|
)));
|
||||||
});
|
});
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import 'dart:collection';
|
import 'dart:collection';
|
||||||
import 'package:aitrainer_app/util/trans.dart';
|
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:fl_chart/fl_chart.dart';
|
||||||
import 'package:aitrainer_app/util/common.dart';
|
import 'package:aitrainer_app/util/common.dart';
|
||||||
import 'package:aitrainer_app/bloc/development_by_muscle/development_by_muscle_bloc.dart';
|
import 'package:aitrainer_app/bloc/development_by_muscle/development_by_muscle_bloc.dart';
|
||||||
@ -223,7 +223,7 @@ class _MyDevelopmentMuscleState extends State<MyDevelopmentMusclePage> with Comm
|
|||||||
}
|
}
|
||||||
|
|
||||||
Widget _getExerciseWidget({@required String exerciseTypeName, List<WorkoutMenuTree> list}) {
|
Widget _getExerciseWidget({@required String exerciseTypeName, List<WorkoutMenuTree> list}) {
|
||||||
return ExerciseTypeWidget(exerciseTypeName: exerciseTypeName);
|
return TreeviewParentWidget(text: exerciseTypeName);
|
||||||
}
|
}
|
||||||
|
|
||||||
List<Widget> _getChildList(List<WorkoutMenuTree> listWorkoutTree, DevelopmentByMuscleBloc bloc) {
|
List<Widget> _getChildList(List<WorkoutMenuTree> listWorkoutTree, DevelopmentByMuscleBloc bloc) {
|
||||||
|
@ -1,16 +1,16 @@
|
|||||||
import 'package:flutter/cupertino.dart';
|
import 'package:flutter/cupertino.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
class ExerciseTypeWidget extends StatelessWidget {
|
class TreeviewParentWidget extends StatelessWidget {
|
||||||
final String exerciseTypeName;
|
final String text;
|
||||||
//final DateTime lastModified;
|
//final DateTime lastModified;
|
||||||
|
|
||||||
ExerciseTypeWidget({@required this.exerciseTypeName});
|
TreeviewParentWidget({@required this.text});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
Widget exerciseTypeNameWidget = Text(
|
Widget parentWidget = Text(
|
||||||
this.exerciseTypeName,
|
this.text,
|
||||||
style: TextStyle(fontWeight: FontWeight.w800, color: Colors.blueAccent, backgroundColor: Colors.transparent),
|
style: TextStyle(fontWeight: FontWeight.w800, color: Colors.blueAccent, backgroundColor: Colors.transparent),
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -22,7 +22,7 @@ class ExerciseTypeWidget extends StatelessWidget {
|
|||||||
elevation: 0.0,
|
elevation: 0.0,
|
||||||
child: ListTile(
|
child: ListTile(
|
||||||
leading: icon,
|
leading: icon,
|
||||||
title: exerciseTypeNameWidget,
|
title: parentWidget,
|
||||||
//subtitle: lastModifiedWidget,
|
//subtitle: lastModifiedWidget,
|
||||||
),
|
),
|
||||||
);
|
);
|
@ -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.
|
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
|
||||||
# Read more about iOS versioning at
|
# Read more about iOS versioning at
|
||||||
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
|
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
|
||||||
version: 1.1.0+22
|
version: 1.1.0+23
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
sdk: ">=2.7.0 <3.1.0"
|
sdk: ">=2.7.0 <3.1.0"
|
||||||
|
Loading…
Reference in New Issue
Block a user