From 217fd15b7d3652cae1df7dc196fbe4f3c0e2ca9e Mon Sep 17 00:00:00 2001
From: appgramming <dev@appgramming.com>
Date: Thu, 27 Jul 2023 15:07:57 +0300
Subject: [PATCH 1/3] Fix some Favorites screen and app drawer issues

---
 lib/common/ui_strings.dart              | 2 +-
 lib/screens/color_favorites_screen.dart | 9 ++++++---
 lib/widgets/internal/app_drawer.dart    | 3 ++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/common/ui_strings.dart b/lib/common/ui_strings.dart
index b32899d..00d9b63 100644
--- a/lib/common/ui_strings.dart
+++ b/lib/common/ui_strings.dart
@@ -92,7 +92,7 @@ const String goHome = 'Go Home';
 // -----------------------------------------------------------------------------------------------
 
 const String favoriteColorsScreenTitle = 'Favorite Colors';
-const String noFavoritesMessage = 'No favorite colors yet';
+const String noFavoritesMessage = 'No favorite colors yet\n\nGo back home and start tapping on';
 const String removedFromFavorites = 'Removed from favorites';
 const String undoRemoveFromFavorites = 'Undo';
 const String clearFavorites = 'Clear favorites';
diff --git a/lib/screens/color_favorites_screen.dart b/lib/screens/color_favorites_screen.dart
index 2b0ca12..b211d12 100644
--- a/lib/screens/color_favorites_screen.dart
+++ b/lib/screens/color_favorites_screen.dart
@@ -67,7 +67,10 @@ class _ColorFavoritesScreenState extends State<ColorFavoritesScreen> {
         onPressed: () => setState(() => settings.colorFavoritesList.insert(index, randomColor)),
       ),
     );
-    ScaffoldMessenger.of(context).showSnackBar(snackBar);
+    ScaffoldMessenger.of(context)
+      // The user may delete multiple colors in a row, so remove any existing snackbar before
+      ..removeCurrentSnackBar()
+      ..showSnackBar(snackBar);
   }
 
   @override
@@ -112,13 +115,13 @@ class _ColorFavoritesScreenState extends State<ColorFavoritesScreen> {
       child: Column(
         mainAxisAlignment: MainAxisAlignment.center,
         children: <Widget>[
-          const Icon(Icons.favorite_border, size: 32),
-          const SizedBox(height: 16),
           Text(
             strings.noFavoritesMessage,
             style: Theme.of(context).textTheme.titleLarge,
             textAlign: TextAlign.center,
           ),
+          const SizedBox(height: 16.0),
+          const Icon(Icons.favorite_border, size: 32.0),
         ],
       ),
     );
diff --git a/lib/widgets/internal/app_drawer.dart b/lib/widgets/internal/app_drawer.dart
index 4cb7a5c..9949a10 100644
--- a/lib/widgets/internal/app_drawer.dart
+++ b/lib/widgets/internal/app_drawer.dart
@@ -137,11 +137,12 @@ class AppDrawer extends StatelessWidget {
     return Drawer(
       child: ListView(
         children: <Widget>[
+          // The app drawer header with a bottom margin
           _AppDrawerHeader(color: randomColor.color),
+          const SizedBox(height: 16.0),
 
           // The Set Color Wallpaper drawer item
           ListTile(
-            contentPadding: const EdgeInsets.all(16.0),
             leading: const Icon(Icons.wallpaper_rounded),
             title: const Text(strings.setWallpaperDrawer),
             subtitle: const Text(strings.setWallpaperDrawerSubtitle),

From 098e3f340709abb0305ccb47f41a240f54779998 Mon Sep 17 00:00:00 2001
From: appgramming <dev@appgramming.com>
Date: Thu, 27 Jul 2023 16:29:42 +0300
Subject: [PATCH 2/3] Add custom list off icon on Color Info screen

---
 assets/fonts/CustomIcons.ttf       | Bin 0 -> 1848 bytes
 lib/common/custom_icons.dart       |  18 ++++++++++++++++++
 lib/screens/color_info_screen.dart |   5 +++--
 pubspec.yaml                       |   4 ++++
 4 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 assets/fonts/CustomIcons.ttf
 create mode 100644 lib/common/custom_icons.dart

diff --git a/assets/fonts/CustomIcons.ttf b/assets/fonts/CustomIcons.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..743be8b8c63195a77eb7a156f1105c0703c8e52f
GIT binary patch
literal 1848
zcmd^9&1)n@9DUV2`7l{m*r2<LU}Y0`vlu3m3A(abLvS=9D1KySgDgtyo#~#LY){wF
zT@#Z%iFy#s!IK9;*|QfB_96;`M-Q$C!JFhDGJ?4&2(pQ<s>@}B>|bE@{HkBQ-|PB)
zbWKA57{}Z2QCh8Dc~*Y#_zgfjO}6%Ob*{W5*WTiKkL!(kC+Pk*^VMfu|4!>R<K5`*
zPrm04euMsQD-0UbKfQC2c%SxEi^Rxf{|fQfwCPqy?~MFF1n~=}(OA_3m`Lzn=QP|2
zcDmwzl;}UhwM>Fec=e5?U+MpmHr-X3mgmlXLFr%gKLZna{b-AGpKCLlY6gdA8L~U0
z+qX6!xcn!^bM1cru@{UmzaQQ9``!VUqww70W+xBRZb!q8@dAzp{A0{@3Ep!nFV=7}
z4s?P?P#EwJViC8S0rzKd)(TcB$OsJo%ldusA%+<EhG#mqm*2%c<^?nGFyxaxX1o$T
z-@tMo{k$Jn{dIgqnd^qBIIr65%{L9q(wLp7In7ICje3@MR!P2qvsP0ud>==wJD<5W
zb&(Y&@BjNaVH@zMYlH2T=@f_QC+ztq;t6|~Cu|Cs7&$%l-~w&(^rW+k=NF!wqD`Kk
z%<bl4=}cVxMx3f0ek{JM-uc6O^ZMfa!=w%msv<gEt$HW!-1H6>OSNj%{I1_cHYiTv
zXBQt>A(iJM_)lMP*uw~3b=W8Wn!^R+y2C@niNnLhyAF@x3B2d<I41D9IX#8@7-tXP
zIxO&zu&0W=hm)e=c%OXgaDn)Jhlhwib$FQgmcwJ%5Z^gGj&q)@sP1msZnm_Xsa%ld
zQh7mM+m(t`I|*VL^mI$5nOv4p+|xQt+jW%`>#8#=BbDedj+I$edYM+8HTtsku-S`)
zbbuLv8)2HYRU+q$r2%#|Ou{tKVZ(&Zwwq<GBN?TtBUfAu*-h0}Sl7jt*4;~UbAz!_
zfkKzvOwmRYEoey0kiEcrnctK$7KpA<A*sw&ZN7;BF_{28KGCwCjO%4uM2}%LLaVRS
zo1n-ysnFrS+9(WT{4p<e*H__l8F`~yv-*VVb?Tb*#Eh0Qv*R?!vl}*pjFp*q67!5y
zy2lQy)FxIR*vuN#=T&FeX8bZ)&CE^qsm)OG{QkEN$xa&I7Wb)BU9|nwWG`Wk*S+dC
hUvx9fH~qNb2~YT#NJEu2!gNzb(WdI@xSfPn{SSiA8tMQ5

literal 0
HcmV?d00001

diff --git a/lib/common/custom_icons.dart b/lib/common/custom_icons.dart
new file mode 100644
index 0000000..79f3948
--- /dev/null
+++ b/lib/common/custom_icons.dart
@@ -0,0 +1,18 @@
+// Copyright 2020-2023 Tecdrop (www.tecdrop.com)
+// Use of this source code is governed by an MIT-style license that can be
+// found in the LICENSE file.
+//
+// Flutter icons CustomIcons
+// Copyright (C) 2023 by original authors @ fluttericon.com, fontello.com
+// This font was generated by FlutterIcon.com, which is derived from Fontello.
+
+/// Custom icons used in the app.
+library;
+
+import 'package:flutter/widgets.dart';
+
+const _kFontFam = 'CustomIcons';
+const String? _kFontPkg = null;
+
+const IconData reorder_off_outlined =
+    IconData(0xe800, fontFamily: _kFontFam, fontPackage: _kFontPkg);
diff --git a/lib/screens/color_info_screen.dart b/lib/screens/color_info_screen.dart
index 1f4322e..62fa008 100644
--- a/lib/screens/color_info_screen.dart
+++ b/lib/screens/color_info_screen.dart
@@ -5,6 +5,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
+import '../../common/custom_icons.dart' as custom_icons;
 import '../common/app_settings.dart' as settings;
 import '../common/app_urls.dart' as urls;
 import '../common/ui_strings.dart' as strings;
@@ -110,8 +111,8 @@ class _AppBar extends StatelessWidget implements PreferredSizeWidget {
         // The toggle color information action button
         IconButton(
           icon: settings.showColorInformation
-              ? const Icon(Icons.visibility_off_outlined)
-              : const Icon(Icons.visibility_outlined),
+              ? const Icon(custom_icons.reorder_off_outlined)
+              : const Icon(Icons.reorder_outlined),
           tooltip: strings.toggleColorInformation,
           onPressed: () => onAction(_AppBarActions.toggleInfo),
         ),
diff --git a/pubspec.yaml b/pubspec.yaml
index fb311cd..23df5a7 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -95,3 +95,7 @@ flutter:
   #
   # For details regarding fonts from package dependencies,
   # see https://flutter.dev/custom-fonts/#from-packages
+  fonts:
+    - family:  CustomIcons
+      fonts:
+        - asset: assets/fonts/CustomIcons.ttf
\ No newline at end of file

From 89873610be27feec65874fa8bef2ff4c3ded6c10 Mon Sep 17 00:00:00 2001
From: appgramming <dev@appgramming.com>
Date: Thu, 27 Jul 2023 17:31:51 +0300
Subject: [PATCH 3/3] Update version and build.gradle

---
 android/build.gradle | 4 ++--
 pubspec.yaml         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 3cdaac9..f7eb7f6 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.7.10'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.android.tools.build:gradle:7.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/pubspec.yaml b/pubspec.yaml
index 23df5a7..a4e4e77 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 2.0.0+3
+version: 2.0.1+4
 
 environment:
   sdk: '>=3.0.6 <4.0.0'