From 70f5fbacd77a259e6891dabbc44bb727fa7619f1 Mon Sep 17 00:00:00 2001
From: Vishnu Mohandas <vishnu@vishnu.tech>
Date: Tue, 26 Jan 2021 16:56:35 +0530
Subject: [PATCH] Blue blue blue

---
 lib/main.dart                     |  8 ++++----
 lib/services/sync_service.dart    |  2 +-
 lib/ui/email_entry_page.dart      | 22 ++++++----------------
 lib/ui/sign_in_header_widget.dart | 25 ++++++++++---------------
 4 files changed, 21 insertions(+), 36 deletions(-)

diff --git a/lib/main.dart b/lib/main.dart
index fdf63e3e6..70850adcf 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -138,12 +138,12 @@ class MyApp extends StatelessWidget with WidgetsBindingObserver {
         fontFamily: 'Ubuntu',
         brightness: Brightness.dark,
         hintColor: Colors.grey,
-        accentColor: Colors.pink[400],
-        buttonColor: Colors.pink,
+        accentColor: Colors.blue[400],
+        buttonColor: Color(0xFF2954a3),
         buttonTheme: ButtonThemeData().copyWith(
-          buttonColor: Colors.pink,
+          buttonColor: Color(0xFF2954a3),
         ),
-        toggleableActiveColor: Colors.pink[400],
+        toggleableActiveColor: Colors.blue[400],
       ),
       home: HomeWidget(_title),
     );
diff --git a/lib/services/sync_service.dart b/lib/services/sync_service.dart
index 939ed364d..ca535f959 100644
--- a/lib/services/sync_service.dart
+++ b/lib/services/sync_service.dart
@@ -157,7 +157,7 @@ class SyncService {
       await _loadAndStorePhotos(startTime, syncStartTime, existingLocalFileIDs);
     }
     await FileRepository.instance.reloadFiles();
-    await syncWithRemote();
+    // await syncWithRemote();
   }
 
   Future<void> _loadAndStorePhotos(
diff --git a/lib/ui/email_entry_page.dart b/lib/ui/email_entry_page.dart
index ceab5304d..9c5c4d29e 100644
--- a/lib/ui/email_entry_page.dart
+++ b/lib/ui/email_entry_page.dart
@@ -34,16 +34,10 @@ class _EmailEntryPageState extends State<EmailEntryPage> {
   @override
   Widget build(BuildContext context) {
     final appBar = AppBar(
-      title: Hero(
-        tag: "sign_up_hero_text",
-        child: Material(
-          color: Colors.transparent,
-          child: Text(
-            "sign up",
-            style: TextStyle(
-              fontSize: 18,
-            ),
-          ),
+      title: Text(
+        "sign up",
+        style: TextStyle(
+          fontSize: 18,
         ),
       ),
     );
@@ -62,15 +56,11 @@ class _EmailEntryPageState extends State<EmailEntryPage> {
         padding: EdgeInsets.all(8),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.stretch,
+          mainAxisAlignment: MainAxisAlignment.center,
           mainAxisSize: MainAxisSize.max,
           children: [
-            // Image.asset(
-            //   "assets/welcome.png",
-            //   width: 300,
-            //   height: 200,
-            // ),
             Padding(
-              padding: EdgeInsets.all(32),
+              padding: EdgeInsets.all(60),
             ),
             Padding(
               padding: const EdgeInsets.fromLTRB(32, 0, 32, 0),
diff --git a/lib/ui/sign_in_header_widget.dart b/lib/ui/sign_in_header_widget.dart
index 07e944a57..babd03072 100644
--- a/lib/ui/sign_in_header_widget.dart
+++ b/lib/ui/sign_in_header_widget.dart
@@ -40,13 +40,13 @@ class _SignInHeaderState extends State<SignInHeader> {
   @override
   Widget build(BuildContext context) {
     var hasConfiguredAccount = Configuration.instance.hasConfiguredAccount();
-    var hasSubscribed = BillingService.instance.getSubscription() != null;
+    var hasSubscribed = BillingService.instance.hasActiveSubscription();
     if (hasConfiguredAccount && hasSubscribed) {
       return Container();
     }
     return SingleChildScrollView(
       child: Container(
-        padding: EdgeInsets.fromLTRB(8, 20, 8, 8),
+        padding: EdgeInsets.fromLTRB(8, 24, 8, 8),
         child: Column(
           children: [
             Text.rich(
@@ -71,7 +71,7 @@ class _SignInHeaderState extends State<SignInHeader> {
               textAlign: TextAlign.center,
             ),
             Padding(
-              padding: EdgeInsets.all(6),
+              padding: EdgeInsets.all(2),
             ),
             Text.rich(
               TextSpan(
@@ -156,20 +156,15 @@ class _SignInHeaderState extends State<SignInHeader> {
             Container(
               width: double.infinity,
               height: 64,
+              padding: const EdgeInsets.fromLTRB(80, 0, 80, 0),
               child: RaisedButton(
-                child: Hero(
-                  tag: "sign_up_hero_text",
-                  child: Material(
-                    color: Colors.transparent,
-                    child: Text(
-                      !hasConfiguredAccount ? "sign up" : "subscribe",
-                      style: TextStyle(
-                        fontWeight: FontWeight.bold,
-                        fontSize: 18,
-                      ),
-                      textAlign: TextAlign.center,
-                    ),
+                child: Text(
+                  "subscribe",
+                  style: TextStyle(
+                    fontWeight: FontWeight.bold,
+                    fontSize: 18,
                   ),
+                  textAlign: TextAlign.center,
                 ),
                 onPressed: () {
                   var page;