diff --git a/app/src/main/java/com/futo/platformplayer/UISlideOverlays.kt b/app/src/main/java/com/futo/platformplayer/UISlideOverlays.kt index 6401dc26..01ef456a 100644 --- a/app/src/main/java/com/futo/platformplayer/UISlideOverlays.kt +++ b/app/src/main/java/com/futo/platformplayer/UISlideOverlays.kt @@ -67,7 +67,7 @@ class UISlideOverlays { return menu; } - fun showSubscriptionOptionsOverlay(subscription: Subscription, container: ViewGroup) { + fun showSubscriptionOptionsOverlay(subscription: Subscription, container: ViewGroup): SlideUpMenuOverlay { val items = arrayListOf(); val originalNotif = subscription.doNotifications; @@ -76,15 +76,13 @@ class UISlideOverlays { val originalVideo = subscription.doFetchVideos; val originalPosts = subscription.doFetchPosts; + val menu = SlideUpMenuOverlay(container.context, container, "Subscription Settings", null, true, listOf()); + StateApp.instance.scopeOrNull?.launch(Dispatchers.IO){ val plugin = StatePlatform.instance.getChannelClient(subscription.channel.url); val capabilities = plugin.getChannelCapabilities(); withContext(Dispatchers.Main) { - - var menu: SlideUpMenuOverlay? = null; - - items.addAll(listOf( SlideUpMenuItem(container.context, R.drawable.ic_notifications, "Notifications", "", "notifications", { subscription.doNotifications = menu?.selectOption(null, "notifications", true, true) ?: subscription.doNotifications; @@ -118,7 +116,7 @@ class UISlideOverlays { }, false)*/ ).filterNotNull()); - menu = SlideUpMenuOverlay(container.context, container, "Subscription Settings", null, true, items); + menu.setItems(items); if(subscription.doNotifications) menu.selectOption(null, "notifications", true, true); @@ -173,6 +171,8 @@ class UISlideOverlays { menu.show(); } } + + return menu; } fun showAddToGroupOverlay(channel: IPlatformVideo, container: ViewGroup) { diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt index a80b1aab..dd10476a 100644 --- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt +++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt @@ -373,7 +373,7 @@ class VideoDetailView : ConstraintLayout { _buttonSubscribe.onSubscribed.subscribe { - UISlideOverlays.showSubscriptionOptionsOverlay(it, _overlayContainer); + _slideUpOverlay = UISlideOverlays.showSubscriptionOptionsOverlay(it, _overlayContainer); }; _container_content_liveChat.onRaidNow.subscribe { @@ -2350,7 +2350,7 @@ class VideoDetailView : ConstraintLayout { } else if(isOverlayed) { _playerProgress.layoutParams = _playerProgress.layoutParams.apply { - (this as MarginLayoutParams).bottomMargin = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, -6f, resources.displayMetrics).toInt(); + (this as MarginLayoutParams).bottomMargin = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, -2f, resources.displayMetrics).toInt(); }; _playerProgress.elevation = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 5f, resources.displayMetrics); }