stuff lol

JiayiSoftware · Aug 31, 2024 · d7a2892 · d7a2892
1 parent 29545f6
commit d7a2892
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/JiayiLauncher/MainPage.xaml.cs b/JiayiLauncher/MainPage.xaml.cs
@@ -56,7 +56,7 @@ public MainPage()
         }
 
         // set language
-        if (JiayiSettings.Instance.Language.Mode != 0) // 0 is default (auto)
+        if (JiayiSettings.Instance.Language.Mode != "Use system language")
         {
             var rm = new ResourceManager(typeof(Strings));
             var cultures = CultureInfo.GetCultures(CultureTypes.AllCultures);
@@ -80,7 +80,7 @@ public MainPage()
             // add languages to languages
             JiayiSettings.Instance.Language.AvailableModes.AddRange(supportedCultures.Select(x => x.EnglishName));
 
-            var lang = JiayiSettings.Instance.Language.AvailableModes[JiayiSettings.Instance.Language.Mode];
+            var lang = JiayiSettings.Instance.Language.Mode;
             var culture = supportedCultures.FirstOrDefault(x => x.EnglishName.Contains(lang));
             if (culture != null) CultureInfo.CurrentUICulture = culture;
         }

diff --git a/JiayiLauncher/Pages/Settings.razor b/JiayiLauncher/Pages/Settings.razor
@@ -107,7 +107,8 @@
                         case true when setting.PropertyType == typeof(ModeSetting):
                             var modeSetting = (ModeSetting)setting.GetValue(JiayiSettings.Instance)!;
                             <JiayiDropDown Name="@localizedSetting.Name" Items="@modeSetting.AvailableModes"
-                                           SelectedItem="@modeSetting.AvailableModes[modeSetting.Mode]"
+                                           SelectedItem="@modeSetting.Mode"
+                                           Style="width: -webkit-fill-available; max-width: 40%;"
                                            OnChange="mode => ChangeModeSetting(mode, setting)"/>
                             break;
                     }
@@ -185,7 +186,7 @@
     private void ChangeModeSetting(JiayiDropDown value, PropertyInfo setting)
     {
         var modeSetting = (ModeSetting)setting.GetValue(JiayiSettings.Instance)!;
-        modeSetting.Mode = modeSetting.AvailableModes.IndexOf(value.SelectedItem!);
+        modeSetting.Mode = value.SelectedItem!;
         setting.SetValue(JiayiSettings.Instance, modeSetting);
         JiayiSettings.Instance!.Save();
     }

diff --git a/JiayiLauncher/Settings/JiayiSettings.cs b/JiayiLauncher/Settings/JiayiSettings.cs
@@ -58,7 +58,7 @@ private string HexToColor(Color c)
     [Setting("Language", "General", "The language used throughout the launcher. Restart Jiayi for this to take full effect.", 
         tooltip: "All languages are community-contributed, and some may be incomplete. " +
                  "If you'd like to help translate the launcher, visit Jiayi Launcher's GitHub repository.")]
-    public ModeSetting Language { get; set; } = new(0, 
+    public ModeSetting Language { get; set; } = new("Use system language",
     [
         "Use system language",
         // "Arabic",

diff --git a/JiayiLauncher/Settings/SpecialTypes/ModeSetting.cs b/JiayiLauncher/Settings/SpecialTypes/ModeSetting.cs
@@ -5,18 +5,18 @@ namespace JiayiLauncher.Settings.SpecialTypes;
 [Serializable]
 public class ModeSetting
 {
-	public int Mode { get; set; }
+	public string Mode { get; set; }
 
 	[JsonIgnore]
 	public List<string> AvailableModes { get; set; }
 
 	public ModeSetting()
 	{
-		Mode = 0;
+		Mode = string.Empty;
 		AvailableModes = new();
 	}
 
-	public ModeSetting(int defaultMode, List<string> availableModes)
+	public ModeSetting(string defaultMode, List<string> availableModes)
 	{
 		Mode = defaultMode;
 		AvailableModes = availableModes;
@@ -41,6 +41,6 @@ public override bool Equals(object? obj)
 
 	public override int GetHashCode()
 	{
-		return Mode;
+		return HashCode.Combine(Mode);
 	}
 }
diff --git a/JiayiLauncher/Shared/Components/JiayiDropDown.razor b/JiayiLauncher/Shared/Components/JiayiDropDown.razor
@@ -1,4 +1,4 @@
-<div class="dropdown">
+<div class="dropdown" style="@Style">
     @if (Multiselect)
     {
         @if (SelectedItems.Count == 0)
@@ -78,6 +78,9 @@
     [Parameter]
     public string? Name { get; set; }
 
+    [Parameter]
+    public string? Style { get; set; }
+
     [Parameter]
     public List<string>? Items { get; set; }