Merge pull request #290 from ente-io/fav-icon-+-appbar

Multiple minor fixes

lib/app.dart

@@ -110,7 +110,7 @@ final darkThemeData = ThemeData(
   scaffoldBackgroundColor: Colors.black,
   backgroundColor: Colors.black,
   appBarTheme: AppBarTheme().copyWith(
-    color: Color.fromRGBO(10, 20, 20, 1.0),
+    color: Colors.black,
     elevation: 0,
   ),
   cardColor: Color.fromRGBO(10, 15, 15, 1.0),

lib/ente_theme_data.dart

@@ -98,6 +98,10 @@ extension CustomColorScheme on ColorScheme {
   Color get galleryThumbDrawColor => brightness == Brightness.light
       ? Colors.black.withOpacity(0.8)
       : Colors.white.withOpacity(0.5);
+
+  Color get backupEnabledBgColor => brightness == Brightness.light
+      ? Color.fromRGBO(230, 230, 230, 0.95)
+      : Color.fromRGBO(10, 40, 40, 0.3);
 }
 
 OutlinedButtonThemeData buildOutlinedButtonThemeData(

lib/ui/device_folder_page.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:photos/core/configuration.dart';
 import 'package:photos/core/event_bus.dart';
 import 'package:photos/db/files_db.dart';
+import 'package:photos/ente_theme_data.dart';
 import 'package:photos/events/backup_folders_updated_event.dart';
 import 'package:photos/events/files_updated_event.dart';
 import 'package:photos/events/local_photos_updated_event.dart';
@@ -86,7 +87,7 @@ class _BackupConfigurationHeaderWidgetState
     return Container(
       padding: EdgeInsets.only(left: 20, right: 12, top: 4, bottom: 4),
       margin: EdgeInsets.only(bottom: 12),
-      color: Color.fromRGBO(10, 40, 40, 0.3),
+      color: Theme.of(context).colorScheme.backupEnabledBgColor,
       child: Row(
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: [
@@ -94,7 +95,11 @@ class _BackupConfigurationHeaderWidgetState
               ? Text("Backup enabled")
               : Text(
                   "Backup disabled",
-                  style: TextStyle(color: Colors.white.withOpacity(0.7)),
+                  style: TextStyle(
+                      color: Theme.of(context)
+                          .colorScheme
+                          .defaultTextColor
+                          .withOpacity(0.7)),
                 ),
           Switch(
             value: isBackedUp,

lib/ui/fading_app_bar.dart

@@ -69,10 +69,6 @@ class FadingAppBarState extends State<FadingAppBar> {
             ),
           ),
           child: _buildAppBar(),
-          // child: _buildAppBar()Padding(_buildAppBar()
-          //   padding: const EdgeInsets.only(top: 0),
-          //   child: SafeArea(child: _buildAppBar()),
-          // ),
         ),
         opacity: _shouldHide ? 0 : 1,
         duration: Duration(milliseconds: 150),
@@ -241,15 +237,11 @@ class FadingAppBarState extends State<FadingAppBar> {
         return hasError ? oldValue : isLiked;
       },
       likeBuilder: (isLiked) {
-        return Padding(
-          padding: const EdgeInsets.only(top: 8.0),
-          child: Icon(
-            Icons.favorite_border,
-            color: isLiked
-                ? Colors.pinkAccent
-                : Colors.white, //same for both themes
-            size: 24,
-          ),
+        return Icon(
+          isLiked ? Icons.favorite_rounded : Icons.favorite_border,
+          color:
+              isLiked ? Colors.pinkAccent : Colors.white, //same for both themes
+          size: 24,
         );
       },
     );