Adjusted stuff

gdsc-uba · Sep 5, 2021 · bf55782 · bf55782
1 parent cf999d9
commit bf55782
Show file tree

Hide file tree

Showing 2 changed files with 117 additions and 72 deletions.
diff --git a/lib/Components/custom_dialog_route.dart b/lib/Components/custom_dialog_route.dart
@@ -1,40 +1,43 @@
-
 import 'package:flutter/material.dart';
 
 ///{@template custom hero_dialod_route}
 ///Custom [PageRoute] that creates an overlay dialog popup effect
 ///
 ///Best used with a [Hero] animation
 
-class  CustomHeroDialogRoute<T> extends PageRoute<T> {
-
-CustomHeroDialogRoute({
-  @required WidgetBuilder builder,
-  RouteSettings settings,
-  bool fullscreenDialog = false,
-}) : _builder = builder, super(settings: settings, fullscreenDialog: fullscreenDialog);
-
-final WidgetBuilder _builder;
-
-@override
-bool get opaque => false;
-@override
-bool get barrierDismissible => true;
-@override 
-Duration get transitionDuration => const Duration(milliseconds:300);   
-@override 
-bool get maintainState=> true;
-
-@override 
-Color get barrierColor => Colors.black54;
-@override 
-Widget buildTransitions(BuildContext context, Animation<double> animation, Animation<double> secondaryAnimation, Widget child){ return child;}
-
-@override 
-Widget buildPage(BuildContext context, Animation<double> animation, Animation<double> secondaryAnimation){
-  return _builder(context);
+class CustomHeroDialogRoute<T> extends PageRoute<T> {
+  CustomHeroDialogRoute({
+    @required WidgetBuilder builder,
+    RouteSettings settings,
+    bool fullscreenDialog = false,
+  })  : _builder = builder,
+        super(settings: settings, fullscreenDialog: fullscreenDialog);
+
+  final WidgetBuilder _builder;
+
+  @override
+  bool get opaque => false;
+  @override
+  bool get barrierDismissible => true;
+  @override
+  Duration get transitionDuration => const Duration(milliseconds: 300);
+  @override
+  bool get maintainState => true;
+
+  @override
+  Color get barrierColor => Colors.black54;
+  @override
+  Widget buildTransitions(BuildContext context, Animation<double> animation,
+      Animation<double> secondaryAnimation, Widget child) {
+    return child;
+  }
+
+  @override
+  Widget buildPage(BuildContext context, Animation<double> animation,
+      Animation<double> secondaryAnimation) {
+    return _builder(context);
+  }
+
+  @override
+  String get barrierLabel => 'Popup dialog open';
 }
-@override 
-String get barrierLabel => 'Popup dialog open';
-
-}
diff --git a/lib/Components/directions/nav_instructions.dart b/lib/Components/directions/nav_instructions.dart
@@ -21,51 +21,93 @@ class NavigationInstructions extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return DraggableScrollableSheet(
-        minChildSize: .2,
-        maxChildSize: .6,
-        builder: (
-          context,
-          scrollController,
-        ) {
-          return SingleChildScrollView(
-            controller: scrollController,
-            child: Container(
-              decoration: BoxDecoration(
-                borderRadius: BorderRadius.vertical(top: Radius.circular(15)),
-                color: primarycolor,
-              ),
-              child: Stack(
-                children: [
-                  Column(
-                    children: [
-                      Text('Navigating To..'),
-                      Text(tapID),
-                      Text(tapDescription),
-                      Row(
+    Size screenSize = MediaQuery.of(context).size;
+    return Material(
+      child: DraggableScrollableSheet(
+          minChildSize: .3,
+          maxChildSize: .6,
+          builder: (
+            context,
+            scrollController,
+          ) {
+            return SingleChildScrollView(
+              controller: scrollController,
+              child: Container(
+                height: screenSize.height * .5,
+                decoration: BoxDecoration(
+                  borderRadius: BorderRadius.vertical(top: Radius.circular(15)),
+                  color: Colors.white,
+                ),
+                child: Stack(
+                  children: [
+                    Positioned(
+                      top: 5,
+                      left: 5,
+                      child: Text(
+                        'Navigating To..',
+                        style: TextStyle(
+                            fontSize: 42,
+                            fontWeight: FontWeight.bold,
+                            color: Colors.black12),
+                      ),
+                    ),
+                    Padding(
+                      padding: const EdgeInsets.fromLTRB(20, 40, 0, 10),
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
-                          Text(distance),
-                          Text(time),
+                          HeadlineTextBold(
+                            title: tapID,
+                            color: primarycolor,
+                          ),
+                          SizedBox(height: 10),
+                          BodyText(
+                            title: tapDescription,
+                            color: textcolor,
+                          ),
+                          // Row(
+                          //   children: [
+                          //     Text(distance),
+                          //     Text(time),
+                          //   ],
+                          // )
                         ],
-                      )
-                    ],
-                  ),
-                  Container(
-                    decoration: BoxDecoration(
-                      borderRadius: BorderRadius.circular(10),
-                      color: Colors.white,
+                      ),
                     ),
-                    child: SingleChildScrollView(
-                        // child: ListView.builder(
-                        //   itemBuilder: ,
-                        // ),
+                    Positioned(
+                      top: screenSize.height * .2,
+                      left: 0,
+                      right: 0,
+                      child: Container(
+                        width: double.infinity,
+                        decoration: BoxDecoration(
+                          borderRadius: BorderRadius.circular(10),
+                          color: Colors.blue,
+                        ),
+                        child: SingleChildScrollView(
+                          child: Column(
+                            children: [
+                              Text('sup'),
+                              Text('sup'),
+                              Text('sup'),
+                              Text('sup'),
+                              Text('sup'),
+                              Text('sup'),
+                              Text('sup'),
+                            ],
+                          ),
+                          // child: ListView.builder(
+                          //   itemBuilder: ,
+                          // ),
                         ),
-                  ),
-                ],
+                      ),
+                    ),
+                  ],
+                ),
               ),
-            ),
-          );
-        });
+            );
+          }),
+    );
   }
 }