Merge pull request #84 from flutter-news-app-full-source-code/refactor/sync-data-with-the-new-app-aggregator-identity-pivot

Refactor/sync data with the new app aggregator identity pivot

Author: fulleni

lib/src/enums/enums.dart

@@ -12,9 +12,9 @@ export 'dashboard_user_role.dart';
 export 'device_platform.dart';
 export 'feed_decorator_category.dart';
 export 'feed_decorator_type.dart';
-export 'headline_density.dart';
-export 'headline_image_style.dart';
-export 'in_article_ad_slot_type.dart';
+export 'feed_item_click_behavior.dart';
+export 'feed_item_density.dart';
+export 'feed_item_image_style.dart';
 export 'push_notification_provider.dart';
 export 'push_notification_subscription_delivery_type.dart';
 export 'sort_order.dart';

lib/src/enums/feed_item_click_behavior.dart

@@ -0,0 +1,17 @@
+import 'package:json_annotation/json_annotation.dart';
+
+/// {@template feed_item_click_behavior}
+/// Defines how a feed item click should be handled.
+/// {@endtemplate}
+@JsonEnum()
+enum FeedItemClickBehavior {
+  /// Adhere to the behavior defined by the admin in the remote config.
+  @JsonValue('default')
+  defaultBehavior,
+
+  @JsonValue('internalNavigation')
+  internalNavigation,
+
+  @JsonValue('externalNavigation')
+  externalNavigation,
+}

lib/src/enums/headline_density.dart renamed to lib/src/enums/feed_item_density.dart

@@ -1,5 +1,5 @@
-/// Defines how densely headline information should be presented.
-enum HeadlineDensity {
+/// Defines how densely feed item information should be presented.
+enum FeedItemDensity {
   /// Minimal spacing, smaller title font.
   compact,
 

lib/src/enums/headline_image_style.dart renamed to lib/src/enums/feed_item_image_style.dart

@@ -1,5 +1,5 @@
-/// Defines how images should be displayed in the headline feed.
-enum HeadlineImageStyle {
+/// Defines how a feed item image should be displayed.
+enum FeedItemImageStyle {
   /// No image shown in the feed.
   hidden,
 

lib/src/enums/in_article_ad_slot_type.dart

@@ -1,8 +1,8 @@
 import 'package:core/core.dart';
 
-/// User App Settings Demo Data
-final List<UserAppSettings> userAppSettingsFixturesData = [
-  UserAppSettings(
+/// App Settings Demo Data
+final List<AppSettings> appSettingsFixturesData = [
+  AppSettings(
     id: kAdminUserId,
     displaySettings: const DisplaySettings(
       baseTheme: AppBaseTheme.system,
@@ -20,14 +20,13 @@ final List<UserAppSettings> userAppSettingsFixturesData = [
       updatedAt: DateTime.now(),
       status: ContentStatus.active,
     ),
-    feedPreferences: const FeedDisplayPreferences(
-      headlineDensity: HeadlineDensity.standard,
-      headlineImageStyle: HeadlineImageStyle.smallThumbnail,
-      showSourceInHeadlineFeed: true,
-      showPublishDateInHeadlineFeed: true,
+    feedSettings: const FeedSettings(
+      feedItemDensity: FeedItemDensity.standard,
+      feedItemImageStyle: FeedItemImageStyle.smallThumbnail,
+      feedItemClickBehavior: FeedItemClickBehavior.defaultBehavior,
     ),
   ),
-  UserAppSettings(
+  AppSettings(
     id: kUser1Id,
     displaySettings: const DisplaySettings(
       baseTheme: AppBaseTheme.system,
@@ -45,14 +44,13 @@ final List<UserAppSettings> userAppSettingsFixturesData = [
       updatedAt: DateTime.now(),
       status: ContentStatus.active,
     ),
-    feedPreferences: const FeedDisplayPreferences(
-      headlineDensity: HeadlineDensity.standard,
-      headlineImageStyle: HeadlineImageStyle.smallThumbnail,
-      showSourceInHeadlineFeed: true,
-      showPublishDateInHeadlineFeed: true,
+    feedSettings: const FeedSettings(
+      feedItemDensity: FeedItemDensity.standard,
+      feedItemImageStyle: FeedItemImageStyle.smallThumbnail,
+      feedItemClickBehavior: FeedItemClickBehavior.defaultBehavior,
     ),
   ),
-  UserAppSettings(
+  AppSettings(
     id: kUser2Id,
     displaySettings: const DisplaySettings(
       baseTheme: AppBaseTheme.dark,
@@ -70,17 +68,16 @@ final List<UserAppSettings> userAppSettingsFixturesData = [
       updatedAt: DateTime.now(),
       status: ContentStatus.active,
     ),
-    feedPreferences: const FeedDisplayPreferences(
-      headlineDensity: HeadlineDensity.compact,
-      headlineImageStyle: HeadlineImageStyle.largeThumbnail,
-      showSourceInHeadlineFeed: true,
-      showPublishDateInHeadlineFeed: true,
+    feedSettings: const FeedSettings(
+      feedItemDensity: FeedItemDensity.compact,
+      feedItemImageStyle: FeedItemImageStyle.largeThumbnail,
+      feedItemClickBehavior: FeedItemClickBehavior.defaultBehavior,
     ),
   ),
   // Add settings for users 3-10, copying the admin's settings for simplicity
   ...List.generate(
     8,
-    (index) => UserAppSettings(
+    (index) => AppSettings(
       id: [
         kUser3Id,
         kUser4Id,
@@ -107,11 +104,10 @@ final List<UserAppSettings> userAppSettingsFixturesData = [
         updatedAt: DateTime.now(),
         status: ContentStatus.active,
       ),
-      feedPreferences: const FeedDisplayPreferences(
-        headlineDensity: HeadlineDensity.standard,
-        headlineImageStyle: HeadlineImageStyle.smallThumbnail,
-        showSourceInHeadlineFeed: true,
-        showPublishDateInHeadlineFeed: true,
+      feedSettings: const FeedSettings(
+        feedItemDensity: FeedItemDensity.standard,
+        feedItemImageStyle: FeedItemImageStyle.smallThumbnail,
+        feedItemClickBehavior: FeedItemClickBehavior.defaultBehavior,
       ),
     ),
   ),

lib/src/fixtures/user_app_settings.dart renamed to lib/src/fixtures/app_settings.dart

@@ -1,3 +1,4 @@
+export 'app_settings.dart';
 export 'countries.dart';
 export 'dashboard_summary.dart';
 export 'fixture_ids.dart';
@@ -9,6 +10,5 @@ export 'saved_headline_filters.dart';
 export 'saved_source_filters.dart';
 export 'sources.dart';
 export 'topics.dart';
-export 'user_app_settings.dart';
 export 'user_content_preferences.dart';
 export 'users.dart';