Skip to content

Commit af042a2

Browse files
Merge pull request #11 from leandro-mancini/feat/splash/create-page
Feat/splash/create page
2 parents 4e49ea2 + f8d5f86 commit af042a2

File tree

23 files changed

+714
-10
lines changed

23 files changed

+714
-10
lines changed

.github/workflows/CI.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,4 +89,4 @@ jobs:
8989
with:
9090
channel: 'stable'
9191
- name: Flutter test
92-
run: npx nx run-many --target=test --all=true --exclude=flutter-api,flutter-episodes,flutter-characters,flutter-suflex
92+
run: npx nx run-many --target=test --all=true --exclude=flutter-api,flutter-episodes,flutter-characters,flutter-suflex,flutter-splash
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
import 'package:flutter_characters/flutter_characters.dart';
22
import 'package:flutter_episodes/flutter_episodes.dart';
33
import 'package:flutter_modular/flutter_modular.dart';
4+
import 'package:flutter_splash/main.dart';
45

56
class AppModule extends Module {
67
@override
78
List<ModularRoute> get routes => [
8-
ModuleRoute('/', module: CharactersModule()),
9+
ModuleRoute('/', module: SplashModule()),
10+
ModuleRoute('/characters', module: CharactersModule()),
911
ModuleRoute('/episode', module: EpisodesModule())
1012
];
1113
}

apps/flutter/suflex/pubspec.lock

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,13 @@ packages:
139139
relative: true
140140
source: path
141141
version: "0.0.1"
142+
flutter_splash:
143+
dependency: "direct main"
144+
description:
145+
path: "../../../libs/flutter/splash"
146+
relative: true
147+
source: path
148+
version: "1.0.0+1"
142149
flutter_svg:
143150
dependency: transitive
144151
description:

apps/flutter/suflex/pubspec.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ dependencies:
4141
path: ../../../libs/flutter/episodes
4242
flutter_shared:
4343
path: ../../../libs/flutter/shared
44+
flutter_splash:
45+
path: ../../../libs/flutter/splash
4446

4547

4648
# The following adds the Cupertino Icons font to your application.

libs/flutter/characters/lib/src/characters_controller.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ abstract class CharactersControllerBase with Store {
2121

2222
@action
2323
getAllCharacters() async {
24+
hasCharacters = false;
2425
allCharacters = await characterService.getAllCharacters();
2526
characters = allCharacters;
2627
hasCharacters = true;

libs/flutter/characters/lib/src/characters_page.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class _CharactersPageState extends State<CharactersPage> {
4040
searchController: searchValueController,
4141
textInputAction: TextInputAction.search,
4242
onSubmitted: (value) {
43-
Modular.to.pushNamed('/character/search/$value')
43+
Modular.to.pushNamed('/characters/character/search/$value')
4444
.then((value) => charactersController.getAllCharacters());
4545
searchValueController.clear();
4646
},
@@ -51,7 +51,7 @@ class _CharactersPageState extends State<CharactersPage> {
5151
Icons.bookmark_added,
5252
color: Colors.red,
5353
),
54-
onPressed: () => Modular.to.pushNamed('/favorites'),
54+
onPressed: () => Modular.to.pushNamed('/characters/favorites'),
5555
),
5656
IconButton(
5757
icon: const Icon(
@@ -80,7 +80,7 @@ class _CharactersPageState extends State<CharactersPage> {
8080
enabledAction: true,
8181
textButton: 'Buscar',
8282
onPressed: () {
83-
Modular.to.pushNamed('/character/search/${searchValueController.text}')
83+
Modular.to.pushNamed('/characters/character/search/${searchValueController.text}')
8484
.then((value) => charactersController.getAllCharacters());
8585
searchValueController.clear();
8686
},
@@ -98,7 +98,7 @@ class _CharactersPageState extends State<CharactersPage> {
9898
title: charactersController.characters[index].name,
9999
subtitle: charactersController.characters[index].species,
100100
backgroundImage: NetworkImage(charactersController.characters[index].image),
101-
onTap: () => Modular.to.pushNamed('/character/${charactersController.characters[index].id}'),
101+
onTap: () => Modular.to.pushNamed('/characters/character/${charactersController.characters[index].id}'),
102102
);
103103
},
104104
),

libs/flutter/characters/lib/src/pages/favorites/favorites_page.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ class _FavoritesPageState extends State<FavoritesPage> {
3939
searchController: searchValueController,
4040
textInputAction: TextInputAction.search,
4141
onChanged: ((value) => favoriteController.getFilteredToFavorite(value)),
42+
onSubmitted: (value) => favoriteController.getFilteredToFavorite(value),
4243
onPressedLeadingIcon: () => Modular.to.pop(),
4344
),
4445
body: buildBody(),
@@ -76,7 +77,7 @@ class _FavoritesPageState extends State<FavoritesPage> {
7677
subtitle: favoriteController.favorites[index].species,
7778
backgroundImage: NetworkImage(favoriteController.favorites[index].image),
7879
onTap: () {
79-
Modular.to.pushNamed('/character/${favoriteController.favorites[index].id}')
80+
Modular.to.pushNamed('/characters/character/${favoriteController.favorites[index].id}')
8081
.then((value) => favoriteController.getFavorites());
8182

8283
searchValueController.clear();

libs/flutter/characters/lib/src/pages/search/search_controller.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ abstract class SearchControllerBase with Store {
2121

2222
@action
2323
getFilteredCharacters(String name) async {
24-
hasCharacters = true;
24+
hasCharacters = false;
2525
allCharacters = await characterService.getFilteredCharacters(CharacterFilters(name: name));
2626
characters = allCharacters;
2727
hasCharacters = true;

libs/flutter/characters/lib/src/pages/search/search_page.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class _SearchPageState extends State<SearchPage> {
7070
title: searchController.characters[index].name,
7171
subtitle: searchController.characters[index].species,
7272
backgroundImage: NetworkImage(searchController.characters[index].image),
73-
onTap: () => Modular.to.pushNamed('/character/${searchController.characters[index].id}'),
73+
onTap: () => Modular.to.pushNamed('/characters/character/${searchController.characters[index].id}'),
7474
);
7575
},
7676
),

libs/flutter/episodes/lib/src/episodes_page.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ class _EpisodesPageState extends State<EpisodesPage> {
174174
title: episodesController.characters[index].name,
175175
subtitle: episodesController.characters[index].species,
176176
backgroundImage: NetworkImage(episodesController.characters[index].image),
177-
onTap: () => Modular.to.pushNamed('/character/${episodesController.characters[index].id}'),
177+
onTap: () => Modular.to.pushNamed('/characters/character/${episodesController.characters[index].id}'),
178178
);
179179
},
180180
)

0 commit comments

Comments
 (0)