Fix floating number, menu font size

This commit is contained in:
Bossanyi Tibor
2020-07-08 09:34:34 +02:00
parent 9e6b1f2703
commit eac21c5241
10 changed files with 49 additions and 35 deletions
+15
View File
@@ -1,6 +1,7 @@
import 'package:aitrainer_app/localization/app_language.dart';
import 'package:aitrainer_app/localization/app_localization.dart';
import 'package:aitrainer_app/viewmodel/exercise_changing_view_model.dart';
import 'package:flutter/services.dart';
import 'package:intl/intl.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
@@ -153,6 +154,9 @@ class _ExerciseNewPageState extends State {
validator: (input) {
return validateNumberInput(input);
},
inputFormatters: [
WhitelistingTextInputFormatter(RegExp(r"[\d.]"))
],
onFieldSubmitted: (input) => {
print ("UnitQuantity value $input"),
model.exerciseViewModel.setUnitQuantity(
@@ -186,6 +190,9 @@ class _ExerciseNewPageState extends State {
validator: (input) {
return validateNumberInput(input);
},
inputFormatters: [
WhitelistingTextInputFormatter(RegExp(r"[\d.]"))
],
onFieldSubmitted: (input) =>
{
print ("Quantity value $input"),
@@ -212,11 +219,19 @@ class _ExerciseNewPageState extends State {
return null;
}
Pattern pattern = r'^\d+(?:\.\d+)?$';
RegExp regex = new RegExp(pattern);
if (!regex.hasMatch(input)) {
return error;
}
rc = double.tryParse(input);
if ( rc == null ) {
return error;
}
if ( ! ( double.parse(input) < 10000 && double.parse(input) > 0) ) {
return error;
}
+5 -3
View File
@@ -1,3 +1,4 @@
import 'package:aitrainer_app/localization/app_localization.dart';
import 'package:aitrainer_app/model/auth.dart';
import 'package:aitrainer_app/model/exercise_type.dart';
import 'package:aitrainer_app/model/workout_tree.dart';
@@ -36,8 +37,9 @@ class _MenuPageState extends State<MenuPage> {
appBar: AppBar(
backgroundColor: Colors.transparent,
title: Row(
mainAxisAlignment: MainAxisAlignment.end,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
Text(AppLocalizations.of(context).translate("Tests")),
Image.asset(
'asset/image/WT_long_logo.png',
fit: BoxFit.cover,
@@ -46,7 +48,7 @@ class _MenuPageState extends State<MenuPage> {
],
),
leading: IconButton(
icon: Icon(Icons.arrow_back, color: Colors.black),
icon: Icon(Icons.arrow_back, color: Colors.white),
onPressed: () => {
this.setState(() {
widget.parent = 0;
@@ -104,7 +106,7 @@ class _MenuPageState extends State<MenuPage> {
},
),
} else {
exerciseType = Common.getExerciseType(workoutTree.exercise_type_id),
exerciseType = Common.getExerciseType(workoutTree.exerciseTypeId),
model.setExerciseType(exerciseType),
model.setCustomer(Auth().userLoggedIn),
if ( Auth().userLoggedIn == null ) {