diff --git a/therapist/lib/main.dart b/therapist/lib/main.dart index bf13f8c..8c3d53f 100644 --- a/therapist/lib/main.dart +++ b/therapist/lib/main.dart @@ -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 main() async { @@ -30,6 +31,7 @@ Future main() async { runApp( MultiProvider( providers: [ + ChangeNotifierProvider(create: (context) => ActivityProvider()), ChangeNotifierProvider(create: (context) => AuthProvider()), ChangeNotifierProvider(create: (context) => HomeProvider()), ChangeNotifierProvider(create: (context) => TherapistDataProvider()) diff --git a/therapist/lib/presentation/activity/daily_activities_screen.dart b/therapist/lib/presentation/activity/daily_activities_screen.dart new file mode 100644 index 0000000..ea682a6 --- /dev/null +++ b/therapist/lib/presentation/activity/daily_activities_screen.dart @@ -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 createState() => _DailyActivitiesScreenState(); +} + +class _DailyActivitiesScreenState extends State { + @override + Widget build(BuildContext context) { + // final activityProvider = Provider.of(context); + // final activityProvider = context.watch(); + + return Consumer( + 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++) ...[ + 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, + ); + } + ); +} +} \ No newline at end of file diff --git a/therapist/lib/presentation/activity/widgets/activity_set_card.dart b/therapist/lib/presentation/activity/widgets/activity_set_card.dart new file mode 100644 index 0000000..71b9dcf --- /dev/null +++ b/therapist/lib/presentation/activity/widgets/activity_set_card.dart @@ -0,0 +1,286 @@ +import 'package:flutter/material.dart'; +import '../../../provider/activity_provider.dart'; + +class ActivitySetCard extends StatefulWidget { + final String title; + final bool isExpanded; + final bool isActive; + final List activities; + final String? repeatInfo; + final String? additionalInfo; + final VoidCallback onExpandToggle; + final Function(bool) onActiveToggle; + final Function(int, bool)? onDaySelected; + final List selectedDays; + + const ActivitySetCard({ + Key? key, + required this.title, + required this.isExpanded, + required this.isActive, + required this.activities, + this.repeatInfo, + this.additionalInfo, + required this.onExpandToggle, + required this.onActiveToggle, + this.onDaySelected, + required this.selectedDays, + }) : super(key: key); + + @override + _ActivitySetCardState createState() => _ActivitySetCardState(); +} + +class _ActivitySetCardState extends State { + @override + Widget build(BuildContext context) { + return Container( + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(16), + border: Border.all(color: Colors.grey.shade200), + ), + child: Column( + children: [ + // Header + InkWell( + onTap: widget.onExpandToggle, + child: Padding( + padding: const EdgeInsets.all(16.0), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + widget.title, + style: const TextStyle( + fontSize: 16, + fontWeight: FontWeight.bold, + color: Colors.black87, + ), + ), + Icon( + widget.isExpanded + ? Icons.keyboard_arrow_down + : Icons.keyboard_arrow_up, + color: Colors.black54, + ), + ], + ), + ), + ), + + // Content + if (!widget.isExpanded) ...[ + // Collapsed view + Padding( + padding: + const EdgeInsets.only(left: 16.0, right: 16.0, bottom: 16.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + // Show first two activities + ...widget.activities + .take(2) + .map((activity) => Padding( + padding: const EdgeInsets.only(bottom: 4.0), + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Text('• ', + style: TextStyle(fontSize: 14)), + Expanded( + child: Text( + activity, + style: const TextStyle( + fontSize: 14, color: Colors.black54), + ), + ), + ], + ), + )) + .toList(), + + // Additional info + if (widget.additionalInfo != null) + Padding( + padding: const EdgeInsets.only(top: 4.0), + child: Text( + widget.additionalInfo!, + style: const TextStyle( + fontSize: 14, color: Colors.black54), + ), + ), + + // Repeat info and toggle + if (widget.repeatInfo != null) + Padding( + padding: const EdgeInsets.only(top: 16.0, bottom: 12.0), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + widget.repeatInfo!, + style: const TextStyle( + fontSize: 14, color: Colors.black87), + ), + Switch( + value: widget.isActive, + onChanged: widget.onActiveToggle, + activeColor: Colors.white, + activeTrackColor: const Color(0xFFCB6CE6), + inactiveThumbColor: Colors.white, + inactiveTrackColor: Colors.grey.shade400, + ), + ], + ), + ), + ], + ), + ), + ] else ...[ + // Expanded view + Padding( + padding: + const EdgeInsets.only(left: 16.0, right: 16.0, bottom: 16.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + // Activities + ...widget.activities + .map((activity) => Padding( + padding: const EdgeInsets.only(bottom: 8.0), + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Text('• ', + style: TextStyle(fontSize: 14)), + Expanded( + child: Text( + activity, + style: const TextStyle( + fontSize: 14, color: Colors.black54), + ), + ), + ], + ), + )) + .toList(), + + if (widget.additionalInfo != null) + Padding( + padding: const EdgeInsets.only(top: 4.0), + child: Text( + widget.additionalInfo!, + style: const TextStyle( + fontSize: 14, color: Colors.black54), + ), + ), + + // Repeat info + if (widget.repeatInfo != null) + Padding( + padding: const EdgeInsets.only(top: 16.0, bottom: 12.0), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + widget.repeatInfo!, + style: const TextStyle( + fontSize: 14, color: Colors.black87), + ), + Switch( + value: widget.isActive, + onChanged: widget.onActiveToggle, + activeColor: Colors.white, + activeTrackColor: const Color(0xFFCB6CE6), + inactiveThumbColor: Colors.white, + inactiveTrackColor: Colors.grey.shade400, + ), + ], + ), + ), + + // Day selector + Padding( + padding: const EdgeInsets.symmetric(vertical: 12.0), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: + List.generate(7, (index) => _buildDayCircle(index)), + ), + ), + + // Action buttons + Padding( + padding: const EdgeInsets.only(top: 8.0), + child: Column( + children: [ + _buildActionButton(Icons.calendar_today, 'Schedule'), + const SizedBox(height: 12), + _buildActionButton(Icons.add_circle_outline, + 'Add / Remove Activities'), + const SizedBox(height: 12), + _buildActionButton(Icons.delete_outline, 'Delete'), + ], + ), + ), + ], + ), + ), + ], + ], + ), + ); + } + + Widget _buildActionButton(IconData icon, String label) { + return Row( + children: [ + Icon(icon, size: 20, color: Colors.black87), + const SizedBox(width: 8), + Text( + label, + style: const TextStyle( + fontSize: 14, + color: Colors.black87, + ), + ), + ], + ); + } + + Widget _buildDayCircle(int dayIndex) { + final days = ['M', 'T', 'W', 'T', 'F', 'S', 'S']; + return GestureDetector( + onTap: () { + if (widget.onDaySelected != null) { + widget.onDaySelected!(dayIndex, !widget.selectedDays[dayIndex]); + } + }, + child: Container( + width: 36, + height: 36, + decoration: BoxDecoration( + shape: BoxShape.circle, + color: + widget.selectedDays[dayIndex] ? const Color(0xFFCB6CE6) : Colors.white, + border: Border.all( + color: widget.selectedDays[dayIndex] + ? const Color(0xFFCB6CE6) + : Colors.grey.shade300, + width: 1, + ), + ), + child: Center( + child: Text( + days[dayIndex], + style: TextStyle( + color: widget.selectedDays[dayIndex] ? Colors.white : Colors.black54, + fontWeight: FontWeight.w500, + ), + ), + ), + ), + ); + } +} \ No newline at end of file diff --git a/therapist/lib/provider/activity_provider.dart b/therapist/lib/provider/activity_provider.dart new file mode 100644 index 0000000..866251d --- /dev/null +++ b/therapist/lib/provider/activity_provider.dart @@ -0,0 +1,92 @@ +import 'package:flutter/material.dart'; + +class ActivitySet { + final String title; + final List activities; + final String? additionalInfo; + final List selectedDays; + bool isExpanded; + bool isActive; + + ActivitySet({ + required this.title, + required this.activities, + this.additionalInfo, + required this.selectedDays, + this.isExpanded = false, + this.isActive = false, + }); + + String getRepeatInfo() { + final days = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']; + final selectedDayNames = selectedDays + .asMap() + .entries + .where((entry) => entry.value) + .map((entry) => days[entry.key]) + .toList(); + + if (selectedDayNames.isEmpty) { + return 'No Active Schedule'; + } else if (selectedDayNames.length == 7) { + return 'Repeats Every Day'; + } else { + return 'Repeats ${selectedDayNames.join(', ')}'; + } + } +} + +class ActivityProvider extends ChangeNotifier { + final List _activitySets = [ + ActivitySet( + title: 'Activity Set 1', + activities: const [ + 'Brush Teeth', + 'Write legibly for a 10-minute period with minimal hand fatigue within 1 month', + 'Independently comb hair and wash face within 1 week' + ], + selectedDays: List.generate(7, (_) => false), + ), + ActivitySet( + title: 'Activity Set 2', + activities: const [ + 'Brush Teeth', + 'Write legibly for a 10-minute period with minimal hand fatigue within 1 month', + ], + additionalInfo: '5 more activities', + selectedDays: List.generate(7, (_) => false), + ), + ActivitySet( + title: 'Activity Set 3', + activities: const [ + 'Brush Teeth', + 'Write legibly for a 10-minute period with minimal hand fatigue within 1 month', + ], + additionalInfo: '5 more activities', + selectedDays: List.generate(7, (_) => false), + ), + ]; + + List get activitySets => _activitySets; + + void toggleExpanded(int index) { + _activitySets[index].isExpanded = !_activitySets[index].isExpanded; + notifyListeners(); + } + + void toggleActive(int index, bool value) { + _activitySets[index].isActive = value; + _activitySets[index].isExpanded = value; + notifyListeners(); + } + + void updateSelectedDays(int activitySetIndex, int dayIndex, bool value) { + _activitySets[activitySetIndex].selectedDays[dayIndex] = value; + notifyListeners(); + } + + void addActivitySet() { + // Implementation for adding a new activity set + notifyListeners(); + } +} \ No newline at end of file diff --git a/therapist/pubspec.lock b/therapist/pubspec.lock index c36c454..32dc40c 100644 --- a/therapist/pubspec.lock +++ b/therapist/pubspec.lock @@ -77,18 +77,18 @@ packages: dependency: transitive description: name: async - sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 url: "https://pub.dev" source: hosted - version: "2.11.0" + version: "2.12.0" boolean_selector: dependency: transitive description: name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" build: dependency: transitive description: @@ -157,10 +157,10 @@ packages: dependency: transitive description: name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" checked_yaml: dependency: transitive description: @@ -173,10 +173,10 @@ packages: dependency: transitive description: name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" code_builder: dependency: transitive description: @@ -189,10 +189,10 @@ packages: dependency: transitive description: name: collection - sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" url: "https://pub.dev" source: hosted - version: "1.19.0" + version: "1.19.1" convert: dependency: transitive description: @@ -261,10 +261,10 @@ packages: dependency: transitive description: name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.2" ffi: dependency: transitive description: @@ -524,18 +524,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06" + sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec url: "https://pub.dev" source: hosted - version: "10.0.7" + version: "10.0.8" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379" + sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 url: "https://pub.dev" source: hosted - version: "3.0.8" + version: "3.0.9" leak_tracker_testing: dependency: transitive description: @@ -564,10 +564,10 @@ packages: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 url: "https://pub.dev" source: hosted - version: "0.12.16+1" + version: "0.12.17" material_color_utilities: dependency: transitive description: @@ -580,10 +580,10 @@ packages: dependency: transitive description: name: meta - sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.16.0" mime: dependency: transitive description: @@ -612,10 +612,10 @@ packages: dependency: transitive description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" path_parsing: dependency: transitive description: @@ -865,18 +865,18 @@ packages: dependency: transitive description: name: source_span - sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.10.1" stack_trace: dependency: transitive description: name: stack_trace - sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.12.1" storage_client: dependency: transitive description: @@ -889,10 +889,10 @@ packages: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" stream_transform: dependency: transitive description: @@ -905,10 +905,10 @@ packages: dependency: transitive description: name: string_scanner - sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.1" supabase: dependency: transitive description: @@ -929,18 +929,18 @@ packages: dependency: transitive description: name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" test_api: dependency: transitive description: name: test_api - sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" + sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd url: "https://pub.dev" source: hosted - version: "0.7.3" + version: "0.7.4" timing: dependency: transitive description: @@ -1073,10 +1073,10 @@ packages: dependency: transitive description: name: vm_service - sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b + sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14" url: "https://pub.dev" source: hosted - version: "14.3.0" + version: "14.3.1" watcher: dependency: transitive description: @@ -1142,5 +1142,5 @@ packages: source: hosted version: "2.0.3" sdks: - dart: ">=3.6.0 <4.0.0" + dart: ">=3.7.0-0 <4.0.0" flutter: ">=3.27.0"