WT 1.1.14 uxcam fix, nullsafe changes

This commit is contained in:
bossanyit
2021-05-07 19:02:33 +02:00
parent cd0687a529
commit f4344bcf11
6 changed files with 49 additions and 36 deletions
+5
View File
@@ -19,6 +19,7 @@ import 'package:aitrainer_app/widgets/bottom_bar_multiple_exercises.dart';
import 'package:aitrainer_app/widgets/dialog_common.dart';
import 'package:aitrainer_app/widgets/exercise_save.dart';
import 'package:aitrainer_app/widgets/size_widget.dart';
import 'package:aitrainer_app/widgets/tutorial_widget.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
@@ -179,7 +180,11 @@ class _ExerciseNewPageState extends State<ExerciseNewPage> with Trans, Logging {
saveAll(bloc);
return;
} else {
if (tutorialBloc.isActive) {
TutorialWidget().close();
}
Navigator.of(context).pushNamed("registration");
return;
}
}
+15 -12
View File
@@ -154,18 +154,21 @@ class _MyDevelopmentPage extends State<MyDevelopmentPage> with Trans {
backgroundColor: Colors.black54.withOpacity(0.4))),
image: "asset/image/predictions.jpg",
onTap: () => {
Track().track(TrackingEvent.prediction),
showDialog(
context: context,
builder: (BuildContext context) {
return DialogPremium(
unlocked: Cache().hasPurchased,
unlockRound: 3,
function: "Predictions",
unlockedText: null,
onTap: () => {Navigator.of(context).pop()},
);
})
if (Cache().userLoggedIn != null)
{
Track().track(TrackingEvent.prediction),
showDialog(
context: context,
builder: (BuildContext context) {
return DialogPremium(
unlocked: Cache().hasPurchased,
unlockRound: 3,
function: "Predictions",
unlockedText: null,
onTap: () => {Navigator.of(context).pop()},
);
})
}
},
isLocked: true,
),