WT 1.1.14+2 sales page update

This commit is contained in:
bossanyit
2021-05-05 21:01:03 +02:00
parent c901b07bf8
commit 3137bc2330
30 changed files with 1008 additions and 207 deletions
+18 -9
View File
@@ -67,17 +67,25 @@ class _MenuPageWidgetState extends State<MenuPageWidget> with Trans, Logging {
}
Future runDelayedEvent() async {
print("runDelayedEvent start");
bool isFirst = false;
await Future.delayed(Duration(milliseconds: 600), () async {
if (tutorialBloc.isActive == false) {
print("Activate tutorial");
tutorialBloc.canActivate = true;
tutorialBloc.isActive = true;
tutorialBloc.menuBloc = menuBloc;
tutorialBloc.add(TutorialLoad());
tutorialBloc.init();
isFirst = true;
if (Cache().userLoggedIn != null) {
if (Cache().userLoggedIn!.sex == "m") {
tutorialBloc.tutorialName = ActivityDone.tutorialBasicChestPress.toStr();
} else {
tutorialBloc.tutorialName = ActivityDone.tutorialBasicLegPress.toStr();
}
}
if (!tutorialBloc.isTutorialDone()) {
if (tutorialBloc.isActive == false && tutorialBloc.canActivate) {
print("Activate tutorial");
tutorialBloc.canActivate = true;
tutorialBloc.isActive = true;
tutorialBloc.menuBloc = menuBloc;
tutorialBloc.add(TutorialLoad());
tutorialBloc.init();
isFirst = true;
}
}
});
final bool canActivate = tutorialBloc.activateTutorial();
@@ -351,6 +359,7 @@ class _MenuPageWidgetState extends State<MenuPageWidget> with Trans, Logging {
void menuClick(WorkoutMenuTree workoutTree, MenuBloc menuBloc) {
if (tutorialBloc.isActive) {
final String checkText = workoutTree.nameEnglish;
print("Click: tutorial is active $checkText");
if (!tutorialBloc.checkAction(checkText)) {
return;
}
+4 -2
View File
@@ -66,7 +66,8 @@ class SalesButton extends StatelessWidget {
fontSize: 1,
)),
child: Container(
child: Center(
child: Text(
"ho") /* Center(
child: Column(
children: [
Divider(
@@ -92,7 +93,8 @@ class SalesButton extends StatelessWidget {
child: Text(desc4!, maxLines: 2, style: GoogleFonts.inter(fontSize: 10, color: Colors.red[800])))
],
),
)),
) */
),
)));
}
}
+12 -1
View File
@@ -40,10 +40,13 @@ class TutorialWidget with Trans, Logging {
area = bloc.action!.showBubble == true
? Rect.fromLTWH(targetGlobalCenter.dx - bloc.action!.bubbleX, targetGlobalCenter.dy - bloc.action!.bubbleY,
bloc.action!.bubbleWidth.toDouble(), bloc.action!.bubbleHeight.toDouble())
//? Rect.fromLTWH(targetGlobalCenter.dx - 60, targetGlobalCenter.dy + 120, 420, 320)
: null;
}
final double mediaSize = MediaQuery.of(context).size.width;
final double mediaHeight = MediaQuery.of(context).size.width;
final double distortion = mediaHeight / bloc.mediaHeightBase;
double fontSize = 14;
if (mediaSize > 400) {
@@ -51,8 +54,16 @@ class TutorialWidget with Trans, Logging {
} else if (mediaSize < 375) {
fontSize = 13;
}
double calculatedTop = bloc.top! / distortion;
//-((1 - distortion) * 100 * (fontSize));
if (calculatedTop < 0) {
calculatedTop = 10;
}
print("Height: $mediaHeight, distortion: $distortion top: ${bloc.top!} calculated $calculatedTop");
tooltip = SuperTooltip(
top: bloc.top,
top: calculatedTop,
left: bloc.left,
backgroundColor: Colors.black.withOpacity(0.7),
popupDirection: bloc.action == null || bloc.action!.direction == "up" ? TooltipDirection.up : TooltipDirection.down,