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:
@@ -6,6 +6,7 @@ import 'add_supplement_screen.dart';
|
||||
import 'history_screen.dart';
|
||||
import 'settings_screen.dart';
|
||||
import 'supplements_list_screen.dart';
|
||||
import 'today_schedule_screen.dart';
|
||||
|
||||
class HomeScreen extends StatefulWidget {
|
||||
const HomeScreen({super.key});
|
||||
@@ -18,6 +19,7 @@ class _HomeScreenState extends State<HomeScreen> {
|
||||
int _currentIndex = 0;
|
||||
|
||||
final List<Widget> _screens = [
|
||||
const TodayScheduleScreen(),
|
||||
const SupplementsListScreen(),
|
||||
const HistoryScreen(),
|
||||
const SettingsScreen(),
|
||||
@@ -45,11 +47,18 @@ class _HomeScreenState extends State<HomeScreen> {
|
||||
});
|
||||
},
|
||||
type: BottomNavigationBarType.fixed,
|
||||
selectedItemColor: Theme.of(context).colorScheme.primary,
|
||||
unselectedItemColor: Theme.of(context).colorScheme.onSurface.withValues(alpha: 0.4),
|
||||
backgroundColor: Theme.of(context).colorScheme.surface,
|
||||
items: const [
|
||||
BottomNavigationBarItem(
|
||||
icon: Icon(Icons.medication),
|
||||
icon: Icon(Icons.medication_liquid_sharp),
|
||||
label: 'Supplements',
|
||||
),
|
||||
BottomNavigationBarItem(
|
||||
icon: Icon(Icons.edit_calendar_rounded),
|
||||
label: 'Edit',
|
||||
),
|
||||
BottomNavigationBarItem(
|
||||
icon: Icon(Icons.history),
|
||||
label: 'History',
|
||||
@@ -60,7 +69,7 @@ class _HomeScreenState extends State<HomeScreen> {
|
||||
),
|
||||
],
|
||||
),
|
||||
floatingActionButton: _currentIndex == 0
|
||||
floatingActionButton: _currentIndex == 1
|
||||
? FloatingActionButton(
|
||||
onPressed: () async {
|
||||
await Navigator.of(context).push(
|
||||
|
Reference in New Issue
Block a user