Added Remainder Details Form , fixes issues , added TODO Marks, Conve…

…rted stf to stl (where possible)
WaqasZafar9 · May 6, 2024 · 4ad9c4c · 4ad9c4c
1 parent 2094a58
commit 4ad9c4c
Show file tree

Hide file tree

Showing 18 changed files with 328 additions and 102 deletions.
diff --git a/pet_care/.dart_tool/flutter_build/880231b68eb572aa1fc3e7a52a7c2b36/.filecache b/pet_care/.dart_tool/flutter_build/880231b68eb572aa1fc3e7a52a7c2b36/.filecache
diff --git a/pet_care/.dart_tool/flutter_build/880231b68eb572aa1fc3e7a52a7c2b36/app.dill b/pet_care/.dart_tool/flutter_build/880231b68eb572aa1fc3e7a52a7c2b36/app.dill
diff --git a/....dart_tool/flutter_build/880231b68eb572aa1fc3e7a52a7c2b36/debug_android_application.stamp b/....dart_tool/flutter_build/880231b68eb572aa1fc3e7a52a7c2b36/debug_android_application.stamp
diff --git a/pet_care/.dart_tool/flutter_build/880231b68eb572aa1fc3e7a52a7c2b36/flutter_assets.d b/pet_care/.dart_tool/flutter_build/880231b68eb572aa1fc3e7a52a7c2b36/flutter_assets.d
diff --git a/pet_care/.dart_tool/flutter_build/880231b68eb572aa1fc3e7a52a7c2b36/kernel_snapshot.d b/pet_care/.dart_tool/flutter_build/880231b68eb572aa1fc3e7a52a7c2b36/kernel_snapshot.d
diff --git a/pet_care/.dart_tool/flutter_build/880231b68eb572aa1fc3e7a52a7c2b36/kernel_snapshot.stamp b/pet_care/.dart_tool/flutter_build/880231b68eb572aa1fc3e7a52a7c2b36/kernel_snapshot.stamp
diff --git a/pet_care/.flutter-plugins-dependencies b/pet_care/.flutter-plugins-dependencies
diff --git a/pet_care/android/app/src/main/AndroidManifest.xml b/pet_care/android/app/src/main/AndroidManifest.xml
@@ -33,7 +33,7 @@
             android:value="2" />
 <!--&lt;!&ndash;        Todo Change API KEY VALUE Accordingly-->
         <meta-data android:name="com.google.android.geo.API_KEY"
-            android:value="AIzaSyCzaAl9_14o73H6wyYzx9o0X6Y-XediM0I"/>
+            android:value="AIzaSyBSnFpHnup88if4QNvcgTPHfBKRkIhOym4"/>
     </application>
     <!-- Required to query activities that can process text, see:
          https://developer.android.com/training/package-visibility?hl=en and

diff --git a/pet_care/lib/CheckFiles.dart b/pet_care/lib/CheckFiles.dart
@@ -14,14 +14,9 @@ import 'package:pet_care/SplashScreen.dart';
 import 'package:pet_care/TrackingPet.dart';
 import 'package:pet_care/phoneAuthentication.dart';
 
-class checkFiles extends StatefulWidget {
+class checkFiles extends StatelessWidget {
   const checkFiles({super.key});
 
-  @override
-  State<checkFiles> createState() => _checkFilesState();
-}
-
-class _checkFilesState extends State<checkFiles> {
   @override
   Widget build(BuildContext context) {
 

diff --git a/pet_care/lib/HomePage.dart b/pet_care/lib/HomePage.dart
@@ -4,15 +4,10 @@ import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:google_nav_bar/google_nav_bar.dart';
 
-class HomePage extends StatefulWidget {
+class HomePage extends StatelessWidget {
   Map<String,dynamic> userData;
    HomePage({super.key,required this.userData});
 
-  @override
-  State<HomePage> createState() => _HomePageState();
-}
-
-class _HomePageState extends State<HomePage> {
   @override
   Widget build(BuildContext context) {
 
@@ -21,7 +16,7 @@ class _HomePageState extends State<HomePage> {
       child: Scaffold(
 
         appBar: AppBar(
-          title: Text("Welcome ${widget.userData["Name"]}" ),
+          title: Text("Welcome ${userData["Name"]}" ),
           // centerTitle: true,
           bottom:  const TabBar(tabs: [
             Tab(

diff --git a/pet_care/lib/PetDetailsWidget.dart b/pet_care/lib/PetDetailsWidget.dart
@@ -4,6 +4,7 @@ import 'package:flutter/widgets.dart';
 import 'package:pet_care/ColorsScheme.dart';
 import 'package:pet_care/addTaskContainer.dart';
 import 'package:pet_care/petReminderDetailsWidget.dart';
+import 'package:pet_care/showTaskDetailsContainer.dart';
 import 'package:pet_care/uihelper.dart';
 
 class PetDetailsWidget extends StatefulWidget {
@@ -78,8 +79,11 @@ class _PetDetailsWidgetState extends State<PetDetailsWidget> {
                       flex: 9,
                       child: InkWell(
                           onTap: () {},
-                          child: SingleChildScrollView(
-                              child: petReminderDetails())),
+
+                          /// TODO fix scrolling issue
+
+                          child: ListView(children: [petReminderDetails()])
+                      ),
                     )
                   : Expanded(
                       child: InkWell(

diff --git a/pet_care/lib/ProfilePage.dart b/pet_care/lib/ProfilePage.dart
@@ -4,17 +4,12 @@ import 'package:flutter/material.dart';
 import 'package:pet_care/LoginPage.dart';
 import 'package:pet_care/phoneAuthentication.dart';
 
-class ProfilePage extends StatefulWidget {
+class ProfilePage extends StatelessWidget {
 
   Map<String,dynamic> userData;
 
   ProfilePage({super.key,required this.userData});
 
-  @override
-  State<ProfilePage> createState() => _ProfilePageState();
-}
-
-class _ProfilePageState extends State<ProfilePage> {
   @override
   Widget build(BuildContext context) {
     return Stack(children: [
@@ -44,9 +39,9 @@ class _ProfilePageState extends State<ProfilePage> {
                   },
 
                   //Todo : Remove else if as Pic never be null
-                  leading: widget.userData["Pic"]!=null ? CircleAvatar(
+                  leading: userData["Pic"]!=null ? CircleAvatar(
                     radius: 30,
-                    backgroundImage:  NetworkImage(widget.userData["Pic"]),
+                    backgroundImage:  NetworkImage(userData["Pic"]),
                     backgroundColor: Colors.white70,
                   ) :
                   CircleAvatar(
@@ -56,19 +51,19 @@ class _ProfilePageState extends State<ProfilePage> {
                   )
                   ,
                   title: Text(
-                    widget.userData["Name"],
+                    userData["Name"],
                     style: TextStyle(
                       fontSize: 20,
                       fontWeight: FontWeight.bold,
                       decoration: TextDecoration.underline,
                     ),
                   ),
-                  subtitle: Text(widget.userData["Email"]),
+                  subtitle: Text(userData["Email"]),
                   trailing: IconButton(
                     disabledColor: Colors.blueGrey.shade600,
-                    icon: widget.userData["isVerified"] == true ? Icon(Icons.verified_user) : Icon(Icons.add),
-                    onPressed: widget.userData["isVerified"]==false ? (){
-                    Navigator.push(context, MaterialPageRoute(builder: (context) =>PhoneAuthentication(userData: widget.userData,) ,));
+                    icon: userData["isVerified"] == true ? Icon(Icons.verified_user) : Icon(Icons.add),
+                    onPressed: userData["isVerified"]==false ? (){
+                    Navigator.push(context, MaterialPageRoute(builder: (context) =>PhoneAuthentication(userData: userData,) ,));
                    } : null
                   ,),
                 ),

diff --git a/pet_care/lib/TrackingPet.dart b/pet_care/lib/TrackingPet.dart
@@ -355,6 +355,7 @@ class _trackingPetState extends State<trackingPet> {
                       title = values[dropdownvalue]!["Name"].toString();
                       pos = LatLng(values[dropdownvalue]!["Lat"] as double,
                           values[dropdownvalue]!["Long"] as double);
+                      polylineCoordinates=[];
                       isRouting=false;
                     });
 
@@ -367,4 +368,4 @@ class _trackingPetState extends State<trackingPet> {
       ),
     );
   }
-}
+}
diff --git a/pet_care/lib/addTaskContainer.dart b/pet_care/lib/addTaskContainer.dart
@@ -34,7 +34,7 @@ class _addTaskContainerState extends State<addTaskContainer> {
   @override
   Widget build(BuildContext context) {
     return Container(
-      height: 700,
+      height: 714,
       decoration: BoxDecoration(
           color: Colors.grey.shade300, borderRadius: BorderRadius.circular(4)),
       child: Column(
@@ -74,6 +74,7 @@ class _addTaskContainerState extends State<addTaskContainer> {
                           ),
                         ),
                         TextFormField(
+                          maxLength: 16,
                           controller: titleController,
                           autovalidateMode:
                           AutovalidateMode.onUserInteraction,

diff --git a/pet_care/lib/apiKey.dart b/pet_care/lib/apiKey.dart
@@ -1,2 +1,2 @@
 
-var APIKEY="AIzaSyCzaAl9_14o73H6wyYzx9o0X6Y-XediM0I";
+var APIKEY="AIzaSyBSnFpHnup88if4QNvcgTPHfBKRkIhOym4";
diff --git a/pet_care/lib/petDetails.dart b/pet_care/lib/petDetails.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:pet_care/ColorsScheme.dart';
 import 'package:pet_care/PetDetailsWidget.dart';
+import 'package:pet_care/showTaskDetailsContainer.dart';
 
 class petDetails extends StatefulWidget {
   const petDetails({super.key});
@@ -17,6 +18,13 @@ class _petDetailsState extends State<petDetails> {
         title: Text("Welcome Fuzail"),
         backgroundColor: Colors.grey.shade500,
       ),
+
+      /// ToDO Remove Drawer Property
+
+      endDrawer: Drawer(
+        child: ListView(
+            children: [ showTaskDetailsContainer()]),
+      ),
       body: Container(
         color: primaryColorBackground,
         child: Padding(

diff --git a/pet_care/lib/petReminderDetailsWidget.dart b/pet_care/lib/petReminderDetailsWidget.dart
@@ -2,6 +2,8 @@ import 'package:awesome_snackbar_content/awesome_snackbar_content.dart';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:pet_care/petReminderDeatilsData.dart';
+import 'package:pet_care/showTaskDetailsContainer.dart';
+import 'package:pet_care/uihelper.dart';
 
 class petReminderDetails extends StatefulWidget {
   const petReminderDetails({Key? key}) : super(key: key);
@@ -11,8 +13,13 @@ class petReminderDetails extends StatefulWidget {
 }
 
 class _petReminderDetailsState extends State<petReminderDetails> {
+
+
+
   var data = perReminderDetailsData().ReminderData;
 
+  bool isTaskDetail=false;
+
   @override
   Widget build(BuildContext context) {
     return Container(
@@ -84,79 +91,89 @@ class _petReminderDetailsState extends State<petReminderDetails> {
                   // color: Colors.greenAccent,
                   borderRadius: BorderRadius.circular(4),
                 ),
-                child: Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceAround,
-                  children: [
-                    Expanded(
-                      flex: 5,
-                      child: Text(
-                        data[index]["title"] as String,
-                        style: TextStyle(
-                            fontSize: 15, fontWeight: FontWeight.w500),
-                      ),
-                    ),
-                    Expanded(
-                      flex: 2,
-                      child: Center(
+                child: InkWell(
+
+                  ///TODO fixe Remainder Details Contianer Rendering
+
+                  onTap: (){
+                    isTaskDetail=true;
+                    Scaffold.of(context).openEndDrawer(
+                    );
+                  },
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceAround,
+                    children: [
+                      Expanded(
+                        flex: 5,
                         child: Text(
-                          data[index]["Time"] as String,
-                          style: TextStyle(fontSize: 16),
+                          data[index]["title"] as String,
+                          style: TextStyle(
+                              fontSize: 15, fontWeight: FontWeight.w500),
                         ),
                       ),
-                    ),
-                    Expanded(
-                      flex: 3,
-                      child: Center(
-                        child: Text(
-                          data[index]["Date"] as String,
-                          style: TextStyle(fontSize: 16),
+                      Expanded(
+                        flex: 2,
+                        child: Center(
+                          child: Text(
+                            data[index]["Time"] as String,
+                            style: TextStyle(fontSize: 16),
+                          ),
                         ),
                       ),
-                    ),
-                    InkWell(
-                      onTap: () {
-                        setState(() {
-                          data[index]["isSilent"] =
-                              !(data[index]["isSilent"] as bool);
-                        });
-
-                        final snackBar = SnackBar(
-                          elevation: 0,
-                          behavior: SnackBarBehavior.floating,
-                          backgroundColor: Colors.transparent,
-                          content: AwesomeSnackbarContent(
-                            title: 'Ring!',
-                            message: 'Notifications Turned ON!',
-                            contentType: ContentType.success,
+                      Expanded(
+                        flex: 3,
+                        child: Center(
+                          child: Text(
+                            data[index]["Date"] as String,
+                            style: TextStyle(fontSize: 16),
                           ),
-                        );
+                        ),
+                      ),
+                      InkWell(
+                        onTap: () {
+                          setState(() {
+                            data[index]["isSilent"] =
+                                !(data[index]["isSilent"] as bool);
+                          });
 
-                        final snackBarSilent = SnackBar(
-                          elevation: 0,
-                          behavior: SnackBarBehavior.floating,
-                          backgroundColor: Colors.transparent,
-                          content: AwesomeSnackbarContent(
-                            title: 'Silent!',
-                            message: 'Notifications Turned OFF!',
-                            contentType: ContentType.warning,
-                            color: Colors.blueGrey,
-                          ),
-                        );
+                          final snackBar = SnackBar(
+                            elevation: 0,
+                            behavior: SnackBarBehavior.floating,
+                            backgroundColor: Colors.transparent,
+                            content: AwesomeSnackbarContent(
+                              title: 'Ring!',
+                              message: 'Notifications Turned ON!',
+                              contentType: ContentType.success,
+                            ),
+                          );
+
+                          final snackBarSilent = SnackBar(
+                            elevation: 0,
+                            behavior: SnackBarBehavior.floating,
+                            backgroundColor: Colors.transparent,
+                            content: AwesomeSnackbarContent(
+                              title: 'Silent!',
+                              message: 'Notifications Turned OFF!',
+                              contentType: ContentType.warning,
+                              color: Colors.blueGrey,
+                            ),
+                          );
 
-                        data[index]["isSilent"] == true
-                            ? ScaffoldMessenger.of(context)
-                                .showSnackBar(snackBarSilent)
-                            : ScaffoldMessenger.of(context)
-                                .showSnackBar(snackBar);
-                      },
-                      child: data[index]["isSilent"] == true
-                          ? FaIcon(
-                              FontAwesomeIcons.clock,
-                              size: 20,
-                            )
-                          : FaIcon(FontAwesomeIcons.userClock,size: 20,),
-                    ),
-                  ],
+                          data[index]["isSilent"] == true
+                              ? ScaffoldMessenger.of(context)
+                                  .showSnackBar(snackBarSilent)
+                              : ScaffoldMessenger.of(context)
+                                  .showSnackBar(snackBar);
+                        },
+                        child: data[index]["isSilent"] == true
+                            ? FaIcon(
+                                FontAwesomeIcons.clock,
+                                size: 20,
+                              )
+                            : FaIcon(FontAwesomeIcons.userClock,size: 20,),
+                      ),
+                    ],
+                  ),
                 ),
               );
             },
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@

		var APIKEY="AIzaSyCzaAl9_14o73H6wyYzx9o0X6Y-XediM0I";
		var APIKEY="AIzaSyBSnFpHnup88if4QNvcgTPHfBKRkIhOym4";