Fixed fav buttons not appearing on avatar favorite lists

yobson1 · May 26, 2022 · 75f7ae1 · 75f7ae1
1 parent f147266
commit 75f7ae1
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 8 deletions.
diff --git a/FavCat/Modules/AvatarModule.cs b/FavCat/Modules/AvatarModule.cs
@@ -65,12 +65,14 @@ private static Transform GetListsParent()
             var randomList = foundAvatarPage.GetComponentInChildren<UiAvatarList>();
             return randomList.transform.parent;
         }
-
-        //protected override void OnFavButtonClicked(StoredCategory storedCategory)
-        //{
-        //    ApiAvatar currentApiAvatar = myPageAvatar.field_Public_SimpleAvatarPedestal_0.field_Internal_ApiAvatar_0;
-        //    OnFavButtonClicked(storedCategory, currentApiAvatar.id, false);
-        //}
+
+        protected override void OnFavButtonClicked(StoredCategory storedCategory)
+        {
+            ApiAvatar currentApiAvatar = myPageAvatar.field_Public_SimpleAvatarPedestal_0.field_Internal_ApiAvatar_0;
+            OnFavButtonClicked(storedCategory, currentApiAvatar.id, false);
+        }
+
+        protected override bool FavButtonsOnLists => true;
 
         private void OnFavButtonClicked(StoredCategory storedCategory, string avatarId, bool disallowRecursiveRequests)
         {
@@ -100,7 +102,7 @@ private IEnumerator ReFavAfterDelay(StoredCategory category, string id)
             OnFavButtonClicked(category, id, true);
         }
 
-        private void RefreshFavButtons()
+        protected internal override void RefreshFavButtons()
         {
             var apiAvatar = myPageAvatar != null ? myPageAvatar.field_Public_SimpleAvatarPedestal_0 != null ? myPageAvatar.field_Public_SimpleAvatarPedestal_0.field_Internal_ApiAvatar_0 : null : null;
 

diff --git a/FavCat/Modules/ExtendedFavoritesModuleBase.cs b/FavCat/Modules/ExtendedFavoritesModuleBase.cs
@@ -49,8 +49,11 @@ protected void PlaySound()
 
 
         protected abstract void OnPickerSelected(IPickerElement picker);
+        protected abstract void OnFavButtonClicked(StoredCategory storedCategory);
+        protected abstract bool FavButtonsOnLists { get; }
         protected abstract void SortModelList(string sortCriteria, string category, List<(StoredFavorite?, T)> list);
         protected abstract IPickerElement WrapModel(StoredFavorite? favorite, T model);
+        protected internal abstract void RefreshFavButtons();
         protected abstract void SearchButtonClicked();
 
         protected bool CanPerformAdditiveActions { get; }
@@ -99,6 +102,7 @@ protected ExtendedFavoritesModuleBase(ExpandedMenu expandedMenu, DatabaseFavorit
                 if (PickerLists.TryGetValue(categoryName, out var list))
                 {
                     UpdateListElements(categoryName, list);
+                    RefreshFavButtons();
                 }
             };
 
@@ -229,6 +233,7 @@ private void CreateCategory()
                         Favorites.UpdateCategory(newCategory);
                         CreateList(newCategory);
                         ReorderLists();
+                        RefreshFavButtons();
                     }
                     else
                     {
@@ -411,6 +416,7 @@ private async Task FavoriteAll(StoredCategory newCategory)
             await TaskUtilities.YieldToMainThread();
             CreateList(newCategory);
             ReorderLists();
+            RefreshFavButtons();
         }
 
         internal void CreateList(StoredCategory storedCategory)
@@ -421,7 +427,8 @@ internal void CreateList(StoredCategory storedCategory)
             list.SetVisibleRows(storedCategory.VisibleRows);
             list.OnModelClick += OnPickerSelected;
             list.Category = storedCategory;
-            list.SetFavButtonVisible(false);
+            list.OnFavClick += () => OnFavButtonClicked(storedCategory);
+            list.SetFavButtonVisible(FavButtonsOnLists);
             list.OnSettingsClick += () =>
             {
                 myCurrentlySelectedList = list;

diff --git a/FavCat/Modules/PlayersModule.cs b/FavCat/Modules/PlayersModule.cs
@@ -117,6 +117,17 @@ public void OnPickerSelected(string playerId, GameObject whichObjectToCheck)
             }));
         }
 
+        protected override void OnFavButtonClicked(StoredCategory storedCategory)
+        {
+            throw new NotSupportedException(); // not happening
+        }
+        protected internal override void RefreshFavButtons()
+        {
+            // do nothing
+        }
+
+        protected override bool FavButtonsOnLists => false;
+
         protected override void SortModelList(string sortCriteria, string category, List<(StoredFavorite?, StoredPlayer)> avatars)
         {
             var inverted = sortCriteria.Length > 0 && sortCriteria[0] == '!';

diff --git a/FavCat/Modules/WorldsModule.cs b/FavCat/Modules/WorldsModule.cs
@@ -122,6 +122,18 @@ protected override void OnPickerSelected(IPickerElement picker)
             }));
         }
 
+        protected override void OnFavButtonClicked(StoredCategory storedCategory)
+        {
+            throw new NotSupportedException(); // not happening
+        }
+
+        protected internal override void RefreshFavButtons()
+        {
+            // do nothing
+        }
+
+        protected override bool FavButtonsOnLists => false;
+
         protected override void SortModelList(string sortCriteria, string category, List<(StoredFavorite?, StoredWorld)> avatars)
         {
             var inverted = sortCriteria.Length > 0 && sortCriteria[0] == '!';