Skip to content

Commit 46ab1be

Browse files
Jiggy9Jiggy9
authored
Merge branch 'wger-project:master' into master
2 parents c74efff + 3022a52 commit 46ab1be

File tree

15 files changed

+768
-72
lines changed

15 files changed

+768
-72
lines changed

‎ios/Flutter/AppFrameworkInfo.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>9.0</string>
24+
<string>11.0</string>
2525
</dict>
2626
</plist>

‎ios/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment this line to define a global platform for your project
2-
# platform :ios, '9.0'
2+
platform :ios, '12.0'
33

44
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
55
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

‎ios/Podfile.lock‎

Lines changed: 42 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,71 @@
11
PODS:
2-
- camera (0.0.1):
3-
- Flutter
42
- Flutter (1.0.0)
3+
- flutter_barcode_scanner (2.0.0):
4+
- Flutter
55
- flutter_keyboard_visibility (0.0.1):
66
- Flutter
7-
- image_picker (0.0.1):
7+
- image_picker_ios (0.0.1):
88
- Flutter
9-
- package_info (0.0.1):
9+
- integration_test (0.0.1):
1010
- Flutter
11-
- shared_preferences_ios (0.0.1):
11+
- package_info_plus (0.4.5):
1212
- Flutter
13-
- url_launcher_ios (0.0.1):
13+
- rive_common (0.0.1):
1414
- Flutter
15-
- video_player (0.0.1):
15+
- shared_preferences_foundation (0.0.1):
1616
- Flutter
17-
- wakelock (0.0.1):
17+
- FlutterMacOS
18+
- url_launcher_ios (0.0.1):
1819
- Flutter
19-
- webview_flutter_wkwebview (0.0.1):
20+
- video_player_avfoundation (0.0.1):
2021
- Flutter
2122

2223
DEPENDENCIES:
23-
- camera (from `.symlinks/plugins/camera/ios`)
2424
- Flutter (from `Flutter`)
25+
- flutter_barcode_scanner (from `.symlinks/plugins/flutter_barcode_scanner/ios`)
2526
- flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`)
26-
- image_picker (from `.symlinks/plugins/image_picker/ios`)
27-
- package_info (from `.symlinks/plugins/package_info/ios`)
28-
- shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`)
27+
- image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
28+
- integration_test (from `.symlinks/plugins/integration_test/ios`)
29+
- package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
30+
- rive_common (from `.symlinks/plugins/rive_common/ios`)
31+
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/ios`)
2932
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
30-
- video_player (from `.symlinks/plugins/video_player/ios`)
31-
- wakelock (from `.symlinks/plugins/wakelock/ios`)
32-
- webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`)
33+
- video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/ios`)
3334

3435
EXTERNAL SOURCES:
35-
camera:
36-
:path: ".symlinks/plugins/camera/ios"
3736
Flutter:
3837
:path: Flutter
38+
flutter_barcode_scanner:
39+
:path: ".symlinks/plugins/flutter_barcode_scanner/ios"
3940
flutter_keyboard_visibility:
4041
:path: ".symlinks/plugins/flutter_keyboard_visibility/ios"
41-
image_picker:
42-
:path: ".symlinks/plugins/image_picker/ios"
43-
package_info:
44-
:path: ".symlinks/plugins/package_info/ios"
45-
shared_preferences_ios:
46-
:path: ".symlinks/plugins/shared_preferences_ios/ios"
42+
image_picker_ios:
43+
:path: ".symlinks/plugins/image_picker_ios/ios"
44+
integration_test:
45+
:path: ".symlinks/plugins/integration_test/ios"
46+
package_info_plus:
47+
:path: ".symlinks/plugins/package_info_plus/ios"
48+
rive_common:
49+
:path: ".symlinks/plugins/rive_common/ios"
50+
shared_preferences_foundation:
51+
:path: ".symlinks/plugins/shared_preferences_foundation/ios"
4752
url_launcher_ios:
4853
:path: ".symlinks/plugins/url_launcher_ios/ios"
49-
video_player:
50-
:path: ".symlinks/plugins/video_player/ios"
51-
wakelock:
52-
:path: ".symlinks/plugins/wakelock/ios"
53-
webview_flutter_wkwebview:
54-
:path: ".symlinks/plugins/webview_flutter_wkwebview/ios"
54+
video_player_avfoundation:
55+
:path: ".symlinks/plugins/video_player_avfoundation/ios"
5556

5657
SPEC CHECKSUMS:
57-
camera: fe33292aff715a981eb34d7ce7b35b54337ff34c
58-
Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
58+
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
59+
flutter_barcode_scanner: 7a1144744c28dc0c57a8de7218ffe5ec59a9e4bf
5960
flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069
60-
image_picker: 9aa50e1d8cdacdbed739e925b7eea16d014367e6
61-
package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
62-
shared_preferences_ios: aef470a42dc4675a1cdd50e3158b42e3d1232b32
63-
url_launcher_ios: 02f1989d4e14e998335b02b67a7590fa34f971af
64-
video_player: ecd305f42e9044793efd34846e1ce64c31ea6fcb
65-
wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
66-
webview_flutter_wkwebview: 005fbd90c888a42c5690919a1527ecc6649e1162
61+
image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5
62+
integration_test: a1e7d09bd98eca2fc37aefd79d4f41ad37bdbbe5
63+
package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
64+
rive_common: 60ae7896ab40f9513974f36f015de33f70d2c5c5
65+
shared_preferences_foundation: 986fc17f3d3251412d18b0265f9c64113a8c2472
66+
url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
67+
video_player_avfoundation: 81e49bb3d9fb63dccf9fa0f6d877dc3ddbeac126
6768

68-
PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
69+
PODFILE CHECKSUM: 4e8f8b2be68aeea4c0d5beb6ff1e79fface1d048
6970

70-
COCOAPODS: 1.11.2
71+
COCOAPODS: 1.12.0

‎ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 50;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -199,6 +199,7 @@
199199
/* Begin PBXShellScriptBuildPhase section */
200200
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
201201
isa = PBXShellScriptBuildPhase;
202+
alwaysOutOfDate = 1;
202203
buildActionMask = 2147483647;
203204
files = (
204205
);
@@ -252,6 +253,7 @@
252253
};
253254
9740EEB61CF901F6004384FC /* Run Script */ = {
254255
isa = PBXShellScriptBuildPhase;
256+
alwaysOutOfDate = 1;
255257
buildActionMask = 2147483647;
256258
files = (
257259
);
@@ -339,7 +341,7 @@
339341
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
340342
GCC_WARN_UNUSED_FUNCTION = YES;
341343
GCC_WARN_UNUSED_VARIABLE = YES;
342-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
344+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
343345
MTL_ENABLE_DEBUG_INFO = NO;
344346
SDKROOT = iphoneos;
345347
SUPPORTED_PLATFORMS = iphoneos;
@@ -425,7 +427,7 @@
425427
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
426428
GCC_WARN_UNUSED_FUNCTION = YES;
427429
GCC_WARN_UNUSED_VARIABLE = YES;
428-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
430+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
429431
MTL_ENABLE_DEBUG_INFO = YES;
430432
ONLY_ACTIVE_ARCH = YES;
431433
SDKROOT = iphoneos;
@@ -474,7 +476,7 @@
474476
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
475477
GCC_WARN_UNUSED_FUNCTION = YES;
476478
GCC_WARN_UNUSED_VARIABLE = YES;
477-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
479+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
478480
MTL_ENABLE_DEBUG_INFO = NO;
479481
SDKROOT = iphoneos;
480482
SUPPORTED_PLATFORMS = iphoneos;

‎ios/Runner/Info.plist‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,7 @@
4343
<false/>
4444
<key>CADisableMinimumFrameDurationOnPhone</key>
4545
<true/>
46+
<key>UIApplicationSupportsIndirectInputEvents</key>
47+
<true/>
4648
</dict>
4749
</plist>

‎lib/helpers/i18n.dart‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ String getTranslation(String value, BuildContext context) {
2828
case 'Biceps':
2929
return AppLocalizations.of(context).biceps;
3030

31+
case 'Body Weight':
32+
return AppLocalizations.of(context).body_weight;
33+
3134
case 'Calves':
3235
return AppLocalizations.of(context).calves;
3336

@@ -58,21 +61,27 @@ String getTranslation(String value, BuildContext context) {
5861
case 'Kilometers':
5962
return AppLocalizations.of(context).kilometers;
6063

64+
case 'Kilometers Per Hour':
65+
return AppLocalizations.of(context).kilometers_per_hour;
66+
6167
case 'Lats':
6268
return AppLocalizations.of(context).lats;
6369

6470
case 'Legs':
6571
return AppLocalizations.of(context).legs;
6672

67-
case 'Lower back':
68-
return AppLocalizations.of(context).lower_back;
69-
7073
case 'Miles':
7174
return AppLocalizations.of(context).miles;
7275

76+
case 'Miles Per Hour':
77+
return AppLocalizations.of(context).miles_per_hour;
78+
7379
case 'Minutes':
7480
return AppLocalizations.of(context).minutes;
7581

82+
case 'Plates':
83+
return AppLocalizations.of(context).plates;
84+
7685
case 'Pull-up bar':
7786
return AppLocalizations.of(context).pull_up_bar;
7887

@@ -100,6 +109,12 @@ String getTranslation(String value, BuildContext context) {
100109
case 'Until Failure':
101110
return AppLocalizations.of(context).until_failure;
102111

112+
case 'kg':
113+
return AppLocalizations.of(context).kg;
114+
115+
case 'lb':
116+
return AppLocalizations.of(context).lb;
117+
103118
case 'none (bodyweight exercise)':
104119
return AppLocalizations.of(context).none__bodyweight_exercise_;
105120

‎lib/l10n/app_en.arb‎

Lines changed: 116 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -635,37 +635,150 @@
635635
}
636636
},
637637
"cacheWarning": "Due to caching it might take some time till the changes are visible throughout the application.",
638+
"textPromptTitle": "Ready to start?",
639+
"textPromptSubheading": "Press the action button to begin",
638640
"abs": "Abs",
641+
"@abs": {
642+
"description": "Generated entry for translation for server strings"
643+
},
639644
"arms": "Arms",
645+
"@arms": {
646+
"description": "Generated entry for translation for server strings"
647+
},
640648
"back": "Back",
649+
"@back": {
650+
"description": "Generated entry for translation for server strings"
651+
},
641652
"barbell": "Barbell",
653+
"@barbell": {
654+
"description": "Generated entry for translation for server strings"
655+
},
642656
"bench": "Bench",
657+
"@bench": {
658+
"description": "Generated entry for translation for server strings"
659+
},
643660
"biceps": "Biceps",
661+
"@biceps": {
662+
"description": "Generated entry for translation for server strings"
663+
},
664+
"body_weight": "Body Weight",
665+
"@body_weight": {
666+
"description": "Generated entry for translation for server strings"
667+
},
644668
"calves": "Calves",
669+
"@calves": {
670+
"description": "Generated entry for translation for server strings"
671+
},
645672
"cardio": "Cardio",
673+
"@cardio": {
674+
"description": "Generated entry for translation for server strings"
675+
},
646676
"chest": "Chest",
677+
"@chest": {
678+
"description": "Generated entry for translation for server strings"
679+
},
647680
"dumbbell": "Dumbbell",
681+
"@dumbbell": {
682+
"description": "Generated entry for translation for server strings"
683+
},
648684
"glutes": "Glutes",
685+
"@glutes": {
686+
"description": "Generated entry for translation for server strings"
687+
},
649688
"gym_mat": "Gym mat",
689+
"@gym_mat": {
690+
"description": "Generated entry for translation for server strings"
691+
},
650692
"hamstrings": "Hamstrings",
693+
"@hamstrings": {
694+
"description": "Generated entry for translation for server strings"
695+
},
651696
"incline_bench": "Incline bench",
697+
"@incline_bench": {
698+
"description": "Generated entry for translation for server strings"
699+
},
652700
"kettlebell": "Kettlebell",
701+
"@kettlebell": {
702+
"description": "Generated entry for translation for server strings"
703+
},
653704
"kilometers": "Kilometers",
705+
"@kilometers": {
706+
"description": "Generated entry for translation for server strings"
707+
},
708+
"kilometers_per_hour": "Kilometers Per Hour",
709+
"@kilometers_per_hour": {
710+
"description": "Generated entry for translation for server strings"
711+
},
654712
"lats": "Lats",
713+
"@lats": {
714+
"description": "Generated entry for translation for server strings"
715+
},
655716
"legs": "Legs",
656-
"lower_back": "Lower back",
717+
"@legs": {
718+
"description": "Generated entry for translation for server strings"
719+
},
657720
"miles": "Miles",
721+
"@miles": {
722+
"description": "Generated entry for translation for server strings"
723+
},
724+
"miles_per_hour": "Miles Per Hour",
725+
"@miles_per_hour": {
726+
"description": "Generated entry for translation for server strings"
727+
},
658728
"minutes": "Minutes",
729+
"@minutes": {
730+
"description": "Generated entry for translation for server strings"
731+
},
732+
"plates": "Plates",
733+
"@plates": {
734+
"description": "Generated entry for translation for server strings"
735+
},
659736
"pull_up_bar": "Pull-up bar",
737+
"@pull_up_bar": {
738+
"description": "Generated entry for translation for server strings"
739+
},
660740
"quads": "Quads",
741+
"@quads": {
742+
"description": "Generated entry for translation for server strings"
743+
},
661744
"repetitions": "Repetitions",
745+
"@repetitions": {
746+
"description": "Generated entry for translation for server strings"
747+
},
662748
"sz_bar": "SZ-Bar",
749+
"@sz_bar": {
750+
"description": "Generated entry for translation for server strings"
751+
},
663752
"seconds": "Seconds",
753+
"@seconds": {
754+
"description": "Generated entry for translation for server strings"
755+
},
664756
"shoulders": "Shoulders",
757+
"@shoulders": {
758+
"description": "Generated entry for translation for server strings"
759+
},
665760
"swiss_ball": "Swiss Ball",
761+
"@swiss_ball": {
762+
"description": "Generated entry for translation for server strings"
763+
},
666764
"triceps": "Triceps",
765+
"@triceps": {
766+
"description": "Generated entry for translation for server strings"
767+
},
667768
"until_failure": "Until Failure",
769+
"@until_failure": {
770+
"description": "Generated entry for translation for server strings"
771+
},
772+
"kg": "kg",
773+
"@kg": {
774+
"description": "Generated entry for translation for server strings"
775+
},
776+
"lb": "lb",
777+
"@lb": {
778+
"description": "Generated entry for translation for server strings"
779+
},
668780
"none__bodyweight_exercise_": "none (bodyweight exercise)",
669-
"textPromptTitle": "Ready to start?",
670-
"textPromptSubheading": "Press the action button to begin"
781+
"@none__bodyweight_exercise_": {
782+
"description": "Generated entry for translation for server strings"
783+
}
671784
}

0 commit comments

Comments
 (0)