added new logo; improvements & bugfixes

assets/logo.svg

@@ -1,12 +1,20 @@
 <svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
 <rect width="200" height="200" rx="24" fill="white"/>
-<rect x="31" y="32" width="40" height="40" rx="4" fill="#67EDF6"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M73.7149 30.9567C53.8792 37.2174 38.2174 52.8792 31.9567 72.7149C33.0987 73.5243 34.4938 74 36 74H58.0649C62.2402 67.0667 68.0667 61.2402 75 57.0649V35C75 33.4938 74.5243 32.0987 73.7149 30.9567ZM124 55.9231C117.009 52.1448 109.005 50 100.5 50C92.398 50 84.7506 51.9465 78 55.3974V35C78 32.5023 79.3081 30.3102 81.2766 29.0713C85.0772 28.3678 88.9957 28 93 28H108C112.501 28 116.893 28.4646 121.131 29.3483C122.87 30.6219 124 32.679 124 35V55.9231ZM142.935 74C138.76 67.0667 132.933 61.2402 126 57.0649V35C126 33.4938 126.476 32.0987 127.285 30.9567C147.121 37.2174 162.783 52.8792 169.043 72.7149C167.901 73.5243 166.506 74 165 74H142.935ZM144.603 122C148.053 115.249 150 107.602 150 99.5C150 90.9952 147.855 82.9914 144.077 76H165C167.321 76 169.378 77.1296 170.652 78.869C171.535 83.1072 172 87.4994 172 92V107C172 111.004 171.632 114.923 170.929 118.723C169.69 120.692 167.498 122 165 122H144.603ZM126 141.935C132.933 137.76 138.76 131.933 142.935 125H165C166.506 125 167.901 125.476 169.043 126.285C162.783 146.121 147.121 161.783 127.285 168.043C126.476 166.901 126 165.506 126 164V141.935ZM78 143.603C84.7506 147.053 92.398 149 100.5 149C109.005 149 117.009 146.855 124 143.077V164C124 166.321 122.87 168.378 121.131 169.652C116.893 170.535 112.501 171 108 171H93C88.9957 171 85.0772 170.632 81.2766 169.929C79.3081 168.69 78 166.498 78 164V143.603ZM58.0649 125C62.2402 131.933 68.0667 137.76 75 141.935V164C75 165.506 74.5243 166.901 73.7149 168.043C53.8792 161.783 38.2174 146.121 31.9567 126.285C33.0987 125.476 34.4938 125 36 125H58.0649ZM56.9231 76C53.1448 82.9914 51 90.9952 51 99.5C51 107.602 52.9465 115.249 56.3974 122H36C33.5023 122 31.3102 120.692 30.0713 118.723C29.3678 114.923 29 111.004 29 107V92C29 87.4994 29.4646 83.1072 30.3483 78.869C31.6219 77.1296 33.679 76 36 76H56.9231Z" fill="#474341"/>
-<rect x="129" y="32" width="40" height="40" rx="4" fill="#F4E669"/>
+<g filter="url(#filter0_d_58_2)">
-<rect x="80" y="32" width="40" height="40" rx="4" fill="#E74FD8"/>
+<rect x="51" y="50" width="99" height="99" rx="49.5" fill="white"/>
-<rect x="31" y="80" width="40" height="40" rx="4" fill="#73F49F"/>
+</g>
-<rect x="129" y="80" width="40" height="40" rx="4" fill="#A667F6"/>
+<defs>
-<rect x="80" y="80" width="40" height="40" rx="4" fill="#5464F3"/>
+<filter id="filter0_d_58_2" x="11" y="10" width="179" height="179" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<rect x="31" y="128" width="40" height="40" rx="4" fill="#F66D6D"/>
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<rect x="129" y="128" width="40" height="40" rx="4" fill="#73F49F"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<rect x="80" y="128" width="40" height="40" rx="4" fill="#67EDF6"/>
+<feMorphology radius="6" operator="dilate" in="SourceAlpha" result="effect1_dropShadow_58_2"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="17"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.8 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_58_2"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_58_2" result="shape"/>
+</filter>
+</defs>
 </svg>

assets/logo_blank.svg

@@ -1,11 +0,0 @@
-<svg width="138" height="136" viewBox="0 0 138 136" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="40" height="40" rx="4" fill="#67EDF6"/>
-<rect x="98" width="40" height="40" rx="4" fill="#F4E669"/>
-<rect x="49" width="40" height="40" rx="4" fill="#E74FD8"/>
-<rect y="48" width="40" height="40" rx="4" fill="#73F49F"/>
-<rect x="98" y="48" width="40" height="40" rx="4" fill="#A667F6"/>
-<rect x="49" y="48" width="40" height="40" rx="4" fill="#5464F3"/>
-<rect y="96" width="40" height="40" rx="4" fill="#F66D6D"/>
-<rect x="98" y="96" width="40" height="40" rx="4" fill="#73F49F"/>
-<rect x="49" y="96" width="40" height="40" rx="4" fill="#67EDF6"/>
-</svg>

lib/constants/themes.dart

@@ -3,6 +3,10 @@ import 'package:flutter/material.dart';
 import 'package:quid_faciam_hodie/constants/spacing.dart';
 
 final LIGHT_THEME_MATERIAL = ThemeData(
+  colorScheme: ThemeData.light().colorScheme.copyWith(
+        primary: const Color(0xffd77422),
+        secondary: const Color(0xffcb4a1c),
+      ),
   textTheme: ThemeData().textTheme.copyWith(
         headline1: const TextStyle(
           fontSize: 32,
@@ -20,6 +24,10 @@ final LIGHT_THEME_MATERIAL = ThemeData(
 );
 
 final DARK_THEME_MATERIAL = ThemeData.dark().copyWith(
+  colorScheme: ThemeData.dark().colorScheme.copyWith(
+        primary: const Color(0xffd77422),
+        secondary: const Color(0xffcb4a1c),
+      ),
   textTheme: ThemeData.dark().textTheme.copyWith(
         headline1: const TextStyle(
           fontSize: 32,
@@ -37,6 +45,7 @@ final DARK_THEME_MATERIAL = ThemeData.dark().copyWith(
 );
 
 final LIGHT_THEME_CUPERTINO = CupertinoThemeData().copyWith(
+  primaryColor: const Color(0xffcb4a1c),
   textTheme: CupertinoThemeData().textTheme.copyWith(
         navLargeTitleTextStyle: const TextStyle(
           fontSize: 32,

lib/locale/l10n/app_en.arb

@@ -136,7 +136,7 @@
 
 
   "emptyScreenTitle": "Houston, we have a problem",
-  "emptyScreenSubtitle": "The user hasn't created any memories yet!",
+  "emptyScreenSubtitle": "The user hasn't created any mem ories yet!",
   "emptyScreenDescription": "To view your timeline you need to create some memories first! :)",
   "emptyScreenCreateMemory": "Create a Memory",
 

lib/screens/server_loading_screen.dart

@@ -41,7 +41,10 @@ class _ServerLoadingScreenState extends State<ServerLoadingScreen> {
   }
 
   Future<void> load() async {
-    if (widget.isInitialLoading) {
+    await GlobalValuesManager.waitForInitialization();
+    final session = Supabase.instance.client.auth.session();
+
+    if (widget.isInitialLoading && session == null) {
       await Navigator.pushNamed(
         context,
         WelcomeScreen.ID,
@@ -58,10 +61,7 @@ class _ServerLoadingScreenState extends State<ServerLoadingScreen> {
       }
     }
 
-    await GlobalValuesManager.waitForInitialization();
-
     final memories = context.read<Memories>();
-    final session = Supabase.instance.client.auth.session();
 
     if (session == null && widget.nextScreen == LoginScreen.ID) {
       Navigator.pushReplacementNamed(

lib/widgets/help_sheet.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
@@ -49,7 +51,7 @@ class _HelpSheetState extends State<HelpSheet> {
       return;
     }
 
-    WidgetsBinding.instance.addPostFrameCallback((_) async {
+    Timer(Duration(milliseconds: 300), () async {
       if (!mounted) {
         return;
       }
@@ -109,8 +111,9 @@ class _HelpSheetState extends State<HelpSheet> {
   @override
   Widget build(BuildContext context) {
     return AnimatedScale(
-      scale: isShowingSheet ? .99 : 1,
+      scale: isShowingSheet ? .95 : 1,
-      duration: const Duration(milliseconds: 200),
+      curve: Curves.easeOutSine,
+      duration: const Duration(milliseconds: 500),
       child: widget.child,
     );
   }

lib/widgets/help_sheet/help_sheet_form.dart

@@ -41,12 +41,17 @@ class _HelpSheetFormState extends State<HelpSheetForm> {
             child: Text(localizations.generalUnderstoodButtonLabel),
             onPressed: () => Navigator.pop(context, dontShowSheetAgain),
           ),
-          const SizedBox(height: MEDIUM_SPACE),
+          const SizedBox(height: SMALL_SPACE),
           Row(
             mainAxisAlignment: MainAxisAlignment.center,
             children: <Widget>[
               PlatformSwitch(
                 value: dontShowSheetAgain,
+                activeColor: platformThemeData(
+                  context,
+                  material: (data) => data.colorScheme.primary,
+                  cupertino: (data) => data.primaryColor,
+                ),
                 onChanged: (value) {
                   setState(() {
                     dontShowSheetAgain = value;

lib/widgets/logo.dart

@@ -21,12 +21,9 @@ class Logo extends StatelessWidget {
           ),
         ],
       ),
-      child: Padding(
+      child: SvgPicture.asset(
-        padding: const EdgeInsets.all(SPACE_MULTIPLIER * 15),
+        'assets/logo.svg',
-        child: SvgPicture.asset(
+        width: 150,
-          'assets/logo_blank.svg',
-          width: 100,
-        ),
       ),
     );
   }