WT 1.1.11+3 Evaluation, null-safe fixes
This commit is contained in:
@@ -98,17 +98,22 @@ mixin Common {
|
||||
return datePart;
|
||||
}
|
||||
|
||||
static String? emailValidation(String email) {
|
||||
static String? emailValidation(String? email) {
|
||||
final String error = "Please type an email address";
|
||||
if (email == null) {
|
||||
return error;
|
||||
}
|
||||
bool emailValid = RegExp(r"^[a-zA-Z0-9.a-zA-Z0-9.!#$%&'*+-/=?^_`{|}~]+@[a-zA-Z0-9]+\.[a-zA-Z]+").hasMatch(email);
|
||||
return emailValid ? null : "Please type an email address";
|
||||
return emailValid ? null : error;
|
||||
}
|
||||
|
||||
static String? passwordValidation(String? value) {
|
||||
final String error = "Password too short";
|
||||
if (value == null || value.length == 0) {
|
||||
return null;
|
||||
return error;
|
||||
}
|
||||
bool valid = 8 < value.length;
|
||||
return valid ? null : "Password too short";
|
||||
return valid ? null : error;
|
||||
}
|
||||
|
||||
static Widget badgedIcon(Color color, IconData icon, String badgeKey) {
|
||||
|
||||
@@ -73,3 +73,11 @@ extension SizesExt on SizesEnum {
|
||||
bool equalsTo(SizesEnum event) => this.toString() == event.toString();
|
||||
bool equalsStringTo(String event) => this.toString() == event;
|
||||
}
|
||||
|
||||
enum EvaluationText { very_poor, poor, fair, below_average, average, above_average, good, excellent, elite }
|
||||
|
||||
extension EvaluationTextExt on EvaluationText {
|
||||
String toStr() => this.toString().split(".").last;
|
||||
bool equalsTo(EvaluationText eval) => this.toString() == eval.toString();
|
||||
bool equalsStringTo(String eval) => this.toStr() == eval;
|
||||
}
|
||||
|
||||
+1
-1
@@ -3,8 +3,8 @@ import 'package:aitrainer_app/model/cache.dart';
|
||||
import 'package:aitrainer_app/service/logging.dart';
|
||||
import 'package:aitrainer_app/service/tracking_service.dart';
|
||||
import 'package:aitrainer_app/util/enums.dart';
|
||||
import 'package:aitrainer_app/library/flurry.dart';
|
||||
import 'package:aitrainer_app/model/tracking.dart' as model;
|
||||
import 'package:flurry/flurry.dart';
|
||||
import 'package:smartlook/smartlook.dart';
|
||||
|
||||
class Track with Logging {
|
||||
|
||||
@@ -8,6 +8,9 @@ mixin Trans {
|
||||
}
|
||||
|
||||
String t(String text) {
|
||||
if (context == null) {
|
||||
throw Exception("Translation: initialize the context");
|
||||
}
|
||||
return AppLocalizations.of(context)!.translate(text);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user