diff --git a/.gitmodules b/.gitmodules
index 3c5b4994cbf6fef58134eee3aa9cd0c7b0aa1d59..19b8f63e4f1da7a45fc39ff290aeb03b431a209d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
[submodule "dep/polycentricandroid"]
path = dep/polycentricandroid
url = ../polycentricandroid.git
-[submodule "app/src/playstore/assets/sources/peertube"]
- path = app/src/playstore/assets/sources/peertube
- url = ../plugins/peertube.git
[submodule "app/src/stable/assets/sources/kick"]
path = app/src/stable/assets/sources/kick
url = ../plugins/kick.git
diff --git a/app/build.gradle b/app/build.gradle
index e8ed5131961165f0d118b97074f393c50e4d5ae6..ecde63420d199936ed38f7e7aed1941cf4be28ef 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -151,7 +151,7 @@ dependencies {
//Core
implementation 'androidx.core:core-ktx:1.12.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
- implementation 'com.google.android.material:material:1.10.0'
+ implementation 'com.google.android.material:material:1.11.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
//Images
@@ -172,15 +172,15 @@ dependencies {
implementation("com.caoccao.javet:javet-android:3.0.2")
//Exoplayer
- implementation 'androidx.media3:media3-exoplayer:1.2.0'
- implementation 'androidx.media3:media3-exoplayer-dash:1.2.0'
- implementation 'androidx.media3:media3-ui:1.2.0'
- implementation 'androidx.media3:media3-exoplayer-hls:1.2.0'
- implementation 'androidx.media3:media3-exoplayer-rtsp:1.2.0'
- implementation 'androidx.media3:media3-exoplayer-smoothstreaming:1.2.0'
- implementation 'androidx.media3:media3-transformer:1.2.0'
- implementation 'androidx.navigation:navigation-fragment-ktx:2.7.5'
- implementation 'androidx.navigation:navigation-ui-ktx:2.7.5'
+ implementation 'androidx.media3:media3-exoplayer:1.2.1'
+ implementation 'androidx.media3:media3-exoplayer-dash:1.2.1'
+ implementation 'androidx.media3:media3-ui:1.2.1'
+ implementation 'androidx.media3:media3-exoplayer-hls:1.2.1'
+ implementation 'androidx.media3:media3-exoplayer-rtsp:1.2.1'
+ implementation 'androidx.media3:media3-exoplayer-smoothstreaming:1.2.1'
+ implementation 'androidx.media3:media3-transformer:1.2.1'
+ implementation 'androidx.navigation:navigation-fragment-ktx:2.7.6'
+ implementation 'androidx.navigation:navigation-ui-ktx:2.7.6'
implementation 'androidx.media:media:1.7.0'
//Other
diff --git a/app/src/main/java/com/futo/platformplayer/states/StateAnnouncement.kt b/app/src/main/java/com/futo/platformplayer/states/StateAnnouncement.kt
index a2304d721133d675e33052363cc999d1365bac2b..0c12d35a7d96b9b004b33bd9827064707f251044 100644
--- a/app/src/main/java/com/futo/platformplayer/states/StateAnnouncement.kt
+++ b/app/src/main/java/com/futo/platformplayer/states/StateAnnouncement.kt
@@ -12,7 +12,6 @@ import kotlinx.coroutines.withContext
import kotlinx.serialization.Serializable
import kotlinx.serialization.json.Json
import java.time.OffsetDateTime
-import java.util.Random
import java.util.UUID
class StateAnnouncement {
@@ -252,41 +251,6 @@ class StateAnnouncement {
}
- fun registerDidYouKnow() {
- val random = Random();
- val message: String? = when (random.nextInt(4 * 18 + 1)) {
- 0 -> "You can login to different platforms and unify your content experience. Check it out in the source settings!"
- 1 -> "Importing your playlists and subscriptions from other platforms to Grayjay is quick and easy. Check it out in the source settings!"
- 2 -> "Want to cast to a big screen? Try out FCast (https://fcast.org/)."
- 3 -> "Explore Grayjay's gesture controls. When in full-screen swipe on the left to change brightness, swipe on the right to change volume."
- 4 -> "Explore Grayjay's gesture controls. Swipe up in the center of a video to toggle full-screen."
- 5 -> "Grayjay's multi-platform search lets you find content from various sources."
- 6 -> "Grayjay's multi-platform search filters will unify filters across platforms. If your expected filters are not there, try toggling some platforms off in the search filters."
- 7 -> "You can share playlists with friends on the playlist page and make full-backups in the settings page."
- 8 -> "Discover Grayjay's offline playback feature. Save content for when you're on the go!"
- 9 -> "Paid content from your favorite creators gets seamlessly integrated into your Grayjay feed. Login to a platform to seamlessly see content you paid for."
- 10 -> "Explore Grayjay's plugin features! Login, import playlists, and tweak plugin settings for a tailored experience."
- 11 -> "Directly engage with content by liking, disliking, or leaving comments on the Polycentric network."
- 12 -> "With Grayjay's rotation lock, you can watch videos in your preferred orientation regardless of device settings. Check it out during playback!"
- 13 -> "Grayjay supports background play. Listen to your favorite content even while multitasking!"
- 14 -> "Use Grayjay's quality selection to adjust video resolution. Save data or watch in high definition – it's up to you."
- 15 -> "Customize your Grayjay experience by changing playback speed. Watch content at your own pace."
- 16 -> "Save time by adding videos to your 'Watch Later' list. Perfect for catching up on content during your free time."
- 17 -> "On Grayjay, your playlists, subscriptions, and settings are stored offline for privacy and quick access."
- 18 -> "Explore and engage with live content using Grayjay's live stream feature."
- else -> null
- };
-
- if (message != null) {
- registerAnnouncement(
- "did-you-know?",
- "Did you know?",
- message,
- AnnouncementType.SESSION_RECURRING
- );
- }
- }
-
fun registerDefaultHandlerAnnouncement() {
registerAnnouncement(
"default-url-handler",
diff --git a/app/src/main/java/com/futo/platformplayer/states/StateApp.kt b/app/src/main/java/com/futo/platformplayer/states/StateApp.kt
index f1b409edab14a46c3afd7fdb1567d7782dd60488..d3e2f1583fce0e6d432deced8e5a1a32a9823f07 100644
--- a/app/src/main/java/com/futo/platformplayer/states/StateApp.kt
+++ b/app/src/main/java/com/futo/platformplayer/states/StateApp.kt
@@ -5,7 +5,6 @@ import android.app.Activity
import android.content.Context
import android.content.Intent
import android.content.IntentFilter
-import android.graphics.Color
import android.media.AudioManager
import android.net.ConnectivityManager
import android.net.Network
@@ -42,7 +41,6 @@ import com.futo.platformplayer.stores.v2.ManagedStore
import com.futo.platformplayer.views.ToastView
import kotlinx.coroutines.*
import java.io.File
-import java.time.OffsetDateTime
import java.util.*
import java.util.concurrent.TimeUnit
import kotlin.system.measureTimeMillis
@@ -427,8 +425,6 @@ class StateApp {
}
}
- StateAnnouncement.instance.registerAnnouncement("fa4647d3-36fa-4c8c-832d-85b00fc72dca", "Disclaimer", "This is an early alpha build of the application, expect bugs and unfinished features.", AnnouncementType.DELETABLE, OffsetDateTime.now())
-
if(SettingsDev.instance.developerMode && SettingsDev.instance.devServerSettings.devServerOnBoot)
StateDeveloper.instance.runServer();
@@ -557,7 +553,6 @@ class StateApp {
}
StateAnnouncement.instance.registerDefaultHandlerAnnouncement();
- StateAnnouncement.instance.registerDidYouKnow();
Logger.i(TAG, "MainApp Started: Finished");
StatePlaylists.instance.toMigrateCheck();
@@ -580,25 +575,9 @@ class StateApp {
null,
"Plugin updates available"
));
-
- /*
- StateAnnouncement.instance.registerAnnouncement(
- "plugin-update",
- "Plugin updates available",
- "There are ${updateAvailable.size} plugin updates available.",
- AnnouncementType.SESSION_RECURRING
- )*/
}
}
}
-
- /*
- UIDialogs.appToast("This is a test", false);
- UIDialogs.appToast("This is a test 2", false);
- UIDialogs.appToastError("This is a test 3 (Error)", false);
- UIDialogs.appToast(ToastView.Toast("This is a test 4, with title", false, Color.WHITE, "Test title"));
- UIDialogs.appToast("This is a test 5 Long text\nWith enters\nasdh asfh fds h rwe h fxh sdfh sdf h dsfh sdf hasdfhsdhg ads as", true);
- */
}
fun mainAppStartedWithExternalFiles(context: Context) {
diff --git a/app/src/playstore/assets/sources/peertube b/app/src/playstore/assets/sources/peertube
deleted file mode 160000
index cfabdc97ab435822c44b0135b3b76519327ba05a..0000000000000000000000000000000000000000
--- a/app/src/playstore/assets/sources/peertube
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cfabdc97ab435822c44b0135b3b76519327ba05a
diff --git a/app/src/playstore/res/raw/plugin_config.json b/app/src/playstore/res/raw/plugin_config.json
index 72fc5c5bfcd941b6a7fe441c4aaa03719acd333f..c1784dc519518699bb6c7b873b234cabc144796f 100644
--- a/app/src/playstore/res/raw/plugin_config.json
+++ b/app/src/playstore/res/raw/plugin_config.json
@@ -1,7 +1,5 @@
{
- "SOURCES_EMBEDDED": {
-
- },
+ "SOURCES_EMBEDDED": {},
"SOURCES_EMBEDDED_DEFAULT": [],
"SOURCES_UNDER_CONSTRUCTION": {}
}
diff --git a/sign-all-sources.sh b/sign-all-sources.sh
index 0226997c513030265b9f6ffae41d9abe9fd7ab4b..ff4c0de6840ec80ec91302492b7e1d84e7a38efb 100755
--- a/sign-all-sources.sh
+++ b/sign-all-sources.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# Array of directories to look in
-dirs=("app/src/unstable/assets/sources" "app/src/stable/assets/sources" "app/src/playstore/assets/sources")
+dirs=("app/src/unstable/assets/sources" "app/src/stable/assets/sources")
# Loop through each directory
for dir in "${dirs[@]}"; do