Skip to content

Commit ad070cf

Browse files
rolandgeiderrolandgeider
committed
Merge branch 'master' into feature/flatpak-build
2 parents a0f6ff3 + f58f61e commit ad070cf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1908
-733
lines changed

‎.vscode/settings.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"dart.lineLength": 100,
3-
"diffEditor.ignoreTrimWhitespace": true,
4-
}
2+
"dart.lineLength": 100,
3+
"diffEditor.ignoreTrimWhitespace": true,
4+
}

‎AUTHORS.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
## Developers
44

5+
- Jigar Prajapati - <https://github.com/Jiggy9>
56
- Roland Geider – <https://github.com/rolandgeider>
67
- Dylan Aird - <https://github.com/Dolaned>
78
- Jannik Norden - <https://github.com/Jannik-dev>
@@ -19,6 +20,8 @@
1920
- Aman Negi - <https://github.com/AmanNegi>
2021
- Sandi Milohanic - <https://github.com/sandimilohanic>
2122
- Miroslav Mazel - <https://gitlab.com/12people>
23+
- artchiee - <https://github.com/artchiee>
24+
- Tejas Bir Singh - <https://github.com/tejasbirsingh>
2225

2326
## Translators
2427

‎fastlane/metadata/android/hr/full_description.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Tvoje tijelo:
1616
Nema potrebe za guglanjem sastojaka omiljenih poslastica – odaberi dnevne obroke od više od 78.000 proizvoda i pogledaj prehrambene vrijednosti. Dodaj obroke u plan prehrane i čuvaj pregled svoje prehrane u kalendaru.
1717

1818
Tvoji treninzi:
19-
Znaš što je najbolje za tvoje tijelo. Izradi vlastite treninge iz više od 200 različitih vježbi. Zatim koristi modus teretane vođenje kroz trening dok jednim dodirom bilježiš utege.
19+
Znaš što je najbolje za tvoje tijelo. Izradi vlastite treninge iz više od 200 različitih vježbi. Zatim koristi modus teretane za vođenje kroz trening dok jednim dodirom bilježiš svoje težine.
2020

2121
Tvoj napredak:
2222
Nikada ne gubi iz vida svoje ciljeve. Prati svoju težinu i vodi statistiku.

‎flatpak/de.wger.flutter.appdata.xml‎

Lines changed: 115 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,128 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<component type="desktop-application">
3-
<id>de.wger.flutter</id>
4-
<name>wger</name>
5-
<summary>Fitness/workout, nutrition and weight tracker</summary>
3+
<id>de.wger.flutter</id>
4+
<name>wger</name>
5+
<summary>Fitness/workout, nutrition and weight tracker</summary>
66

7-
<metadata_license>CC0-1.0</metadata_license>
8-
<project_license>AGPL-3.0-or-later</project_license>
9-
<recommends>
10-
<control>touch</control>
11-
<control>pointing</control>
12-
<control>keyboard</control>
13-
</recommends>
14-
<developer_name>wger</developer_name>
15-
<url type="homepage">https://wger.de/</url>
16-
<url type="bugtracker">https://github.com/wger-project/flutter/issues</url>
7+
<metadata_license>CC0-1.0</metadata_license>
8+
<project_license>AGPL-3.0-or-later</project_license>
9+
<recommends>
10+
<control>touch</control>
11+
<control>pointing</control>
12+
<control>keyboard</control>
13+
</recommends>
14+
<developer_name>wger</developer_name>
15+
<url type="homepage">https://wger.de/</url>
16+
<url type="bugtracker">https://github.com/wger-project/flutter/issues</url>
1717

18-
<custom>
19-
<value key="Purism::form_factor">workstation</value>
20-
<value key="Purism::form_factor">mobile</value>
21-
</custom>
18+
<custom>
19+
<value key="Purism::form_factor">workstation</value>
20+
<value key="Purism::form_factor">mobile</value>
21+
</custom>
2222

23-
<description>
24-
<p>From fitness lovers to fitness lovers – get your health organized with WGER, your Workout Manager!</p>
25-
<p>Have you already found your #1 fitness app and do you love to create your own sports routines? No matter what type of sporty beast you are – we all have something in common: We love to keep track of our health data &lt;3</p>
26-
<p>So we don’t judge you for still managing your fitness journey with your handy little workout log book but welcome to 2021!</p>
27-
<p>We have developed a 100% free digital health and fitness tracker app for you, sized down to the most relevant features to make your life easier. Get started, keep training and celebrate your progress!</p>
28-
<p>wger is an Open Source project and all about:</p>
29-
<ul>
30-
<li><strong>Your body:</strong> No need to google for the ingredients of your favourite treats – choose your daily meals from more than 78000 products and see the nutritional values. Add meals to the nutritional plan and keep an overview of your diet in the calendar.</li>
31-
<li><strong>Your workouts:</strong> You know what is best for your body. Create your own workouts out of a growing variety from 200 different exercises. Then, use the Gym Mode to guide you through the training while you log your weights with one tap.</li>
32-
<li><strong>Your progress:</strong> Never lose sight of your goals. Track your weight and keep your statistics.</li>
33-
<li><strong>Your data:</strong> wger is your personalized fitness diary – but you own your data. Use the REST API to access and do amazing things with it.</li>
34-
</ul>
35-
<p>Please note: This free app is not based on additional fundings and we don’t ask you to donate money. More than that it is a community project which is growing constantly. So be prepared for new features anytime!</p>
36-
<p><strong>OpenSource – what does that mean?</strong> Open Source means that the whole source code for this app and the server it talks to is free and available to anybody:</p>
37-
<ul>
23+
<description>
24+
<p>
25+
From fitness lovers to fitness lovers – get your health organized with WGER,
26+
your Workout Manager!
27+
</p>
28+
<p>
29+
Have you already found your #1 fitness app and do you love to create your own sports
30+
routines? No matter what type of sporty beast you are – we all have something in common:
31+
We love to keep track of our health data &lt;3
32+
</p>
33+
<p>
34+
So we don’t judge you for still managing your fitness journey with your handy little
35+
workout log book but welcome to 2021!
36+
</p>
37+
<p>
38+
We have developed a 100% free digital health and fitness tracker app for you, sized down
39+
to the most relevant features to make your life easier. Get started, keep training and
40+
celebrate your progress!
41+
</p>
42+
<p>wger is an Open Source project and all about:</p>
43+
<ul>
44+
<li>
45+
Your body:
46+
No need to google for the ingredients of your favourite treats – choose your daily
47+
meals from more than 78000 products and see the nutritional values. Add meals to the
48+
nutritional plan and keep an overview of your diet in the calendar.
49+
</li>
50+
<li>
51+
Your workouts:
52+
You know what is best for your body. Create your own workouts out of a growing
53+
variety from 200 different exercises. Then, use the Gym Mode to guide you through
54+
the training while you log your weights with one tap.
55+
</li>
56+
<li>
57+
Your progress:
58+
Never lose sight of your goals. Track your weight and keep your statistics.
59+
</li>
60+
<li>
61+
Your data:
62+
wger is your personalized fitness diary – but you own your data. Use the REST API to
63+
access and do amazing things with it.
64+
</li>
65+
</ul>
66+
<p>Please note: This free app is not based on additional fundings and we don’t ask you to
67+
donate money. More than that it is a community project which is growing constantly. So
68+
be prepared for new features anytime!
69+
</p>
70+
<p>
71+
OpenSource – what does that mean?
72+
Open Source means that the whole source code for this app and the server it talks to is
73+
free and available to anybody:
74+
</p>
75+
<ul>
3876
<li>Do you want to run wger on your own server for you or your local gym? Go ahead!</li>
3977
<li>Do you miss a feature and want to implement it? Start now!</li>
4078
<li>Do you want to check that nothing is being sent anywhere? You can!</li>
41-
</ul>
42-
<p>Join our community and become a part of sport enthusiasts and IT geeks from all over the world. We keep working on adjusting and optimizing the app customized to our needs. We love your input so feel free to jump in anytime and contribute your wishes and ideas!</p>
43-
<ul>
44-
<li>find the source code on <a href="https://github.com/wger-project">https://github.com/wger-project</a></li>
45-
<li>ask your questions or just say hello on our discord Server <a href="https://discord.gg/rPWFv6W">https://discord.gg/rPWFv6W</a></li>
46-
</ul>
47-
</description>
79+
</ul>
80+
<p>Join our community and become a part of sport enthusiasts and IT geeks from all over the
81+
world. We keep working on adjusting and optimizing the app customized to our needs. We
82+
love your input so feel free to jump in anytime and contribute your wishes and ideas!
83+
</p>
84+
<ul>
85+
<li>find the source code on https://github.com/wger-project
86+
</li>
87+
<li>
88+
ask your questions or just say hello on our discord Server
89+
https://discord.gg/rPWFv6W
90+
</li>
91+
</ul>
92+
</description>
4893

49-
<screenshots>
50-
<screenshot type="default">
51-
<caption>wger's dashboard</caption>
52-
<image type="source">https://github.com/wger-project/flutter/raw/master/fastlane/metadata/android/en-US/images/phoneScreenshots/01%20-%20dashboard.png</image>
53-
</screenshot>
54-
</screenshots>
94+
<screenshots>
95+
<screenshot type="default">
96+
<caption>wger's dashboard</caption>
97+
<image type="source">
98+
https://raw.githubusercontent.com/wger-project/flutter/master/fastlane/metadata/android/en-US/images/phoneScreenshots/01%20-%20dashboard.png
99+
</image>
100+
</screenshot>
101+
<screenshot>
102+
<caption>Workout detail</caption>
103+
<image type="source">
104+
https://raw.githubusercontent.com/wger-project/flutter/master/fastlane/metadata/android/en-US/images/phoneScreenshots/02%20-%20workout%20detail.png
105+
</image>
106+
</screenshot>
107+
<screenshot>
108+
<caption>Measurements</caption>
109+
<image type="source">
110+
https://raw.githubusercontent.com/wger-project/flutter/master/fastlane/metadata/android/en-US/images/phoneScreenshots/04%20-%20measurements.png
111+
</image>
112+
</screenshot>
113+
<screenshot>
114+
<caption>Nutritional plan</caption>
115+
<image type="source">
116+
https://raw.githubusercontent.com/wger-project/flutter/master/fastlane/metadata/android/en-US/images/phoneScreenshots/05%20-%20nutritional%20plan.png
117+
</image>
118+
</screenshot>
119+
</screenshots>
55120

56-
<releases>
57-
<release version="1.5.3" date="2023-03-16" />
58-
</releases>
121+
<releases>
122+
<release version="1.5.3" date="2023-03-16" />
123+
</releases>
59124

60-
<content_rating type="oars-1.1" />
125+
<content_rating type="oars-1.1" />
61126

62-
<launchable type="desktop-id">de.wger.flutter.desktop</launchable>
127+
<launchable type="desktop-id">de.wger.flutter.desktop</launchable>
63128
</component>

‎flatpak/flatpak_meta.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"--share=network",
2424
"--socket=fallback-x11",
2525
"--socket=wayland",
26+
"--socket=pulseaudio",
2627
"--device=dri"
2728
]
2829
}

‎flatpak/scripts/pubspec.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,4 @@ packages:
8282
source: hosted
8383
version: "1.3.1"
8484
sdks:
85-
dart: ">=2.18.5 <3.0.0"
85+
dart: ">=2.18.5 <4.0.0"

‎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

0 commit comments

Comments
 (0)