Skip to content

Commit 2b04b87

Browse files
committed
Refactor view package to features
1 parent b040182 commit 2b04b87

29 files changed

+50
-14
lines changed
Loading
Loading

ios/Flutter/AppFrameworkInfo.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>11.0</string>
24+
<string>12.0</string>
2525
</dict>
2626
</plist>

ios/Podfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment this line to define a global platform for your project
2-
# platform :ios, '11.0'
2+
# platform :ios, '12.0'
33

44
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
55
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

ios/Runner.xcodeproj/project.pbxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@
205205
isa = PBXProject;
206206
attributes = {
207207
BuildIndependentTargetsInParallel = YES;
208-
LastUpgradeCheck = 1300;
208+
LastUpgradeCheck = 1510;
209209
ORGANIZATIONNAME = "";
210210
TargetAttributes = {
211211
97C146ED1CF9000F007C117D = {
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

lib/generated/assets.gen.dart

+22
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/index.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
export 'bloc/email_list/email_list_bloc.dart';
22
export 'bloc/theme/theme_cubit.dart';
33
export 'constants/index.dart';
4+
export 'features/view.dart';
45
export 'models/models.dart';
56
export 'repository/repository.dart';
67
export 'routes/router.dart';
78
export 'theme/theme.dart';
8-
export 'view/view.dart';
99
export 'widgets/widgets.dart';

lib/models/nav_destination.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class NavDestination {
1111

1212
final Widget screen;
1313
final String label;
14-
final Icon icon;
14+
final Widget icon;
1515
final Widget? selectedIcon;
1616
final Widget? child;
1717
}

lib/routes/router.dart

+14-7
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,34 @@
11
import 'package:flutter/cupertino.dart';
22
import 'package:flutter/material.dart';
33
import 'package:flutter_bloc/flutter_bloc.dart';
4+
import 'package:flutter_bloc_app_template/generated/assets.gen.dart';
45
import 'package:flutter_bloc_app_template/index.dart';
56

6-
const List<NavDestination> destinations = [
7+
final List<NavDestination> destinations = [
78
NavDestination(
8-
label: 'Home',
9-
icon: Icon(Icons.home_filled),
10-
selectedIcon: Icon(Icons.home_filled),
11-
screen: EmailListScreen(),
9+
label: 'Contacts',
10+
icon: Assets.icons.navigation.iconContactsOutline.svg(),
11+
selectedIcon: Assets.icons.navigation.iconContacts.svg(),
12+
screen: const EmailListScreen(),
1213
),
13-
NavDestination(
14+
const NavDestination(
1415
label: 'News',
1516
icon: Icon(Icons.library_books_outlined),
1617
selectedIcon: Icon(Icons.library_books),
1718
screen: NewsScreen(),
1819
),
19-
NavDestination(
20+
const NavDestination(
2021
label: 'Settings',
2122
icon: Icon(Icons.settings),
2223
selectedIcon: Icon(Icons.settings_applications),
2324
screen: SettingsScreen(),
2425
),
26+
const NavDestination(
27+
label: 'Profile',
28+
icon: Icon(Icons.settings),
29+
selectedIcon: Icon(Icons.settings_applications),
30+
screen: SettingsScreen(),
31+
),
2532
];
2633

2734
class Routes {

pubspec.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ flutter:
6666
assets:
6767
# Add assets from the images directory to the application.
6868
- assets/images/
69+
- assets/icons/navigation/
6970
- google_fonts/
7071
fonts:
7172
- family: Roboto

test/view/email_list/email_list_view_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import 'package:bloc_test/bloc_test.dart';
22
import 'package:flutter/material.dart';
33
import 'package:flutter_bloc/flutter_bloc.dart';
4+
import 'package:flutter_bloc_app_template/features/email_list/view/attachment_icon.dart';
45
import 'package:flutter_bloc_app_template/generated/l10n.dart';
56
import 'package:flutter_bloc_app_template/index.dart';
6-
import 'package:flutter_bloc_app_template/view/email_list/view/attachment_icon.dart';
77
import 'package:flutter_localizations/flutter_localizations.dart';
88
import 'package:flutter_test/flutter_test.dart';
99
import 'package:mocktail/mocktail.dart';

test/view/settings/settings_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import 'package:bloc_test/bloc_test.dart';
22
import 'package:flutter/material.dart';
33
import 'package:flutter_bloc/flutter_bloc.dart';
44
import 'package:flutter_bloc_app_template/bloc/theme/app_theme.dart';
5+
import 'package:flutter_bloc_app_template/features/settings/settings.dart';
56
import 'package:flutter_bloc_app_template/generated/l10n.dart';
67
import 'package:flutter_bloc_app_template/index.dart';
7-
import 'package:flutter_bloc_app_template/view/settings/settings.dart';
88
import 'package:flutter_localizations/flutter_localizations.dart';
99
import 'package:flutter_test/flutter_test.dart';
1010
import 'package:mocktail/mocktail.dart';

0 commit comments

Comments
 (0)