Refactor view package to features

ashtanko · Mar 30, 2024 · 2b04b87 · 2b04b87
1 parent b040182
commit 2b04b87
Show file tree

Hide file tree

Showing 29 changed files with 50 additions and 14 deletions.
diff --git a/assets/icons/navigation/icon_contacts.svg b/assets/icons/navigation/icon_contacts.svg
diff --git a/assets/icons/navigation/icon_contacts_outline.svg b/assets/icons/navigation/icon_contacts_outline.svg
diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>11.0</string>
+  <string>12.0</string>
 </dict>
 </plist>
diff --git a/ios/Podfile b/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '11.0'
+# platform :ios, '12.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -205,7 +205,7 @@
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {

diff --git a/lib/view/email_list/email_list.dart → lib/features/email_list/email_list.dart b/lib/view/email_list/email_list.dart → lib/features/email_list/email_list.dart
diff --git a/lib/view/email_list/email_list_screen.dart → ...eatures/email_list/email_list_screen.dart b/lib/view/email_list/email_list_screen.dart → ...eatures/email_list/email_list_screen.dart
diff --git a/...view/email_list/view/attachment_icon.dart → ...ures/email_list/view/attachment_icon.dart b/...view/email_list/view/attachment_icon.dart → ...ures/email_list/view/attachment_icon.dart
diff --git a/lib/view/email_list/view/attachments.dart → ...features/email_list/view/attachments.dart b/lib/view/email_list/view/attachments.dart → ...features/email_list/view/attachments.dart
diff --git a/...view/email_list/view/email_list_item.dart → ...ures/email_list/view/email_list_item.dart b/...view/email_list/view/email_list_item.dart → ...ures/email_list/view/email_list_item.dart
diff --git a/...view/email_list/view/email_list_view.dart → ...ures/email_list/view/email_list_view.dart b/...view/email_list/view/email_list_view.dart → ...ures/email_list/view/email_list_view.dart
diff --git a/lib/view/email_list/view/favorite_icon.dart → ...atures/email_list/view/favorite_icon.dart b/lib/view/email_list/view/favorite_icon.dart → ...atures/email_list/view/favorite_icon.dart
diff --git a/lib/view/main/main_screen.dart → lib/features/main/main_screen.dart b/lib/view/main/main_screen.dart → lib/features/main/main_screen.dart
diff --git a/lib/view/news/news_screen.dart → lib/features/news/news_screen.dart b/lib/view/news/news_screen.dart → lib/features/news/news_screen.dart
diff --git a/lib/view/news/view/news_item_view.dart → lib/features/news/view/news_item_view.dart b/lib/view/news/view/news_item_view.dart → lib/features/news/view/news_item_view.dart
diff --git a/lib/view/news/view/news_trending_list.dart → ...eatures/news/view/news_trending_list.dart b/lib/view/news/view/news_trending_list.dart → ...eatures/news/view/news_trending_list.dart
diff --git a/lib/view/settings/settings.dart → lib/features/settings/settings.dart b/lib/view/settings/settings.dart → lib/features/settings/settings.dart
diff --git a/lib/view/settings/settings_screen.dart → lib/features/settings/settings_screen.dart b/lib/view/settings/settings_screen.dart → lib/features/settings/settings_screen.dart
diff --git a/lib/view/settings/view/setting_cell.dart → lib/features/settings/view/setting_cell.dart b/lib/view/settings/view/setting_cell.dart → lib/features/settings/view/setting_cell.dart
diff --git a/...view/settings/view/theme_dialog_cell.dart → ...ures/settings/view/theme_dialog_cell.dart b/...view/settings/view/theme_dialog_cell.dart → ...ures/settings/view/theme_dialog_cell.dart
diff --git a/lib/view/splash_view.dart → lib/features/splash_view.dart b/lib/view/splash_view.dart → lib/features/splash_view.dart
diff --git a/lib/view/view.dart → lib/features/view.dart b/lib/view/view.dart → lib/features/view.dart
diff --git a/lib/generated/assets.gen.dart b/lib/generated/assets.gen.dart
diff --git a/lib/index.dart b/lib/index.dart
@@ -1,9 +1,9 @@
 export 'bloc/email_list/email_list_bloc.dart';
 export 'bloc/theme/theme_cubit.dart';
 export 'constants/index.dart';
+export 'features/view.dart';
 export 'models/models.dart';
 export 'repository/repository.dart';
 export 'routes/router.dart';
 export 'theme/theme.dart';
-export 'view/view.dart';
 export 'widgets/widgets.dart';
diff --git a/lib/models/nav_destination.dart b/lib/models/nav_destination.dart
@@ -11,7 +11,7 @@ class NavDestination {
 
   final Widget screen;
   final String label;
-  final Icon icon;
+  final Widget icon;
   final Widget? selectedIcon;
   final Widget? child;
 }
diff --git a/lib/routes/router.dart b/lib/routes/router.dart
@@ -1,27 +1,34 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_bloc_app_template/generated/assets.gen.dart';
 import 'package:flutter_bloc_app_template/index.dart';
 
-const List<NavDestination> destinations = [
+final List<NavDestination> destinations = [
   NavDestination(
-    label: 'Home',
-    icon: Icon(Icons.home_filled),
-    selectedIcon: Icon(Icons.home_filled),
-    screen: EmailListScreen(),
+    label: 'Contacts',
+    icon: Assets.icons.navigation.iconContactsOutline.svg(),
+    selectedIcon: Assets.icons.navigation.iconContacts.svg(),
+    screen: const EmailListScreen(),
   ),
-  NavDestination(
+  const NavDestination(
     label: 'News',
     icon: Icon(Icons.library_books_outlined),
     selectedIcon: Icon(Icons.library_books),
     screen: NewsScreen(),
   ),
-  NavDestination(
+  const NavDestination(
     label: 'Settings',
     icon: Icon(Icons.settings),
     selectedIcon: Icon(Icons.settings_applications),
     screen: SettingsScreen(),
   ),
+  const NavDestination(
+    label: 'Profile',
+    icon: Icon(Icons.settings),
+    selectedIcon: Icon(Icons.settings_applications),
+    screen: SettingsScreen(),
+  ),
 ];
 
 class Routes {

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -66,6 +66,7 @@ flutter:
   assets:
     # Add assets from the images directory to the application.
     - assets/images/
+    - assets/icons/navigation/
     - google_fonts/
   fonts:
     - family: Roboto

diff --git a/test/view/email_list/email_list_view_test.dart b/test/view/email_list/email_list_view_test.dart
@@ -1,9 +1,9 @@
 import 'package:bloc_test/bloc_test.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_bloc_app_template/features/email_list/view/attachment_icon.dart';
 import 'package:flutter_bloc_app_template/generated/l10n.dart';
 import 'package:flutter_bloc_app_template/index.dart';
-import 'package:flutter_bloc_app_template/view/email_list/view/attachment_icon.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mocktail/mocktail.dart';

diff --git a/test/view/settings/settings_test.dart b/test/view/settings/settings_test.dart
@@ -2,9 +2,9 @@ import 'package:bloc_test/bloc_test.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_bloc_app_template/bloc/theme/app_theme.dart';
+import 'package:flutter_bloc_app_template/features/settings/settings.dart';
 import 'package:flutter_bloc_app_template/generated/l10n.dart';
 import 'package:flutter_bloc_app_template/index.dart';
-import 'package:flutter_bloc_app_template/view/settings/settings.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mocktail/mocktail.dart';