bossanyit/workouttest_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WT1.1.0+41 error fixing

Browse Source
This commit is contained in:
bossanyit
2020-12-29 13:20:35 +01:00
parent 9755cc764a
commit 2aecb9d431
22 changed files with 492 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/view/exercise_execute_page.dart
+1 -2
View File
@@ -7,7 +7,6 @@ import 'package:aitrainer_app/util/trans.dart';
import 'package:aitrainer_app/widgets/app_bar.dart';
import 'package:aitrainer_app/widgets/bottom_nav.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';
import 'package:flutter/scheduler.dart';
@@ -155,7 +154,7 @@ class _ExerciseExecutePage extends State<ExerciseExecutePage> with Trans {
child: Row(mainAxisAlignment: MainAxisAlignment.start, children: [
IconButton(
icon: element.executed
? Icon(Icons.check_box, color: Colors.green)
? Icon(Icons.check_box, color: Colors.green[200])
: Icon(
Icons.indeterminate_check_box,
color: Colors.blue.shade800,
lib/view/exercise_execute_plan_add_page.dart
+1
View File
@@ -79,6 +79,7 @@ class _ExerciseExecuteAddPage extends State<ExerciseExecutePlanAddPage> with Tra
padding: const EdgeInsets.only(top: 25, left: 25, right: 25),
child: SingleChildScrollView(
scrollDirection: Axis.vertical,
physics: BouncingScrollPhysics(),
controller: ScrollController(
initialScrollOffset: exerciseBloc.scrollOffset,
),
lib/view/exercise_log_page.dart
+9 -5
View File
@@ -239,10 +239,12 @@ class _ExerciseLogPage extends State<ExerciseLogPage> with Trans, Common {
context: context,
builder: (BuildContext context) {
return DialogPremium(
title: "Go Premium",
descriptions: "Unleash your potential with WorkoutTest Premium!",
description2: "Enjoy also this premium fetaure to show all old evaluation data of your successful exercises.",
text: "OK",
unlocked: true,
unlockRound: 1,
unlockedText: t("Enjoy also this premium fetaure to show all old evaluation data of your successful exercises."),
function: "My Exercise Logs",
onTap: () => {Navigator.of(context).pop()},
onCancel: () => {Navigator.of(context).pop()},
);
});
}
@@ -255,6 +257,8 @@ class _ExerciseLogPage extends State<ExerciseLogPage> with Trans, Common {
? "on the " + DateFormat(DateFormat.YEAR_MONTH_DAY, AppLanguage().appLocal.toString()).format(exercise.dateAdd.toUtc())
: DateFormat(DateFormat.YEAR_MONTH_DAY, AppLanguage().appLocal.toString()).format(exercise.dateAdd.toUtc()) + "-n";
final String unitQuantity = exercise.unitQuantity == null ? "" : "x" + exercise.unitQuantity.toStringAsFixed(0);
showCupertinoDialog(
useRootNavigator: true,
context: context,
@@ -268,7 +272,7 @@ class _ExerciseLogPage extends State<ExerciseLogPage> with Trans, Common {
style: (TextStyle(color: Colors.blue)),
),
Text(
exercise.quantity.toStringAsFixed(0) + "x" + exercise.unitQuantity.toStringAsFixed(0) + " ",
exercise.quantity.toStringAsFixed(0) + unitQuantity + " ",
//+
//exerciseType.unitQuantityUnit == null
// ? ""
lib/view/gdpr.dart
+7 -4
View File
@@ -1,4 +1,5 @@
import 'package:aitrainer_app/localization/app_localization.dart';
import 'package:aitrainer_app/widgets/app_bar_min.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
@@ -6,17 +7,19 @@ class Gdpr extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBarMin(
back: true,
),
body: Container(
padding: const EdgeInsets.only(left: 15, right: 15),
child: ListView(
children: <Widget>[
new InkWell(
child: new Text(
InkWell(
child: Text(
AppLocalizations.of(context).translate('gdpr_text'),
),
customBorder: Border.all(color: Colors.teal, width: 1),
customBorder: Border.all(color: Colors.orange, width: 1),
),
Spacer(flex: 2),
],
)));
}
lib/view/mydevelopment_body_page.dart
+5 -4
View File
@@ -33,11 +33,12 @@ class _MyDevelopmentBodyPage extends State<MyDevelopmentBodyPage> with Trans, Co
context: context,
barrierDismissible: false,
builder: (BuildContext context) {
setContext(context);
return DialogPremium(
title: "Go Premium",
descriptions: "Unleash your potential with WorkoutTest Premium!",
description2: "The Body Development feature is reachable if you finished the second 100% test-circles",
text: "OK",
unlocked: false,
unlockRound: 2,
function: "My Whole Body Development",
unlockedText: "",
onTap: () => {Navigator.of(context).pop(), Navigator.of(context).pop()},
onCancel: () => {Navigator.of(context).pop(), Navigator.of(context).pop()},
);
lib/view/mydevelopment_muscle_page.dart
+4 -4
View File
@@ -38,10 +38,10 @@ class _MyDevelopmentMuscleState extends State<MyDevelopmentMusclePage> with Comm
barrierDismissible: false,
builder: (BuildContext context) {
return DialogPremium(
title: "Go Premium",
descriptions: "Unleash your potential with WorkoutTest Premium!",
description2: "The Muscle Development feature is reachable if you finished the first 100% test-circles",
text: "OK",
unlocked: false,
unlockRound: 1,
function: "Development Of Muscles",
unlockedText: "",
onTap: () => {Navigator.of(context).pop(), Navigator.of(context).pop()},
onCancel: () => {Navigator.of(context).pop(), Navigator.of(context).pop()},
);
lib/view/mydevelopment_page.dart
+4 -5
View File
@@ -107,12 +107,11 @@ class _MyDevelopmentPage extends State<MyDevelopmentPage> with Trans {
context: context,
builder: (BuildContext context) {
return DialogPremium(
title: "Go Premium",
descriptions: "Unleash your potential with WorkoutTest Premium!",
description2: "The Predictions feature is reachable if you finished the second 100% test-circles",
text: "OK",
unlocked: false,
unlockRound: 2,
function: "Predictions",
unlockedText: "",
onTap: () => {Navigator.of(context).pop()},
onCancel: () => {Navigator.of(context).pop()},
);
})
},
lib/view/myexcercise_plan_page.dart
+12 -12
View File
@@ -95,10 +95,10 @@ class _MyExercisePlanPage extends State<MyExercisePlanPage> with Trans, Logging
context: context,
builder: (BuildContext context) {
return DialogPremium(
title: "Go Premium",
descriptions: "Unleash your potential with WorkoutTest Premium!",
description2: "The Suggested Training Plan is reachable if you finished the first 100% test-circles",
text: "OK",
unlocked: false,
unlockRound: 1,
function: "Suggested Training Plan",
unlockedText: "",
onTap: () => {Navigator.of(context).pop()},
onCancel: () => {Navigator.of(context).pop()},
);
@@ -123,10 +123,10 @@ class _MyExercisePlanPage extends State<MyExercisePlanPage> with Trans, Logging
context: context,
builder: (BuildContext context) {
return DialogPremium(
title: "Go Premium",
descriptions: "Unleash your potential with WorkoutTest Premium!",
description2: "The Special Plan is reachable if you finished the first 100% test-circles",
text: "OK",
unlocked: false,
unlockRound: 1,
function: "My Special Plan",
unlockedText: "",
onTap: () => {Navigator.of(context).pop()},
onCancel: () => {Navigator.of(context).pop()},
);
@@ -151,10 +151,10 @@ class _MyExercisePlanPage extends State<MyExercisePlanPage> with Trans, Logging
context: context,
builder: (BuildContext context) {
return DialogPremium(
title: "Go Premium",
descriptions: "Unleash your potential with WorkoutTest Premium!",
description2: "The Star's Exericise Plan is reachable if you finished the second 100% test-circles",
text: "OK",
unlocked: false,
unlockRound: 2,
function: "Star's Exercise Plan",
unlockedText: "",
onTap: () => {Navigator.of(context).pop()},
onCancel: () => {Navigator.of(context).pop()},
);
lib/view/sales_page.dart
+1 -44
View File
@@ -84,50 +84,7 @@ class SalesPage extends StatelessWidget with Trans {
),
])),
SliverGrid(
delegate: SliverChildListDelegate(getButtons(bloc)
/* [
SalesButton(
title: "Annual",
price: "9970 Ft / év",
desc1: "Development programs",
desc2: "Suggestions based on your actual status",
desc3: "Special customized training plans",
descStyle: GoogleFonts.inter(fontSize: 10, color: Colors.blue[800]),
badgeText: "2 months free",
badgeColor: Colors.orange,
style: GoogleFonts.archivoBlack(fontSize: 14, color: Colors.blue[800]),
onTap: () {
print("1");
//bloc.sessionBloc.add(event)
},
),
SalesButton(
title: "Annual",
price: "10970 Ft / év",
desc1: "Development programs",
desc2: "Suggestions based on your actual status",
desc3: "Special customized training plans",
desc4: "AI driven predictions",
descStyle: GoogleFonts.inter(fontSize: 10, color: Colors.blue[800]),
badgeText: "one month free",
badgeColor: Colors.orange,
style: GoogleFonts.archivoBlack(fontSize: 14, color: Colors.blue[800]),
onTap: () => {print("2")},
),
SalesButton(
title: "Monthly",
price: "970 Ft / hó",
desc1: "Development programs",
desc2: "Suggestions based on your actual status",
desc3: "Special customized training plans",
desc4: "AI driven predictions",
descStyle: GoogleFonts.inter(fontSize: 10, color: Colors.blue[800]),
badgeColor: Colors.transparent,
style: GoogleFonts.archivoBlack(fontSize: 14, color: Colors.blue[800]),
onTap: () => {print("3")},
),
] */
),
delegate: SliverChildListDelegate(getButtons(bloc)),
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 3,
mainAxisSpacing: 10.0,