Skip to content
This repository has been archived by the owner on Aug 9, 2024. It is now read-only.

Completion of the test: Incorporating suggested changes #22

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .fvm/fvm_config.json

This file was deleted.

3 changes: 3 additions & 0 deletions .fvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"flutter": "3.13.9"
}
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,6 @@ app.*.map.json
/android/app/release

# fvm
.fvm/flutter_sdk

# FVM Version Cache
.fvm/
14 changes: 7 additions & 7 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"dart.flutterSdkPath": ".fvm/flutter_sdk",
"search.exclude": {
"**/.fvm": true
},
"files.watcherExclude": {
"**/.fvm": true
}
"dart.flutterSdkPath": ".fvm\\versions\\3.13.9",
"search.exclude": {
"**/.fvm": true
},
"files.watcherExclude": {
"**/.fvm": true
}
}
6 changes: 3 additions & 3 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
buildscript {
ext.kotlin_version = '1.3.50'
ext.kotlin_version = '1.9.22'
repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:4.1.0'
classpath 'com.android.tools.build:gradle:7.3.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand All @@ -26,6 +26,6 @@ subprojects {
project.evaluationDependsOn(':app')
}

task clean(type: Delete) {
tasks.register("clean", Delete) {
delete rootProject.buildDir
}
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
90 changes: 51 additions & 39 deletions lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,57 +1,69 @@
import 'package:flutter/material.dart';
import 'package:restaurantour/repositories/yelp_repository.dart';
import 'package:provider/provider.dart';
import 'package:restaurantour/providers/restaurantProvider.dart';
import 'package:restaurantour/screens/homeScreen.dart';

void main() {
runApp(const Restaurantour());
runApp(
ChangeNotifierProvider(
create: (context) => RestaurantProvider(),
child: const Restaurantour(),
),
);
}

class Restaurantour extends StatelessWidget {
// This widget is the root of your application.
const Restaurantour({Key? key}) : super(key: key);

@override
Widget build(BuildContext context) {
return MaterialApp(
title: 'RestauranTour',
theme: ThemeData(
visualDensity: VisualDensity.adaptivePlatformDensity,
),
home: const HomePage(),
);
}
}

class HomePage extends StatelessWidget {
const HomePage({Key? key}) : super(key: key);

@override
Widget build(BuildContext context) {
return Scaffold(
body: Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
const Text('Restaurantour'),
ElevatedButton(
child: const Text('Fetch Restaurants'),
onPressed: () async {
final yelpRepo = YelpRepository();

try {
final result = await yelpRepo.getRestaurants();
if (result != null) {
print('Fetched ${result.restaurants!.length} restaurants');
} else {
print('No restaurants fetched');
}
} catch (e) {
print('Failed to fetch restaurants: $e');
}
},
),
],
brightness: Brightness.light,
primaryColor: Colors.white, // Color de fondo de la barra de aplicación
appBarTheme: AppBarTheme(
color: Colors.white,
toolbarTextStyle: ThemeData.light()
.textTheme
.copyWith(
titleLarge: const TextStyle(
color: Colors
.black, // Color del texto del título de la barra de aplicación
fontSize: 20,
fontWeight: FontWeight.bold,
),
)
.bodyMedium,
titleTextStyle: ThemeData.light()
.textTheme
.copyWith(
titleLarge: const TextStyle(
color: Colors
.black, // Color del texto del título de la barra de aplicación
fontSize: 20,
fontWeight: FontWeight.bold,
),
)
.titleLarge,
),
colorScheme: const ColorScheme(
// Configuración de colores general
primary: Colors.black,
secondary: Colors.black,
brightness: Brightness.light,
onBackground: Colors.white,
onPrimary: Colors.black,
surface: Colors.white,
onSurface: Colors.white,
error: Colors.white,
onError: Colors.white,
onSecondary: Colors.white,
background: Colors.white,
),
visualDensity: VisualDensity.adaptivePlatformDensity,
),
home: const HomeScreen(),
);
}
}
39 changes: 39 additions & 0 deletions lib/providers/restaurantProvider.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import 'package:flutter/material.dart';
import 'package:restaurantour/models/restaurant.dart';
import 'package:restaurantour/repositories/yelp_repository.dart';

class RestaurantProvider extends ChangeNotifier {
final YelpRepository _repository = YelpRepository();
List<Restaurant>? _restaurants;
Set<String> _favorites = {};

List<Restaurant>? get restaurants => _restaurants;

Set<String> get favorites => _favorites;

Future<void> fetchRestaurants() async {
print('Fetching restaurants...');
final result = await _repository.getRestaurants();
if (result != null) {
_restaurants = result.restaurants;
notifyListeners();
}
}

List<Restaurant> getFavoriteRestaurants() {
return _restaurants?.where((restaurant) {
return _favorites.contains(restaurant.id);
}).toList() ??
[];
}

void toggleFavorite(String restaurantId, bool isFavorite) {
if (isFavorite) {
_favorites.add(restaurantId);
} else {
_favorites.remove(restaurantId);
}

notifyListeners();
}
}
8 changes: 5 additions & 3 deletions lib/repositories/yelp_repository.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ import 'package:dio/dio.dart';
import 'package:flutter/foundation.dart';
import 'package:restaurantour/models/restaurant.dart';

const _apiKey = '<PUT YOUR API KEY HERE>';
const _apiKey =
'xPkMA-zzjOcUpYI7PV4lcnjJNCklJ38n9L7Dg7AAG3PUiA9eHbNpcgUJP5qxTCemRufUBC-MtlMxwzpEIpxGGOYcuhliCYWsQwJg_1KCMNjVEiJ7Nmu0fp_gJqPTZXYx';

class YelpRepository {
late Dio dio;
Expand Down Expand Up @@ -73,8 +74,8 @@ class YelpRepository {
String _getQuery(int offset) {
return '''
query getRestaurants {
search(location: "Las Vegas", limit: 20, offset: $offset) {
total
search(location: "Miami", limit: 20, offset: $offset) {
total
business {
id
name
Expand All @@ -89,6 +90,7 @@ query getRestaurants {
image_url
name
}
text
}
categories {
title
Expand Down
47 changes: 47 additions & 0 deletions lib/screens/homeScreen.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:restaurantour/providers/restaurantProvider.dart';
import 'package:restaurantour/widgets/home/allRestaurantTab.dart';
import 'package:restaurantour/widgets/home/myFavoritesTab.dart';

class HomeScreen extends StatefulWidget {
const HomeScreen({Key? key}) : super(key: key);

@override
_HomeScreenState createState() => _HomeScreenState();
}

class _HomeScreenState extends State<HomeScreen> {
@override
void initState() {
super.initState();
final restaurantProvider =
Provider.of<RestaurantProvider>(context, listen: false);
restaurantProvider.fetchRestaurants();
}

@override
Widget build(BuildContext context) {
return DefaultTabController(
length: 2,
child: Scaffold(
appBar: AppBar(
centerTitle: true,
title: const Text('RestauranTour'),
bottom: const TabBar(
tabs: [
Tab(text: 'All Restaurants'),
Tab(text: 'My Favorites'),
],
),
),
body: const TabBarView(
children: [
AllRestaurantsTab(),
MyFavoritesTab(),
],
),
),
);
}
}
Loading