chore: refactor screens structure and names (#82)

* Refactor favorites * Do refactor code * refactor code * separated favorite logic * do refactor * resolve problems
xmartlabs · Feb 1, 2023 · f4f347c · f4f347c
1 parent 41c9140
commit f4f347c
Show file tree

Hide file tree

Showing 20 changed files with 306 additions and 317 deletions.
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -167,4 +167,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 4e8f8b2be68aeea4c0d5beb6ff1e79fface1d048
 
-COCOAPODS: 1.10.2
+COCOAPODS: 1.11.3
diff --git a/lib/ui/app_router.dart b/lib/ui/app_router.dart
@@ -2,17 +2,16 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/widgets.dart';
 import 'package:fluttips/ui/about/about_screen.dart';
 import 'package:fluttips/ui/catalog/catalog_screen.dart';
-import 'package:fluttips/ui/favourites/list_favourites_tips_screen.dart';
 import 'package:fluttips/ui/home/home_screen.dart';
 import 'package:fluttips/ui/onboarding/onboarding_screen.dart';
 import 'package:fluttips/ui/section/section_router.dart';
-import 'package:fluttips/ui/tips/show_tips_type.dart';
-import 'package:fluttips/ui/tips/tips_screen.dart';
-import 'package:fluttips/ui/videos/videos.dart';
-import 'package:fluttips/ui/favourites/favourites_tips_screen.dart';
-import 'package:fluttips/core/model/tip.dart';
-import 'package:auto_route/empty_router_widgets.dart';
+import 'package:fluttips/ui/videos_details_screen/videos_details_screen.dart';
 import 'package:fluttips/ui/webView/webview_screen.dart';
+import 'package:fluttips/ui/favourites_tip_details/favourites_tip_details_screen.dart';
+import 'package:fluttips/ui/favourites_tip_simple_list/favourites_tip_simple_list_screen.dart';
+import 'package:fluttips/ui/image_tip_details/image_tip_details_screen.dart';
+import 'package:fluttips/ui/image_tip_details/show_image_tip_details_type.dart';
+import 'package:fluttips/core/model/tip.dart';
 
 part 'app_router.gr.dart';
 
@@ -46,40 +45,34 @@ part 'app_router.gr.dart';
             AutoRoute(
               path: AppRouter.tipsPath,
               name: 'HomeTipsScreenRoute',
-              page: TipsScreen,
+              page: ImageTipDetailsScreen,
             ),
             AutoRoute(
               path: AppRouter.videosPath,
               name: 'HomeVideosScreenRoute',
-              page: VideosScreen,
+              page: VideosDetailsScreen,
             ),
             AutoRoute(
               path: AppRouter.favouritesTipsPath,
               name: 'HomeFavouritesTipsScreenRoute',
-              page: FavouritesTipsScreen,
+              page: FavouritesTipSimpleListScreen,
             ),
             AutoRoute(
-              name: 'AboutFlowRoute',
-              page: EmptyRouterPage,
-              children: [
-                AutoRoute(
-                  path: AppRouter.aboutPath,
-                  initial: true,
-                  name: 'AboutScreenRoute',
-                  page: AboutScreen,
-                ),
-                AutoRoute(
-                  path: AppRouter.webViewPath,
-                  name: 'WebViewRoute',
-                  page: WebViewScreen,
-                ),
-              ],
+              path: AppRouter.aboutPath,
+              name: 'HomeAboutScreenRoute',
+              page: AboutScreen,
             ),
           ],
         ),
+        AutoRoute(
+          path: AppRouter.webViewPath,
+          name: 'WebViewRoute',
+          page: WebViewScreen,
+        ),
         AutoRoute(
           path: AppRouter.listFavouritesTipsPath,
-          page: ListFavouritesTipsScreen,
+          name: 'FavoritesTipDetailsScreen',
+          page: FavouritesTipDetailsScreen,
         ),
       ],
     ),

diff --git a/lib/ui/app_router.gr.dart b/lib/ui/app_router.gr.dart
Original file line number	Diff line number	Diff line change
Expand Up		@@ -167,4 +167,4 @@ SPEC CHECKSUMS:

		PODFILE CHECKSUM: 4e8f8b2be68aeea4c0d5beb6ff1e79fface1d048

		COCOAPODS: 1.10.2
		COCOAPODS: 1.11.3