From cbbbfbfa95f82b9a9ad4be53c3a3f95c5eeb0452 Mon Sep 17 00:00:00 2001 From: Lucas Delanier Date: Wed, 2 Nov 2022 19:03:34 +0100 Subject: [PATCH] commit merge linkView and master --- .idea/libraries/Dart_SDK.xml | 38 +++++++++---------- Sources/dafl_project_flutter/lib/main.dart | 1 - .../lib/views/pages/home/p_home.dart | 37 +++--------------- 3 files changed, 24 insertions(+), 52 deletions(-) diff --git a/.idea/libraries/Dart_SDK.xml b/.idea/libraries/Dart_SDK.xml index 1aea070..6ae284f 100644 --- a/.idea/libraries/Dart_SDK.xml +++ b/.idea/libraries/Dart_SDK.xml @@ -1,25 +1,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/Sources/dafl_project_flutter/lib/main.dart b/Sources/dafl_project_flutter/lib/main.dart index 76bda2a..19fa439 100644 --- a/Sources/dafl_project_flutter/lib/main.dart +++ b/Sources/dafl_project_flutter/lib/main.dart @@ -1,5 +1,4 @@ import 'dart:async'; -import 'package:dafl_project_flutter/views/pages/main/w_bottomsheet.dart'; import 'package:fluttertoast/fluttertoast.dart'; import 'package:vibration/vibration.dart'; import 'dart:math'; diff --git a/Sources/dafl_project_flutter/lib/views/pages/home/p_home.dart b/Sources/dafl_project_flutter/lib/views/pages/home/p_home.dart index 737d33c..781c451 100644 --- a/Sources/dafl_project_flutter/lib/views/pages/home/p_home.dart +++ b/Sources/dafl_project_flutter/lib/views/pages/home/p_home.dart @@ -28,30 +28,12 @@ class _HomePageState extends State { crossAxisAlignment: CrossAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.end, children: [ - + Spacer(), Image.asset( 'assets/images/Logo.png', - width: 200, + width: 230, ), - SizedBox(height: height*0.04,), - SizedBox( - height: 55, - width: width*0.75, - child: ElevatedButton( - style: ElevatedButton.styleFrom( - backgroundColor: Color(0xFF24CF5F), - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(15.0), - ),// background// foreground - ), - onPressed: () { - }, - child: Text("CONTINUER AVEC SPOTIFY", - style: TextStyle(color: Colors.white ,fontSize: 17, fontWeight: FontWeight.bold), - textAlign: TextAlign.center, - ), - ),), - SizedBox(height: height*0.015,), + SizedBox(height: height*0.08,), SizedBox( height: 55, width: width*0.75, @@ -76,7 +58,7 @@ class _HomePageState extends State { textAlign: TextAlign.center, ), ),), - SizedBox(height: 220,), + Spacer(), GestureDetector( onTap: (){ Navigator.of(context).push( @@ -112,18 +94,9 @@ class _HomePageState extends State { ], ), - Align( - alignment: Alignment.topRight, - child: Container( - padding: EdgeInsets.fromLTRB(0, 20, 20, 0), - child: Text("v1.0", - style: TextStyle(fontFamily: 'DMSans', color: Colors.white.withOpacity(0.5) ,fontSize: 17, fontWeight: FontWeight.w700), - ), - ) - ), ], ), ); } -} +} \ No newline at end of file