🔃 Merge pull request #36 from catoverse/feed_service_api

Feed service api
catoverse · Nov 12, 2021 · 10909d5 · 10909d5
2 parents 8f9ea37 + 624db51
commit 10909d5
Show file tree

Hide file tree

Showing 38 changed files with 377 additions and 677 deletions.
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -7,6 +7,7 @@ analyzer:
     - lib/core/models/app_models.g.dart
     - test/helpers/test_helpers.mocks.dart
     - test/helpers/test_helpers.dart
+    - lib/ui/invite/invite_view.form.dart
   errors:
     todo: warning
 

diff --git a/lib/app/app.dart b/lib/app/app.dart
@@ -6,6 +6,7 @@ import 'package:feed/core/services/life_cycle_service.dart';
 import 'package:feed/core/services/message_queue_service.dart';
 import 'package:feed/core/services/notification_service.dart';
 import 'package:feed/core/services/share_service.dart';
+import 'package:feed/core/services/update_service.dart';
 import 'package:feed/core/services/url_service.dart';
 import 'package:feed/core/services/video_manager_service.dart';
 import 'package:feed/feedplayer/controller.dart';
@@ -87,6 +88,7 @@ import 'injection.dart';
       presolveUsing: VideoManagerService.getInstance,
     ),
     LazySingleton(classType: Connectivity),
+    LazySingleton(classType: AppUpdateService),
     LazySingleton(
         classType: ConnectivityServiceImpl, asType: ConnectivityService),
 

diff --git a/lib/app/app.locator.dart b/lib/app/app.locator.dart
diff --git a/lib/app/app.logger.dart b/lib/app/app.logger.dart
diff --git a/lib/app/app.router.dart b/lib/app/app.router.dart
diff --git a/lib/core/constants/assets.dart b/lib/core/constants/assets.dart
@@ -2,6 +2,7 @@ class Assets {
   static const onboardingImage1 = "assets/images/onboarding1.png";
   static const onboardingImage2 = "assets/images/onboarding2.png";
   static const onboardingImage3 = "assets/images/onboarding3.png";
+  static const appIcon = 'assets/images/app_icon.png';
   static const topicSocialImage = "assets/images/social.png";
   static const topicCareerImage = "assets/images/career.png";
   static const topicEmotionalImage = "assets/images/emotional.png";

diff --git a/lib/core/constants/strings.dart b/lib/core/constants/strings.dart
@@ -11,7 +11,10 @@ const String onboardingItemSubtitle3 =
     "Play games with friends to practice,\nimplement and improve upon what you learn";
 const String confirmExitTitle = "Are you sure to exit?";
 const String confirmExitDescription = "👋 Bye!";
-const kNotificationPermissionsTitle = 'A new idea a day to expand your horizons';
-const kNotificationPermissionDescription = 'Trun on notifications to get highly curated video recommendations on your selected topics';
+const kNotificationPermissionsTitle =
+    'A new idea a day to expand your horizons';
+const kNotificationPermissionDescription =
+    'Trun on notifications to get highly curated video recommendations on your selected topics';
 const kTextCopiedToClipboardMessage = 'Text copied to clipboard';
-
+const kPlayStoreUrl =
+    "https://play.google.com/store/apps/details?id=cato.tv.app";
diff --git a/lib/core/exceptions/api_exception.dart b/lib/core/exceptions/api_exception.dart
@@ -7,7 +7,7 @@ class GraphQLException implements Exception {
 
   @override
   String toString() {
-    return 'ApiException: $message';
+    return 'GraphQLException: $message';
   }
 }
 

diff --git a/lib/core/models/app_models.dart b/lib/core/models/app_models.dart
@@ -48,30 +48,49 @@ class Video with _$Video {
     @HiveField(3) @JsonKey(name: "title") required String title,
     @HiveField(4) @JsonKey(name: 'available') bool? available,
     @HiveField(5) @JsonKey(name: "video_url") required String videoUrl,
-    @HiveField(6) @JsonKey(name: "topic") required Topic topic,
+    @HiveField(6) @JsonKey(name: "topics") required List<Topic> topics,
     @HiveField(7) @JsonKey(name: "start_timestamp") int? startTimestamp,
     @HiveField(8) @JsonKey(name: "end_timestamp") int? endTimestamp,
     @HiveField(9) @JsonKey(name: "thumbnail_url") String? thumbnailUrl,
     @HiveField(10) @JsonKey(name: "channel_name") String? channelName,
-    @HiveField(11) @JsonKey(name: "channel_avatar_url") String? channelAvatarUrl,
+    @HiveField(11)
+    @JsonKey(name: "channel_avatar_url")
+        String? channelAvatarUrl,
     @HiveField(12) @Default(false) bool bookmarked,
   }) = _Video;
 
   factory Video.fromJson(Map<String, dynamic> json) => _$VideoFromJson(json);
 }
 
-@freezed
-class Failure with _$Failure {
-  const factory Failure.error(Error error) = _GenericError;
-  const factory Failure.exception(Exception exception) = _RaisedException;
-  const factory Failure.message(String message) = _FailureMessage;
+class Failure {
+  final Error? error;
+
+  final Exception? exception;
+
+  final String? message;
+
+  const Failure.error(Error e)
+      : error = e,
+        message = null,
+        exception = null;
+
+  const Failure.exception(Exception e)
+      : error = null,
+        message = null,
+        exception = e;
+
+  const Failure.message(String m)
+      : error = null,
+        message = m,
+        exception = null;
 
+  @override
   String toString() {
-    return this.map(
-      error: (e) => e.error.toString(),
-      exception: (e) => e.exception.toString(),
-      message: (e) => e.message,
-    );
+    return error == null
+        ? exception == null
+            ? message!
+            : exception.toString()
+        : error.toString();
   }
 }