features:

- launcher logo
 - tab bar tint color
 - favorites logic udpated

Pixiview/Illust/IllustCollectionPage.cs

@@ -15,7 +15,6 @@ namespace Pixiview.Illust
 {
     public interface IIllustCollectionPage
     {
-        List<IllustItem> Favorites { get; }
         IllustCollection IllustCollection { get; set; }
     }
 
@@ -60,13 +59,13 @@ namespace Pixiview.Illust
             set => SetValue(LoadingProperty, value);
         }
 
-        public List<IllustItem> Favorites { get; } = new List<IllustItem>();
+        #endregion
+
+        protected static bool IsUpdated { get; private set; } = true;
+
         public IllustCollection IllustCollection { get; set; }
 
         protected virtual bool IsFavoriteVisible => true;
-
-        #endregion
-
         protected Thickness totalBarOffset;
         protected Thickness navigationBarOffset;
         protected bool loaded;
@@ -79,12 +78,6 @@ namespace Pixiview.Illust
         {
             BindingContext = this;
             commandIllustImageTapped = new Command<IllustItem>(IllustImageTapped);
-
-            var favorites = Stores.LoadFavoritesIllusts();
-            if (favorites != null)
-            {
-                Favorites.AddRange(favorites.Illusts);
-            }
         }
 
         private void IllustImageTapped(IllustItem illust)
@@ -97,22 +90,38 @@ namespace Pixiview.Illust
         protected override void OnAppearing()
         {
             base.OnAppearing();
-
             Connectivity.ConnectivityChanged += Connectivity_ConnectivityChanged;
+
+            if (IsUpdated || !loaded)
+            {
+                IsUpdated = false;
+                loaded = false;
+                StartLoad();
+            }
+            else if (IsFavoriteVisible)
+            {
+                var favorites = Stores.Favorites;
+                foreach (var item in IllustCollection)
+                {
+                    item.IsFavorite = favorites.Any(i => i.Id == item.Id);
+                }
+            }
         }
 
         protected override void OnDisappearing()
         {
-            base.OnDisappearing();
-
             Connectivity.ConnectivityChanged -= Connectivity_ConnectivityChanged;
+            base.OnDisappearing();
         }
 
         private void Connectivity_ConnectivityChanged(object sender, ConnectivityChangedEventArgs e)
         {
             if (e.NetworkAccess == NetworkAccess.Internet || e.NetworkAccess == NetworkAccess.ConstrainedInternet)
             {
-                StartLoad();
+                if (!loaded)
+                {
+                    StartLoad(true);
+                }
             }
         }
 
@@ -293,7 +302,7 @@ namespace Pixiview.Illust
                         }
                     }
                 }
-                .DynamicResource(BackgroundColorProperty, ThemeBase.SubColor);
+                .DynamicResource(BackgroundColorProperty, ThemeBase.CardBackgroundColor);
             });
         }
 
@@ -308,15 +317,20 @@ namespace Pixiview.Illust
                 Loading = false;
                 return;
             }
+            if (force)
+            {
+                IsUpdated = true;
+            }
 
             var data = DoGetIllustList(illustData, commandIllustImageTapped).Where(i => i != null);
 
             var collection = new IllustCollection(data);
             if (IsFavoriteVisible)
             {
+                var favorites = Stores.Favorites;
                 foreach (var item in collection)
                 {
-                    item.IsFavorite = Favorites.Any(i => i.Id == item.Id);
+                    item.IsFavorite = favorites.Any(i => i.Id == item.Id);
                 }
             }
             IllustCollection = collection;
@@ -404,7 +418,7 @@ namespace Pixiview.Illust
     public class IllustFavorite
     {
         public DateTime LastFavoriteUtc { get; set; }
-        public IllustItem[] Illusts { get; set; }
+        public List<IllustItem> Illusts { get; set; }
     }
 
     [JsonObject(MemberSerialization.OptIn)]