diff --git a/frontend/memoree_client/lib/pages/login.dart b/frontend/memoree_client/lib/pages/login.dart index 51eec41..d61d00a 100755 --- a/frontend/memoree_client/lib/pages/login.dart +++ b/frontend/memoree_client/lib/pages/login.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:memoree_client/app/services/firebase_auth.dart'; import 'package:memoree_client/app_scaffold.dart'; +import 'package:memoree_client/constants.dart'; class LoginPage extends StatefulWidget { @override @@ -18,7 +19,8 @@ class _LoginPageState extends State { mainAxisSize: MainAxisSize.max, mainAxisAlignment: MainAxisAlignment.center, children: [ - FlutterLogo(size: 150), + Image(image: AssetImage("logos/memoree_logo.png"), height: 275,), + Text(PageTitles.appName, textScaleFactor: 2, style: TextStyle(color: Color(0xffb83b5e), letterSpacing: 1, fontWeight: FontWeight.w600),), SizedBox(height: 50,), OutlineButton( splashColor: Colors.grey, diff --git a/frontend/memoree_client/logos/memoree_logo.png b/frontend/memoree_client/logos/memoree_logo.png new file mode 100755 index 0000000..71fc498 Binary files /dev/null and b/frontend/memoree_client/logos/memoree_logo.png differ diff --git a/frontend/memoree_client/pubspec.yaml b/frontend/memoree_client/pubspec.yaml index 240299d..82d2f5c 100755 --- a/frontend/memoree_client/pubspec.yaml +++ b/frontend/memoree_client/pubspec.yaml @@ -80,4 +80,103 @@ flutter: fonts: - family: OpenSans fonts: - - asset: fonts/OpenSans-Regular.ttf + - asset: fonts/OpenSans/OpenSans-Bold.ttf + weight: 700 + - asset: fonts/OpenSans/OpenSans-BoldItalic.ttf + weight: 700 + style: italic + - asset: fonts/OpenSans/OpenSans-ExtraBold.ttf + weight: 800 + - asset: fonts/OpenSans/OpenSans-ExtraBoldItalic.ttf + weight: 800 + style: italic + - asset: fonts/OpenSans/OpenSans-Italic.ttf + style: italic + - asset: fonts/OpenSans/OpenSans-Light.ttf + weight: 300 + - asset: fonts/OpenSans/OpenSans-LightItalic.ttf + weight: 300 + style: italic + - asset: fonts/OpenSans/OpenSans-Regular.ttf + - asset: fonts/OpenSans/OpenSans-SemiBold.ttf + weight: 600 + - asset: fonts/OpenSans/OpenSans-SemiBoldItalic.ttf + weight: 600 + style: italic + + - family: ProductSans + fonts: + - asset: fonts/ProductSans/ProductSans-Black.ttf + weight: 900 + - asset: fonts/ProductSans/ProductSans-BlackItalic.ttf + weight: 900 + style: italic + - asset: fonts/ProductSans/ProductSans-Bold.ttf + weight: 700 + - asset: fonts/ProductSans/ProductSans-BoldItalic.ttf + weight: 700 + style: italic + - asset: fonts/ProductSans/ProductSans-Italic.ttf + style: italic + - asset: fonts/ProductSans/ProductSans-Light.ttf + weight: 300 + - asset: fonts/ProductSans/ProductSans-LightItalic.ttf + weight: 300 + style: italic + - asset: fonts/ProductSans/ProductSans-Medium.ttf + weight: 500 + - asset: fonts/ProductSans/ProductSans-MediumItalic.ttf + weight: 500 + style: italic + - asset: fonts/ProductSans/ProductSans-Regular.ttf + - asset: fonts/ProductSans/ProductSans-Thin.ttf + weight: 100 + - asset: fonts/ProductSans/ProductSans-ThinItalic.ttf + weight: 100 + style: italic + + - family: Montserrat + fonts: + - asset: fonts/Montserrat/Montserrat-Black.ttf + weight: 900 + - asset: fonts/Montserrat/Montserrat-BlackItalic.ttf + weight: 900 + style: italic + - asset: fonts/Montserrat/Montserrat-Bold.ttf + weight: 700 + - asset: fonts/Montserrat/Montserrat-BoldItalic.ttf + weight: 700 + style: italic + - asset: fonts/Montserrat/Montserrat-ExtraBold.ttf + weight: 700 + - asset: fonts/Montserrat/Montserrat-ExtraBoldItalic.ttf + weight: 700 + style: italic + - asset: fonts/Montserrat/Montserrat-ExtraLight.ttf + weight: 200 + - asset: fonts/Montserrat/Montserrat-ExtraLightItalic.ttf + weight: 200 + style: italic + - asset: fonts/Montserrat/Montserrat-Italic.ttf + style: italic + - asset: fonts/Montserrat/Montserrat-Light.ttf + weight: 300 + - asset: fonts/Montserrat/Montserrat-LightItalic.ttf + weight: 300 + style: italic + - asset: fonts/Montserrat/Montserrat-Medium.ttf + weight: 500 + - asset: fonts/Montserrat/Montserrat-MediumItalic.ttf + weight: 500 + style: italic + - asset: fonts/Montserrat/Montserrat-Regular.ttf + - asset: fonts/Montserrat/Montserrat-SemiBold.ttf + weight: 600 + - asset: fonts/Montserrat/Montserrat-SemiBoldItalic.ttf + weight: 600 + style: italic + - asset: fonts/Montserrat/Montserrat-Thin.ttf + weight: 100 + - asset: fonts/Montserrat/Montserrat-ThinItalic.ttf + weight: 100 + style: italic