From 70cf24924d3d10f133f9c913afea25e42e5244ac Mon Sep 17 00:00:00 2001 From: Kai Date: Wed, 21 Aug 2024 14:33:26 -0500 Subject: [PATCH] initial gridlayout --- app/src/main/AndroidManifest.xml | 19 +------------------ .../mainactivity/main/ContentFeedView.kt | 16 ++++++++++++---- .../mainactivity/main/CreatorFeedView.kt | 4 ++-- .../fragment/mainactivity/main/FeedView.kt | 3 ++- app/src/main/res/values/dimensions.xml | 3 ++- app/src/unstable/AndroidManifest.xml | 3 ++- 6 files changed, 21 insertions(+), 27 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 05675554..a876523a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -51,7 +51,6 @@ android:name=".activities.MainActivity" android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout" android:exported="true" - android:screenOrientation="sensorPortrait" android:theme="@style/Theme.FutoVideo.NoActionBar" android:launchMode="singleTask" android:resizeableActivity="true" @@ -153,27 +152,21 @@ @@ -187,44 +180,34 @@ - \ No newline at end of file + 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 fcabcb5b..35c4f32e 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 @@ -4,6 +4,7 @@ import android.content.Context import android.util.Log import android.view.LayoutInflater import android.widget.LinearLayout +import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.futo.platformplayer.R @@ -162,10 +163,17 @@ abstract class ContentFeedView : FeedView= resources.getDimension(R.dimen.landscape_threshold)) 2 else 1 + ); + glmResults.orientation = GridLayoutManager.VERTICAL; + return glmResults; } override fun onScrollStateChanged(newState: Int) { diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/CreatorFeedView.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/CreatorFeedView.kt index 78f90fb1..95b92f29 100644 --- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/CreatorFeedView.kt +++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/CreatorFeedView.kt @@ -34,9 +34,9 @@ abstract class CreatorFeedView : FeedView : L } } protected abstract fun createAdapter(recyclerResults: RecyclerView, context: Context, dataset: ArrayList): InsertedViewAdapterWithLoader; - protected abstract fun createLayoutManager(recyclerResults: RecyclerView, context: Context): LinearLayoutManager; + protected abstract fun createLayoutManager(recyclerResults: RecyclerView, context: Context): GridLayoutManager; protected open fun onRestoreCachedData(cachedData: RecyclerData, LinearLayoutManager, TPager, TResult, TConverted, InsertedViewHolder>) {} protected fun setProgress(fin: Int, total: Int) { diff --git a/app/src/main/res/values/dimensions.xml b/app/src/main/res/values/dimensions.xml index d3c299e7..320998e2 100644 --- a/app/src/main/res/values/dimensions.xml +++ b/app/src/main/res/values/dimensions.xml @@ -2,4 +2,5 @@ 200dp - \ No newline at end of file + 300dp + diff --git a/app/src/unstable/AndroidManifest.xml b/app/src/unstable/AndroidManifest.xml index a5fdd260..9affd8ab 100644 --- a/app/src/unstable/AndroidManifest.xml +++ b/app/src/unstable/AndroidManifest.xml @@ -7,7 +7,8 @@ - +