chore: Remove gradient and add login wallpaper

This commit is contained in:
Christian Pauly 2021-08-31 11:51:39 +02:00
parent 57a7eb8d11
commit c336bd8b21
7 changed files with 33 additions and 67 deletions

BIN
assets/login_wallpaper.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 211 KiB

View File

@ -2,7 +2,6 @@ import 'dart:ui';
import 'package:emoji_picker_flutter/emoji_picker_flutter.dart'; import 'package:emoji_picker_flutter/emoji_picker_flutter.dart';
import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/app_config.dart';
import 'package:fluffychat/widgets/background_gradient_box.dart';
import 'package:matrix/matrix.dart'; import 'package:matrix/matrix.dart';
import 'package:fluffychat/pages/chat.dart'; import 'package:fluffychat/pages/chat.dart';
import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/avatar.dart';
@ -205,7 +204,6 @@ class ChatView extends StatelessWidget {
: null, : null,
body: Stack( body: Stack(
children: <Widget>[ children: <Widget>[
BackgroundGradientBox(),
if (Matrix.of(context).wallpaper != null) if (Matrix.of(context).wallpaper != null)
Image.file( Image.file(
Matrix.of(context).wallpaper, Matrix.of(context).wallpaper,

View File

@ -1,6 +1,5 @@
import 'dart:math'; import 'dart:math';
import 'package:fluffychat/widgets/background_gradient_box.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
class EmptyPage extends StatelessWidget { class EmptyPage extends StatelessWidget {
@ -11,31 +10,26 @@ class EmptyPage extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
final _width = min(MediaQuery.of(context).size.width, EmptyPage._width); final _width = min(MediaQuery.of(context).size.width, EmptyPage._width);
return Scaffold( return Scaffold(
body: Stack( body: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
BackgroundGradientBox(), Center(
Column( child: Hero(
mainAxisAlignment: MainAxisAlignment.center, tag: 'info-logo',
children: [ child: Image.asset(
Center( 'assets/info-logo.png',
child: Hero( width: _width,
tag: 'info-logo', height: _width,
child: Image.asset(
'assets/info-logo.png',
width: _width,
height: _width,
),
),
), ),
if (loading) ),
Center(
child: SizedBox(
width: _width,
child: LinearProgressIndicator(),
),
),
],
), ),
if (loading)
Center(
child: SizedBox(
width: _width,
child: LinearProgressIndicator(),
),
),
], ],
), ),
); );

View File

@ -1,27 +0,0 @@
import 'package:flutter/material.dart';
class BackgroundGradientBox extends StatelessWidget {
final Widget child;
const BackgroundGradientBox({
Key key,
this.child,
}) : super(key: key);
@override
Widget build(BuildContext context) {
return Container(
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topRight,
end: Alignment.bottomLeft,
colors: [
Theme.of(context).scaffoldBackgroundColor,
Theme.of(context).secondaryHeaderColor.withAlpha(150),
Theme.of(context).secondaryHeaderColor,
],
),
),
child: child,
);
}
}

View File

@ -54,7 +54,7 @@ class Message extends StatelessWidget {
final client = Matrix.of(context).client; final client = Matrix.of(context).client;
final ownMessage = event.senderId == client.userID; final ownMessage = event.senderId == client.userID;
final alignment = ownMessage ? Alignment.topRight : Alignment.topLeft; final alignment = ownMessage ? Alignment.topRight : Alignment.topLeft;
var color = Theme.of(context).scaffoldBackgroundColor; var color = Theme.of(context).secondaryHeaderColor;
final sameSender = nextEvent != null && final sameSender = nextEvent != null &&
[EventTypes.Message, EventTypes.Sticker].contains(nextEvent.type) [EventTypes.Message, EventTypes.Sticker].contains(nextEvent.type)
? nextEvent.sender.id == event.sender.id ? nextEvent.sender.id == event.sender.id

View File

@ -30,7 +30,7 @@ class StateMessage extends StatelessWidget {
padding: const EdgeInsets.all(8), padding: const EdgeInsets.all(8),
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border.all( border: Border.all(
color: Theme.of(context).secondaryHeaderColor, color: Theme.of(context).dividerColor,
), ),
color: Theme.of(context).scaffoldBackgroundColor, color: Theme.of(context).scaffoldBackgroundColor,
borderRadius: BorderRadius.circular(AppConfig.borderRadius), borderRadius: BorderRadius.circular(AppConfig.borderRadius),

View File

@ -3,8 +3,6 @@ import 'dart:math';
import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/config/themes.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../background_gradient_box.dart';
class OnePageCard extends StatelessWidget { class OnePageCard extends StatelessWidget {
final Widget child; final Widget child;
@ -16,19 +14,22 @@ class OnePageCard extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return MediaQuery.of(context).size.width <= breakpoint return MediaQuery.of(context).size.width <= breakpoint
? child ? child
: Material( : Container(
color: Theme.of(context).backgroundColor, decoration: BoxDecoration(
child: BackgroundGradientBox( image: DecorationImage(
child: Padding( image: AssetImage('assets/login_wallpaper.jpg'),
padding: EdgeInsets.symmetric( fit: BoxFit.cover,
horizontal:
max((MediaQuery.of(context).size.width - 600) / 2, 12),
vertical:
max((MediaQuery.of(context).size.height - 800) / 2, 12),
),
child: SafeArea(child: Card(elevation: 3, child: child)),
), ),
), ),
child: Padding(
padding: EdgeInsets.symmetric(
horizontal:
max((MediaQuery.of(context).size.width - 600) / 2, 24),
vertical:
max((MediaQuery.of(context).size.height - 800) / 2, 24),
),
child: SafeArea(child: Card(elevation: 5, child: child)),
),
); );
} }
} }