Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 99e4961

Browse files
rolandgeiderrolandgeider
committed
Merge branch 'refs/heads/master' into powersync
2 parents ea60e18 + 5f0630f commit 99e4961

File tree

107 files changed

+2445
-1118
lines changed

Some content is hidden

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

107 files changed

+2445
-1118
lines changed

‎.github/workflows/build-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
uses: subosito/flutter-action@v2
2727
with:
2828
channel: stable
29-
flutter-version: 3.22.x
29+
flutter-version: 3.24.x
3030

3131
- name: Flutter info
3232
run: |

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
uses: subosito/flutter-action@v2
2020
with:
2121
channel: 'stable'
22-
flutter-version: '3.22.x'
22+
flutter-version: '3.24.x'
2323

2424
- run: dart --version
2525
- run: flutter --version

‎.github/workflows/linter.yml.bak‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
uses: subosito/flutter-action@v2
2121
with:
2222
channel: 'stable'
23-
flutter-version: '3.19.x'
23+
flutter-version: '3.24.x'
2424

2525
- name: Get dependencies
2626
run: flutter pub get

‎AUTHORS.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,12 @@
2929
- Bassam Mutairi - <https://github.com/mutairibassam>
3030
- Dieter Plaetinck - <https://github.com/Dieterbe>
3131
- Dennis van Peer - <https://github.com/Denpeer>
32+
- sizzlesloth - <https://github.com/sizzlesloth>
3233

3334
## Translators
3435

3536
- Saudi Arabian
36-
- Hanaa Allohibi <Gmail: programmerHanaa>
37+
- Hanaa Allohibi <Gmail: programmerHanaa>
3738

3839
- German
3940

@@ -66,7 +67,7 @@
6667
- Norwegian Bokmål
6768

6869
- Allan Nordhøy <[email protected]> (98)
69-
70+
7071
- Japanese
7172

7273
- Kosei TANAKA <[email protected]> (97)
@@ -76,5 +77,5 @@
7677
- Nenza Nurfirmansyah <[email protected]> (73)
7778

7879
- Croatian
79-
80+
8081
- Sandi Milohaic <[email protected]>

‎analysis_options.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,9 @@ dart_code_metrics:
163163
- prefer-prefixed-global-constants: false # we don't really care for the 'k' prefix
164164
- prefer-single-widget-per-file: false
165165
- avoid-passing-self-as-argument: false # fairly harmless. and e.g. drift calls are like this
166+
- avoid-passing-async-when-sync-expected: false # we really like to do this in onTap() etc, and it seems harmless
167+
- prefer-match-file-name: false # dieter wants to enable this. but requires a lot of renames. what does roland think?
168+
166169
formatter:
167170
indent: 0
168171
line-length: 100

‎fastlane/metadata/android/it-IT/full_description.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Da amanti del fitness per amanti del fitness – Organizza la tua salute con wger il tuo gestore dell'allenamento!
1+
Da amanti del fitness per amanti del fitness – Organizza la tua salute con WGER il tuo Workout Manager!
22

33
Hai già trovato la tua applicazione per il fitness nº 1 e ti piace creare le tue routines sportive? Non importa che tipo di sportivo sei – Abbiamo tutti qualcosa in comune: Amiamo tenere sotto controllo i dati sulla nostra salute <3
44

‎fastlane/metadata/android/pl-PL/video.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎integration_test/1_dashboard.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ Widget createDashboardScreen({locale = 'en'}) {
3434
'date': '2022-12-01',
3535
'impression': '3',
3636
'time_start': '17:00',
37-
'time_end': '19:00'
38-
}
39-
]
37+
'time_end': '19:00',
38+
},
39+
],
4040
};
4141
when(mockWorkoutProvider.fetchSessionData()).thenAnswer((a) => Future.value(logs));
4242

‎integration_test/6_weight.dart‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,7 @@ Widget createWeightScreen({locale = 'en'}) {
3636
supportedLocales: AppLocalizations.supportedLocales,
3737
theme: wgerLightTheme,
3838
home: const WeightScreen(),
39-
routes: {
40-
FormScreen.routeName: (ctx) => const FormScreen(),
41-
},
39+
routes: {FormScreen.routeName: (ctx) => const FormScreen()},
4240
),
4341
);
4442
}

‎integration_test/make_screenshots_test.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ const languages = [
5757
'ru-RU',
5858
'tr-TR',
5959
'uk',
60-
'zh-CN'
60+
'zh-CN',
6161
];
6262

6363
void main() {

0 commit comments

Comments
 (0)