chronometriq · Divinoart · Apr 29, 2024
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -1,50 +1,16 @@
 PODS:
-  - Firebase/CoreOnly (10.3.0):
-    - FirebaseCore (= 10.3.0)
-  - firebase_core (2.7.0):
-    - Firebase/CoreOnly (= 10.3.0)
-    - Flutter
-  - FirebaseCore (10.3.0):
-    - FirebaseCoreInternal (~> 10.0)
-    - GoogleUtilities/Environment (~> 7.8)
-    - GoogleUtilities/Logger (~> 7.8)
-  - FirebaseCoreInternal (10.3.0):
-    - "GoogleUtilities/NSData+zlib (~> 7.8)"
   - Flutter (1.0.0)
-  - GoogleUtilities/Environment (7.10.0):
-    - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/Logger (7.10.0):
-    - GoogleUtilities/Environment
-  - "GoogleUtilities/NSData+zlib (7.10.0)"
-  - PromisesObjC (2.1.1)
 
 DEPENDENCIES:
-  - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
   - Flutter (from `Flutter`)
 
-SPEC REPOS:
-  trunk:
-    - Firebase
-    - FirebaseCore
-    - FirebaseCoreInternal
-    - GoogleUtilities
-    - PromisesObjC
-
 EXTERNAL SOURCES:
-  firebase_core:
-    :path: ".symlinks/plugins/firebase_core/ios"
   Flutter:
     :path: Flutter
 
 SPEC CHECKSUMS:
-  Firebase: f92fc551ead69c94168d36c2b26188263860acd9
-  firebase_core: 128d8c43c3a453a4a67463314fc3761bedff860b
-  FirebaseCore: 988754646ab3bd4bdcb740f1bfe26b9f6c0d5f2a
-  FirebaseCoreInternal: 29b76f784d607df8b2a1259d73c3f04f1210137b
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
-  GoogleUtilities: bad72cb363809015b1f7f19beb1f1cd23c589f95
-  PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb
 
 PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
 
-COCOAPODS: 1.13.0
+COCOAPODS: 1.15.2
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -141,7 +141,6 @@
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				4E5A40E9A37C95B5E9A54A0E /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -158,7 +157,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -217,23 +216,6 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
-		4E5A40E9A37C95B5E9A54A0E /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		63A61AFE2EE5F600ADD9CEA5 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/lib/feature/home/components/appointments/appointments.dart b/lib/feature/home/components/appointments/appointments.dart
@@ -7,8 +7,12 @@ import '../section/section_row.dart';
 import 'appointments_item.dart';
 
 class Appointments extends StatelessWidget {
+  final GlobalKey four;
+  final GlobalKey five;
   const Appointments({
     Key? key,
+    required this.four,
+    required this.five,
     this.verticalLayout = false,
   }) : super(key: key);
 
@@ -19,6 +23,7 @@ class Appointments extends StatelessWidget {
     return Section(
       name: context.localizations.upcoming_appointments,
       showViewAll: true,
+      globalKey: five,
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
@@ -64,6 +69,7 @@ class Appointments extends StatelessWidget {
         cta: "Join virtual visit",
         image: Image.asset('images/house.png').image,
         condensed: verticalLayout,
+        globalKey: four,
       ),
       AppointmentsItem(
         date: DateTime.now(),

diff --git a/lib/feature/home/components/appointments/appointments_item.dart b/lib/feature/home/components/appointments/appointments_item.dart
@@ -3,6 +3,8 @@ import 'package:chrconnecthpdraft/feature/home/components/calendar.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 
+import '../../../widgets/showcase/showcase.dart';
+
 class AppointmentsItem extends StatelessWidget {
   const AppointmentsItem({
     Key? key,
@@ -16,6 +18,7 @@ class AppointmentsItem extends StatelessWidget {
     this.calendarSize = const Size(64, 64),
     this.imageRadius = 12,
     this.condensed = false,
+    this.globalKey,
   }) : super(key: key);
 
   final String title;
@@ -28,6 +31,7 @@ class AppointmentsItem extends StatelessWidget {
   final double imageRadius;
   final Size calendarSize;
   final bool condensed;
+  final GlobalKey? globalKey;
 
   @override
   Widget build(BuildContext context) =>
@@ -229,10 +233,22 @@ class AppointmentsItem extends StatelessWidget {
                     ),
               ),
               const Spacer(),
-              TextButton(
-                onPressed: () {},
-                child: Text(cta),
-              ),
+              if (globalKey != null)...[
+                ShowCase(
+                  globalKey: globalKey!,
+                  title: "There are direct links to your virtual appointments.",
+                  desc: "Continue",
+                  child: TextButton(
+                    onPressed: () {},
+                    child: Text(cta),
+                  ),
+                ),
+              ] else ...[
+                TextButton(
+                  onPressed: () {},
+                  child: Text(cta),
+                ),
+              ],
               const SizedBox(width: 16),
             ],
           ),

diff --git a/lib/feature/home/components/section/section.dart b/lib/feature/home/components/section/section.dart
@@ -1,17 +1,21 @@
 import 'package:chrconnecthpdraft/feature/app/extension/context.dart';
 import 'package:flutter/material.dart';
 
+import '../../../widgets/showcase/showcase.dart';
+
 class Section extends StatelessWidget {
   const Section({
     Key? key,
     this.name,
     this.child,
     this.showViewAll = false,
+    this.globalKey,
   }) : super(key: key);
 
   final String? name;
   final Widget? child;
   final bool showViewAll;
+  final GlobalKey? globalKey;
 
   @override
   Widget build(BuildContext context) {
@@ -28,14 +32,28 @@ class Section extends StatelessWidget {
                   style: Theme.of(context).textTheme.displayMedium,
                 ),
                 const Spacer(),
-                if (showViewAll)
+                if (showViewAll && globalKey != null)
+                  ShowCase(
+                    globalKey: globalKey!,
+                    title: "You can view your appointments via this link",
+                    desc: "Continue",
+                    child: Text(
+                      context.localizations.view_all,
+                      style: Theme.of(context).textTheme.displaySmall?.copyWith(
+                            decoration: TextDecoration.underline,
+                            fontWeight: FontWeight.w400,
+                            color: Theme.of(context).colorScheme.primary,
+                          ),
+                    ),
+                  ),
+                if (showViewAll && globalKey == null)
                   Text(
                     context.localizations.view_all,
                     style: Theme.of(context).textTheme.displaySmall?.copyWith(
-                          decoration: TextDecoration.underline,
-                          fontWeight: FontWeight.w400,
-                          color: Theme.of(context).colorScheme.primary,
-                        ),
+                      decoration: TextDecoration.underline,
+                      fontWeight: FontWeight.w400,
+                      color: Theme.of(context).colorScheme.primary,
+                    ),
                   ),
               ],
             ),

diff --git a/lib/feature/home/home_screen.dart b/lib/feature/home/home_screen.dart
@@ -4,37 +4,78 @@ import 'package:chrconnecthpdraft/feature/home/components/more_resources.dart';
 import 'package:chrconnecthpdraft/feature/home/components/welcoming.dart';
 import 'package:flutter/material.dart';
 
+import '../widgets/showcase/showcase.dart';
 import 'components/reminders/reminders.dart';
 
 class HomeScreen extends StatelessWidget {
-  const HomeScreen({Key? key}) : super(key: key);
+  final GlobalKey one;
+  final GlobalKey two;
+  final GlobalKey three;
+  final GlobalKey four;
+  final GlobalKey five;
+  final GlobalKey six;
+  final ScrollController scrollController;
+  const HomeScreen({
+    Key? key,
+    required this.one,
+    required this.two,
+    required this.three,
+    required this.four,
+    required this.five,
+    required this.six,
+    required this.scrollController,
+  }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
     return Stack(
       children: [
         Image.asset('images/background.png'),
         SingleChildScrollView(
+          controller: scrollController,
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
-            children: const [
-              SizedBox(height: 24),
-              Padding(
-                padding: EdgeInsets.symmetric(horizontal: 16.0),
-                child: Welcoming(
-                  state: WelcomingStates.evening,
-                  name: "Linda",
+            children: [
+              const SizedBox(height: 24),
+              ShowCase(
+                globalKey: one,
+                title: "We'll take you on a quick tour of your home page",
+                desc: "Continue",
+                child: const Padding(
+                  padding: EdgeInsets.symmetric(horizontal: 16.0),
+                  child: Welcoming(
+                    state: WelcomingStates.evening,
+                    name: "Linda",
+                  ),
                 ),
               ),
-              SizedBox(height: 32),
-              Reminders(),
-              SizedBox(height: 32),
-              Appointments(verticalLayout: true),
-              SizedBox(height: 32),
-              Inbox(verticalLayout: true),
-              SizedBox(height: 32),
-              MoreResources(),
-              SizedBox(height: 88),
+              const SizedBox(height: 32),
+              ShowCase(
+                globalKey: two,
+                title: "The first section shows your reminders. If there are any task requiring action from you, you'll find them here",
+                desc: "Scroll to the next section",
+                child: const Reminders(),
+              ),
+              const SizedBox(height: 32),
+              ShowCase(
+                  globalKey: three,
+                  title: "This second section gives you easy access to upcoming appointments",
+                  desc: "Continue",
+                  child: Appointments(four: four, five: five)),
+              const SizedBox(height: 32),
+              ShowCase(
+                globalKey: six,
+                title: "At the bottom of the page, you'll find your messages and some extra resources",
+                desc: "Continue",
+                child: Column(
+                  children: const [
+                    Inbox(),
+                    SizedBox(height: 32),
+                    MoreResources(),
+                  ],
+                ),
+              ),
+              const SizedBox(height: 88),
             ],
           ),
         ),