v1.27.1 error fixes

This commit is contained in:
bossanyit
2023-01-15 11:45:30 +01:00
parent 98901f2770
commit 3f52d95bbf
10 changed files with 46 additions and 34 deletions
+6 -1
View File
@@ -220,7 +220,12 @@ class ExerciseNewBloc extends Bloc<ExerciseNewEvent, ExerciseNewState> with Logg
double getBMR() {
var date = DateTime.now();
if (weight == null || height == null || height == 0 || weight == 0) {
if (weight == null ||
height == null ||
height == 0 ||
weight == 0 ||
customerRepository.customer == null ||
customerRepository.customer!.birthYear == null) {
this.bmi = 0;
return 0;
}
+7 -5
View File
@@ -40,10 +40,12 @@ class ImageCache with Logging {
final String imageKey = generateMd5(url + "_" + id.toString());
// get from storage
final String imageString = (await getImageAs64BaseString(id, url))!;
final String? imageString = await getImageAs64BaseString(id, url);
_images[imageKey] = imageString;
_imageMap[imageKey] = true;
if (imageString != null) {
_images[imageKey] = imageString;
_imageMap[imageKey] = true;
}
}
Future<void> saveImageToPrefs(String key, String value) async {
@@ -93,14 +95,14 @@ class ImageCache with Logging {
return image;
}
Future<String?> getImageAs64BaseString(int id, String name) async {
Future<String?>? getImageAs64BaseString(int id, String name) async {
final String imageKey = generateMd5(name + "_" + id.toString());
String? imageString;
if (await storage.containsKey(key: imageKey)) {
//log(" .. get from storage");
imageString = await storage.read(key: imageKey);
} else {
imageString = (await downloadAndSaveImage(id, name))!;
imageString = await downloadAndSaveImage(id, name);
//log(" .. downloaded");
}
return imageString;
+1 -1
View File
@@ -118,7 +118,7 @@ class Cache with Logging {
static String baseUrlLive = 'https://api.workouttest.org/api/';
static String baseUrlTest = 'https://apitest.workouttest.org/api/';
late String baseUrl;
static final String mediaUrl = 'https://admin.aitrainer.app/media/';
static final String mediaUrl = 'https://admin.workouttest.org/media/';
static final String username = 'bosi';
static final String password = 'andio2009';
@@ -94,7 +94,7 @@ class CustomerTrainingPlanDetails {
this.exerciseType = Cache().getExerciseTypeById(exerciseTypeId!);
this.baseOneRepMax = json['baseOneRepMax'];
this.baseOneRepMax = json['baseOneRepMax'] == null ? 0 : json['baseOneRepMax'];
}
ExerciseType? getExerciseType() => exerciseType;
+1 -1
View File
@@ -4,7 +4,7 @@ import 'package:aitrainer_app/model/mautic.dart';
import 'package:aitrainer_app/service/logging.dart';
class MauticApi with Logging {
final String mauticUrl = "https://mautic.aitrainer.app/form/submit?formId=";
final String mauticUrl = "https://mautic.workouttest.org/form/submit?formId=";
Future<void> sendMauticForm(Mautic model) async {
final String body = model.toForm();
+2
View File
@@ -568,6 +568,8 @@ class ExerciseTile extends StatelessWidget with Trans {
final bool hasRightAlternative =
detail.alternatives.length > 0 && index + 1 < bloc.alternatives[detail.customerTrainingPlanDetailsId].length;
print("getTile Detail: $detail");
return Container(
child: Stack(alignment: Alignment.centerRight, children: [
Stack(alignment: Alignment.centerLeft, children: [
+15 -12
View File
@@ -229,19 +229,22 @@ class _ExerciseSaveState extends State<ExerciseSave> with Trans {
: widget.repeats!.toStringAsFixed(0);
changable = (_controller2.text != "TEST" && _controller1.text != "TEST");
if (widget.unitQuantityUnit != null && widget.tip != null && Cache().isActivityDone(widget.tip!) == false) {
Timer(
/*Timer(
Duration(milliseconds: 2000),
() => {
TutorialWidget().explanation(
context,
ExplanationWidget(
unitQuantityUnit: widget.unitQuantityUnit,
unit: widget.unit,
tip: widget.tip,
weight: widget.weight,
repeats: widget.repeats,
)),
});
if (context != null)
{
TutorialWidget().explanation(
context,
ExplanationWidget(
unitQuantityUnit: widget.unitQuantityUnit,
unit: widget.unit,
tip: widget.tip,
weight: widget.weight,
repeats: widget.repeats,
)),
}
});*/
}
});
}
@@ -387,7 +390,7 @@ class _ExerciseSaveState extends State<ExerciseSave> with Trans {
leading: IconButton(
iconSize: 30,
onPressed: () => {
if (widget.unitQuantityUnit != null)
if (widget.unitQuantityUnit != null && context != null)
{
TutorialWidget().explanation(
context,