.vscode/launch.json

@@ -1,15 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "type": "chrome",
-            "request": "launch",
-            "name": "Launch Chrome against localhost",
-            "url": "http://localhost:8080",
-            "webRoot": "${workspaceFolder}"
-        }
-    ]
-}

lib/main.dart

@@ -1,5 +1,3 @@
-// lib/main.dart
-
 // ignore_for_file: deprecated_member_use
 
 import 'dart:async';
@@ -9,8 +7,6 @@ import 'package:bot_toast/bot_toast.dart';
 import 'package:didvan/config/theme_data.dart';
 import 'package:didvan/firebase_options.dart';
 import 'package:didvan/models/notification_message.dart';
-import 'package:didvan/models/requests/news.dart';
-import 'package:didvan/models/requests/radar.dart';
 import 'package:didvan/providers/media.dart';
 import 'package:didvan/providers/theme.dart';
 import 'package:didvan/providers/user.dart';
@@ -36,56 +32,56 @@ import 'package:home_widget/home_widget.dart';
 import 'package:provider/provider.dart';
 import 'package:flutter_downloader/flutter_downloader.dart';
 import 'package:sentry_flutter/sentry_flutter.dart';
+
+// پکیج جدید برای Deep Linking
 import 'package:app_links/app_links.dart';
 
-import 'services/network/request.dart';
-
 final GlobalKey<NavigatorState> navigatorKey = GlobalKey<NavigatorState>();
+
+// متغیر استاتیک برای نگهداری لینک اولیه
 Uri? initialURI;
 
 @pragma('vm:entry-point')
 Future<void> _backgroundCallbackHomeWidget(Uri? uri) async {
   if (uri != null) {
-    await HomeWidget.saveWidgetData("uri", uri.host);
+      await HomeWidget.saveWidgetData("uri", uri.host);
   }
 }
 
 void main() async {
-  runZonedGuarded(
+  WidgetsFlutterBinding.ensureInitialized();
-        () async {
+  try {
-      WidgetsFlutterBinding.ensureInitialized();
+    if (!kIsWeb) {
+      HomeWidget.registerBackgroundCallback(_backgroundCallbackHomeWidget);
+      HomeWidget.registerInteractivityCallback(_backgroundCallbackHomeWidget);
+      await NotificationService.initializeNotification();
       try {
-        if (!kIsWeb) {
+        if (Platform.isAndroid) {
-          HomeWidget.registerBackgroundCallback(_backgroundCallbackHomeWidget);
+          await FlutterDownloader.initialize(
-          HomeWidget.registerInteractivityCallback(_backgroundCallbackHomeWidget);
+              debug: true, 
-          await NotificationService.initializeNotification();
+              ignoreSsl: true 
-          try {
+              );
-            if (Platform.isAndroid) {
-              await FlutterDownloader.initialize(debug: true, ignoreSsl: true);
-            }
-          } catch (e) {
-            e.printError();
-          }
         }
-
-        await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform);
-        await FirebaseApi().initNotification();
       } catch (e) {
-        debugPrint(e.toString());
+        e.printError();
       }
+    }
 
-      await SentryFlutter.init(
+    await Firebase.initializeApp(
-            (options) {
+        options: DefaultFirebaseOptions.currentPlatform);
-          options.dsn = 'https://a4cfcaa7d67471240d295c25c968d91d@o4508585857384448.ingest.de.sentry.io/4508585886548048';
+    await FirebaseApi().initNotification();
-          options.tracesSampleRate = 1.0;
+  } catch (e) {
-          options.profilesSampleRate = 1.0;
+    debugPrint(e.toString());
-        },
+  }
-        appRunner: () => runApp(const Didvan()),
+
-      );
+  await SentryFlutter.init(
-    },
+    (options) {
-        (error, stack) {
+      options.dsn =
-      Sentry.captureException(error, stackTrace: stack);
+          'https://a4cfcaa7d67471240d295c25c968d91d@o4508585857384448.ingest.de.sentry.io/4508585886548048';
+      options.tracesSampleRate = 1.0;
+      options.profilesSampleRate = 1.0;
     },
+    appRunner: () => runApp(const Didvan()),
   );
 }
 
@@ -104,57 +100,41 @@ class _DidvanState extends State<Didvan> with WidgetsBindingObserver {
   void initState() {
     super.initState();
     WidgetsBinding.instance.addObserver(this);
+    // مقداردهی اولیه و گوش دادن به لینک‌ها در اینجا انجام می‌شود
     _initDeepLinks();
   }
-
+  
   @override
   void dispose() {
     WidgetsBinding.instance.removeObserver(this);
-    _linkSubscription?.cancel();
+    _linkSubscription?.cancel(); // لغو کردن subscription
     if (MediaService.currentPodcast != null) {
       MediaService.audioPlayer.dispose();
     }
     super.dispose();
   }
-
+  
+  /// منطق جدید برای مدیریت لینک‌ها با app_links
   Future<void> _initDeepLinks() async {
     _appLinks = AppLinks();
+
+    // لینک اولیه را فقط در متغیر ذخیره می‌کنیم
     initialURI = await _appLinks.getInitialLink();
+
+    // به لینک‌های جدید زمانی که اپلیکیشن باز است گوش می‌دهیم
     _linkSubscription = _appLinks.uriLinkStream.listen((uri) {
       _navigateTo(uri);
     });
   }
-
+  
+  /// تابع کمکی برای ناوبری
   void _navigateTo(Uri uri) {
     if (mounted) {
       String path = uri.path;
-      final Map<String, String> params = uri.queryParameters;
+      if (uri.fragment.isNotEmpty) {
-
+        path = "/${uri.fragment}";
-      final String? token = params['token'];
-
-      if (token != null) {
-        //todo: this didnt work
-        print("DEBUG: received token in url, token: $token, path: $path");
-        RequestService.token = token;
-      }
-
-      if (path.startsWith('/news/')) {
-        final id = path.split('/news/').last;
-        if (id.isNotEmpty) {
-          navigatorKey.currentState?.pushNamed(
-            Routes.newsDetails,
-            arguments: {'id': int.parse(id), 'args': const NewsRequestArgs(page: 0)},
-          );
-        }
-      } else if (path.startsWith('/radar/')) {
-        final id = path.split('/radar/').last;
-        if (id.isNotEmpty) {
-          navigatorKey.currentState?.pushNamed(
-            Routes.radarDetails,
-            arguments: {'id': int.parse(id), 'args': const RadarRequestArgs(page: 0)},
-          );
-        }
       }
+      navigatorKey.currentState?.pushNamed(path);
     }
   }
 
@@ -163,9 +143,11 @@ class _DidvanState extends State<Didvan> with WidgetsBindingObserver {
     if (!kIsWeb) {
       if (state == AppLifecycleState.resumed) {
         var r = await HomeWidget.getWidgetData("cRoute", defaultValue: '');
-        if (r.toString() != Routes.splash) {
+        if (r!.toString() != Routes.splash) {
-          await HomeWidgetRepository.decideWhereToGo();
+          await HomeWidgetRepository.decideWhereToGo(); 
+
           NotificationMessage? data = HomeWidgetRepository.data;
+
           if (data != null) {
             await HomeWidgetRepository.decideWhereToGoNotif();
           }
@@ -193,43 +175,43 @@ class _DidvanState extends State<Didvan> with WidgetsBindingObserver {
           color: Theme.of(context).colorScheme.surface,
           child: SafeArea(
               child: MaterialApp(
-                scrollBehavior: MyCustomScrollBehavior(),
+            scrollBehavior: MyCustomScrollBehavior(),
-                navigatorKey: navigatorKey,
+            navigatorKey: navigatorKey,
-                debugShowCheckedModeBanner: false,
+            debugShowCheckedModeBanner: false,
-                title: 'Didvan',
+            title: 'Didvan',
-                theme: LightThemeConfig.themeData.copyWith(
+            theme: LightThemeConfig.themeData.copyWith(
-                    bottomSheetTheme: const BottomSheetThemeData(
+                bottomSheetTheme: const BottomSheetThemeData(
-                        surfaceTintColor: Colors.transparent,
+                    surfaceTintColor: Colors.transparent,
-                        backgroundColor: Colors.transparent),
+                    backgroundColor: Colors.transparent),
-                    textTheme: LightThemeConfig.themeData.textTheme.apply(
+                textTheme: LightThemeConfig.themeData.textTheme.apply(
-                      fontFamily: themeProvider.fontFamily,
+                  fontFamily: themeProvider.fontFamily,
-                    )),
+                )),
-                darkTheme: DarkThemeConfig.themeData.copyWith(
+            darkTheme: DarkThemeConfig.themeData.copyWith(
-                    bottomSheetTheme: const BottomSheetThemeData(
+                bottomSheetTheme: const BottomSheetThemeData(
-                        surfaceTintColor: Colors.transparent,
+                    surfaceTintColor: Colors.transparent,
-                        backgroundColor: Colors.transparent),
+                    backgroundColor: Colors.transparent),
-                    textTheme: DarkThemeConfig.themeData.textTheme.apply(
+                textTheme: DarkThemeConfig.themeData.textTheme.apply(
-                      fontFamily: themeProvider.fontFamily,
+                  fontFamily: themeProvider.fontFamily,
-                    )),
+                )),
-                color: LightThemeConfig.themeData.primaryColor,
+            color: LightThemeConfig.themeData.primaryColor,
-                themeMode: themeProvider.themeMode,
+            themeMode: themeProvider.themeMode,
-                onGenerateRoute: (settings) =>
+            onGenerateRoute: (settings) =>
-                    RouteGenerator.generateRoute(settings),
+                RouteGenerator.generateRoute(settings),
-                builder: BotToastInit(),
+            builder: BotToastInit(),
-                navigatorObservers: [BotToastNavigatorObserver()],
+            navigatorObservers: [BotToastNavigatorObserver()],
-                initialRoute: "/",
+            initialRoute: "/",
-                localizationsDelegates: const [
+            localizationsDelegates: const [
-                  GlobalCupertinoLocalizations.delegate,
+              GlobalCupertinoLocalizations.delegate,
-                  GlobalMaterialLocalizations.delegate,
+              GlobalMaterialLocalizations.delegate,
-                  GlobalWidgetsLocalizations.delegate,
+              GlobalWidgetsLocalizations.delegate,
-                ],
+            ],
-                supportedLocales: const [
+            supportedLocales: const [
-                  Locale("fa", "IR"),
+              Locale("fa", "IR"),
-                ],
+            ],
-                locale: const Locale("fa", "IR"),
+            locale: const Locale("fa", "IR"),
-              )),
+          )),
         ),
       ),
     );
   }
-}
+}

lib/services/network/request.dart

@@ -1,5 +1,3 @@
-// lib/services/network/request.dart
-
 // ignore_for_file: empty_catches
 
 import 'dart:convert';
@@ -17,7 +15,7 @@ import 'package:mime/mime.dart';
 import 'package:permission_handler/permission_handler.dart';
 
 class RequestService {
-  static String? token; // Made token nullable
+  static late String token;
   int? statusCode;
 
   dynamic data(String s) {
@@ -50,9 +48,12 @@ class RequestService {
   }) {
     if (body != null) _requestBody = body;
     if (requestHeaders != null) _headers.addAll(requestHeaders);
-    if (useAutherization && token != null) { // Check if token is not null
+    if (useAutherization) _headers.addAll({'Authorization': 'Bearer $token'});
-      _headers.addAll({'Authorization': 'Bearer $token'});
+    // if (kDebugMode) {
-    }
+    //   try {
+    //     print('Authorization : Bearer $token');
+    //   } catch (e) {}
+    // }
     if (body != null) _requestBody = body;
   }
 

lib/views/authentication/authentication.dart

@@ -42,6 +42,7 @@ class _AuthenticationState extends State<Authentication> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
+      resizeToAvoidBottomInset: false,
       body: Consumer<AuthenticationState>(
         builder: (context, state, child) => WillPopScope(
           onWillPop: () async {

lib/views/authentication/widgets/authentication_layout.dart

@@ -49,8 +49,7 @@ class AuthenticationLayout extends StatelessWidget {
         SliverPadding(
           padding: const EdgeInsets.symmetric(horizontal: 20),
           sliver: SliverFillRemaining(
-            hasScrollBody: true,
+            hasScrollBody: false,
-            fillOverscroll: true,
             child: Column(
               children: [
                 for (var i = 0; i < children.length; i++) children[i],

lib/views/customize_category/customize_category_state.dart

@@ -24,7 +24,6 @@ class CustomizeCategoryState extends CoreProvier {
 
   Future<void> getFavourites() async {
     appState = AppState.busy;
-    update();
 
     final service = RequestService(
       RequestHelper.favourites(),
@@ -32,19 +31,13 @@ class CustomizeCategoryState extends CoreProvier {
     await service.httpGet();
     if (service.isSuccess) {
       faves.clear();
-      final favouritesData = service.data('types');
+      final favourites = service.data('types');
-      if (favouritesData is List) {
+      for (var i = 0; i < favourites.length; i++) {
-        for (var i = 0; i < favouritesData.length; i++) {
+        faves.add(FavoritesResponse.fromJson(favourites[i]));
-          faves.add(FavoritesResponse.fromJson(favouritesData[i]));
-        }
       }
-
-      // اضافه کردن مستقیم بخش فرصت و تهدید
-      faves.add(FavoritesResponse(id: 999, name: 'فرصت و تهدید', selected: false));
-      
       selectedFavIds.clear();
       for (var element in faves) {
-        if (element.selected == true) {
+        if (element.selected!) {
           selectedFavIds.add(element.id!);
         }
       }

lib/views/customize_category/favorites_step.dart

@@ -78,38 +78,29 @@ class _FavoritesStepState extends State<FavoritesStep> {
                     asset: Assets.emptyChat,
                     title: 'اولین نظر را بنویسید...',
                   ),
-                  builder: (context, state, index) => Column(
+                  builder: (context, state, index) => Center(
-                    children: [
+                    child: Container(
-                      Center(
+                        height: 48,
-                        child: Container(
+                        decoration: BoxDecoration(
-                          height: 48,
-                          decoration: BoxDecoration(
                             borderRadius: BorderRadius.circular(10),
                             border: Border.all(
-                              width: 1,
+                                width: 1,
-                              color: state.faves[index].selected!
+                                color: state.faves[index].selected!
-                                  ? Theme.of(context).colorScheme.focusedBorder
+                                    ? Theme.of(context)
-                                  : Theme.of(context).colorScheme.cardBorder
+                                        .colorScheme
-                            ),
+                                        .focusedBorder
+                                    : Theme.of(context).colorScheme.cardBorder),
                             color: state.faves[index].selected!
                                 ? Theme.of(context).colorScheme.focused
-                                : Theme.of(context).colorScheme.cardBorder
+                                : Theme.of(context).colorScheme.cardBorder),
-                          ),
+                        child: CustomizeCategoryCheckbox(
-                          child: CustomizeCategoryCheckbox(
                             title: state.faves[index].name!,
                             value: state.faves[index].selected,
                             checkColor: Theme.of(context).colorScheme.checkFav,
                             onChanged: (val) {
                               state.changeSelected(
-                                index, state.faves, state.selectedFavIds);
+                                  index, state.faves, state.selectedFavIds);
-                            }
+                            })),
-                          )
-                        ),
-                      ),
-                      // Add extra bottom padding for the last item
-                      if (index == state.faves.length - 1)
-                        const SizedBox(height: 80),
-                    ],
                   ),
                 ),
               ),
@@ -138,4 +129,4 @@ class _FavoritesStepState extends State<FavoritesStep> {
       ),
     );
   }
-}
+}

lib/views/home/home.dart

@@ -142,10 +142,9 @@ class _HomeState extends State<Home>
 
   @override
   void initState() {
-    // Remove dialog showing logic to prevent welcome popups
+    if (widget.showDialogs ?? false) {
-    // if (widget.showDialogs ?? false) {
+      _showDialog(context);
-    //   _showDialog(context);
+    }
-    // }
 
     final state = context.read<HomeState>();
     DesignConfig.updateSystemUiOverlayStyle();

lib/views/home/home_state.dart

@@ -82,7 +82,6 @@ class HomeState extends CoreProvier {
     );
     await service.httpGet();
     if (service.isSuccess) {
-      print("DEBUG : Homestate is succes");
       lastPage = service.result['lastPage'];
       results.addAll(
         List<OverviewData>.from(
@@ -95,14 +94,12 @@ class HomeState extends CoreProvier {
       appState = AppState.idle;
       return;
     }
-    print("DEBUG : Homestate is NOT succes");
     appState = AppState.failed;
   }
 
   Future<void> searchAll({required int page}) async {
     this.page = page;
     if (page == 1) {
-      print("DEBUG : serach is busy");
       results.clear();
       appState = AppState.busy;
     }
@@ -118,7 +115,6 @@ class HomeState extends CoreProvier {
     );
     await service.httpGet();
     if (service.isSuccess) {
-      print("DEBUG : HTTPget Home is succes");
       lastPage = service.result['lastPage'];
       unreadCount = service.result['unread'] ?? unreadCount;
       results.addAll(
@@ -132,7 +128,6 @@ class HomeState extends CoreProvier {
       appState = AppState.idle;
       return;
     }
-    print("DEBUG : Homestate is faild");
     appState = AppState.failed;
   }
 

lib/views/home/main/main_page.dart

@@ -33,44 +33,30 @@ class MainPage extends StatefulWidget {
 class _MainPageState extends State<MainPage> {
   @override
   void initState() {
-    super.initState();
+    context.read<MainPageState>().init();
-    print("DEBUG: _MainPageState initstate called");
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      print("DEBUG: addPostFrameCallback called");
-      context.read<MainPageState>().init();
-    });
     super.initState();
   }
 
   @override
   Widget build(BuildContext context) {
-    print("DEBUG: _MainPageState build called");
     return StateHandler<MainPageState>(
-      onRetry: () => {
+      onRetry: context.read<MainPageState>().init,
-        print("DEBUG: _MainPageState onRetry called"),
-        context.read<MainPageState>().init
-      },
       state: context.watch<MainPageState>(),
-      builder: (context, state) {
+      builder: (context, state) => ListView(
-        print("DEBUG: FutureBuilder waiting");
-        print("DEBUG: FutureBuilder state.stories.isNotEmpty: ${state.stories.isNotEmpty}");
-        print("DEBUG: FutureBuilder state.content: ${state.content!.lists}");
-        print("DEBUG: FutureBuilder state.content != null: ${state.content != null}");
-        print("DEBUG: FutureBuilder state.content!.lists.isNotEmpty: ${state.content!.lists.isNotEmpty}");
-        return ListView(
         padding: const EdgeInsets.symmetric(vertical: 16),
         children: [
           if (state.stories.isNotEmpty) StorySection(stories: state.stories),
           const SizedBox(height: 12),
           const MainPageMainContent(),
+
           Builder(builder: (context) {
             final List<Widget> pageContent = [];
             if (state.content != null && state.content!.lists.isNotEmpty) {
               final lists = state.content!.lists;
-      
+
               for (int i = 0; i < lists.length; i++) {
                 final currentList = lists[i];
-      
+
                 if (i == 4) {
                   pageContent.add(
                     Padding(
@@ -121,23 +107,21 @@ class _MainPageState extends State<MainPage> {
                     ),
                   );
                 }
-      
+
                 pageContent.add(_MainPageSection(
                   list: currentList,
                   isLast: i == lists.length - 1,
                 ));
-      
+                
                 if (currentList.type == 'startup') {
                   pageContent.add(_SwotSection(swotItems: state.swotItems));
                 }
               }
             }
-            print("DEBUG: FutureBuilder error");
             return Column(children: pageContent);
           }),
         ],
-      );
+      ),
-      },
     );
   }
 }
@@ -151,7 +135,7 @@ class _SwotSection extends StatelessWidget {
     if (swotItems.isEmpty) {
       return const SizedBox.shrink();
     }
-
+    
     return Padding(
       padding: const EdgeInsets.all(0.0),
       child: Column(
@@ -304,7 +288,8 @@ class _MainPageSection extends StatelessWidget {
     if (list.contents.isEmpty) {
       return const SizedBox();
     }
-
+    
+    // This condition handles the "Soha" module, which should not display the Opportunity/Threat module.
     if (list.type == 'delphi') {
       return Column(
         children: [
@@ -313,7 +298,8 @@ class _MainPageSection extends StatelessWidget {
         ],
       );
     }
-
+    
+    // For all other modules, display as before.
     return Column(
       children: [
         _buildSectionHeader(context, icon),
@@ -400,4 +386,4 @@ class _MainPageSection extends StatelessWidget {
       ),
     );
   }
-}
+}

lib/views/home/main/main_page_state.dart

@@ -24,19 +24,12 @@ class MainPageState extends CoreProvier {
   List<SwotItem> swotItems = [];
 
   Future<void> _getMainPageContent() async {
-    print("DEBUG: _getMainPageContent started");
     final service = RequestService(RequestHelper.mainPageContent);
     await service.httpGet();
     if (service.isSuccess) {
-      print("DEBUG: _getMainPageContent success");
       content = MainPageContent.fromJson(service.result);
-      print("DEBUG: _getMainPageContent service.result: ${service.result}");
       unread = service.result['unread'];
-      print("DEBUG: __getMainPageContent unread: $unread, content: $content");
-      notifyListeners();
     } else {
-      print("DEBUG: _getMainPageContent failed state");
-      notifyListeners();
       throw Exception('Failed to load main page content');
     }
   }
@@ -50,14 +43,14 @@ class MainPageState extends CoreProvier {
     try {
       swotItems = await SwotService.fetchSwotItems();
     } catch (e) {
-      print(e);
+      
     }
   }
 
   Future<void> _fetchStories() async {
     try {
       stories = await StoryService.getStories();
-      // print("Fetched ${stories.length} stories.");
+      print("Fetched ${stories.length} stories.");
     } catch (e) {
       stories = [];
       debugPrint("Could not fetch stories: $e");
@@ -65,7 +58,6 @@ class MainPageState extends CoreProvier {
   }
 
   void init() {
-    print("DEBUG: MainPageState init called");
     Future.delayed(Duration.zero, () async {
       appState = AppState.busy;
       try {
@@ -79,7 +71,6 @@ class MainPageState extends CoreProvier {
         appState = AppState.failed;
       }
     });
-    _getMainPageContent();
   }
 
   void markChangeHandler(String type, int id, bool value) {

lib/views/news/news_details/news_details.dart

@@ -31,7 +31,7 @@ class _NewsDetailsState extends State<NewsDetails> {
     Future.delayed(Duration.zero, () {
       state.getNewsDetails(widget.pageData['id']);
     });
-    if (widget.pageData['goToComment'] != null) {
+    if(widget.pageData['goToComment'] != null){
       state.openComments = widget.pageData['goToComment'];
     }
     super.initState();
@@ -42,8 +42,7 @@ class _NewsDetailsState extends State<NewsDetails> {
     return Scaffold(
       body: Consumer<NewsDetailsState>(
         builder: (context, state, child) => StateHandler<NewsDetailsState>(
-          onRetry: () =>
+          onRetry: () => state.getNewsDetails(state.currentNews.id),
-              state.getNewsDetails(widget.pageData['id']),
           state: state,
           builder: (context, state) => Stack(
             children: [

lib/views/news/news_details/news_details_state.dart

@@ -17,7 +17,6 @@ class NewsDetailsState extends CoreProvier {
   int _trackingTimerCounter = 0;
   bool isFetchingNewItem = false;
   final List<int> relatedQueue = [];
-  bool _isRequestInProgress = false;
 
   int _currentIndex = 0;
   int get currentIndex => _currentIndex;
@@ -26,95 +25,62 @@ class NewsDetailsState extends CoreProvier {
   NewsDetailsData get currentNews => news[_currentIndex]!;
 
   Future<void> getNewsDetails(int id, {bool? isForward}) async {
-    // Prevent duplicate requests
-    if (_isRequestInProgress) {
-      return;
-    }
-    _isRequestInProgress = true;
-
-    // Set loading state
     if (isForward == null) {
       appState = AppState.busy;
     } else {
       isFetchingNewItem = true;
       notifyListeners();
     }
-
+    final service = RequestService(RequestHelper.newsDetails(id, args));
-    try {
+    await service.httpGet();
-      // Wait for token to be ready
+    _handleTracking(sendRequest: isForward != null);
-      if (RequestService.token == null || RequestService.token!.isEmpty) {
+    if (service.isSuccess) {
-        await Future.delayed(const Duration(milliseconds: 500));
+      final result = service.result;
-        if (RequestService.token == null || RequestService.token!.isEmpty) {
+      final newsItem = NewsDetailsData.fromJson(result['news']);
-          throw Exception('Token not available');
+      if (args.page == 0) {
-        }
+        news.add(newsItem);
-      }
+        initialIndex = 0;
-
-      final service = RequestService(RequestHelper.newsDetails(id, args));
-      await service.httpGet();
-      _handleTracking(sendRequest: isForward != null);
-
-      if (service.isSuccess) {
-        final result = service.result;
-        final newsItem = NewsDetailsData.fromJson(result['news']);
-        if (args.page == 0) {
-          news.add(newsItem);
-          initialIndex = 0;
-          appState = AppState.idle;
-          isFetchingNewItem = false;
-          _isRequestInProgress = false;
-          return;
-        }
-        NewsDetailsData? prevNews;
-        if (result['prevNews'].isNotEmpty) {
-          prevNews = NewsDetailsData.fromJson(result['prevNews']);
-        }
-        NewsDetailsData? nextNews;
-        if (result['nextNews'].isNotEmpty) {
-          nextNews = NewsDetailsData.fromJson(result['nextNews']);
-        }
-        if (isForward == null) {
-          news.addAll(List.generate(max(newsItem.order - 2, 0), (index) => null));
-          if (prevNews != null) {
-            news.add(prevNews);
-          }
-          news.add(newsItem);
-          if (nextNews != null) {
-            news.add(nextNews);
-          }
-          _currentIndex = initialIndex = newsItem.order - 1;
-        } else if (isForward) {
-          if (!exists(nextNews) && nextNews != null) {
-            news.add(nextNews);
-          }
-          _currentIndex++;
-        } else if (!isForward) {
-          if (!exists(prevNews) && prevNews != null) {
-            news[_currentIndex - 2] = prevNews;
-          }
-          _currentIndex--;
-        }
-        isFetchingNewItem = false;
-        if (currentNews.contents.length == 1) {
-          getRelatedContents();
-        }
         appState = AppState.idle;
-      } else {
+        return;
-        isFetchingNewItem = false;
+      }
-        if (isForward == null) {
+      NewsDetailsData? prevNews;
-          appState = AppState.failed;
+      if (result['prevNews'].isNotEmpty) {
-        } else {
+        prevNews = NewsDetailsData.fromJson(result['prevNews']);
-          notifyListeners();
+      }
-        }
+      NewsDetailsData? nextNews;
+      if (result['nextNews'].isNotEmpty) {
+        nextNews = NewsDetailsData.fromJson(result['nextNews']);
       }
-    } catch (e) {
-      print('Error fetching news details: $e');
-      isFetchingNewItem = false;
       if (isForward == null) {
-        appState = AppState.failed;
+        news.addAll(List.generate(max(newsItem.order - 2, 0), (index) => null));
+        if (prevNews != null) {
+          news.add(prevNews);
+        }
+        news.add(newsItem);
+        if (nextNews != null) {
+          news.add(nextNews);
+        }
+        _currentIndex = initialIndex = newsItem.order - 1;
+      } else if (isForward) {
+        if (!exists(nextNews) && nextNews != null) {
+          news.add(nextNews);
+        }
+        _currentIndex++;
+      } else if (!isForward) {
+        if (!exists(prevNews) && prevNews != null) {
+          news[_currentIndex - 2] = prevNews;
+        }
+        _currentIndex--;
       }
-      notifyListeners();
+      isFetchingNewItem = false;
-    } finally {
+      if (currentNews.contents.length == 1) {
-      _isRequestInProgress = false;
+        getRelatedContents();
+      }
+      appState = AppState.idle;
+      return;
+    }
+    if (isForward == null) {
+      appState = AppState.failed;
     }
   }
 
@@ -187,4 +153,4 @@ class NewsDetailsState extends CoreProvier {
     _trackingTimer.cancel();
     super.dispose();
   }
-}
+}

lib/views/profile/general_settings/settings.dart

@@ -56,8 +56,7 @@ class _GeneralSettingsState extends State<GeneralSettings> {
           appBarData: AppBarData(hasBack: true, title: 'تنظیمات'),
           children: [
             DidvanCard(
-              child:
+              child: MenuOption(
-               MenuOption(
                 title: 'زمان دریافت اعلان',
                 onTap: () => Navigator.of(context).pushNamed(
                   Routes.notificationTime,

lib/views/profile/profile.dart

@@ -94,47 +94,47 @@ class _ProfilePageState extends State<ProfilePage> {
                             padding: const EdgeInsets.only(right: 8.0, top: 8),
                             child: Column(
                               children: [
-                                // Padding(
+                                Padding(
-                                //   padding: const EdgeInsets.symmetric(
+                                  padding: const EdgeInsets.symmetric(
-                                //       vertical: 12.0),
+                                      vertical: 12.0),
-                                //   child: MenuOption(
+                                  child: MenuOption(
-                                //     title: 'زمان دریافت اعلان',
+                                    title: 'زمان دریافت اعلان',
-                                //     onTap: () =>
+                                    onTap: () =>
-                                //         Navigator.of(context).pushNamed(
+                                        Navigator.of(context).pushNamed(
-                                //       Routes.notificationTime,
+                                      Routes.notificationTime,
-                                //       arguments: {
+                                      arguments: {
-                                //         "fromFav": false,
+                                        "fromFav": false,
-                                //         'onTimeChanged': () => Future.delayed(
+                                        'onTimeChanged': () => Future.delayed(
-                                //               Duration.zero,
+                                              Duration.zero,
-                                //               () => state.getTime(),
+                                              () => state.getTime(),
-                                //             )
+                                            )
-                                //       },
+                                      },
-                                //     ),
+                                    ),
-                                //     icon: DidvanIcons.notification_regular,
+                                    icon: DidvanIcons.notification_regular,
-                                //     suffix: state.time,
+                                    suffix: state.time,
-                                //     // suffix: 'از${DateTimeUtils.normalizeTimeDuration(
+                                    // suffix: 'از${DateTimeUtils.normalizeTimeDuration(
-                                //     //   Duration(minutes: state.notificationTimeRange[0]),
+                                    //   Duration(minutes: state.notificationTimeRange[0]),
-                                //     // )} تا ${DateTimeUtils.normalizeTimeDuration(
+                                    // )} تا ${DateTimeUtils.normalizeTimeDuration(
-                                //     //   Duration(minutes: state.notificationTimeRange[1]),
+                                    //   Duration(minutes: state.notificationTimeRange[1]),
-                                //     // )}',
+                                    // )}',
-                                //   ),
+                                  ),
-                                // ),
+                                ),
-                                // Padding(
+                                Padding(
-                                //   padding: const EdgeInsets.symmetric(
+                                  padding: const EdgeInsets.symmetric(
-                                //       vertical: 12.0),
+                                      vertical: 12.0),
-                                //   child: MenuOption(
+                                  child: MenuOption(
-                                //     title: 'شخصی سازی محتوا',
+                                    title: 'شخصی سازی محتوا',
-                                //     onTap: () => Navigator.of(context)
+                                    onTap: () => Navigator.of(context)
-                                //         .pushNamed(Routes.favouritesStep,
+                                        .pushNamed(Routes.favouritesStep,
-                                //             arguments: {"toTimer": false}),
+                                            arguments: {"toTimer": false}),
-                                //     icon: DidvanIcons.note_regular,
+                                    icon: DidvanIcons.note_regular,
-                                //     // suffix: 'از${DateTimeUtils.normalizeTimeDuration(
+                                    // suffix: 'از${DateTimeUtils.normalizeTimeDuration(
-                                //     //   Duration(minutes: state.notificationTimeRange[0]),
+                                    //   Duration(minutes: state.notificationTimeRange[0]),
-                                //     // )} تا ${DateTimeUtils.normalizeTimeDuration(
+                                    // )} تا ${DateTimeUtils.normalizeTimeDuration(
-                                //     //   Duration(minutes: state.notificationTimeRange[1]),
+                                    //   Duration(minutes: state.notificationTimeRange[1]),
-                                //     // )}',
+                                    // )}',
-                                //   ),
+                                  ),
-                                // ),
+                                ),
                                 Padding(
                                   padding: const EdgeInsets.symmetric(
                                       vertical: 12.0),

lib/views/radar/radar_details/radar_details_state.dart

@@ -18,7 +18,6 @@ class RadarDetailsState extends CoreProvier {
   bool isFetchingNewItem = false;
   final List<int> relatedQueue = [];
   bool openComments = false;
-  bool _isRequestInProgress = false;
 
   int _currentIndex = 0;
   int get currentIndex => _currentIndex;
@@ -32,98 +31,66 @@ class RadarDetailsState extends CoreProvier {
   }
 
   Future<void> getRadarDetails(int id, {bool? isForward}) async {
-    // Prevent duplicate requests
-    if (_isRequestInProgress) {
-      return;
-    }
-    _isRequestInProgress = true;
-
-    // Set loading state
     if (isForward == null) {
       appState = AppState.busy;
     } else {
       isFetchingNewItem = true;
       notifyListeners();
     }
-
+    final service = RequestService(RequestHelper.radarDetails(id, args));
-    try {
+    await service.httpGet();
-      // Wait for token to be ready
+    _handleTracking(sendRequest: isForward != null);
-      if (RequestService.token == null || RequestService.token!.isEmpty) {
+    if (service.isSuccess) {
-        await Future.delayed(const Duration(milliseconds: 500));
+      final result = service.result;
-        if (RequestService.token == null || RequestService.token!.isEmpty) {
+      final radar = RadarDetailsData.fromJson(result['radar']);
-          throw Exception('Token not available');
+      if (args.page == 0) {
-        }
+        radars.add(radar);
-      }
+        initialIndex = 0;
-
-      final service = RequestService(RequestHelper.radarDetails(id, args));
-      await service.httpGet();
-      _handleTracking(sendRequest: isForward != null);
-
-      if (service.isSuccess) {
-        final result = service.result;
-        final radar = RadarDetailsData.fromJson(result['radar']);
-        if (args.page == 0) {
-          radars.add(radar);
-          initialIndex = 0;
-          appState = AppState.idle;
-          isFetchingNewItem = false;
-          _isRequestInProgress = false;
-          return;
-        }
-
-        RadarDetailsData? prevRadar;
-        if (result['prevRadar'].isNotEmpty) {
-          prevRadar = RadarDetailsData.fromJson(result['prevRadar']);
-        }
-
-        RadarDetailsData? nextRadar;
-        if (result['nextRadar'].isNotEmpty) {
-          nextRadar = RadarDetailsData.fromJson(result['nextRadar']);
-        }
-
-        if (isForward == null) {
-          radars.addAll(List.generate(max(radar.order - 2, 0), (index) => null));
-          if (prevRadar != null) {
-            radars.add(prevRadar);
-          }
-          radars.add(radar);
-          if (nextRadar != null) {
-            radars.add(nextRadar);
-          }
-          _currentIndex = initialIndex = radar.order - 1;
-        } else if (isForward) {
-          if (!exists(nextRadar) && nextRadar != null) {
-            radars.add(nextRadar);
-          }
-          _currentIndex++;
-        } else if (!isForward) {
-          if (!exists(prevRadar) && prevRadar != null) {
-            radars[_currentIndex - 2] = prevRadar;
-          }
-          _currentIndex--;
-        }
-        isFetchingNewItem = false;
-        if (currentRadar.contents.length == 1) {
-          getRelatedContents();
-        }
         appState = AppState.idle;
-      } else {
+        return;
-        isFetchingNewItem = false;
-        if (isForward == null) {
-          appState = AppState.failed;
-        } else {
-          notifyListeners();
-        }
       }
-    } catch (e) {
+
-      print('Error fetching radar details: $e');
+      RadarDetailsData? prevRadar;
-      isFetchingNewItem = false;
+      if (result['prevRadar'].isNotEmpty) {
+        prevRadar = RadarDetailsData.fromJson(result['prevRadar']);
+      }
+
+      RadarDetailsData? nextRadar;
+      if (result['nextRadar'].isNotEmpty) {
+        nextRadar = RadarDetailsData.fromJson(result['nextRadar']);
+      }
+
       if (isForward == null) {
-        appState = AppState.failed;
+        radars.addAll(List.generate(max(radar.order - 2, 0), (index) => null));
+        if (prevRadar != null) {
+          radars.add(prevRadar);
+        }
+        radars.add(radar);
+        if (nextRadar != null) {
+          radars.add(nextRadar);
+        }
+        _currentIndex = initialIndex = radar.order - 1;
+      } else if (isForward) {
+        if (!exists(nextRadar) && nextRadar != null) {
+          radars.add(nextRadar);
+        }
+        _currentIndex++;
+      } else if (!isForward) {
+        if (!exists(prevRadar) && prevRadar != null) {
+          radars[_currentIndex - 2] = prevRadar;
+        }
+        _currentIndex--;
       }
-      notifyListeners();
+      isFetchingNewItem = false;
-    } finally {
+      if (currentRadar.contents.length == 1) {
-      _isRequestInProgress = false;
+        getRelatedContents();
+      }
+      appState = AppState.idle;
+      return;
+    }
+    //why? total page state shouldn't die!
+    if (isForward == null) {
+      appState = AppState.failed;
     }
   }
 
@@ -197,4 +164,4 @@ class RadarDetailsState extends CoreProvier {
     _trackingTimer.cancel();
     super.dispose();
   }
-}
+}

lib/views/splash/splash.dart

@@ -87,9 +87,7 @@ class _SplashState extends State<Splash> {
   Future<void> _initialize(ThemeProvider themeProvider,
       UserProvider userProvider, MediaProvider mediaProvider) async {
     try {
-      print("checking if is in browser");
       if (kIsWeb) {
-        print("detected browser");
         html.window.onBeforeUnload.listen((event) {
           StorageService.webStorage
               .removeWhere((key, value) => key == 'image-cache');
@@ -105,22 +103,20 @@ class _SplashState extends State<Splash> {
       await AppInitializer.setupServices(navigatorKey.currentContext!);
 
       final String? token = await userProvider.setAndGetToken();
-      print("detected token as $token");
 
       if (token != null) {
-        RequestService.token = token;
         if (!kIsWeb) {
           await mediaProvider.getDownloadsList();
         }
 
+        RequestService.token = token;
+
         final result = await userProvider.getUserInfo();
 
         if (!result) {
-          print("no results were returned for user info");
           try {
             StorageService.delete(key: 'token');
           } catch (e) {
-            print("error in case of no user info result: $e");
             // catch
           }
 
@@ -131,33 +127,28 @@ class _SplashState extends State<Splash> {
 
           return;
         }
-        print("got results for user info: $result");
+
         await ServerDataProvider.getData();
       }
+      
+      // --- بخش اصلاح شده ---
+      // ابتدا بررسی می‌کنیم که کاربر باید به کدام صفحه اصلی برود
+      final String destinationRoute = token == null ? Routes.authenticaion : Routes.home;
+      final dynamic routeArguments = token == null ? false : {'showDialogs': true};
 
-      print("token route is $token");
+      // اگر لینک ورودی وجود داشت، آن را به عنوان آرگومان به صفحه Home می‌فرستیم
-      String extractedPath = initialURI?.path.toString() == '/' ? Routes.home : initialURI?.path.toString() ?? Routes.home;
+      if (destinationRoute == Routes.home && initialURI != null) {
-      final String destinationRoute = token == null ? Routes.authenticaion : extractedPath;
+          (routeArguments as Map)['deepLinkUri'] = initialURI;
-      // Set showDialogs to false to prevent welcome popups
+          initialURI = null; // لینک را مصرف می‌کنیم تا دوباره استفاده نشود
-      dynamic routeArguments = token == null ? {'isResetPassword': false} : {'showDialogs': false};
-
-
-      if (destinationRoute == Routes.home) {
-        print("destination route was home and init uri is $initialURI");
-        // (routeArguments as Map)['deepLinkUri'] = initialURI;
-        initialURI = null;
       }
 
-      if(destinationRoute == Routes.authenticaion){
+      // در نهایت به مسیر تعیین شده می‌رویم
-        print("destination route is auth route");
-        routeArguments = false;
-      }
-
-      print("destination route: $destinationRoute, route args: $routeArguments");
       await navigatorKey.currentState!.pushReplacementNamed(
         destinationRoute,
         arguments: routeArguments,
       );
+      // --- پایان بخش اصلاح شده ---
+
     } catch (e) {
       setState(() {
         _errorOccured = true;

lib/views/webview/web_view.dart

@@ -26,14 +26,12 @@ class _WebViewState extends State<WebView> {
   };
 
   void _onProgress(int progress) {
-    print('🌐 WebView loading progress: $progress%'); // Add logging
     setState(() {
       this.progress = progress;
     });
   }
 
   void _onPageFinished(String url) async {
-    print('✅ WebView finished loading: $url'); // Add logging
     await Future.delayed(const Duration(seconds: 2));
     setState(() {
       if (progress == 100) loading = false;
@@ -42,24 +40,21 @@ class _WebViewState extends State<WebView> {
 
   @override
   void initState() {
-    print('🔄 Initializing WebView with URL: ${widget.src}'); // Add logging
     controller = WebViewController()
       ..setJavaScriptMode(JavaScriptMode.unrestricted)
       ..setNavigationDelegate(
         NavigationDelegate(
           onProgress: _onProgress,
-          onPageStarted: (String url) {
+          onPageStarted: (String url) {},
-            print('▶️ WebView started loading: $url'); // Add logging
-          },
           onPageFinished: _onPageFinished,
-          onHttpError: (HttpResponseError error) {
+          onHttpError: (HttpResponseError error) {},
-            // print('❌ WebView HTTP error: ${error.statusCode} on ${error.url}'); // Add logging
-          },
           onWebResourceError: (WebResourceError error) {
-            // print('❌ WebView resource error: ${error.description} on ${error.failingUrl}'); // Add logging
+            // navigatorKey.currentState!.pop();
           },
           onNavigationRequest: (NavigationRequest request) {
-            print('🔀 WebView navigation request to: ${request.url}'); // Add logging
+            // if (request.url.startsWith('https://www.youtube.com/')) {
+            //   return NavigationDecision.prevent;
+            // }
             return NavigationDecision.navigate;
           },
         ),
@@ -82,7 +77,7 @@ class _WebViewState extends State<WebView> {
         child: Scaffold(
           appBar: AppBar(
             title: const DidvanText(
-              'بازگشت',
+              'بازگشت به دیدوان',
             ),
             leading: const BackButton(),
           ),

lib/views/widgets/didvan/text_field.dart

@@ -109,7 +109,7 @@ class _DidvanTextFieldState extends State<DidvanTextField> {
                       ? TextDirection.ltr
                       : TextDirection.rtl,
                   child: Padding(
-                    padding: const EdgeInsets.fromLTRB(kIsWeb?8:4,kIsWeb?4:4,kIsWeb?8:0,kIsWeb?0:8),
+                    padding: const EdgeInsets.fromLTRB(kIsWeb?8:8,kIsWeb?4:8,kIsWeb?8:0,kIsWeb?0:8),
                     child: Center(
                       child: TextFormField(
                         inputFormatters: <TextInputFormatter>[

makefile

@@ -1,9 +1,2 @@
 update_js:
-	cp ./lib/assets/js/main.js ./build/flutter_assets/lib/assets/js/main.js
+	cp ./lib/assets/js/main.js ./build/flutter_assets/lib/assets/js/main.js
-
-zip_web:
-	powershell Compress-Archive -Path build\web\* -DestinationPath build.zip -Force
-
-build_web:
-	flutter build web
-