diff --git a/README.md b/README.md index eda0825..755573e 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ flutter packages pub run build_runner watch **Step 4:** -Execute the following command to run the app (you must have an open android emulator) +Execute the following command to run the app (you must have an open android emulator): ``` flutter run -t lib/main/main_dev.dart diff --git a/lang/en.json b/lang/en.json index 2a213ef..5c1ed3b 100644 --- a/lang/en.json +++ b/lang/en.json @@ -1,5 +1,5 @@ { - "app_title": "Prospera", + "app_title": "Movies & Weather", "initial_state": "initial state", "success_state": "success state", "failure_state": "failure state", diff --git a/lib/app/features/movie/data/datasources/local/movie_cache_datasource.dart b/lib/app/features/movie/data/datasources/local/movie_cache_datasource.dart index 75e5155..0cad965 100644 --- a/lib/app/features/movie/data/datasources/local/movie_cache_datasource.dart +++ b/lib/app/features/movie/data/datasources/local/movie_cache_datasource.dart @@ -23,6 +23,7 @@ class MovieCacheDatasource { for (final cacheMovie in cacheMovies) { final movie = MovieModel.fromJson( json.decode(cacheMovie) as Map); + if (movie.title.toLowerCase() == title.toLowerCase()) { return Right(movie); } diff --git a/lib/app/features/presentation/home_page/widgets/movie_view.dart b/lib/app/features/presentation/home_page/widgets/movie_view.dart index 4e1edd7..44814ce 100644 --- a/lib/app/features/presentation/home_page/widgets/movie_view.dart +++ b/lib/app/features/presentation/home_page/widgets/movie_view.dart @@ -15,6 +15,11 @@ class MovieView extends StatelessWidget { Widget buildMovieCard(BuildContext context, Movie movie) { const bold = TextStyle(fontWeight: FontWeight.bold); return Card( + shape: const RoundedRectangleBorder( + borderRadius: BorderRadius.vertical(top: Radius.circular(12.0))), + margin: const EdgeInsets.symmetric( + vertical: 15.0, + ), elevation: 4.0, child: Column( children: [ @@ -24,7 +29,7 @@ class MovieView extends StatelessWidget { child: ImageHandlerWidget(urlToImage: movie.poster), ), Padding( - padding: const EdgeInsets.only(left: 8.0), + padding: const EdgeInsets.all(10.0), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ diff --git a/lib/app/features/presentation/index.dart b/lib/app/features/presentation/index.dart index e2fbe24..a83aff6 100644 --- a/lib/app/features/presentation/index.dart +++ b/lib/app/features/presentation/index.dart @@ -2,4 +2,3 @@ export './home_page/view/home_view.dart'; export './loading_page/view/loading_view.dart'; export './main_page/view/main_view.dart'; export './weather_page/view/weather_view.dart'; -export './search_page/view/search_view.dart'; diff --git a/lib/app/features/presentation/loading_page/view/loading_view.dart b/lib/app/features/presentation/loading_page/view/loading_view.dart index 366c613..3140f3c 100644 --- a/lib/app/features/presentation/loading_page/view/loading_view.dart +++ b/lib/app/features/presentation/loading_page/view/loading_view.dart @@ -5,6 +5,7 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:prospera_exercise/app/core/widgets/index.dart'; import 'package:prospera_exercise/di/injector.dart'; +import 'package:prospera_exercise/localization/app_localizations.dart'; import '../controller/index.dart'; @@ -19,15 +20,15 @@ class LoadingView extends StatelessWidget { children: [ Row( mainAxisAlignment: MainAxisAlignment.center, - children: const [ - Icon( + children: [ + const Icon( Icons.movie, size: 50, ), - SizedBox(width: 15.0), + const SizedBox(width: 15.0), Text( - 'Prospera', - style: TextStyle( + AppLocalizations.of(context).translate(APP_TITLE), + style: const TextStyle( fontWeight: FontWeight.bold, fontSize: 25, ), diff --git a/lib/app/features/presentation/main_page/view/main_view.dart b/lib/app/features/presentation/main_page/view/main_view.dart index ba4f164..aafed68 100644 --- a/lib/app/features/presentation/main_page/view/main_view.dart +++ b/lib/app/features/presentation/main_page/view/main_view.dart @@ -26,31 +26,9 @@ class MainView extends StatelessWidget { Text(AppLocalizations.of(context).translate(APP_TITLE)) ], ), - actions: [ - BlocBuilder( - builder: (context, state) { - if (state.index == 0) { - return buildSearch(context); - } - return Container(); - }, - ), - const SizedBox( - width: 10.0, - ), - ], ); } - Widget buildSearch(BuildContext context) { - return IconButton( - icon: const Icon(Icons.search), - onPressed: () => showSearch( - context: context, - delegate: CustomSearchDelegate(), - )); - } - @override Widget build(BuildContext context) { return SafeArea(