Skip to content
Merged

Main #508

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 4 additions & 13 deletions app/lib/database/repositories/user_repository.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@ class UserRepository {

UserRepository() : manager = Manager(AppDatabase.instance);

Future<void> createUser(UserEntry user) async {
/// Saves or updates the user data.
Future<void> saveUser(UserEntry user) async {
final db = await dbProvider.database;
await db.insert(
'user',
user.toMap(),
'user',
user.toMap(),
conflictAlgorithm: ConflictAlgorithm.replace,
);
}
Expand All @@ -27,16 +28,6 @@ class UserRepository {
return UserEntry.fromMap(maps.first);
}

Future<void> updateUser(UserEntry user) async {
final db = await dbProvider.database;
await db.update(
'user',
user.toMap(),
where: 'id = ?',
whereArgs: [UserEntry.singletonId],
);
}

Future<void> deleteUser() async {
final db = await dbProvider.database;
await db.delete('user', where: 'id = ?', whereArgs: [UserEntry.singletonId]);
Expand Down
3 changes: 2 additions & 1 deletion app/lib/screens/onboarding/onboarding_screen.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:menstrudel/l10n/app_localizations.dart';
import 'package:menstrudel/services/settings_service.dart';
import 'package:menstrudel/services/user_service.dart';
import 'package:provider/provider.dart';
import 'package:menstrudel/models/app/user_entry.dart';
import 'package:menstrudel/models/app/user_goal_types_enum.dart';
Expand Down Expand Up @@ -32,7 +33,7 @@ class _OnboardingScreenState extends State<OnboardingScreen> {
birthDate: _selectedDate,
primaryGoal: _selectedGoal,
);
await context.read<UserRepository>().createUser(newUser);
await context.read<UserService>().updateUser(newUser);
if (mounted){
await context.read<SettingsService>().applySettingsForGoal(_selectedGoal);
}
Expand Down
10 changes: 5 additions & 5 deletions app/lib/services/user_service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class UserService extends ChangeNotifier {
Future<void> updateUser(UserEntry user) async {
_user = user;
notifyListeners();
_userRepo.updateUser(user);
_userRepo.saveUser(user);
}

/// Updates the user's date of birth.
Expand All @@ -60,31 +60,31 @@ class UserService extends ChangeNotifier {
_user = _user!.copyWith(birthDate: date);
_age = AgeCalculator.age(_user!.birthDate!).years;
notifyListeners();
_userRepo.updateUser(_user!);
_userRepo.saveUser(_user!);
}

/// Remove date of birth.
Future<void> removeBirthDate() async {
if (_user == null) return;
_user = _user!.copyWith(birthDate: null);
notifyListeners();
_userRepo.updateUser(_user!);
_userRepo.saveUser(_user!);
}

/// Updates the user's name
Future<void> setName(String name) async {
if (_user == null) return;
_user = _user!.copyWith(name: name);
notifyListeners();
_userRepo.updateUser(_user!);
_userRepo.saveUser(_user!);
}

/// Updates the user's primary goal
Future<void> setPrimaryGoal(UserGoalTypes goal, SettingsService settingsService) async {
if (_user == null) return;
_user = _user!.copyWith(primaryGoal: goal);
notifyListeners();
_userRepo.updateUser(_user!);
_userRepo.saveUser(_user!);
settingsService.applySettingsForGoal(goal);
}
}
2 changes: 1 addition & 1 deletion app/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: menstrudel
description: "Your private, offline, menstrual cycle tracker."
publish_to: 'none'

version: 4.2.2+29
version: 4.2.4+31

environment:
sdk: ^3.8.1
Expand Down
2 changes: 1 addition & 1 deletion sonar-project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ sonar.organization=j-shw

# This is the name and version displayed in the SonarCloud UI.
sonar.projectName=Menstrudel
sonar.projectVersion=4.2.2
sonar.projectVersion=4.2.3


# Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
Expand Down
2 changes: 1 addition & 1 deletion website/_includes/schema/schema-main.html
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
"caption": "Sexual Activity Tracking"
}
],
"softwareVersion": "4.2.2",
"softwareVersion": "4.2.4",
"releaseNotes": "https://menstrudel.app/release%20notes/announcements/2026/04/03/announcing-menstrudel-v4.2.0.html"
}
</script>
Loading