Commit Graph

73 Commits

Author SHA1 Message Date
Roland Geider
98f2fb0096 Merge branch 'master' into powersync
# Conflicts:
#	Gemfile.lock
#	android/settings.gradle
#	fastlane/report.xml
#	integration_test/1_dashboard.dart
#	integration_test/2_workout.dart
#	integration_test/3_gym_mode.dart
#	integration_test/5_nutritional_plan.dart
#	integration_test/6_weight.dart
#	lib/helpers/i18n.dart
#	lib/helpers/ui.dart
#	lib/main.dart
#	lib/models/nutrition/meal.g.dart
#	lib/models/nutrition/nutritional_plan.dart
#	lib/providers/auth.dart
#	lib/providers/nutrition.dart
#	lib/screens/add_exercise_screen.dart
#	lib/screens/auth_screen.dart
#	lib/screens/dashboard.dart
#	lib/screens/exercises_screen.dart
#	lib/screens/home_tabs_screen.dart
#	lib/screens/log_meal_screen.dart
#	lib/screens/log_meals_screen.dart
#	lib/screens/nutritional_plan_screen.dart
#	lib/screens/routine_list_screen.dart
#	lib/screens/workout_plan_screen.dart
#	lib/widgets/add_exercise/steps/step1basics.dart
#	lib/widgets/add_exercise/steps/step5images.dart
#	lib/widgets/add_exercise/steps/step_2_variations.dart
#	lib/widgets/add_exercise/steps/step_3_description.dart
#	lib/widgets/add_exercise/steps/step_4_translations.dart
#	lib/widgets/core/about.dart
#	lib/widgets/core/settings.dart
#	lib/widgets/dashboard/calendar.dart
#	lib/widgets/dashboard/widgets.dart
#	lib/widgets/exercises/exercises.dart
#	lib/widgets/gallery/overview.dart
#	lib/widgets/measurements/categories_card.dart
#	lib/widgets/measurements/charts.dart
#	lib/widgets/measurements/entries.dart
#	lib/widgets/measurements/forms.dart
#	lib/widgets/measurements/helpers.dart
#	lib/widgets/nutrition/charts.dart
#	lib/widgets/nutrition/forms.dart
#	lib/widgets/nutrition/helpers.dart
#	lib/widgets/nutrition/meal.dart
#	lib/widgets/nutrition/nutritional_diary_table.dart
#	lib/widgets/nutrition/nutritional_plan_detail.dart
#	lib/widgets/nutrition/nutritional_plans_list.dart
#	lib/widgets/nutrition/widgets.dart
#	lib/widgets/routines/charts.dart
#	lib/widgets/routines/workout_logs.dart
#	lib/widgets/weight/forms.dart
#	lib/widgets/weight/weight_overview.dart
#	lib/widgets/workouts/app_bar.dart
#	lib/widgets/workouts/day.dart
#	lib/widgets/workouts/forms.dart
#	lib/widgets/workouts/gym_mode.dart
#	lib/widgets/workouts/workout_plan_detail.dart
#	lib/widgets/workouts/workout_plans_list.dart
#	linux/flutter/generated_plugin_registrant.cc
#	linux/flutter/generated_plugins.cmake
#	pubspec.lock
#	pubspec.yaml
#	test/auth/auth_screen_test.dart
#	test/core/settings_test.dart
#	test/core/settings_test.mocks.dart
#	test/nutrition/nutritional_meal_form_test.mocks.dart
#	test/nutrition/nutritional_meal_item_form_test.dart
#	test/nutrition/nutritional_plan_form_test.mocks.dart
#	test/nutrition/nutritional_plan_screen_test.dart
#	test/nutrition/nutritional_plans_screen_test.dart
#	test/routine/repetition_unit_form_widget_test.dart
#	test/routine/routine_screen_test.dart
#	test/routine/routines_screen_test.dart
#	test/routine/weight_unit_form_widget_test.dart
#	test/workout/gym_mode_screen_test.dart
#	test/workout/workout_day_form_test.dart
#	test/workout/workout_form_test.dart
#	test/workout/workout_set_form_test.dart
2025-10-19 14:48:15 +02:00
Roland Geider
93a11a16e4 Recreate generated files and reformat the repo
Seems the default dart formatting rules changed recently, and this was causing
huge diffs in branches
2025-10-09 17:39:02 +02:00
Roland Geider
f812910bdf Save the token to the right variable 2025-05-01 13:12:46 +02:00
Roland Geider
ece38a39d2 Refactor login screen
The api token toggle is now only visible when showing a custom server, since at
the moment this is the only time when such an auth method makes sense (plus it
keeps the rest of the UI cleaner). The different fields in the screen have been
moved to individual files, to make the structure clearer.
2025-04-30 22:50:55 +02:00
Roland Geider
38cdc9f37c Merge branch 'master' into fork/eyJhb/api-token
# Conflicts:
#	lib/providers/auth.dart
2025-04-29 19:23:55 +02:00
Roland Geider
59ea2d93e7 Set the authentication state, just to be sure 2025-04-01 21:48:26 +02:00
Roland Geider
6742c8091a Return the actions enum directly, no need for a dict here 2025-04-01 21:39:45 +02:00
Roland Geider
61f61a64c5 Merge branch 'master' into feature/improve-min-app-version
# Conflicts:
#	lib/providers/auth.dart
2025-03-31 09:44:43 +02:00
Roland Geider
e4b550ab52 Refactor app version handling and update authentication flow
Previously, this was only triggered when logging in to the application. If a user
just opened the app, it would just stop working. We also now always check this min
version and have removed the option from the android manifest file since disabling
this doesn't make much sense and we have many other platforms as well (iOS, flatpak)
2025-03-28 17:22:36 +01:00
Roland Geider
cde9d64a2c Merge branch 'master' into yhm/issue-731 2025-03-28 16:15:52 +01:00
Roland Geider
13614ee4fe Merge branch 'master' into fork/mutairibassam/feature/min-version-handling
# Conflicts:
#	AUTHORS.md
#	lib/providers/auth.dart
2025-03-27 17:43:58 +01:00
Yashas H Majmudar
529c63c92e migration: migrated all instances of sharedPreferences to sharedPreferencesAsync 2025-03-23 14:26:05 -04:00
Roland Geider
58e7a52e3d Use log levels when logging to console 2025-01-25 12:45:33 +01:00
Roland Geider
86f8b7ae35 Add a third option to the theme mode
This allows the user to use the system settings as well, and not always force
light or dark mode in the app. Also move the logic to the UserProvider and
do some light refactoring.
2025-01-23 23:22:50 +01:00
sangharshdeveloper
06ca72e0f8 #687 enhancement theme-customization 2025-01-17 22:19:54 +05:30
sangharshdeveloper
ced268660b #687 enhancement theme-customization 2025-01-12 20:48:31 +05:30
eyjhb
24937a2e5c Adds ability to use API Key to "sign in" 2025-01-03 13:08:39 +01:00
Roland Geider
d35ff240a7 Update/fix android configuration
It seems some packages that have not been updated in some years are causing
problems. android_metadata has been removed here, but flutter_barcode_scanner
is still needed
2024-12-12 20:49:24 +01:00
Roland Geider
3978b4bd8b Remove WGER_API_KEY, this registration key is not needed anymore 2024-11-09 13:07:36 +01:00
Dieter Plaetinck
bb679754b9 fix/refactor/simplify powersync auth setup 2024-09-15 12:25:10 +03:00
Dieter Plaetinck
e1e27fb1dd for consistency and safety, always use prefs constants 2024-07-11 20:22:25 +03:00
Roland Geider
9e5a950b33 Remove call to applicationUpdateRequired during registration
This happens in the login method anyway, which is called after the registration
was successfully completed
2024-07-10 15:40:34 +02:00
Dieter Plaetinck
420f9ae16d dcm fix --only-rules=avoid-inferrable-type-arguments lib 2024-06-07 14:59:00 +03:00
Dieter Plaetinck
8db1a7c960 dcm fix --only-rules=unnecessary-trailing-comma lib 2024-06-07 14:59:00 +03:00
Dieter Plaetinck
7f74bff32c dcm fix --only-rules=prefer-trailing-comma lib 2024-06-07 14:59:00 +03:00
Bassam A
7f93620003 feat: min application version handling. 2024-01-29 22:49:06 +03:00
Roland Geider
51a0e8798d Correctly show any errors from the server on the registration page
Also, add some tests
2024-01-22 16:55:59 +01:00
null
4d90b8fc13 Fix bugs (#476)
* #454 issue, prefill only on debug mode

* #454 issue, prefill only on debug mode

* added myself <3

* -

* -

* fix #478 LateInitializationError

* add consts, make the funcs private

* latest update, change the name of prod, adding test server in debug mode

* -

---------

Co-authored-by: allohibihanaa <digitalhanaa@gmail.com>
Co-authored-by: Roland Geider <roland@geider.net>
2024-01-11 10:42:24 +01:00
Miroslav Mazel
7aeed3bde5 Prep Linux/macOS support: package_info_plus package + env variables instead of AndroidMetadata 2023-03-21 21:06:37 +01:00
Roland Geider
5a4e8a3587 Fix min application version tests 2022-10-15 11:15:23 +02:00
Roland Geider
ab50bf6a91 Fix min application version check 2022-10-15 10:59:55 +02:00
Roland Geider
6fbabf4112 Use an enum for the login action instead of a string 2022-10-15 10:59:54 +02:00
amannegi
4b3e067a52 Modified Error Dialog and Added App Compatibility check on login/signup #101 2022-10-10 21:56:42 +05:30
Roland Geider
e5bd9e901f Add workaround for the AndroidMetadata checks
The metaDataAsMap method doesn't work during tests and throws a null check
error. A better solution should be implemented when possible.
2021-11-08 10:55:16 +01:00
Roland Geider
fbff8f5425 Send user agent header with app version when logging in and registering 2021-11-08 09:57:18 +01:00
Roland Geider
1e9c44e56b Use makeUri helper function in auth provider 2021-11-08 09:54:50 +01:00
Roland Geider
909349ce90 Remove unsed code in auth provider 2021-11-08 09:44:22 +01:00
Roland Geider
cf882c194f Move flag checking for minimum required version to manifest
This is still not the best solution, ideally we would save this to some kind
of configuration file that we can use for dev/prod etc. Also, this solution
doesn't work with iOS or web
2021-11-08 09:42:32 +01:00
Roland Geider
498a43f292 Test min application version check in auth provider 2021-11-08 09:42:32 +01:00
AxelBlaz3
8228b42bb2 Merge branch 'master' of https://github.com/AxelBlaz3/flutter 2021-10-14 09:08:54 +05:30
AxelBlaz3
1b92b073ca Display errors in login page
Now the app shows the reason why the login failed to the user.

Why this happened?
There's a 'Consumer' at the top most widget (MaterialApp) which gets rebuild everytime during logout and login. We don't need to notify listeners and rebuild the MaterialApp widget when logging out (cleaning up old data) during login. By doing so, context is in place and dialog appears. If the whole MaterialApp rebuilds, the old context is gone and a new context is given to all the widgets, which is where the issue arises and the dialog uses old context (which doens't exist in the first place).

Signed-off-by: AxelBlaz3 <karthikgaddam4@gmail.com>
2021-10-14 08:51:18 +05:30
Sandi Milohanić
ee3df1bada #29 - Add minimum required server version 2021-10-12 18:43:45 +02:00
Marvin M
45a2a5f857 Fixes pt 1 2021-10-01 17:18:17 +02:00
ton-An
19445c36a2 (Measurements) Added Equatable + Refactored
(MeasurementProvider)
- Passing in the WgerBaseProvider instead of extending with it
- Re-written tests
- Added the fixture reader to make test file less crowded

(Measurement Models)
- Added Equatable
- Re-written tests
2021-08-22 18:07:47 +02:00
Roland Geider
b59e30b220 Send app information in the user agent when making requests 2021-05-17 20:06:46 +02:00
Roland Geider
ee2e6ac671 Give providers a consistent name 2021-05-11 12:10:53 +02:00
Roland Geider
6fa492c569 Set correct type for metadata variable 2021-04-30 11:28:18 +02:00
Roland Geider
ad7507c8b7 Update license header as well 2021-04-13 10:28:15 +02:00
Roland Geider
ecd2773a87 Upgrade packages and move application to null safety 2021-03-25 22:20:16 +01:00
Roland Geider
1ad4e5aebb Move default server to constants file 2021-03-18 11:16:22 +01:00