Merge pull request #6 from dhruv1345/master

screen overflow for starter page resolved. Issue #7 and Enhanced the Ui of StartPage.dart. Issue #12
ruqaiyasattar · Mar 14, 2023 · 3614244 · 3614244
2 parents d6d8cee + a1bdce2
commit 3614244
Show file tree

Hide file tree

Showing 5 changed files with 240 additions and 70 deletions.
diff --git a/lib/CustomButton.dart b/lib/CustomButton.dart
@@ -11,17 +11,22 @@ class CustomButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-      padding: const EdgeInsets.only(left: 28.0, right: 28.0,top: 10.0, bottom: 10.0),
+      padding: const EdgeInsets.only(
+          left: 28.0, right: 28.0, top: 10.0, bottom: 10.0),
       decoration: BoxDecoration(
         color: const Color(0xffC5D7FE),
         borderRadius: BorderRadius.circular(25.0),
       ),
       child: InkWell(
         child: Text(
           txt,
-          style: const TextStyle(color: Colors.black),
+          style: const TextStyle(
+            color: Colors.blueAccent,
+            fontWeight: FontWeight.bold,
+            fontSize: 20,
+          ),
         ),
       ),
     );
   }
-}
+}
diff --git a/lib/main.dart b/lib/main.dart
@@ -7,9 +7,7 @@ void main() {
   runApp(
     MaterialApp(
       // title: 'Flutter Demo',
-      theme: ThemeData(
-        primarySwatch: Colors.blue
-      ),
+      theme: ThemeData(primarySwatch: Colors.blue),
       home: const StartPage(),
       debugShowCheckedModeBanner: false,
       initialRoute: '/',
@@ -21,4 +19,3 @@ void main() {
     ),
   );
 }
-
diff --git a/lib/screens/StartPage.dart b/lib/screens/StartPage.dart
@@ -11,33 +11,34 @@ class StartPage extends StatelessWidget {
       backgroundColor: const Color(0xffF3F7FF),
       body: Column(
         children: [
-          const SizedBox(
-            height: 100,
-          ),
-          Padding(
-            padding: const EdgeInsets.only(left: 26,right: 26, top: 87),
-            child: Image.asset(
+          Flexible(
+            flex: 3,
+            fit: FlexFit.loose,
+            child: Padding(
+              padding: const EdgeInsets.only(left: 26, right: 26, top: 87),
+              child: Image.asset(
                 'assets/images/img.png',
-              height: 280,
+                height: 300,
+              ),
             ),
           ),
           const Padding(
             padding: EdgeInsets.only(left: 23, right: 23),
             child: Text(
-                'mboathoscope',
-                 style: TextStyle(
-                 color: Color(0xff3D79FD),
-                 fontWeight: FontWeight.bold,
-                 fontSize: 50,
+              'mboathoscope',
+              style: TextStyle(
+                color: Color(0xff3D79FD),
+                fontWeight: FontWeight.bold,
+                fontSize: 45,
               ),
             ),
           ),
           const SizedBox(
-            height: 39,
+            height: 50,
           ),
           GestureDetector(
-            onTap: (){
-              Navigator.pushNamed(context,'/rolepage');
+            onTap: () {
+              Navigator.pushNamed(context, '/rolepage');
             },
             child: const Padding(
               padding: EdgeInsets.only(bottom: 199),
@@ -50,4 +51,4 @@ class StartPage extends StatelessWidget {
       ),
     );
   }
-}
+}