Moved some stuff around so that VS behaves

Began update to 0.13.3

BSIPA-ModList/BSIPA-ModList.csproj

@@ -80,7 +80,7 @@
     <Compile Include="UI\ButtonUI.cs" />
     <Compile Include="UI\DownloadProgressCell.cs" />
     <Compile Include="UI\ModListFlowCoordinator.cs" />
-    <Compile Include="UI\SettingsViewController.cs" />
+    <Compile Include="UI\ViewControllers\SettingsViewController.cs" />
     <Compile Include="UI\ViewControllers\BackButtonNavigationController.cs" />
     <Compile Include="UI\ViewControllers\DownloadProgressViewController.cs" />
     <Compile Include="UI\FloatingNotification.cs" />
@@ -122,7 +122,7 @@
     <EmbeddedResource Include="README.md" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="TMP Exporter\Assets\AssetBundles\fonts\consolas.font">
+    <EmbeddedResource Include="..\TMP Exporter\Assets\AssetBundles\fonts\consolas.font">
       <Link>Bundles\consolas.font</Link>
     </EmbeddedResource>
   </ItemGroup>

BSIPA-ModList/UI/ButtonUI.cs

@@ -14,7 +14,7 @@ namespace BSIPA_ModList.UI
     internal class ButtonUI : MonoBehaviour
     {
         private const string ControllerPanel = "MainMenuViewController/SmallButtons";
-        private const string CopyButton = "CreditsButton";
+        private const string CopyButton = "BeatmapEditorButton";
 
         internal static ButtonUI Instance;
 

BSIPA-ModList/UI/DownloadProgressCell.cs

@@ -34,7 +34,7 @@ namespace BSIPA_ModList.UI
             _songNameText = GetComponentsInChildren<TextMeshProUGUI>().First(x => x.name == "SongName");
             _songNameText.enableWordWrapping = false;
             _songNameText.overflowMode = TextOverflowModes.Overflow;
-            _coverImage = GetComponentsInChildren<UnityEngine.UI.Image>().First(x => x.name == "CoverImage");
+            _coverRawImage = GetComponentsInChildren<UnityEngine.UI.RawImage>().First(x => x.name == "CoverImage");
             _bgImage = GetComponentsInChildren<UnityEngine.UI.Image>().First(x => x.name == "BG");
             _highlightImage = GetComponentsInChildren<UnityEngine.UI.Image>().First(x => x.name == "Highlight");
             _beatmapCharacteristicAlphas = new float[0];
@@ -46,7 +46,7 @@ namespace BSIPA_ModList.UI
 
             _songNameText.text = $"{mod.Mod.Name} <size=60%>v{mod.Mod.ResolvedVersion}</size>";
             _authorText.text = "";
-            _coverImage.sprite = mod.Icon;
+            _coverRawImage.texture = mod.Icon.texture;
 
             _bgImage.enabled = true;
             _bgImage.sprite = Sprite.Create(new Texture2D(1, 1), new Rect(0, 0, 1, 1), Vector2.one / 2f);

BSIPA-ModList/UI/ViewControllers/DownloadProgressViewController.cs

@@ -152,7 +152,7 @@ namespace BSIPA_ModList.UI.ViewControllers
 
         public float CellSize()
         {
-            return 10f;
+            return 8.5f;
         }
 
         public int NumberOfCells()

BSIPA-ModList/UI/ViewControllers/ModInfoViewController.cs

@@ -76,7 +76,9 @@ namespace BSIPA_ModList.UI
                 rowTransform = Instantiate(rowTransformOriginal, rectTransform);
                 rowTransform.anchorMin = new Vector2(0f, 0f);
                 rowTransform.anchorMax = new Vector2(1f, .15f);
-                rowTransform.anchoredPosition = new Vector2(-3.5f, -2f);
+                rowTransform.anchoredPosition = new Vector2(-3.5f, 4f);
+                rowTransform.sizeDelta = Vector2.zero;
+                Destroy(rowTransform.GetComponent<StartMiddleEndButtonsGroup>());
 
                 foreach (Transform child in rowTransform)
                 {
@@ -86,32 +88,35 @@ namespace BSIPA_ModList.UI
 
                 if (links?.ProjectHome != null)
                 {
-                    linkHomeButton = BeatSaberUI.CreateUIButton(rowTransform, "QuitButton", buttonText: "Home",
+                    linkHomeButton = BeatSaberUI.CreateUIButton(rowTransform, "QuitButton", buttonText: "Home", anchoredPosition: Vector2.zero, sizeDelta: new Vector2(20, 10),
                         onClick: () => Process.Start(links.ProjectHome.ToString()));
                     linkHomeButton.GetComponentInChildren<HorizontalLayoutGroup>().padding = new RectOffset(6, 6, 0, 0);
                     addedLink = true;
                 }
                 if (links?.ProjectSource != null)
                 {
-                    linkSourceButton = BeatSaberUI.CreateUIButton(rowTransform, "QuitButton", buttonText: "Source",
+                    linkSourceButton = BeatSaberUI.CreateUIButton(rowTransform, "QuitButton", buttonText: "Source", anchoredPosition: Vector2.zero, sizeDelta: new Vector2(20, 10),
                         onClick: () => Process.Start(links.ProjectSource.ToString()));
                     linkSourceButton.GetComponentInChildren<HorizontalLayoutGroup>().padding = new RectOffset(6, 6, 0, 0);
                     addedLink = true;
                 }
                 if (links?.Donate != null)
                 {
-                    linkDonateButton = BeatSaberUI.CreateUIButton(rowTransform, "QuitButton", buttonText: "Donate",
+                    linkDonateButton = BeatSaberUI.CreateUIButton(rowTransform, "QuitButton", buttonText: "Donate", anchoredPosition: Vector2.zero, sizeDelta: new Vector2(20, 10),
                         onClick: () => Process.Start(links.Donate.ToString()));
                     linkDonateButton.GetComponentInChildren<HorizontalLayoutGroup>().padding = new RectOffset(6, 6, 0, 0);
                     addedLink = true;
                 }
                 if (moreInfoLink != null)
                 {
-                    linkDonateButton = BeatSaberUI.CreateUIButton(rowTransform, "QuitButton", buttonText: "More Info",
+                    linkDonateButton = BeatSaberUI.CreateUIButton(rowTransform, "QuitButton", buttonText: "More Info", anchoredPosition: Vector2.zero, sizeDelta: new Vector2(20, 10),
                         onClick: () => Process.Start(moreInfoLink.ToString()));
                     linkDonateButton.GetComponentInChildren<HorizontalLayoutGroup>().padding = new RectOffset(6, 6, 0, 0);
                     addedLink = true;
                 }
+
+                foreach (var cmp in rowTransform.GetComponentsInChildren<StartMiddleEndButtonBackgroundController>())
+                    cmp.SetMiddleSprite();
             }
             if (UpdateInfo != null && !addedLink)
                 StartCoroutine(GetMoreInfoLink());

IPA.Loader/Loader/Composite/CompositeBSPlugin.cs

@@ -59,8 +59,6 @@ namespace IPA.Loader.Composite
 
         public string Version => throw new InvalidOperationException();
 
-        public ModsaberModInfo ModInfo => throw new InvalidOperationException();
-
         public void OnLateUpdate() {
             Invoke(plugin => {
                 if (plugin.Plugin is IEnhancedBeatSaberPlugin saberPlugin)

Refs/BeatSaberCustomUI.xml

@@ -129,6 +129,28 @@
             <param name="sizeDelta">The size of the color picker's RectTransform.</param>
             <returns></returns>
         </member>
+        <member name="M:CustomUI.BeatSaber.BeatSaberUI.CreateTextSegmentedControl(UnityEngine.RectTransform,UnityEngine.Vector2,UnityEngine.Vector2,UnityEngine.Events.UnityAction{System.Int32},System.Single,System.Single)">
+            <summary>
+            Creates a custom TextSegmentedControl component.
+            </summary>
+            <param name="parent">Thet transform to parent the new TextSegmentedControl component to.</param>
+            <param name="anchoredPosition">The position the TextSegmentedControl component should be anchored to.</param>
+            <param name="sizeDelta">The size of the TextSegmentedControl component RectTransform.</param>
+            <param name="onValueChanged">Callback when the user clicks on one of the segments.</param>
+            <param name="fontSize">Size of text in segments.</param>
+            <param name="padding">Size of padding in segments.</param>
+            <returns>The newly created TextSegmentedControl component.</returns>
+        </member>
+        <member name="M:CustomUI.BeatSaber.BeatSaberUI.CreateIconSegmentedControl(UnityEngine.RectTransform,UnityEngine.Vector2,UnityEngine.Vector2,UnityEngine.Events.UnityAction{System.Int32})">
+            <summary>
+            Creates a custom IconSegmentedControl component.
+            </summary>
+            <param name="parent">Thet transform to parent the new IconSegmentedControl component to.</param>
+            <param name="anchoredPosition">The position the IconSegmentedControl component should be anchored to.</param>
+            <param name="sizeDelta">The size of the IconSegmentedControl component RectTransform.</param>
+            <param name="onValueChanged">Callback when the user clicks on one of the segments.</param>
+            <returns>The newly created IconSegmentedControl component.</returns>
+        </member>
         <member name="F:CustomUI.BeatSaber.CustomFlowCoordinator.parentFlowCoordinator">
             <summary>
             The FlowCoordinator that presented this FlowCoordinator