feat: connect ui

ice-blockchain · Dec 23, 2024 · 519632a · 519632a
1 parent 906a984
commit 519632a
Show file tree

Hide file tree

Showing 9 changed files with 121 additions and 36 deletions.
diff --git a/lib/app/components/app_update_handler/app_update_handler.dart b/lib/app/components/app_update_handler/app_update_handler.dart
@@ -0,0 +1,30 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:ion/app/components/app_update_handler/hooks/use_app_update.dart';
+import 'package:ion/app/features/core/model/app_update_type.dart';
+import 'package:ion/app/features/core/views/pages/app_update_modal.dart';
+import 'package:ion/app/router/app_routes.c.dart';
+import 'package:ion/app/router/utils/show_simple_bottom_sheet.dart';
+
+class AppUpdateHandler extends HookConsumerWidget {
+  const AppUpdateHandler({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final isModalShown = useAppUpdate(ref);
+
+    if (!isModalShown) {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        showSimpleBottomSheet<void>(
+          isDismissible: false,
+          context: rootNavigatorKey.currentContext!,
+          child: const AppUpdateModal(
+            appUpdateType: AppUpdateType.updateRequired,
+          ),
+        );
+      });
+    }
+
+    return const SizedBox.shrink();
+  }
+}
diff --git a/lib/app/components/app_update_handler/hooks/use_app_update.dart b/lib/app/components/app_update_handler/hooks/use_app_update.dart
@@ -0,0 +1,22 @@
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:ion/app/features/config/providers/force_update_provider.c.dart';
+
+bool useAppUpdate(WidgetRef ref) {
+  final isModalShown = useState(false);
+
+  final forceUpdateState = ref.watch(forceUpdateProvider);
+
+  useEffect(
+    () {
+      if (forceUpdateState.showUpdateModal && !isModalShown.value) {
+        isModalShown.value = true;
+      }
+
+      return null;
+    },
+    [forceUpdateState],
+  );
+
+  return isModalShown.value;
+}
diff --git a/lib/app/exceptions/exceptions.dart b/lib/app/exceptions/exceptions.dart
@@ -205,3 +205,7 @@ class ForceUpdateCouldntLaunchUrlException extends IONException {
   ForceUpdateCouldntLaunchUrlException({required String url})
       : super(10042, 'Could not launch $url');
 }
+
+class ForceUpdateFetchConfigException extends IONException {
+  ForceUpdateFetchConfigException() : super(10043, 'Failed to get version config');
+}
diff --git a/lib/app/features/config/providers/config_provider.c.dart b/lib/app/features/config/providers/config_provider.c.dart
@@ -30,14 +30,21 @@ class ConfigNotifier extends _$ConfigNotifier {
     }
   }
 
-  Future<Map<String, dynamic>> fetchConfigForCurrentPlatform() async {
+  Future<String> fetchConfigForCurrentPlatform() async {
     final configName = _getPlatformConfigName();
-    final path = '${EnvVariable.ION_ORIGIN}/v1/config/$configName';
 
-    final dio = ref.read(dioProvider);
-    final response = await dio.get<Map<String, dynamic>>(path);
+    const baseUrl = EnvVariable.ION_ORIGIN;
+    final path = '$baseUrl/v1/config/$configName';
 
-    return response.data!;
+    try {
+      final response = await ref.read(dioProvider).get<String>(path);
+      if (response.data == null) {
+        throw ForceUpdateFetchConfigException();
+      }
+      return response.data!;
+    } catch (e) {
+      throw ForceUpdateFetchConfigException();
+    }
   }
 }
 

diff --git a/lib/app/features/config/providers/force_update_provider.c.dart b/lib/app/features/config/providers/force_update_provider.c.dart
@@ -3,19 +3,33 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:ion/app/features/config/providers/config_provider.c.dart';
 import 'package:ion/app/features/config/providers/force_update_last_sync_date_provider.c.dart';
 import 'package:ion/app/features/core/providers/app_lifecycle_provider.c.dart';
+import 'package:ion/app/services/logger/logger.dart';
+import 'package:ion/app/utils/force_update.dart';
+import 'package:package_info_plus/package_info_plus.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
+part 'force_update_provider.c.freezed.dart';
 part 'force_update_provider.c.g.dart';
 
+@freezed
+class ForceUpdateState with _$ForceUpdateState {
+  const factory ForceUpdateState({
+    @Default(false) bool showUpdateModal,
+  }) = _ForceUpdateState;
+
+  const ForceUpdateState._();
+}
+
 @Riverpod(keepAlive: true)
 class ForceUpdate extends _$ForceUpdate {
   static const int eightHoursInMilliseconds = 8 * 60 * 60 * 1000;
 
   @override
-  FutureOr<void> build() {
+  ForceUpdateState build() {
     ref.listen<AppLifecycleState>(
       appLifecycleProvider,
       (previous, next) {
@@ -24,15 +38,34 @@ class ForceUpdate extends _$ForceUpdate {
         }
       },
     );
+
+    return const ForceUpdateState();
   }
 
   Future<void> _checkAndUpdateConfig() async {
     final lastSyncDate = ref.read(forceUpdateLastSyncDateNotifierProvider);
 
+    Logger.log('lastSyncDate: $lastSyncDate');
+
     if (lastSyncDate == null ||
         DateTime.now().difference(lastSyncDate).inMilliseconds >= eightHoursInMilliseconds) {
-      await ref.read(configNotifierProvider.notifier).fetchConfigForCurrentPlatform();
+      final remoteVersion =
+          await ref.read(configNotifierProvider.notifier).fetchConfigForCurrentPlatform();
+
+      final packageInfo = await PackageInfo.fromPlatform();
+      final localVersion = packageInfo.version;
+
+      if (ForceUpdateUtil.isVersionOutdated(localVersion, remoteVersion)) {
+        state = state.copyWith(showUpdateModal: true);
+      } else {
+        state = state.copyWith(showUpdateModal: false);
+      }
+
       ref.read(forceUpdateLastSyncDateNotifierProvider.notifier).updateLastSyncDate(DateTime.now());
     }
   }
+
+  void resetUpdateModal() {
+    state = state.copyWith(showUpdateModal: false);
+  }
 }
diff --git a/lib/app/features/core/views/pages/app_update_modal.dart b/lib/app/features/core/views/pages/app_update_modal.dart
@@ -7,7 +7,7 @@ import 'package:ion/app/components/screen_offset/screen_bottom_offset.dart';
 import 'package:ion/app/components/screen_offset/screen_side_offset.dart';
 import 'package:ion/app/extensions/extensions.dart';
 import 'package:ion/app/features/core/model/app_update_type.dart';
-import 'package:ion/app/router/utils/show_simple_bottom_sheet.dart';
+import 'package:ion/app/utils/force_update.dart';
 
 class AppUpdateModal extends StatelessWidget {
   const AppUpdateModal({
@@ -37,14 +37,8 @@ class AppUpdateModal extends StatelessWidget {
               color: context.theme.appColors.onPrimaryAccent,
             ),
             onPressed: () {
-              Navigator.of(context, rootNavigator: true).pop();
               if (appUpdateType == AppUpdateType.updateRequired) {
-                showSimpleBottomSheet<void>(
-                  context: context,
-                  child: const AppUpdateModal(
-                    appUpdateType: AppUpdateType.upToDate,
-                  ),
-                );
+                ForceUpdateUtil.handleForceUpdateRedirect();
               }
             },
             label: Text(appUpdateType.getActionTitle(context)),

diff --git a/lib/app/features/feed/views/pages/feed_page/feed_page.dart b/lib/app/features/feed/views/pages/feed_page/feed_page.dart
@@ -1,16 +1,12 @@
 // SPDX-License-Identifier: ice License 1.0
 
-import 'dart:math';
-
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:ion/app/components/screen_offset/screen_top_offset.dart';
 import 'package:ion/app/components/scroll_view/load_more_builder.dart';
 import 'package:ion/app/components/scroll_view/pull_to_refresh_builder.dart';
 import 'package:ion/app/extensions/extensions.dart';
-import 'package:ion/app/features/core/model/app_update_type.dart';
-import 'package:ion/app/features/core/views/pages/app_update_modal.dart';
 import 'package:ion/app/features/feed/data/models/feed_category.dart';
 import 'package:ion/app/features/feed/providers/feed_current_filter_provider.c.dart';
 import 'package:ion/app/features/feed/providers/feed_posts_data_source_provider.c.dart';
@@ -22,10 +18,8 @@ import 'package:ion/app/features/feed/views/pages/feed_page/components/feed_post
 import 'package:ion/app/features/feed/views/pages/feed_page/components/stories/stories.dart';
 import 'package:ion/app/features/feed/views/pages/feed_page/components/trending_videos/trending_videos.dart';
 import 'package:ion/app/features/nostr/providers/entities_paged_data_provider.c.dart';
-import 'package:ion/app/hooks/use_on_init.dart';
 import 'package:ion/app/hooks/use_scroll_top_on_tab_press.dart';
 import 'package:ion/app/router/components/navigation_app_bar/collapsing_app_bar.dart';
-import 'package:ion/app/router/utils/show_simple_bottom_sheet.dart';
 
 class FeedPage extends HookConsumerWidget {
   const FeedPage({super.key});
@@ -39,21 +33,6 @@ class FeedPage extends HookConsumerWidget {
           .select((state) => (state?.hasMore).falseOrValue),
     );
 
-    useOnInit(
-      () {
-        if (Random().nextInt(10) == 0) {
-          showSimpleBottomSheet<void>(
-            isDismissible: false,
-            context: context,
-            child: const AppUpdateModal(
-              appUpdateType: AppUpdateType.updateRequired,
-            ),
-          );
-        }
-      },
-      <Object>[],
-    );
-
     useScrollTopOnTabPress(context, scrollController: scrollController);
 
     final slivers = [

diff --git a/lib/app/router/components/app_router_builder.dart b/lib/app/router/components/app_router_builder.dart
@@ -3,6 +3,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:ion/app/components/app_update_handler/app_update_handler.dart';
 import 'package:ion/app/components/global_notification_bar/global_notification_bar.dart';
 import 'package:ion/app/components/global_notification_bar/providers/global_notification_provider.c.dart';
 import 'package:ion/app/extensions/extensions.dart';
@@ -40,6 +41,7 @@ class AppRouterBuilder extends HookConsumerWidget {
             Expanded(
               child: child ?? const SizedBox.shrink(),
             ),
+            const AppUpdateHandler(),
           ],
         ),
       ),

diff --git a/lib/app/utils/force_update.dart b/lib/app/utils/force_update.dart
@@ -36,4 +36,18 @@ class ForceUpdateUtil {
     const fallbackWebsite = 'https://example.com'; //TODO: Replace with the actual website
     await _openUrl(fallbackWebsite);
   }
+
+  static bool isVersionOutdated(String localVersion, String remoteVersion) {
+    final localParts = localVersion.split('.').map(int.parse).toList();
+    final remoteParts = remoteVersion.split('.').map(int.parse).toList();
+
+    for (var i = 0; i < remoteParts.length; i++) {
+      if (localParts.length <= i || localParts[i] < remoteParts[i]) {
+        return true;
+      } else if (localParts[i] > remoteParts[i]) {
+        return false;
+      }
+    }
+    return false;
+  }
 }