Skip to content

chore/home_refresh_indicator #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ClementPeter wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore/home_refresh_indicator #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 70d9d25280d0dd177a5f637cdb0f0b0b12c6a189

COCOAPODS: 1.14.2
COCOAPODS: 1.12.1
160 changes: 82 additions & 78 deletions lib/ui/views/home/home_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,88 +60,92 @@ class HomeView extends StackedView<HomeViewModel> {
),
),
body: SafeArea(
child: OverlayLoader(
isBusy: viewModel.isBusy,
content: Column(
children: [
SizedBox(
height: 18.h,
),
Builder(
builder: (context) {
//Error
if (viewModel.hasError) {
return Center(
child: Column(
children: [
Lottie.asset(
AppImages.noDishFound,
width: 200,
height: 200,
),
Text(
viewModel.modelMessage ?? S.current.unknown_error,
textAlign: TextAlign.center,
),
],
),
);
}
//Data not yet ready
if (!viewModel.dataReady) {
return Align(
heightFactor: 20,
alignment: Alignment.bottomCenter,
child: Text(
viewModel.modelMessage ??
S.current.generate_recipe_contents,
),
);
}
child: RefreshIndicator.adaptive(
onRefresh: () => viewModel.refreshHomeData(),
child: OverlayLoader(
isBusy: viewModel.isBusy,
content: Column(
children: [
SizedBox(
height: 18.h,
),
Builder(
builder: (context) {
//Error
if (viewModel.hasError) {
return Center(
child: Column(
children: [
Lottie.asset(
AppImages.noDishFound,
width: 200,
height: 200,
),
Text(
viewModel.modelMessage ?? S.current.unknown_error,
textAlign: TextAlign.center,
),
],
),
);
}
//Data not yet ready
if (!viewModel.dataReady) {
return Align(
heightFactor: 20,
alignment: Alignment.bottomCenter,
child: Text(
viewModel.modelMessage ??
S.current.generate_recipe_contents,
),
);
}

// Empty
if (viewModel.data == null || viewModel.data!.isEmpty) {
return Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Lottie.asset(
AppImages.noDishFound,
width: 200,
height: 200,
),
Text(S.current.no_dish_available),
],
),
);
}
// Empty
if (viewModel.data == null || viewModel.data!.isEmpty) {
return Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Lottie.asset(
AppImages.noDishFound,
width: 200,
height: 200,
),
Text(S.current.no_dish_available),
],
),
);
}

// Loaded
return Expanded(
child: Padding(
padding: EdgeInsets.symmetric(horizontal: sidePadding),
child: GridView.builder(
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 2,
childAspectRatio: 0.90,
mainAxisSpacing: 20.h,
crossAxisSpacing: 16.w,
// Loaded
return Expanded(
child: Padding(
padding: EdgeInsets.symmetric(horizontal: sidePadding),
child: GridView.builder(
gridDelegate:
SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 2,
childAspectRatio: 0.90,
mainAxisSpacing: 20.h,
crossAxisSpacing: 16.w,
),
itemCount: viewModel.data?.length,
itemBuilder: (context, index) {
final recipe = viewModel.data?.elementAt(index);
return ProductItem(
recipe: recipe,
onTap: () =>
viewModel.navigateToDishDetailsView(recipe),
);
},
),
itemCount: viewModel.data?.length,
itemBuilder: (context, index) {
final recipe = viewModel.data?.elementAt(index);
return ProductItem(
recipe: recipe,
onTap: () =>
viewModel.navigateToDishDetailsView(recipe),
);
},
),
),
);
},
),
],
);
},
),
],
),
),
),
),
Expand Down
4 changes: 4 additions & 0 deletions lib/ui/views/home/home_viewmodel.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ class HomeViewModel extends FutureViewModel<List<Recipe>?> {
}
}

Future refreshHomeData() async {
await initialise();
}

void navigateToHome() {
_navigationService.back();
}
Expand Down