Skip to content

Implemented a Daily Activities Screen with Provider Integration, Dynamic UI, and enhanced user Interactions #85

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.

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
wants to merge 1 commit into
base: main
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: 3 additions & 1 deletion therapist/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ import 'package:flutter/services.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:provider/provider.dart';
import 'package:supabase_flutter/supabase_flutter.dart';

import 'presentation/splash_screen.dart';
import 'provider/auth_provider.dart';
import 'provider/home_provider.dart';
import 'provider/therapist_provider.dart';
import 'provider/activity_provider.dart';

import 'repository/supabase_consultation_repository.dart';

Future<void> main() async {
Expand All @@ -30,6 +31,7 @@ Future<void> main() async {
runApp(
MultiProvider(
providers: [
ChangeNotifierProvider(create: (context) => ActivityProvider()),
ChangeNotifierProvider(create: (context) => AuthProvider()),
ChangeNotifierProvider(create: (context) => HomeProvider()),
ChangeNotifierProvider(create: (context) => TherapistDataProvider())
Expand Down
118 changes: 118 additions & 0 deletions therapist/lib/presentation/activity/daily_activities_screen.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import '../../provider/activity_provider.dart';
import 'widgets/activity_set_card.dart';

class DailyActivitiesScreen extends StatefulWidget {
const DailyActivitiesScreen({super.key});

@override
State<DailyActivitiesScreen> createState() => _DailyActivitiesScreenState();
}

class _DailyActivitiesScreenState extends State<DailyActivitiesScreen> {
@override
Widget build(BuildContext context) {
// final activityProvider = Provider.of<ActivityProvider>(context);
// final activityProvider = context.watch<ActivityProvider>();

return Consumer<ActivityProvider>(
builder: (context, activityProvider, child) {

final activitySets = activityProvider.activitySets;

return Scaffold(
body: SafeArea(
child: Column(
children: [
// App Bar
Padding(
padding:
const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
child: Row(
children: [
IconButton(
icon: const Icon(Icons.arrow_back, color: Colors.black),
onPressed: () {},
),
const Expanded(
child: Center(
child: Text(
'Daily Activities',
style: TextStyle(
fontSize: 18,
fontWeight: FontWeight.bold,
),
),
),
),
const SizedBox(width: 48), // Balance the back button
],
),
),

// Content
Expanded(
child: SingleChildScrollView(
padding: const EdgeInsets.all(16.0),
child: Column(
children: [
// Activity Sets
for (int i = 0; i < activitySets.length; i++) ...[
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could make use of a list view instead of a for loop?

ActivitySetCard(
title: activitySets[i].title,
isExpanded: activitySets[i].isExpanded,
isActive: activitySets[i].isActive,
activities: activitySets[i].activities,
additionalInfo: activitySets[i].additionalInfo,
repeatInfo: activitySets[i].getRepeatInfo(),
selectedDays: activitySets[i].selectedDays,
onExpandToggle: () {
activityProvider.toggleExpanded(i);
},
onActiveToggle: (value) {
activityProvider.toggleActive(i, value);
},
onDaySelected: (dayIndex, value) {
activityProvider.updateSelectedDays(i, dayIndex, value);
},
),
if (i < activitySets.length - 1) const SizedBox(height: 16),
],

const SizedBox(height: 80), // Space for the button
],
),
),
),
],
),
),
floatingActionButton: Padding(
padding: const EdgeInsets.only(bottom: 16.0, right: 16.0),
child: SizedBox(
width: 200,
child: FloatingActionButton.extended(
onPressed: () {
activityProvider.addActivitySet();
},
backgroundColor: const Color(0xFFCB6CE6),
label: const Text(
'Add Activity Set',
style: TextStyle(
color: Colors.white,
fontWeight: FontWeight.w500,
),
),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(30),
),
),
),
),
floatingActionButtonLocation: FloatingActionButtonLocation.endFloat,
);
}
);
}
}
Loading