Merge remote-tracking branch 'origin/SQL_Script' into DB_Script
continuous-integration/drone/push Build is passing Details

remotes/origin/mvc-implementation
Dorian HODIN 2 years ago
commit 6d0c1f8e65

@ -51,7 +51,14 @@ class _SpotsWidgetState extends State<SpotsWidget> {
Align( Align(
alignment: FractionalOffset.bottomCenter, alignment: FractionalOffset.bottomCenter,
child: MyApp.controller.currentUser.spots.isEmpty child: MyApp.controller.currentUser.spots.isEmpty
? Container() ? const Center(
child: SizedBox(
width: 300,
height: 300,
child: riv.RiveAnimation.asset(
'assets/images/search_spot_animation.riv'),
),
)
: OpenContainer( : OpenContainer(
closedColor: Colors.transparent, closedColor: Colors.transparent,
closedElevation: 0, closedElevation: 0,
@ -64,14 +71,6 @@ class _SpotsWidgetState extends State<SpotsWidget> {
}, },
), ),
), ),
const Center(
child: SizedBox(
width: 300,
height: 300,
child: riv.RiveAnimation.asset(
'assets/images/search_spot_animation.riv'),
),
),
Positioned( Positioned(
top: height * 0.68, top: height * 0.68,
width: width, width: width,
@ -166,26 +165,48 @@ class _SpotsWidgetState extends State<SpotsWidget> {
)), )),
), ),
), ),
MyApp.controller.currentUser.spots.isEmpty?
SafeArea(child: Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
children: [
MyApp.controller.currentUser.spots.isEmpty?
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const Text(
'Quelques instants...',
style: TextStyle(
color: Colors.white,
fontWeight: FontWeight.w500,
fontSize: 25),
),
const Padding(padding: EdgeInsets.fromLTRB(0, 5, 0, 0)),
Text(
'Nous cherchons des profils a vous proposer.',
style: TextStyle(
color: Colors.grey.withOpacity(0.4), fontSize: 15),
),
],
) :
Container(),
]
)
),):
Padding( Padding(
padding: const EdgeInsets.fromLTRB(20, 60, 0, 0), padding: const EdgeInsets.fromLTRB(20, 60, 0, 0),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(MyApp.controller.currentUser.spots.last.music.name,
MyApp.controller.currentUser.spots.isEmpty
? ''
: MyApp.controller.currentUser.spots.last.music.name,
style: TextStyle( style: TextStyle(
fontFamily: 'DMSans', fontFamily: 'DMSans',
color: Colors.white.withOpacity(1), color: Colors.white.withOpacity(1),
fontSize: 20, fontSize: 20,
fontWeight: FontWeight.w800), fontWeight: FontWeight.w800),
), ),
Text( Text(MyApp.controller.currentUser.spots.last.music.artist,
MyApp.controller.currentUser.spots.isEmpty
? ''
: MyApp
.controller.currentUser.spots.last.music.artist,
style: TextStyle( style: TextStyle(
fontFamily: 'DMSans', fontFamily: 'DMSans',
color: Colors.white.withOpacity(1), color: Colors.white.withOpacity(1),

Loading…
Cancel
Save