mirror of
https://github.com/vleeuwenmenno/supplements.git
synced 2025-09-11 18:29:12 +02:00
feat: Update theme colors and add Today Schedule screen
- Changed color scheme from ShadBlueColorScheme to ShadZincColorScheme in main.dart - Added getMostRecentIntake method in SupplementProvider to retrieve the latest intake for a supplement - Integrated TodayScheduleScreen into HomeScreen with a new BottomNavigationBar item - Updated SupplementsListScreen title and adjusted layout for better UX - Enhanced SupplementCard to support undoing last taken action and improved popover menu options - Added popover package for better UI interactions
This commit is contained in:
@@ -18,7 +18,7 @@ class SupplementsListScreen extends StatelessWidget {
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
title: const Text('My Supplements'),
|
||||
title: const Text('Edit Supplements'),
|
||||
backgroundColor: Theme.of(context).colorScheme.inversePrimary,
|
||||
actions: [
|
||||
Consumer<SimpleSyncProvider>(
|
||||
@@ -100,18 +100,18 @@ class SupplementsListScreen extends StatelessWidget {
|
||||
await provider.loadSupplements();
|
||||
await provider.refreshDailyStatus();
|
||||
},
|
||||
child: _buildGroupedSupplementsList(context, provider.supplements, settingsProvider),
|
||||
child: _buildGroupedSupplementsList(context, provider.supplements, settingsProvider, provider),
|
||||
);
|
||||
},
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildGroupedSupplementsList(BuildContext context, List<Supplement> supplements, SettingsProvider settingsProvider) {
|
||||
Widget _buildGroupedSupplementsList(BuildContext context, List<Supplement> supplements, SettingsProvider settingsProvider, SupplementProvider provider) {
|
||||
final groupedSupplements = _groupSupplementsByTimeOfDay(supplements, settingsProvider);
|
||||
|
||||
return ListView(
|
||||
padding: const EdgeInsets.all(16),
|
||||
padding: const EdgeInsets.fromLTRB(16, 16, 16, 80),
|
||||
children: [
|
||||
if (groupedSupplements['morning']!.isNotEmpty) ...[
|
||||
_buildSectionHeader('Morning (${settingsProvider.morningRange})', Icons.wb_sunny, Colors.orange, groupedSupplements['morning']!.length),
|
||||
@@ -123,6 +123,7 @@ class SupplementsListScreen extends StatelessWidget {
|
||||
onDelete: () => _deleteSupplement(context, supplement),
|
||||
onArchive: () => _archiveSupplement(context, supplement),
|
||||
onDuplicate: () => context.read<SupplementProvider>().duplicateSupplement(supplement.id!),
|
||||
showCompletionStatus: false,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
@@ -138,6 +139,7 @@ class SupplementsListScreen extends StatelessWidget {
|
||||
onDelete: () => _deleteSupplement(context, supplement),
|
||||
onArchive: () => _archiveSupplement(context, supplement),
|
||||
onDuplicate: () => context.read<SupplementProvider>().duplicateSupplement(supplement.id!),
|
||||
showCompletionStatus: false,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
@@ -153,6 +155,7 @@ class SupplementsListScreen extends StatelessWidget {
|
||||
onDelete: () => _deleteSupplement(context, supplement),
|
||||
onArchive: () => _archiveSupplement(context, supplement),
|
||||
onDuplicate: () => context.read<SupplementProvider>().duplicateSupplement(supplement.id!),
|
||||
showCompletionStatus: false,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
@@ -168,6 +171,7 @@ class SupplementsListScreen extends StatelessWidget {
|
||||
onDelete: () => _deleteSupplement(context, supplement),
|
||||
onArchive: () => _archiveSupplement(context, supplement),
|
||||
onDuplicate: () => context.read<SupplementProvider>().duplicateSupplement(supplement.id!),
|
||||
showCompletionStatus: false,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
@@ -183,9 +187,11 @@ class SupplementsListScreen extends StatelessWidget {
|
||||
onDelete: () => _deleteSupplement(context, supplement),
|
||||
onArchive: () => _archiveSupplement(context, supplement),
|
||||
onDuplicate: () => context.read<SupplementProvider>().duplicateSupplement(supplement.id!),
|
||||
showCompletionStatus: false,
|
||||
),
|
||||
),
|
||||
],
|
||||
|
||||
],
|
||||
);
|
||||
}
|
||||
@@ -278,7 +284,7 @@ class SupplementsListScreen extends StatelessWidget {
|
||||
|
||||
return grouped;
|
||||
}
|
||||
|
||||
|
||||
void _editSupplement(BuildContext context, Supplement supplement) {
|
||||
Navigator.of(context).push(
|
||||
MaterialPageRoute(
|
||||
|
Reference in New Issue
Block a user