From 95207341db0b85db05d6bd64daa3718f8a6e0620 Mon Sep 17 00:00:00 2001 From: Kai Date: Wed, 21 Aug 2024 15:50:22 -0500 Subject: [PATCH] bottom bar and tutorial fixes --- .../bottombar/MenuBottomBarFragment.kt | 15 +++++++++++- .../mainactivity/main/ContentFeedView.kt | 4 ++-- .../fragment/mainactivity/main/FeedView.kt | 24 ++++++++++++++++--- .../mainactivity/main/HomeFragment.kt | 5 ++-- .../main/SubscriptionsFeedFragment.kt | 7 +++--- .../mainactivity/main/TutorialFragment.kt | 11 ++++++++- .../mainactivity/main/VideoDetailFragment.kt | 10 +++----- 7 files changed, 57 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/bottombar/MenuBottomBarFragment.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/bottombar/MenuBottomBarFragment.kt index 8855a89e..c08a7865 100644 --- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/bottombar/MenuBottomBarFragment.kt +++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/bottombar/MenuBottomBarFragment.kt @@ -7,6 +7,7 @@ import android.annotation.SuppressLint import android.app.Activity import android.content.Context import android.content.Intent +import android.content.res.Configuration import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -56,6 +57,12 @@ class MenuBottomBarFragment : MainActivityFragment() { return _view?.onBackPressed() ?: false; } + override fun onConfigurationChanged(newConfig: Configuration) { + super.onConfigurationChanged(newConfig) + + _view?.updateAllButtonVisibility() + } + @SuppressLint("ViewConstructor") class MenuBottomBarView : LinearLayout { private val _fragment: MenuBottomBarFragment; @@ -251,9 +258,15 @@ class MenuBottomBarFragment : MainActivityFragment() { button.updateActive(_fragment); } + override fun onConfigurationChanged(newConfig: Configuration?) { + super.onConfigurationChanged(newConfig) + + updateAllButtonVisibility() + } + fun updateAllButtonVisibility() { val defs = currentButtonDefinitions?.toMutableList() ?: return - val metrics = StateApp.instance.displayMetrics ?: resources.displayMetrics; + val metrics = resources.displayMetrics; _buttonsVisible = floor(metrics.widthPixels.toDouble() / 65.dp(resources).toDouble()).roundToInt(); if (_buttonsVisible >= defs.size) { updateBottomMenuButtons(defs.toMutableList(), false); diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ContentFeedView.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ContentFeedView.kt index 35c4f32e..c8144e3b 100644 --- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ContentFeedView.kt +++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ContentFeedView.kt @@ -46,7 +46,7 @@ abstract class ContentFeedView : FeedView, LinearLayoutManager, IPager, IPlatformContent, IPlatformContent, InsertedViewHolder>? = null) : super(fragment, inflater, cachedRecyclerData) { + constructor(fragment: TFragment, inflater: LayoutInflater, cachedRecyclerData: RecyclerData, GridLayoutManager, IPager, IPlatformContent, IPlatformContent, InsertedViewHolder>? = null) : super(fragment, inflater, cachedRecyclerData) { } @@ -152,7 +152,7 @@ abstract class ContentFeedView : FeedView, LinearLayoutManager, IPager, IPlatformContent, IPlatformContent, InsertedViewHolder>) { + override fun onRestoreCachedData(cachedData: RecyclerData, GridLayoutManager, IPager, IPlatformContent, IPlatformContent, InsertedViewHolder>) { super.onRestoreCachedData(cachedData) val v = LinearLayout(context).apply { layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT); diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/FeedView.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/FeedView.kt index ee0b7a2b..4f4e17cd 100644 --- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/FeedView.kt +++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/FeedView.kt @@ -1,6 +1,7 @@ package com.futo.platformplayer.fragment.mainactivity.main import android.content.Context +import android.content.res.Configuration import android.graphics.Color import android.view.LayoutInflater import android.view.View @@ -59,14 +60,14 @@ abstract class FeedView : L private var _activeTags: List? = null; private var _nextPageHandler: TaskHandler>; - val recyclerData: RecyclerData, LinearLayoutManager, TPager, TResult, TConverted, InsertedViewHolder>; + val recyclerData: RecyclerData, GridLayoutManager, TPager, TResult, TConverted, InsertedViewHolder>; val fragment: TFragment; private val _scrollListener: RecyclerView.OnScrollListener; private var _automaticNextPageCounter = 0; - constructor(fragment: TFragment, inflater: LayoutInflater, cachedRecyclerData: RecyclerData, LinearLayoutManager, TPager, TResult, TConverted, InsertedViewHolder>? = null) : super(inflater.context) { + constructor(fragment: TFragment, inflater: LayoutInflater, cachedRecyclerData: RecyclerData, GridLayoutManager, TPager, TResult, TConverted, InsertedViewHolder>? = null) : super(inflater.context) { this.fragment = fragment; inflater.inflate(R.layout.fragment_feed, this); @@ -227,7 +228,24 @@ abstract class FeedView : L } } + override fun onConfigurationChanged(newConfig: Configuration?) { + super.onConfigurationChanged(newConfig) + + if (resources.configuration.screenWidthDp >= resources.getDimension(R.dimen.landscape_threshold) && recyclerData.layoutManager.spanCount != 2){ + recyclerData.layoutManager.spanCount = 2 + } else if (resources.configuration.screenWidthDp < resources.getDimension(R.dimen.landscape_threshold) && recyclerData.layoutManager.spanCount != 1){ + recyclerData.layoutManager.spanCount = 1 + } + } + fun onResume() { + //update the number of columns + if (resources.configuration.screenWidthDp >= resources.getDimension(R.dimen.landscape_threshold) && recyclerData.layoutManager.spanCount != 2){ + recyclerData.layoutManager.spanCount = 2 + } else if (resources.configuration.screenWidthDp < resources.getDimension(R.dimen.landscape_threshold) && recyclerData.layoutManager.spanCount != 1){ + recyclerData.layoutManager.spanCount = 1 + } + //Reload the pager if the plugin was killed val pager = recyclerData.pager; if((pager is MultiPager<*> && pager.findPager { it is JSPager<*> && !it.isAvailable } != null) || @@ -279,7 +297,7 @@ abstract class FeedView : L } protected abstract fun createAdapter(recyclerResults: RecyclerView, context: Context, dataset: ArrayList): InsertedViewAdapterWithLoader; protected abstract fun createLayoutManager(recyclerResults: RecyclerView, context: Context): GridLayoutManager; - protected open fun onRestoreCachedData(cachedData: RecyclerData, LinearLayoutManager, TPager, TResult, TConverted, InsertedViewHolder>) {} + protected open fun onRestoreCachedData(cachedData: RecyclerData, GridLayoutManager, TPager, TResult, TConverted, InsertedViewHolder>) {} protected fun setProgress(fin: Int, total: Int) { val progress = (fin.toFloat() / total); diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/HomeFragment.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/HomeFragment.kt index d0994783..b7138aff 100644 --- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/HomeFragment.kt +++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/HomeFragment.kt @@ -6,6 +6,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.lifecycle.lifecycleScope +import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import com.futo.platformplayer.* import com.futo.platformplayer.activities.MainActivity @@ -44,7 +45,7 @@ class HomeFragment : MainFragment() { override val hasBottomBar: Boolean get() = true; private var _view: HomeView? = null; - private var _cachedRecyclerData: FeedView.RecyclerData, LinearLayoutManager, IPager, IPlatformContent, IPlatformContent, InsertedViewHolder>? = null; + private var _cachedRecyclerData: FeedView.RecyclerData, GridLayoutManager, IPager, IPlatformContent, IPlatformContent, InsertedViewHolder>? = null; override fun onShownWithView(parameter: Any?, isBack: Boolean) { super.onShownWithView(parameter, isBack); @@ -98,7 +99,7 @@ class HomeFragment : MainFragment() { private val _taskGetPager: TaskHandler>; override val shouldShowTimeBar: Boolean get() = Settings.instance.home.progressBar - constructor(fragment: HomeFragment, inflater: LayoutInflater, cachedRecyclerData: RecyclerData, LinearLayoutManager, IPager, IPlatformContent, IPlatformContent, InsertedViewHolder>? = null) : super(fragment, inflater, cachedRecyclerData) { + constructor(fragment: HomeFragment, inflater: LayoutInflater, cachedRecyclerData: RecyclerData, GridLayoutManager, IPager, IPlatformContent, IPlatformContent, InsertedViewHolder>? = null) : super(fragment, inflater, cachedRecyclerData) { _announcementsView = AnnouncementView(context, null).apply { headerView.addView(this); }; diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SubscriptionsFeedFragment.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SubscriptionsFeedFragment.kt index 03d9a626..33bc3740 100644 --- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SubscriptionsFeedFragment.kt +++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SubscriptionsFeedFragment.kt @@ -7,6 +7,7 @@ import android.view.View import android.view.ViewGroup import android.widget.LinearLayout import androidx.lifecycle.lifecycleScope +import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import com.futo.platformplayer.* import com.futo.platformplayer.activities.MainActivity @@ -57,7 +58,7 @@ class SubscriptionsFeedFragment : MainFragment() { private var _view: SubscriptionsFeedView? = null; private var _group: SubscriptionGroup? = null; - private var _cachedRecyclerData: FeedView.RecyclerData, LinearLayoutManager, IPager, IPlatformContent, IPlatformContent, InsertedViewHolder>? = null; + private var _cachedRecyclerData: FeedView.RecyclerData, GridLayoutManager, IPager, IPlatformContent, IPlatformContent, InsertedViewHolder>? = null; override fun onShownWithView(parameter: Any?, isBack: Boolean) { super.onShownWithView(parameter, isBack); @@ -110,7 +111,7 @@ class SubscriptionsFeedFragment : MainFragment() { var subGroup: SubscriptionGroup? = null; - constructor(fragment: SubscriptionsFeedFragment, inflater: LayoutInflater, cachedRecyclerData: RecyclerData, LinearLayoutManager, IPager, IPlatformContent, IPlatformContent, InsertedViewHolder>? = null) : super(fragment, inflater, cachedRecyclerData) { + constructor(fragment: SubscriptionsFeedFragment, inflater: LayoutInflater, cachedRecyclerData: RecyclerData, GridLayoutManager, IPager, IPlatformContent, IPlatformContent, InsertedViewHolder>? = null) : super(fragment, inflater, cachedRecyclerData) { Logger.i(TAG, "SubscriptionsFeedFragment constructor()"); StateSubscriptions.instance.global.onUpdateProgress.subscribe(this) { progress, total -> }; @@ -395,7 +396,7 @@ class SubscriptionsFeedFragment : MainFragment() { _taskGetPager.run(withRefetch); } - override fun onRestoreCachedData(cachedData: RecyclerData, LinearLayoutManager, IPager, IPlatformContent, IPlatformContent, InsertedViewHolder>) { + override fun onRestoreCachedData(cachedData: RecyclerData, GridLayoutManager, IPager, IPlatformContent, IPlatformContent, InsertedViewHolder>) { super.onRestoreCachedData(cachedData); setEmptyPager(cachedData.results.isEmpty()); } diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/TutorialFragment.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/TutorialFragment.kt index 5139c0f8..8e223e53 100644 --- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/TutorialFragment.kt +++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/TutorialFragment.kt @@ -6,6 +6,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.LinearLayout +import android.widget.ScrollView import android.widget.TextView import com.futo.platformplayer.* import com.futo.platformplayer.api.media.IPlatformClient @@ -58,7 +59,15 @@ class TutorialFragment : MainFragment() { } @SuppressLint("ViewConstructor") - class TutorialView : LinearLayout { + class TutorialView(fragment: TutorialFragment, inflater: LayoutInflater) : + ScrollView(inflater.context) { + init { + addView(TutorialContainer(fragment, inflater)) + } + } + + @SuppressLint("ViewConstructor") + class TutorialContainer : LinearLayout { val fragment: TutorialFragment constructor(fragment: TutorialFragment, inflater: LayoutInflater) : super(inflater.context) { diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailFragment.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailFragment.kt index e1f311fb..d5c415a9 100644 --- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailFragment.kt +++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailFragment.kt @@ -96,14 +96,10 @@ class VideoDetailFragment : MainFragment { val currentOrientation = _currentOrientation val isFs = isFullscreen - if (isFs && isMaximized) { - if (isFullScreenPortraitAllowed) { - activity?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR - } else { - activity?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE - } + if (isFs && isMaximized && !isFullScreenPortraitAllowed) { + activity?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE } else { - activity?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT + activity?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR } Log.i(TAG, "updateOrientation (isFs = ${isFs}, currentOrientation = ${currentOrientation}, isMaximized = ${isMaximized}, isFullScreenPortraitAllowed = ${isFullScreenPortraitAllowed}) resulted in requested orientation ${activity?.requestedOrientation}");