diff --git a/README.md b/README.md index 263689a2..b05b5b82 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,8 @@ technologies that frustrate centralization and industry consolidation. - - + + @@ -24,12 +24,10 @@ The FUTO media app is a player that exposes multiple video websites as sources i
Video
- - + - - +
Sources (all enabled)Sources (one disabled)Sources
@@ -38,7 +36,7 @@ Additional sources can also be installed. These sources are JavaScript sources, - + @@ -54,8 +52,8 @@ When a user enters a search term into the search bar, the query is posted to th
Install a new source
- - + + @@ -71,7 +69,7 @@ Creators are able to configure their profile using NeoPass.
Search (list)
- + @@ -112,7 +110,7 @@ The app offers a lot of settings customizing how the app looks and feels. An exa
Channel
- + @@ -125,8 +123,8 @@ Playlists allow you to make a collection of videos that you can create and custo
Settings
- - + + @@ -142,7 +140,7 @@ Both individual videos and playlists can be downloaded for local, offline playba
Playlists
- + @@ -157,7 +155,7 @@ For more information about casting please click [here](./docs/casting.md).
Downloads
- + @@ -182,6 +180,12 @@ In the future we hope to offer users the choice of their desired recommendation 1. Download a copy of the repository. 2. Open the project in Android Studio: Once the repository is cloned, you can open it in Android Studio by selecting "Open an Existing Project" from the welcome screen and navigating to the directory where you cloned the repository. +3. Open the terminal in Android Studio by clicking on the terminal icon on bottom left and run the following command: + +```sh +git submodule update --init --recursive +``` + 3. Build the project: With the project open in Android Studio, you can build it by selecting "Build > Make Project" from the main menu. This will compile the code and generate an APK file that you can install on your device or emulator. 4. Run the project: To run the project, select "Run > Run 'app'" from the main menu. This will launch the app on your device or emulator, allowing you to test it and make any necessary changes. @@ -199,7 +203,6 @@ Create a tag on the master branch, incrementing the last version number by 1 (fo Click on the CI/CD tab, you should now see the tests and build are in progress. If the build succeeds the last step will become available. The last step is a manual action which can be triggered by clicking the run button on the action. This action will deploy the build to all users using the app through auto-update. - ## Documentation The documentation can be found [here](https://gitlab.futo.org/videostreaming/documents/-/wikis/API-Overview). diff --git a/app/src/main/java/com/futo/platformplayer/mdns/ServiceDiscoverer.kt b/app/src/main/java/com/futo/platformplayer/mdns/ServiceDiscoverer.kt index 79d29736..f4a3e5e9 100644 --- a/app/src/main/java/com/futo/platformplayer/mdns/ServiceDiscoverer.kt +++ b/app/src/main/java/com/futo/platformplayer/mdns/ServiceDiscoverer.kt @@ -37,7 +37,10 @@ class ServiceDiscoverer(names: Array, private val _onServicesUpdated: (L } fun start() { - if (_started) throw Exception("Already running.") + if (_started) { + Logger.i(TAG, "Already started.") + return + } _started = true val listener = MDNSListener() diff --git a/app/src/main/java/com/futo/platformplayer/states/StateSync.kt b/app/src/main/java/com/futo/platformplayer/states/StateSync.kt index 7c05d20d..b6bf0ca8 100644 --- a/app/src/main/java/com/futo/platformplayer/states/StateSync.kt +++ b/app/src/main/java/com/futo/platformplayer/states/StateSync.kt @@ -66,6 +66,10 @@ class StateSync { val deviceUpdatedOrAdded: Event2 = Event2() fun start() { + if (_started) { + Logger.i(TAG, "Already started.") + return + } _started = true if (Settings.instance.synchronization.broadcast || Settings.instance.synchronization.connectDiscovered) { diff --git a/images/casting.jpg b/images/casting.jpg deleted file mode 100755 index 3a88e381..00000000 Binary files a/images/casting.jpg and /dev/null differ diff --git a/images/casting.png b/images/casting.png new file mode 100644 index 00000000..8f8a24a4 Binary files /dev/null and b/images/casting.png differ diff --git a/images/channel.jpg b/images/channel.jpg deleted file mode 100755 index 5f6d51cc..00000000 Binary files a/images/channel.jpg and /dev/null differ diff --git a/images/channel.png b/images/channel.png new file mode 100644 index 00000000..356631e9 Binary files /dev/null and b/images/channel.png differ diff --git a/images/creators.png b/images/creators.png index 71b458d9..e989eefe 100644 Binary files a/images/creators.png and b/images/creators.png differ diff --git a/images/downloads.jpg b/images/downloads.jpg deleted file mode 100755 index 584ab75b..00000000 Binary files a/images/downloads.jpg and /dev/null differ diff --git a/images/downloads.png b/images/downloads.png new file mode 100644 index 00000000..9373d54f Binary files /dev/null and b/images/downloads.png differ diff --git a/images/history.jpg b/images/history.jpg deleted file mode 100755 index aaaa91d4..00000000 Binary files a/images/history.jpg and /dev/null differ diff --git a/images/history.png b/images/history.png new file mode 100644 index 00000000..242c1df3 Binary files /dev/null and b/images/history.png differ diff --git a/images/playlist.jpg b/images/playlist.jpg deleted file mode 100755 index b853216c..00000000 Binary files a/images/playlist.jpg and /dev/null differ diff --git a/images/playlist.png b/images/playlist.png new file mode 100644 index 00000000..6d93c640 Binary files /dev/null and b/images/playlist.png differ diff --git a/images/playlists.jpg b/images/playlists.jpg deleted file mode 100755 index bff89844..00000000 Binary files a/images/playlists.jpg and /dev/null differ diff --git a/images/playlists.png b/images/playlists.png new file mode 100644 index 00000000..349f8adf Binary files /dev/null and b/images/playlists.png differ diff --git a/images/search-list.jpg b/images/search-list.jpg deleted file mode 100755 index c5c140ad..00000000 Binary files a/images/search-list.jpg and /dev/null differ diff --git a/images/search-list.png b/images/search-list.png new file mode 100644 index 00000000..3b0bca3d Binary files /dev/null and b/images/search-list.png differ diff --git a/images/search-preview.jpg b/images/search-preview.jpg deleted file mode 100755 index e14b4d5d..00000000 Binary files a/images/search-preview.jpg and /dev/null differ diff --git a/images/search-preview.png b/images/search-preview.png new file mode 100644 index 00000000..c0fd0cd7 Binary files /dev/null and b/images/search-preview.png differ diff --git a/images/search-suggestions.jpg b/images/search-suggestions.jpg deleted file mode 100755 index 7bf7f8a5..00000000 Binary files a/images/search-suggestions.jpg and /dev/null differ diff --git a/images/search-suggestions.png b/images/search-suggestions.png new file mode 100644 index 00000000..aa01fe54 Binary files /dev/null and b/images/search-suggestions.png differ diff --git a/images/settings.jpg b/images/settings.jpg deleted file mode 100755 index 12a3b8d3..00000000 Binary files a/images/settings.jpg and /dev/null differ diff --git a/images/settings.png b/images/settings.png new file mode 100644 index 00000000..16378e7f Binary files /dev/null and b/images/settings.png differ diff --git a/images/source-install.png b/images/source-install.png index 6e63a31b..514ba077 100644 Binary files a/images/source-install.png and b/images/source-install.png differ diff --git a/images/source-settings.jpg b/images/source-settings.jpg deleted file mode 100755 index 8674ce70..00000000 Binary files a/images/source-settings.jpg and /dev/null differ diff --git a/images/source-settings.png b/images/source-settings.png new file mode 100644 index 00000000..01281a58 Binary files /dev/null and b/images/source-settings.png differ diff --git a/images/source.jpg b/images/source.jpg deleted file mode 100755 index 4df7cf0f..00000000 Binary files a/images/source.jpg and /dev/null differ diff --git a/images/source.png b/images/source.png new file mode 100644 index 00000000..7188ac6b Binary files /dev/null and b/images/source.png differ diff --git a/images/sources-disabled.jpg b/images/sources-disabled.jpg deleted file mode 100755 index db84ac83..00000000 Binary files a/images/sources-disabled.jpg and /dev/null differ diff --git a/images/sources.jpg b/images/sources.jpg deleted file mode 100755 index 1ce53652..00000000 Binary files a/images/sources.jpg and /dev/null differ diff --git a/images/subscriptions-list.png b/images/subscriptions-list.png index 62c034d6..0eb18975 100644 Binary files a/images/subscriptions-list.png and b/images/subscriptions-list.png differ diff --git a/images/subscriptions-preview.png b/images/subscriptions-preview.png index 6aafa9cd..9af23834 100644 Binary files a/images/subscriptions-preview.png and b/images/subscriptions-preview.png differ diff --git a/images/video-details.jpg b/images/video-details.jpg deleted file mode 100755 index 11d8975e..00000000 Binary files a/images/video-details.jpg and /dev/null differ diff --git a/images/video-details.png b/images/video-details.png new file mode 100644 index 00000000..f2a99aa4 Binary files /dev/null and b/images/video-details.png differ diff --git a/images/video.jpg b/images/video.jpg deleted file mode 100755 index f740a590..00000000 Binary files a/images/video.jpg and /dev/null differ diff --git a/images/video.png b/images/video.png new file mode 100644 index 00000000..fb3b6842 Binary files /dev/null and b/images/video.png differ
Casting