Skip to content

Commit 7ce0aad

Browse files
authored
Merge pull request #42 from flutter-news-app-full-source-code/API-Server-Synchronization-with-core-package
Api server synchronization with core package
2 parents 56feee3 + ffacc22 commit 7ce0aad

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

lib/src/registry/data_operation_registry.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ class DataOperationRegistry {
199199
final repo = c.read<DataRepository<User>>();
200200
final existingUser = c.read<FetchedItem<dynamic>>().data as User;
201201
final updatedUser = existingUser.copyWith(
202-
feedActionStatus: (item as User).feedActionStatus,
202+
feedDecoratorStatus: (item as User).feedDecoratorStatus,
203203
);
204204
return repo.update(id: id, item: updatedUser, userId: uid);
205205
},

lib/src/services/auth_service.dart

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -287,11 +287,11 @@ class AuthService {
287287
appRole: AppUserRole.standardUser,
288288
dashboardRole: DashboardUserRole.none,
289289
createdAt: DateTime.now(),
290-
feedActionStatus: Map.fromEntries(
291-
FeedActionType.values.map(
290+
feedDecoratorStatus: Map.fromEntries(
291+
FeedDecoratorType.values.map(
292292
(type) => MapEntry(
293293
type,
294-
const UserFeedActionStatus(isCompleted: false),
294+
const UserFeedDecoratorStatus(isCompleted: false),
295295
),
296296
),
297297
),
@@ -347,10 +347,12 @@ class AuthService {
347347
appRole: AppUserRole.guestUser,
348348
dashboardRole: DashboardUserRole.none,
349349
createdAt: DateTime.now(),
350-
feedActionStatus: Map.fromEntries(
351-
FeedActionType.values.map(
352-
(type) =>
353-
MapEntry(type, const UserFeedActionStatus(isCompleted: false)),
350+
feedDecoratorStatus: Map.fromEntries(
351+
FeedDecoratorType.values.map(
352+
(type) => MapEntry(
353+
type,
354+
const UserFeedDecoratorStatus(isCompleted: false),
355+
),
354356
),
355357
),
356358
);
@@ -527,7 +529,7 @@ class AuthService {
527529
textScaleFactor: AppTextScaleFactor.medium,
528530
fontWeight: AppFontWeight.regular,
529531
),
530-
language: 'en',
532+
language: languagesFixturesData.firstWhere((l) => l.code == 'en'),
531533
feedPreferences: const FeedDisplayPreferences(
532534
headlineDensity: HeadlineDensity.standard,
533535
headlineImageStyle: HeadlineImageStyle.smallThumbnail,

lib/src/services/database_seeding_service.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,10 +216,10 @@ class DatabaseSeedingService {
216216
appRole: AppUserRole.standardUser,
217217
dashboardRole: DashboardUserRole.admin,
218218
createdAt: DateTime.now(),
219-
feedActionStatus: Map.fromEntries(
220-
FeedActionType.values.map(
219+
feedDecoratorStatus: Map.fromEntries(
220+
FeedDecoratorType.values.map(
221221
(type) =>
222-
MapEntry(type, const UserFeedActionStatus(isCompleted: false)),
222+
MapEntry(type, const UserFeedDecoratorStatus(isCompleted: false)),
223223
),
224224
),
225225
);
@@ -258,7 +258,7 @@ class DatabaseSeedingService {
258258
textScaleFactor: AppTextScaleFactor.medium,
259259
fontWeight: AppFontWeight.regular,
260260
),
261-
language: 'en',
261+
language: languagesFixturesData.firstWhere((l) => l.code == 'en'),
262262
feedPreferences: const FeedDisplayPreferences(
263263
headlineDensity: HeadlineDensity.standard,
264264
headlineImageStyle: HeadlineImageStyle.smallThumbnail,

0 commit comments

Comments
 (0)