Merge branch 'master' of https://github.com/b-rad15/MusicVideoPlayerU…

…pdated

VideoPlayer/UI/VideosFlowCoordinator.cs

@@ -13,6 +13,7 @@
 using MusicVideoPlayer.YT;
 using SongCore.Utilities;
 using Object = System.Object;
+using System.Collections;
 
 namespace MusicVideoPlayer.UI
 {
@@ -50,15 +51,7 @@ protected override void DidActivate(bool firstActivation, ActivationType activat
             if (_videoDetailViewController == null)
             {
                 _videoDetailViewController = BeatSaberUI.CreateViewController<MusicVideoPlayer.UI.ViewControllers.VideoDetailViewController>();
-                _videoDetailViewController.Init();
-                _videoDetailViewController.backButtonPressed += DetailViewBackPressed;
-                _videoDetailViewController.addOffsetPressed += DetailViewAddOffsetPressed;
-                _videoDetailViewController.subOffsetPressed += DetailViewSubOffsetPressed;
-                _videoDetailViewController.changeOffsetMagnitudePressed += DetailsViewChangeMagnitudePressed;
-                _videoDetailViewController.previewButtonPressed += DetailViewPreviewPressed;
-                _videoDetailViewController.loopButtonPressed += DetailViewLoopPressed;
-                _videoDetailViewController.listButtonPressed += DetailViewSearchPressed;
-                _videoDetailViewController.downloadDeleteButtonPressed += DetailViewDownloadDeletePressed;
+                StartCoroutine(LoadDetailView());
             }
 
             if (_videoListViewController == null)
@@ -90,6 +83,8 @@ protected override void DidActivate(bool firstActivation, ActivationType activat
             }
         }
 
+
+
         private void DetailViewDownloadDeletePressed()
         {
             switch (selectedLevelVideo.downloadState) { 
@@ -127,6 +122,24 @@ private void DoSearch(string query)
         }
 
         #region DetailView
+        private IEnumerator LoadDetailView()
+        {
+            while (GameObject.Find("PlayButton") == null)
+            {
+                yield return null;
+            }
+
+            _videoDetailViewController.Init();
+            _videoDetailViewController.backButtonPressed += DetailViewBackPressed;
+            _videoDetailViewController.addOffsetPressed += DetailViewAddOffsetPressed;
+            _videoDetailViewController.subOffsetPressed += DetailViewSubOffsetPressed;
+            _videoDetailViewController.changeOffsetMagnitudePressed += DetailsViewChangeMagnitudePressed;
+            _videoDetailViewController.previewButtonPressed += DetailViewPreviewPressed;
+            _videoDetailViewController.loopButtonPressed += DetailViewLoopPressed;
+            _videoDetailViewController.listButtonPressed += DetailViewSearchPressed;
+            _videoDetailViewController.downloadDeleteButtonPressed += DetailViewDownloadDeletePressed;
+        }
+
         private void DetailViewBackPressed()
         {
             VideoLoader.SaveVideoToDisk(selectedLevelVideo);

VideoPlayer/UI/ViewControllers/VideoDetailViewController.cs

@@ -51,6 +51,8 @@ class VideoDetailViewController : VRUIViewController
 
         private TextMeshProUGUI _progressText;
 
+        private const int MAX_TITLE_LENGTH = 43;
+
         protected override void DidActivate(bool firstActivation, ActivationType type)
         {
             if (type == ActivationType.AddedToHierarchy)
@@ -140,7 +142,7 @@ public void Init()
             _duration.rectTransform.sizeDelta = new Vector2(80, 5);
 
             _description = BeatSaberUI.CreateText(rectTransform,
-                "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
+                "DESCRIPTION",
                 new Vector2(0, -14));
             _description.alignment = TextAlignmentOptions.TopLeft;
             _description.rectTransform.sizeDelta = new Vector2(80, 10);
@@ -176,40 +178,6 @@ public void Init()
             _hoverHint = BeatSaberUI.AddHintText(_thumbnail.transform as RectTransform, "Banana banana banana");
         }
 
-        private IEnumerator FindPlayButton()
-        {
-            // Download Progress ring
-            Button _playbutton = null;
-
-            while(_playbutton == null)
-            {
-                _playbutton = GameObject.Find("PlayButton")?.GetComponent<Button>();
-                yield return null;
-            }
-
-            var _progressButton = Instantiate(_playbutton, _thumbnail.transform);
-            _progressButton.name = "DownloadProgress";
-            (_progressButton.transform as RectTransform).anchorMax = new Vector2(0.5f, 0.5f);
-            (_progressButton.transform as RectTransform).anchorMin = new Vector2(0.5f, 0.5f);
-            (_progressButton.transform as RectTransform).anchoredPosition = new Vector2(0, 0);
-            (_progressButton.transform as RectTransform).pivot = new Vector2(0.5f, 0.5f);
-            (_progressButton.transform as RectTransform).sizeDelta = new Vector2(18, 18);
-            _progressText = _progressButton.GetComponentInChildren<TextMeshProUGUI>();
-            _progressText.text = "100%";
-
-            _progressRingGlow = _progressButton.GetComponentsInChildren<Image>().First(x => x.name == "Glow");
-            Destroy(_progressButton);
-            _progressRingGlow.gameObject.SetActive(false);
-
-            var hlg = _progressButton.GetComponentsInChildren<HorizontalLayoutGroup>().First(x => x.name == "Content");
-            hlg.padding = new RectOffset(2, 2, 2, 2);
-
-            _progressCircle = _progressButton.GetComponentsInChildren<Image>().First(x => x.name == "Stroke");
-            _progressCircle.type = Image.Type.Filled;
-            _progressCircle.fillMethod = Image.FillMethod.Radial360;
-            _progressCircle.fillAmount = 1f;
-        }
-
         public void SetPreviewState(bool playing)
         {
             if (playing)
@@ -260,7 +228,7 @@ public void UpdateContent()
                 return;
             }
 
-            _title.SetText(selectedVideo.title.CleanASCII());
+            _title.SetText(selectedVideo.title.CleanASCII().ShortenTitle(MAX_TITLE_LENGTH));
             _description.SetText(selectedVideo.description);
             _uploader.SetText(selectedVideo.author);
             _duration.SetText($"[{selectedVideo.duration}]");

VideoPlayer/Util/ExtensionMethods.cs

@@ -52,5 +52,17 @@ public static string CleanASCII(this string s)
             }
             return sb.ToString();
         }
+
+        public static string ShortenTitle(this string s, int maxLength)
+        {
+            StringBuilder builder = new StringBuilder(s);
+
+            if(builder.Length > maxLength)
+            {
+                builder.Remove(maxLength, builder.Length - maxLength).Insert(maxLength, "...."); ;
+            }
+
+            return builder.ToString();
+        }
     }
 }