From e0857aea9b6721e464c18ee7e9dd39bb7a4f2d95 Mon Sep 17 00:00:00 2001 From: Kelvin K Date: Wed, 26 Nov 2025 09:37:35 -0600 Subject: [PATCH 1/5] Window pan for keyboard --- app/src/main/AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2823496c..ad650f79 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -61,6 +61,7 @@ android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout|uiMode" android:exported="true" android:theme="@style/Theme.FutoVideo.NoActionBar" + android:windowSoftInputMode="adjustPan" android:launchMode="singleInstance" android:resizeableActivity="true" android:supportsPictureInPicture="true"> From 8be7ad9f6881a358bd9d29fa6dd6ef0d7a9773db Mon Sep 17 00:00:00 2001 From: Kelvin K Date: Wed, 26 Nov 2025 10:12:52 -0600 Subject: [PATCH 2/5] Alignment for more menu --- .../bottombar/MenuBottomBarFragment.kt | 27 +++++++++++++------ .../layout/fragment_overview_bottom_bar.xml | 1 + 2 files changed, 20 insertions(+), 8 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 402625f8..d7279bbb 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 @@ -102,6 +102,8 @@ class MenuBottomBarFragment : MainActivityFragment() { private var currentButtonDefinitions: List? = null; + private var moreColumns = 3; + constructor(fragment: MenuBottomBarFragment, inflater: LayoutInflater) : super(inflater.context) { _fragment = fragment; _inflater = inflater; @@ -170,6 +172,7 @@ class MenuBottomBarFragment : MainActivityFragment() { setMoreVisible(false); } }) + moreColumns = columns; val layoutManager = GridLayoutManager(context, columns, GridLayoutManager.VERTICAL, true); _layoutMoreButtons.layoutManager = layoutManager; @@ -321,29 +324,37 @@ class MenuBottomBarFragment : MainActivityFragment() { _layoutMoreButtons.removeAllViews(); var insertedButtons = 0; + //Force settings to be first + val settingsIndex = buttons.indexOfFirst { b -> b.id == 7 }; + if (settingsIndex != -1) { + val button = buttons[settingsIndex] + buttons.removeAt(settingsIndex) + buttons.add(0, button) + //insertedButtons++; + } //Force buy to be on top for more buttons val buyIndex = buttons.indexOfFirst { b -> b.id == 98 }; if (buyIndex != -1) { val button = buttons[buyIndex] buttons.removeAt(buyIndex) - buttons.add(0, button) - insertedButtons++; + buttons.add(button) + //insertedButtons++; } //Force faq to be second val faqIndex = buttons.indexOfFirst { b -> b.id == 97 }; if (faqIndex != -1) { val button = buttons[faqIndex] buttons.removeAt(faqIndex) - buttons.add(if (insertedButtons == 1) 1 else 0, button) - insertedButtons++; + buttons.add(button) + //insertedButtons++; } //Force privacy to be third val privacyIndex = buttons.indexOfFirst { b -> b.id == 96 }; if (privacyIndex != -1) { val button = buttons[privacyIndex] buttons.removeAt(privacyIndex) - buttons.add(if (insertedButtons == 2) 2 else (if(insertedButtons == 1) 1 else 0), button) - insertedButtons++; + buttons.add(button) + //insertedButtons++; } val newButtons = mutableListOf(); @@ -602,7 +613,7 @@ class MenuBottomBarFragment : MainActivityFragment() { if (c is Activity) { c.overridePendingTransition(R.anim.slide_in_up, R.anim.slide_darken); }*/ - }), + }),/* ButtonDefinition(96, R.drawable.ic_disabled_visible, R.drawable.ic_disabled_visible, R.string.privacy_mode, canToggle = true, { false }, { UIDialogs.showDialog(it.context ?: return@ButtonDefinition, R.drawable.ic_disabled_visible_purple, "Privacy Mode", "All requests will be processed anonymously (any logins will be disabled except for the personalized home page), local playback and history tracking will also be disabled.\n\nTap the icon to disable.", null, 0, @@ -612,7 +623,7 @@ class MenuBottomBarFragment : MainActivityFragment() { UIDialogs.Action("Enable", { StateApp.instance.setPrivacyMode(true); }, UIDialogs.ActionStyle.PRIMARY)); - }), + }),*/ ButtonDefinition(97, R.drawable.ic_quiz, R.drawable.ic_quiz_fill, R.string.faq, canToggle = true, { false }, { it.navigate(Settings.URL_FAQ, withHistory = false); }) diff --git a/app/src/main/res/layout/fragment_overview_bottom_bar.xml b/app/src/main/res/layout/fragment_overview_bottom_bar.xml index b8ad4e45..4fde34a4 100644 --- a/app/src/main/res/layout/fragment_overview_bottom_bar.xml +++ b/app/src/main/res/layout/fragment_overview_bottom_bar.xml @@ -109,6 +109,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" + android:layoutDirection="rtl" android:gravity="end"> From baa2a4fcf3d1a37eb6934dbf8099a276e8825a51 Mon Sep 17 00:00:00 2001 From: Kelvin K Date: Wed, 26 Nov 2025 12:05:24 -0600 Subject: [PATCH 3/5] Deps --- app/src/stable/assets/sources/kick | 2 +- app/src/stable/assets/sources/odysee | 2 +- app/src/stable/assets/sources/rumble | 2 +- app/src/stable/assets/sources/youtube | 2 +- app/src/unstable/assets/sources/kick | 2 +- app/src/unstable/assets/sources/odysee | 2 +- app/src/unstable/assets/sources/rumble | 2 +- app/src/unstable/assets/sources/youtube | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/stable/assets/sources/kick b/app/src/stable/assets/sources/kick index 9b3c7ea2..96503584 160000 --- a/app/src/stable/assets/sources/kick +++ b/app/src/stable/assets/sources/kick @@ -1 +1 @@ -Subproject commit 9b3c7ea213c93a88280cd302838bec2fd322f833 +Subproject commit 96503584d98fa9b31c68bd4e9f8f360eb9f3285c diff --git a/app/src/stable/assets/sources/odysee b/app/src/stable/assets/sources/odysee index 89ad7e9a..98a8df5a 160000 --- a/app/src/stable/assets/sources/odysee +++ b/app/src/stable/assets/sources/odysee @@ -1 +1 @@ -Subproject commit 89ad7e9a4bae727164099fbd853f031c4902b674 +Subproject commit 98a8df5a6015f10238392cd82993cee815382315 diff --git a/app/src/stable/assets/sources/rumble b/app/src/stable/assets/sources/rumble index 2864a541..d24fc4cf 160000 --- a/app/src/stable/assets/sources/rumble +++ b/app/src/stable/assets/sources/rumble @@ -1 +1 @@ -Subproject commit 2864a541e674761753bcc081a35660c61b4bc91a +Subproject commit d24fc4cf8e1dd023f1fafcc6cfa5ea4f394070c3 diff --git a/app/src/stable/assets/sources/youtube b/app/src/stable/assets/sources/youtube index 4f0037a1..ec5359ae 160000 --- a/app/src/stable/assets/sources/youtube +++ b/app/src/stable/assets/sources/youtube @@ -1 +1 @@ -Subproject commit 4f0037a19d2f59c555579d535ce0b76764f70fdf +Subproject commit ec5359ae16c2b7f9bdb3a4fcc3d1436410e0729f diff --git a/app/src/unstable/assets/sources/kick b/app/src/unstable/assets/sources/kick index 9b3c7ea2..96503584 160000 --- a/app/src/unstable/assets/sources/kick +++ b/app/src/unstable/assets/sources/kick @@ -1 +1 @@ -Subproject commit 9b3c7ea213c93a88280cd302838bec2fd322f833 +Subproject commit 96503584d98fa9b31c68bd4e9f8f360eb9f3285c diff --git a/app/src/unstable/assets/sources/odysee b/app/src/unstable/assets/sources/odysee index 89ad7e9a..98a8df5a 160000 --- a/app/src/unstable/assets/sources/odysee +++ b/app/src/unstable/assets/sources/odysee @@ -1 +1 @@ -Subproject commit 89ad7e9a4bae727164099fbd853f031c4902b674 +Subproject commit 98a8df5a6015f10238392cd82993cee815382315 diff --git a/app/src/unstable/assets/sources/rumble b/app/src/unstable/assets/sources/rumble index 2864a541..d24fc4cf 160000 --- a/app/src/unstable/assets/sources/rumble +++ b/app/src/unstable/assets/sources/rumble @@ -1 +1 @@ -Subproject commit 2864a541e674761753bcc081a35660c61b4bc91a +Subproject commit d24fc4cf8e1dd023f1fafcc6cfa5ea4f394070c3 diff --git a/app/src/unstable/assets/sources/youtube b/app/src/unstable/assets/sources/youtube index 4f0037a1..ec5359ae 160000 --- a/app/src/unstable/assets/sources/youtube +++ b/app/src/unstable/assets/sources/youtube @@ -1 +1 @@ -Subproject commit 4f0037a19d2f59c555579d535ce0b76764f70fdf +Subproject commit ec5359ae16c2b7f9bdb3a4fcc3d1436410e0729f From d902306fe49cbf0f4362377bc59ac4d16c6ec563 Mon Sep 17 00:00:00 2001 From: Kelvin K Date: Wed, 26 Nov 2025 13:35:09 -0600 Subject: [PATCH 4/5] Revert old ffmpeg --- app/aar/ffmpeg-kit.aar | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/aar/ffmpeg-kit.aar b/app/aar/ffmpeg-kit.aar index a432cb03..27b62b35 100644 --- a/app/aar/ffmpeg-kit.aar +++ b/app/aar/ffmpeg-kit.aar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:22c06ca0d1a5808b2fc0a12227d5915b3126bc0b9b1305cf6bab855f2ec6fcbb -size 36133152 +oid sha256:ea10d3c5562c9f449a4e89e9c3dfcf881ed79a952f3409bc005bcc62c2cf4b81 +size 65512557 From 0dca8798cbdfe0e151c3559b871cfde0f35997c8 Mon Sep 17 00:00:00 2001 From: Kelvin <41-kelvin@users.noreply.gitlab.futo.org> Date: Wed, 26 Nov 2025 20:06:16 +0000 Subject: [PATCH 5/5] Revert "Revert old ffmpeg" This reverts commit d902306fe49cbf0f4362377bc59ac4d16c6ec563 --- app/aar/ffmpeg-kit.aar | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/aar/ffmpeg-kit.aar b/app/aar/ffmpeg-kit.aar index 27b62b35..a432cb03 100644 --- a/app/aar/ffmpeg-kit.aar +++ b/app/aar/ffmpeg-kit.aar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea10d3c5562c9f449a4e89e9c3dfcf881ed79a952f3409bc005bcc62c2cf4b81 -size 65512557 +oid sha256:22c06ca0d1a5808b2fc0a12227d5915b3126bc0b9b1305cf6bab855f2ec6fcbb +size 36133152