From a57d79fbc4c55587fed4c85ab8c35d125eab4dab Mon Sep 17 00:00:00 2001 From: bossanyit Date: Wed, 10 Nov 2021 08:30:42 +0100 Subject: [PATCH] WT 1.1.24+7 translations, calculation fixes --- i18n/en.json | 9 +++++++-- i18n/hu.json | 9 +++++++-- ios/Runner.xcodeproj/project.pbxproj | 6 +++--- lib/util/common.dart | 2 +- lib/widgets/dialog_trial.dart | 6 +++--- lib/widgets/menu_page_widget.dart | 6 +++--- pubspec.yaml | 2 +- 7 files changed, 25 insertions(+), 15 deletions(-) diff --git a/i18n/en.json b/i18n/en.json index 501cbfd..09491cc 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -536,7 +536,7 @@ "and execute it with maximum repeats!": "and execute it with maximum repeats!", "10 days Premium for free": "10 days Premium for free", "Would you like to try all premium functions for 10 days, without any subscription or bank card data?": "Would you like to try all premium functions for 10 days, without any subscription or bank card data?", - "If you click to 'Yes', all premium functions will be available right now.": "If you click to 'Yes', all premium functions will be available right now.", + "If you click to 'OK', all premium functions will be available right now.": "If you click to 'OK', all premium functions will be available right now.", "If you click to 'No', you can use all basic functions, and you will loose the oppurtunity to try the premium functions for free.": "If you click to 'No', you can use all basic functions, and you will loose the oppurtunity to try the premium functions for free.", "Based on your initial data, we will generate the personalized training plan for you.": "Based on your initial data, we will generate the personalized training plan for you.", "No selected Training Plan": "No selected Training Plan", @@ -544,5 +544,10 @@ "You want to skip really the entire exercise?": "You want to skip really the entire exercise?", "Premium function": "Premium function", "This is a premium function, you can reach it outside of the trial period only with a valid subscription": "This is a premium function, you can reach it outside of the trial period only with a valid subscription", - "This is a premium function, you can reach it only with a valid subscription": "This is a premium function, you can reach it only with a valid subscription" + "This is a premium function, you can reach it only with a valid subscription": "This is a premium function, you can reach it only with a valid subscription", + "Maximum Lift": "Maximum Lift", + "Total Repeats": "Total Repeats", + "Exception: Please select your fitness level": "Please select your fitness level", + "Exception: Please select your goal": "Please select your goal", + "Exception: Please select your biologial gender": "Please select your biologial gender" } \ No newline at end of file diff --git a/i18n/hu.json b/i18n/hu.json index 09d2b32..1584fa9 100644 --- a/i18n/hu.json +++ b/i18n/hu.json @@ -536,7 +536,7 @@ "and execute it with maximum repeats!": "és hajtsd végre maximális ismétléssel!", "10 days Premium for free": "10 nap Prémium előfizetés díjmentesen", "Would you like to try all premium functions for 10 days, without any subscription or bank card data?": "Szeretnéd kipróbálni 10 napig az összes prémium funkciót, előfizetés és bankkártya-adatok megadása nélkül?", - "If you click to 'Yes', all premium functions will be available right now.": "Ha az 'Igen'-re kattintasz, azonnal eléred az összes prémium funkciót, edzést.", + "If you click to 'OK', all premium functions will be available right now.": "Ha az 'OK'-ra kattintasz, azonnal eléred az összes prémium funkciót, edzést.", "If you click to 'No', you can use all basic functions, and you will loose the oppurtunity to try the premium functions for free.": "Ha a 'Nem'-re kattintasz, használhatod az összes alapfunkciót, de elveszted a lehetőséget, hogy a prémium funkciókat ingyen kipróbáld.", "Based on your initial data, we will generate the personalized training plan for you.": "A megadott adataid alapján most személyre szabott edzéstervet generálunk neked.", "No selected Training Plan": "Nincs kiválasztott edzésterved", @@ -544,5 +544,10 @@ "You want to skip really the entire exercise?": "Átugrod az egész gyakorlatot?", "Premium function": "Prémium tartalom", "This is a premium function, you can reach it outside of the trial period only with a valid subscription": "Ezt a tartalmat az ingyenes időszakon kívül csak aktív előfizetéssel éred el", - "This is a premium function, you can reach it only with a valid subscription": "Ezt a tartalmat csak aktív előfizetéssel éred el" + "This is a premium function, you can reach it only with a valid subscription": "Ezt a tartalmat csak aktív előfizetéssel éred el", + "Maximum Lift": "Legnagyobb megmozgatott súly", + "Total Repeats": "Összes ismétlés", + "Exception: Please select your fitness level": "Kérlek válaszd ki a fizikai állapotod", + "Exception: Please select your goal": "Kérlek válaszd ki a célod", + "Exception: Please select your biologial gender": "Kérlek válaszd ki a biológiai nemed" } \ No newline at end of file diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 92ef13f..0fcdcd0 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -388,7 +388,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 6; + CURRENT_PROJECT_VERSION = 7; DEVELOPMENT_TEAM = SFJJBDCU6Z; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -531,7 +531,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 6; + CURRENT_PROJECT_VERSION = 7; DEVELOPMENT_TEAM = SFJJBDCU6Z; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -566,7 +566,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 6; + CURRENT_PROJECT_VERSION = 7; DEVELOPMENT_TEAM = SFJJBDCU6Z; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( diff --git a/lib/util/common.dart b/lib/util/common.dart index 24022e0..ce4d149 100644 --- a/lib/util/common.dart +++ b/lib/util/common.dart @@ -186,7 +186,7 @@ mixin Common { } else if (remainder > 2.5 && remainder < 3.25) { rounded = (weight / 5).floor() * 5 + 2.5; } else { - rounded = (((weight / 5).ceil() * 5) + 5).toDouble(); + rounded = (((weight / 5).ceil() * 5)).toDouble(); } } diff --git a/lib/widgets/dialog_trial.dart b/lib/widgets/dialog_trial.dart index 9c8a5e5..7b6ee0e 100644 --- a/lib/widgets/dialog_trial.dart +++ b/lib/widgets/dialog_trial.dart @@ -113,7 +113,7 @@ class _DialogTrialWidgetState extends State with Trans { Row( mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [ - GestureDetector( + /* GestureDetector( onTap: widget.onCancel, child: Stack( alignment: Alignment.center, @@ -124,7 +124,7 @@ class _DialogTrialWidgetState extends State with Trans { style: TextStyle(fontSize: 16, color: Colors.white), ), ], - )), + )), */ GestureDetector( onTap: widget.onTap, child: Stack( @@ -132,7 +132,7 @@ class _DialogTrialWidgetState extends State with Trans { children: [ Image.asset('asset/icon/gomb_orange_c.png', width: 100, height: 45), Text( - t("Yes"), + t("OK"), style: TextStyle(fontSize: 16, color: Colors.white), ), ], diff --git a/lib/widgets/menu_page_widget.dart b/lib/widgets/menu_page_widget.dart index ee0f166..93d5df3 100644 --- a/lib/widgets/menu_page_widget.dart +++ b/lib/widgets/menu_page_widget.dart @@ -87,14 +87,14 @@ class _MenuPageWidgetState extends State with Trans, Logging { description: t("Would you like to try all premium functions for 10 days, without any subscription or bank card data?"), widget: Column(children: [ Text( - t("If you click to 'Yes', all premium functions will be available right now."), + t("If you click to 'OK', all premium functions will be available right now."), style: GoogleFonts.inter(color: Colors.white), ), Divider(), - Text( + /* Text( t("If you click to 'No', you can use all basic functions, and you will loose the oppurtunity to try the premium functions for free."), style: GoogleFonts.inter(color: Colors.white), - ), + ), */ ]), onCancel: () => { Navigator.of(context).pop(), diff --git a/pubspec.yaml b/pubspec.yaml index 024749a..0eaf615 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.1.24+101 +version: 1.1.24+102 environment: sdk: ">=2.12.0 <3.0.0"