still dealing with ui

sb-dor · Aug 16, 2024 · bc89370 · bc89370
1 parent 02bc409
commit bc89370
Show file tree

Hide file tree

Showing 7 changed files with 130 additions and 40 deletions.
diff --git a/..._file_picker_feature/data/models/data_models/telegram_storage_file_picker_data_model.dart b/..._file_picker_feature/data/models/data_models/telegram_storage_file_picker_data_model.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:yahay/core/app_routing/app_router.dart';
 import 'package:yahay/core/utils/global_context/global_context.dart';
+import 'package:yahay/features/telegram_file_picker_feature/domain/entities/telegram_file_folder_enums.dart';
 import 'package:yahay/features/telegram_file_picker_feature/domain/usecases/sheet_opener/telegram_app_folder_sheet_opener.dart';
 import 'package:yahay/features/telegram_file_picker_feature/view/bloc/telegram_file_picker_bloc.dart';
 import 'package:yahay/features/telegram_file_picker_feature/view/bloc/telegram_file_picker_events.dart';
@@ -47,7 +48,8 @@ class TelegramStorageFilePickerDataModel {
       title: "Yahay",
       content: "Browse the app's folder",
       onTap: () async {
-        _telegramBloc.events.add(const SelectScreenForFilesPickerScreenEvent(1));
+        _telegramBloc.events.add(const SelectScreenForFilesPickerScreenEvent(
+            TelegramFileFolderEnum.browseTheAppsFolder));
       },
     ),
     TelegramStorageFilePickerDataModel(
@@ -60,7 +62,8 @@ class TelegramStorageFilePickerDataModel {
       title: "Gallery",
       content: "To send images without compression",
       onTap: () {
-        _telegramBloc.events.add(const SelectScreenForFilesPickerScreenEvent(2));
+        _telegramBloc.events.add(const SelectScreenForFilesPickerScreenEvent(
+            TelegramFileFolderEnum.browseTheGalleryFolder));
       },
     ),
   ];

diff --git a/lib/features/telegram_file_picker_feature/domain/entities/telegram_file_folder_enums.dart b/lib/features/telegram_file_picker_feature/domain/entities/telegram_file_folder_enums.dart
@@ -0,0 +1,6 @@
+enum TelegramFileFolderEnum {
+  recentDownloadsScreen,
+  browseTheAppsFolder,
+  browseTheFolder,
+  browseTheGalleryFolder,
+}
diff --git a/.../telegram_file_picker_feature/view/bloc/state_model/telegram_file_picker_state_model.dart b/.../telegram_file_picker_feature/view/bloc/state_model/telegram_file_picker_state_model.dart
@@ -6,6 +6,7 @@ import 'package:path/path.dart';
 import 'package:yahay/core/global_usages/constants/constants.dart';
 import 'package:yahay/core/utils/global_context/global_context.dart';
 import 'package:yahay/features/telegram_file_picker_feature/data/models/telegram_file_image_model.dart';
+import 'package:yahay/features/telegram_file_picker_feature/domain/entities/telegram_file_folder_enums.dart';
 import 'package:yahay/features/telegram_file_picker_feature/domain/entities/telegram_file_image_entity.dart';
 import 'package:yahay/features/telegram_file_picker_feature/domain/entities/telegram_file_image_with_compressed_and_original_path_entity.dart';
 import 'package:yahay/features/telegram_file_picker_feature/view/bloc/telegram_file_picker_state.dart';
@@ -67,11 +68,12 @@ class TelegramFilePickerStateModel {
 
   Timer? get openButtonSectionTimer => _openButtonSectionTimer;
 
-  int _filePickerScreenSelectedScreen = 0;
+  TelegramFileFolderEnum _filePickerScreenSelectedScreen =
+      TelegramFileFolderEnum.recentDownloadsScreen;
 
-  int get filePickerScreenSelectedScreen => _filePickerScreenSelectedScreen;
+  TelegramFileFolderEnum get filePickerScreenSelectedScreen => _filePickerScreenSelectedScreen;
 
-  void selectScreen(int screen) {
+  void selectScreen(TelegramFileFolderEnum screen) {
     _filePickerScreenSelectedScreen = screen;
   }
 

diff --git a/lib/features/telegram_file_picker_feature/view/bloc/telegram_file_picker_events.dart b/lib/features/telegram_file_picker_feature/view/bloc/telegram_file_picker_events.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:yahay/features/telegram_file_picker_feature/domain/entities/telegram_file_folder_enums.dart';
 import 'package:yahay/features/telegram_file_picker_feature/domain/entities/telegram_file_image_entity.dart';
 import 'package:yahay/features/telegram_file_picker_feature/domain/entities/telegram_file_image_with_compressed_and_original_path_entity.dart';
 
@@ -98,7 +99,7 @@ final class BrowseInternalStorageAndSelectFilesEvent extends TelegramFilePickerE
 }
 
 final class SelectScreenForFilesPickerScreenEvent extends TelegramFilePickerEvents {
-  final int screen;
+  final TelegramFileFolderEnum screen;
 
   const SelectScreenForFilesPickerScreenEvent(this.screen);
 }
diff --git a/...ture/view/pages/screens/telegram_app_folder_screen/telegram_browse_app_folder_screen.dart b/...ture/view/pages/screens/telegram_app_folder_screen/telegram_browse_app_folder_screen.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:yahay/features/telegram_file_picker_feature/domain/entities/telegram_file_folder_enums.dart';
 import 'package:yahay/features/telegram_file_picker_feature/mixins/folder_creator/folder_creator.dart';
 import 'package:yahay/features/telegram_file_picker_feature/view/bloc/telegram_file_picker_bloc.dart';
 import 'package:yahay/features/telegram_file_picker_feature/view/bloc/telegram_file_picker_events.dart';
@@ -33,7 +34,8 @@ class _TelegramBrowseAppFolderScreenState extends State<TelegramBrowseAppFolderS
         const SizedBox(height: 20),
         TelegramFolderWidget(
           onTap: () {
-            _telegramFilePickerBloc.events.add(const SelectScreenForFilesPickerScreenEvent(0));
+            _telegramFilePickerBloc.events.add(const SelectScreenForFilesPickerScreenEvent(
+                TelegramFileFolderEnum.recentDownloadsScreen));
           },
           title: "...",
         ),
@@ -45,7 +47,16 @@ class _TelegramBrowseAppFolderScreenState extends State<TelegramBrowseAppFolderS
           itemCount: foldersName.length,
           itemBuilder: (context, index) {
             return TelegramFolderWidget(
-              onTap: () {},
+              onTap: () {
+                // init here for folder data
+                // _telegramFilePickerBloc.events.add(data);
+                //
+                _telegramFilePickerBloc.events.add(
+                  const SelectScreenForFilesPickerScreenEvent(
+                    TelegramFileFolderEnum.browseTheFolder,
+                  ),
+                );
+              },
               title: foldersName[index],
             );
           },

diff --git a/...ure/view/pages/screens/telegram_app_folder_screen/telegram_browse_folder_data_screen.dart b/...ure/view/pages/screens/telegram_app_folder_screen/telegram_browse_folder_data_screen.dart
@@ -1,11 +1,18 @@
 import 'package:flutter/material.dart';
+import 'package:yahay/features/telegram_file_picker_feature/domain/entities/telegram_file_folder_enums.dart';
 import 'package:yahay/features/telegram_file_picker_feature/view/bloc/telegram_file_picker_bloc.dart';
 import 'package:yahay/features/telegram_file_picker_feature/view/bloc/telegram_file_picker_events.dart';
 import 'package:yahay/features/telegram_file_picker_feature/view/pages/screens/telegram_app_folder_screen/telegram_browse_folder_widget.dart';
 import 'package:yahay/injections/injections.dart';
 
 class TelegramBrowseFolderDataScreen extends StatefulWidget {
-  const TelegramBrowseFolderDataScreen({super.key});
+
+  final VoidCallback onBackFolder;
+
+  const TelegramBrowseFolderDataScreen({
+    super.key,
+    required this.onBackFolder,
+  });
 
   @override
   State<TelegramBrowseFolderDataScreen> createState() => _TelegramBrowseFolderDataScreenState();
@@ -29,9 +36,7 @@ class _TelegramBrowseFolderDataScreenState extends State<TelegramBrowseFolderDat
       children: [
         const SizedBox(height: 20),
         TelegramFolderWidget(
-          onTap: () {
-            _telegramFilePickerBloc.events.add(const SelectScreenForFilesPickerScreenEvent(0));
-          },
+          onTap: widget.onBackFolder,
           title: "...",
         ),
       ],

diff --git a/...feature/view/pages/screens/telegram_files_picker_screen/telegram_files_picker_screen.dart b/...feature/view/pages/screens/telegram_files_picker_screen/telegram_files_picker_screen.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
+import 'package:yahay/features/telegram_file_picker_feature/domain/entities/telegram_file_folder_enums.dart';
 import 'package:yahay/features/telegram_file_picker_feature/view/bloc/telegram_file_picker_bloc.dart';
 import 'package:yahay/features/telegram_file_picker_feature/view/bloc/telegram_file_picker_events.dart';
 import 'package:yahay/features/telegram_file_picker_feature/view/bloc/telegram_file_picker_state.dart';
@@ -30,7 +31,7 @@ class _TelegramFilesPickerScreenState extends State<TelegramFilesPickerScreen> {
   void initState() {
     super.initState();
     _telegramFilePickerBloc = widget.telegramFilePickerBloc;
-    final currentStateModel = _telegramFilePickerBloc.states.value.telegramFilePickerStateModel;
+    // final currentStateModel = _telegramFilePickerBloc.states.value.telegramFilePickerStateModel;
     widget.parentScrollController.addListener(() {
       if (widget.parentScrollController.offset ==
               widget.parentScrollController.position.maxScrollExtent &&
@@ -84,18 +85,21 @@ class _TelegramFilesPickerScreenState extends State<TelegramFilesPickerScreen> {
                 controller: widget.parentScrollController,
                 children: [
                   Visibility(
-                    visible: state.telegramFilePickerStateModel.filePickerScreenSelectedScreen == 0,
+                    visible: state.telegramFilePickerStateModel.filePickerScreenSelectedScreen ==
+                        TelegramFileFolderEnum.recentDownloadsScreen,
                     maintainAnimation: true,
                     maintainState: true,
                     child: AnimatedSlide(
                       curve: Curves.fastOutSlowIn,
                       duration: const Duration(milliseconds: 300),
-                      offset: state.telegramFilePickerStateModel.filePickerScreenSelectedScreen == 0
+                      offset: state.telegramFilePickerStateModel.filePickerScreenSelectedScreen ==
+                              TelegramFileFolderEnum.recentDownloadsScreen
                           ? Offset.zero
                           : const Offset(1, 0),
                       child: AnimatedOpacity(
                         opacity:
-                            state.telegramFilePickerStateModel.filePickerScreenSelectedScreen == 0
+                            state.telegramFilePickerStateModel.filePickerScreenSelectedScreen ==
+                                    TelegramFileFolderEnum.recentDownloadsScreen
                                 ? 1
                                 : 0,
                         duration: const Duration(seconds: 1),
@@ -113,64 +117,122 @@ class _TelegramFilesPickerScreenState extends State<TelegramFilesPickerScreen> {
                       ),
                     ),
                   ),
+                  // apps folder
                   Visibility(
                     maintainAnimation: true,
                     maintainState: true,
-                    visible: state.telegramFilePickerStateModel.filePickerScreenSelectedScreen == 1,
+                    visible: state.telegramFilePickerStateModel.filePickerScreenSelectedScreen ==
+                        TelegramFileFolderEnum.browseTheAppsFolder,
                     child: PopScope(
-                      canPop: state.telegramFilePickerStateModel.filePickerScreenSelectedScreen == 1
+                      canPop: state.telegramFilePickerStateModel.filePickerScreenSelectedScreen ==
+                              TelegramFileFolderEnum.browseTheAppsFolder
                           ? false
                           : true,
                       onPopInvokedWithResult: (v, r) {
-                        _telegramFilePickerBloc.events
-                            .add(const SelectScreenForFilesPickerScreenEvent(0));
+                        _telegramFilePickerBloc.events.add(
+                            const SelectScreenForFilesPickerScreenEvent(
+                                TelegramFileFolderEnum.recentDownloadsScreen));
                       },
                       child: AnimatedSlide(
                         curve: Curves.fastOutSlowIn,
                         duration: const Duration(milliseconds: 300),
-                        offset:
-                            state.telegramFilePickerStateModel.filePickerScreenSelectedScreen == 1
-                                ? Offset.zero
-                                : const Offset(1, 0),
+                        offset: state.telegramFilePickerStateModel.filePickerScreenSelectedScreen ==
+                                TelegramFileFolderEnum.browseTheAppsFolder
+                            ? Offset.zero
+                            : const Offset(1, 0),
                         child: AnimatedOpacity(
                             opacity:
                                 state.telegramFilePickerStateModel.filePickerScreenSelectedScreen ==
-                                        1
+                                        TelegramFileFolderEnum.browseTheAppsFolder
                                     ? 1
                                     : 0,
                             duration: const Duration(seconds: 1),
                             child: const TelegramBrowseAppFolderScreen()),
                       ),
                     ),
                   ),
+
                   Visibility(
                     child: PopScope(
-                      canPop: state.telegramFilePickerStateModel.filePickerScreenSelectedScreen == 2
+                      canPop: state.telegramFilePickerStateModel.filePickerScreenSelectedScreen ==
+                              TelegramFileFolderEnum.browseTheFolder
                           ? false
                           : true,
                       onPopInvokedWithResult: (v, r) {
-                        _telegramFilePickerBloc.events
-                            .add(const SelectScreenForFilesPickerScreenEvent(0));
+                        _telegramFilePickerBloc.events.add(
+                          const SelectScreenForFilesPickerScreenEvent(
+                            TelegramFileFolderEnum.browseTheAppsFolder,
+                          ),
+                        );
                       },
                       child: AnimatedSlide(
                         curve: Curves.fastOutSlowIn,
                         duration: const Duration(milliseconds: 300),
-                        offset:
-                            state.telegramFilePickerStateModel.filePickerScreenSelectedScreen == 2
-                                ? Offset.zero
-                                : const Offset(1, 0),
+                        offset: state.telegramFilePickerStateModel.filePickerScreenSelectedScreen ==
+                                TelegramFileFolderEnum.browseTheFolder
+                            ? Offset.zero
+                            : const Offset(1, 0),
                         child: AnimatedOpacity(
-                            opacity:
-                                state.telegramFilePickerStateModel.filePickerScreenSelectedScreen ==
-                                        2
-                                    ? 1
-                                    : 0,
-                            duration: const Duration(seconds: 1),
-                            child: const TelegramBrowseFolderDataScreen()),
+                          opacity:
+                              state.telegramFilePickerStateModel.filePickerScreenSelectedScreen ==
+                                      TelegramFileFolderEnum.browseTheFolder
+                                  ? 1
+                                  : 0,
+                          duration: const Duration(seconds: 1),
+                          child: TelegramBrowseFolderDataScreen(
+                            onBackFolder: () {
+                              _telegramFilePickerBloc.events.add(
+                                const SelectScreenForFilesPickerScreenEvent(
+                                  TelegramFileFolderEnum.browseTheAppsFolder,
+                                ),
+                              );
+                            },
+                          ),
+                        ),
+                      ),
+                    ),
+                  ),
+
+                  // gallery folder data
+                  Visibility(
+                    child: PopScope(
+                      canPop: state.telegramFilePickerStateModel.filePickerScreenSelectedScreen ==
+                              TelegramFileFolderEnum.browseTheGalleryFolder
+                          ? false
+                          : true,
+                      onPopInvokedWithResult: (v, r) {
+                        _telegramFilePickerBloc.events.add(
+                            const SelectScreenForFilesPickerScreenEvent(
+                                TelegramFileFolderEnum.recentDownloadsScreen));
+                      },
+                      child: AnimatedSlide(
+                        curve: Curves.fastOutSlowIn,
+                        duration: const Duration(milliseconds: 300),
+                        offset: state.telegramFilePickerStateModel.filePickerScreenSelectedScreen ==
+                                TelegramFileFolderEnum.browseTheGalleryFolder
+                            ? Offset.zero
+                            : const Offset(1, 0),
+                        child: AnimatedOpacity(
+                          opacity:
+                              state.telegramFilePickerStateModel.filePickerScreenSelectedScreen ==
+                                      TelegramFileFolderEnum.browseTheGalleryFolder
+                                  ? 1
+                                  : 0,
+                          duration: const Duration(seconds: 1),
+                          child: TelegramBrowseFolderDataScreen(
+                            onBackFolder: () {
+                              _telegramFilePickerBloc.events.add(
+                                const SelectScreenForFilesPickerScreenEvent(
+                                  TelegramFileFolderEnum.recentDownloadsScreen,
+                                ),
+                              );
+                            },
+                          ),
+                        ),
                       ),
                     ),
                   ),
-                ], //TelegramBrowseFolderDataScreen
+                ],
               );
           }
         },