UI/settings/feature/topbarsettings/Topbar settings drag & drop improvements

Assets/Altzone/Scripts/Settings/SettingsCarrier.cs

@@ -1,6 +1,7 @@
 using System;
 using Altzone.Scripts.Audio;
 using Altzone.Scripts.BattleUiShared;
+using System.Collections.Generic;
 using Altzone.Scripts.Chat;
 using Newtonsoft.Json.Linq;
 using UnityEditor;
@@ -92,12 +93,15 @@ public enum SettingsType
     public event Action OnButtonLabelVisibilityChange;
 
     public delegate void MuteAllSoundsChange(bool value);
+
     public static event MuteAllSoundsChange OnMuteAllSoundsChange;
 
     public delegate void TopBarChanged(int index);
+
     public static event TopBarChanged OnTopBarChanged;
 
     public delegate void LanguageChanged(LanguageType language);
+
     public static event LanguageChanged OnLanguageChanged;
 
     // Constants
@@ -138,12 +142,10 @@ public enum SettingsType
     public float soundVolume;
 
     private bool _muteAllSounds;
+
     public bool MuteAllSounds
     {
-        get
-        {
-            return _muteAllSounds;
-        }
+        get { return _muteAllSounds; }
 
         set
         {
@@ -178,15 +180,17 @@ public LanguageType Language
     }
 
     private TextSize _textSize;
-    public TextSize Textsize { get => _textSize; }
+
+    public TextSize Textsize
+    {
+        get => _textSize;
+    }
 
     private bool _showButtonLabels;
+
     public bool ShowButtonLabels
     {
-        get
-        {
-            return _showButtonLabels;
-        }
+        get { return _showButtonLabels; }
 
         set
         {
@@ -196,6 +200,7 @@ public bool ShowButtonLabels
     }
 
     private bool _unlimitedStatUpgradeMaterials;
+
     public bool UnlimitedStatUpgradeMaterials
     {
         get => _unlimitedStatUpgradeMaterials;
@@ -208,6 +213,7 @@ public bool UnlimitedStatUpgradeMaterials
     }
 
     private bool _statDebuggingMode;
+
     public bool StatDebuggingMode
     {
         get => _statDebuggingMode;
@@ -220,6 +226,7 @@ public bool StatDebuggingMode
     }
 
     private bool _battleShowDebugStatsOverlay;
+
     public bool BattleShowDebugStatsOverlay
     {
         get => _battleShowDebugStatsOverlay;
@@ -232,6 +239,7 @@ public bool BattleShowDebugStatsOverlay
     }
 
     private int _battleArenaScale;
+
     public int BattleArenaScale
     {
         get => _battleArenaScale;
@@ -244,6 +252,7 @@ public int BattleArenaScale
     }
 
     private int _battleArenaPosX;
+
     public int BattleArenaPosX
     {
         get => _battleArenaPosX;
@@ -256,6 +265,7 @@ public int BattleArenaPosX
     }
 
     private int _battleArenaPosY;
+
     public int BattleArenaPosY
     {
         get => _battleArenaPosY;
@@ -268,6 +278,7 @@ public int BattleArenaPosY
     }
 
     private BattleMovementInputType _battleMovementInput;
+
     public BattleMovementInputType BattleMovementInput
     {
         get => _battleMovementInput;
@@ -280,6 +291,7 @@ public BattleMovementInputType BattleMovementInput
     }
 
     private BattleRotationInputType _battleRotationInput;
+
     public BattleRotationInputType BattleRotationInput
     {
         get => _battleRotationInput;
@@ -292,6 +304,7 @@ public BattleRotationInputType BattleRotationInput
     }
 
     private float _battleSwipeMinDistance;
+
     public float BattleSwipeMinDistance
     {
         get => _battleSwipeMinDistance;
@@ -304,6 +317,7 @@ public float BattleSwipeMinDistance
     }
 
     private float _battleSwipeMaxDistance;
+
     public float BattleSwipeMaxDistance
     {
         get => _battleSwipeMaxDistance;
@@ -316,6 +330,7 @@ public float BattleSwipeMaxDistance
     }
 
     private float _battleSwipeSensitivity;
+
     public float BattleSwipeSensitivity
     {
         get => _battleSwipeSensitivity;
@@ -328,6 +343,7 @@ public float BattleSwipeSensitivity
     }
 
     private float _battleGyroMinAngle;
+
     public float BattleGyroMinAngle
     {
         get => _battleGyroMinAngle;
@@ -340,20 +356,35 @@ public float BattleGyroMinAngle
     }
 
     private TopBarStyle _topBarStyleSetting;
+
     public TopBarStyle TopBarStyleSetting
     {
         get => _topBarStyleSetting;
         set
         {
             if (_topBarStyleSetting == value) return;
             _topBarStyleSetting = value;
+
             PlayerPrefs.SetInt(TopBarStyleSettingKey, (int)value);
             OnTopBarChanged?.Invoke((int)value);
         }
     }
 
+
+    public static bool IsTopBarItemVisibleByKeyStatic(string key, bool defaultOn = true)
+        => PlayerPrefs.GetInt(key, defaultOn ? 1 : 0) != 0;
+
+
+    private const string _topBarOrderKeyPrefix = "TopBarOrder_";
+    private static string GetTopBarOrderKey(TopBarStyle style) => _topBarOrderKeyPrefix + style;
+
+
     private string _mainMenuMusicName;
-    public string MainMenuMusicName { get { return _mainMenuMusicName; } }
+
+    public string MainMenuMusicName
+    {
+        get { return _mainMenuMusicName; }
+    }
 
     private int? _chatChannel;
 
@@ -379,7 +410,8 @@ private void Awake()
 
     private void Start()
     {
-        Application.targetFrameRate = PlayerPrefs.GetInt("TargetFrameRate", (int)Screen.currentResolution.refreshRateRatio.value);
+        Application.targetFrameRate =
+            PlayerPrefs.GetInt("TargetFrameRate", (int)Screen.currentResolution.refreshRateRatio.value);
         mainMenuWindowIndex = 0;
 
         _language = ParseLanguage(PlayerPrefs.GetString("LanguageType", ""));
@@ -395,7 +427,7 @@ private void Start()
         _muteAllSounds = PlayerPrefs.GetInt("MuteAllSounds", 0) == 1;
 
         jukeboxSoulhome = PlayerPrefs.GetInt("JukeboxSoulHome", 1) != 0;
-        jukeboxUI = PlayerPrefs.GetInt("JukeboxUI",1) != 0;
+        jukeboxUI = PlayerPrefs.GetInt("JukeboxUI", 1) != 0;
         jukeboxBattle = PlayerPrefs.GetInt("JukeboxBattle", 0) != 0;
 
         _battleShowDebugStatsOverlay = PlayerPrefs.GetInt(BattleShowDebugStatsOverlayKey, 0) == 1;
@@ -404,8 +436,10 @@ private void Start()
         _battleArenaPosX = PlayerPrefs.GetInt(BattleArenaPosXKey, BattleArenaPosXDefault);
         _battleArenaPosY = PlayerPrefs.GetInt(BattleArenaPosYKey, BattleArenaPosYDefault);
 
-        _battleMovementInput = (BattleMovementInputType)PlayerPrefs.GetInt(BattleMovementInputKey, (int)BattleMovementInputDefault);
-        _battleRotationInput = (BattleRotationInputType)PlayerPrefs.GetInt(BattleRotationInputKey, (int)BattleRotationInputDefault);
+        _battleMovementInput =
+            (BattleMovementInputType)PlayerPrefs.GetInt(BattleMovementInputKey, (int)BattleMovementInputDefault);
+        _battleRotationInput =
+            (BattleRotationInputType)PlayerPrefs.GetInt(BattleRotationInputKey, (int)BattleRotationInputDefault);
 
         _battleSwipeMinDistance = PlayerPrefs.GetFloat(BattleSwipeMinDistanceKey, BattleSwipeMinDistanceDefault);
         _battleSwipeMaxDistance = PlayerPrefs.GetFloat(BattleSwipeMaxDistanceKey, BattleSwipeMaxDistanceDefault);
@@ -418,6 +452,8 @@ private void Start()
 
         _topBarStyleSetting = (TopBarStyle)PlayerPrefs.GetInt(TopBarStyleSettingKey, 1);
 
+        OnTopBarChanged?.Invoke((int)_topBarStyleSetting);
+
         _mainMenuMusicName = PlayerPrefs.GetString("MainMenuMusic");
 
         ChatListener.OnActiveChannelChanged += SaveChatChannel;
@@ -432,9 +468,18 @@ public void SetVolume(SoundType type, float value)
     {
         switch (type)
         {
-            case SoundType.menu: menuVolume = value; PlayerPrefs.SetFloat("MenuVolume", value); break;
-            case SoundType.music: musicVolume = value; PlayerPrefs.SetFloat("MusicVolume", value); break;
-            case SoundType.sound:  soundVolume = value; PlayerPrefs.SetFloat("SoundVolume", value); break;
+            case SoundType.menu:
+                menuVolume = value;
+                PlayerPrefs.SetFloat("MenuVolume", value);
+                break;
+            case SoundType.music:
+                musicVolume = value;
+                PlayerPrefs.SetFloat("MusicVolume", value);
+                break;
+            case SoundType.sound:
+                soundVolume = value;
+                PlayerPrefs.SetFloat("SoundVolume", value);
+                break;
             default: break;
         }
     }
@@ -451,6 +496,7 @@ public float SentVolume(SoundType type)
             case SoundType.sound: otherVolume = soundVolume; break;
             default: break;
         }
+
         return 1 * (otherVolume * masterVolume);
     }
 
@@ -464,6 +510,7 @@ public float GetVolumeValue(SoundType type)
             case SoundType.sound: otherVolume = soundVolume; break;
             default: break;
         }
+
         return otherVolume;
     }
 
@@ -524,7 +571,11 @@ public BattleUiMovableElementData GetBattleUiMovableElementData(BattleUiElementT
         if (string.IsNullOrEmpty(json)) return null;
 
         BattleUiMovableElementData data = JsonUtility.FromJson<BattleUiMovableElementData>(json);
-        if (data != null) data.UiElementType = data.UiElementType == BattleUiElementType.None ? type : data.UiElementType; // Backwards compatibility with old BattleUiMovableElementData
+        if (data != null)
+            data.UiElementType =
+                data.UiElementType == BattleUiElementType.None
+                    ? type
+                    : data.UiElementType; // Backwards compatibility with old BattleUiMovableElementData
 
         return data;
     }
@@ -571,8 +622,76 @@ public void SetDataFromSelectionBox(SelectionBoxType type, string value)
     {
         switch (type)
         {
-            case SelectionBoxType.MainMenuMusic: _mainMenuMusicName = value; PlayerPrefs.SetString("MainMenuMusic", value); break;
+            case SelectionBoxType.MainMenuMusic:
+                _mainMenuMusicName = value;
+                PlayerPrefs.SetString("MainMenuMusic", value);
+                break;
+        }
+    }
+
+    public void SetTopBarItemVisibleByKey(string key, bool visible)
+    {
+        int newV = visible ? 1 : 0;
+        int oldV = PlayerPrefs.HasKey(key) ? PlayerPrefs.GetInt(key) : -1;
+        if (oldV == newV) return;
+
+        PlayerPrefs.SetInt(key, newV);
+        OnTopBarChanged?.Invoke((int)TopBarStyleSetting);
+    }
+
+    [System.Serializable]
+    private class TopBarOrderData
+    {
+        public List<int> order = new List<int>();
+    }
+
+    public void SaveTopBarOrder(TopBarStyle style, IList<int> order)
+    {
+        string key = GetTopBarOrderKey(style);
+
+        TopBarOrderData data = new TopBarOrderData { order = new List<int>(order) };
+        string jsonNew = JsonUtility.ToJson(data);
+
+        string jsonOld = PlayerPrefs.GetString(key, "");
+        if (jsonOld == jsonNew) return;
+
+        PlayerPrefs.SetString(key, jsonNew);
+        OnTopBarChanged?.Invoke((int)style);
+    }
+
+    public static List<int> LoadTopBarOrderStatic(TopBarStyle style, int count)
+    {
+        List<int> result = new List<int>(count);
+        bool[] used = new bool[count];
+
+        string raw = PlayerPrefs.GetString(GetTopBarOrderKey(style), "");
+        if (string.IsNullOrEmpty(raw))
+        {
+            for (int i = 0; i < count; i++) result.Add(i);
+            return result;
         }
+
+        TopBarOrderData data = JsonUtility.FromJson<TopBarOrderData>(raw);
+
+        // JSON-lista l�pi foreachilla
+        if (data != null && data.order != null)
+        {
+            foreach (int idx in data.order)
+            {
+                if ((uint)idx < (uint)count && !used[idx])
+                {
+                    used[idx] = true;
+                    result.Add(idx);
+                    if (result.Count == count) return result;
+                }
+            }
+        }
+
+        for (int i = 0; i < count; i++)
+            if (!used[i])
+                result.Add(i);
+
+        return result;
     }
 
     public ChatChannelType FetchChatChannel()

Assets/Altzone/Scripts/Settings/TopBarDefs.cs

@@ -0,0 +1,22 @@
+namespace Altzone.Scripts.Settings
+{
+    public static class TopBarDefs
+    {
+        private const string KeyPrefix = "TopBarItem_";
+
+        public enum TopBarItem
+        {
+            ClanTile,
+            Leaderboard,
+            Coins,
+            ClanLogo,
+            ClanTextContainer,
+            Jukebox,
+            PlayerProfile,
+            Voting,
+            Settings,
+        }
+
+        public static string Key(TopBarItem item) => $"{KeyPrefix}{item}";
+    }
+}