Skip to content

Commit

Permalink
Merge branch 'zvonimir-dev' into 'master'
Browse files Browse the repository at this point in the history
Update images in README and add building step for updating & fix services starting

See merge request videostreaming/grayjay!41
  • Loading branch information
koen-futo committed Nov 15, 2024
2 parents d1a54d0 + f938f79 commit df1661d
Show file tree
Hide file tree
Showing 37 changed files with 27 additions and 17 deletions.
35 changes: 19 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ technologies that frustrate centralization and industry consolidation.

<table border="0">
<tr>
<td><b style="font-size:30px"><img src="images/video.jpg" height="700" /></b></td>
<td><b style="font-size:30px"><img src="images/video-details.jpg" height="700" /></b></td>
<td><b style="font-size:30px"><img src="images/video.png" height="700" /></b></td>
<td><b style="font-size:30px"><img src="images/video-details.png" height="700" /></b></td>
</tr>
<tr>
<td>Video</td>
Expand All @@ -24,12 +24,10 @@ The FUTO media app is a player that exposes multiple video websites as sources i

<table border="0">
<tr>
<td><b style="font-size:30px"><img src="images/sources.jpg" height="700" /></b></td>
<td><b style="font-size:30px"><img src="images/sources-disabled.jpg" height="700" /></b></td>
<td><b style="font-size:30px"><img src="images/source.png" height="700" /></b></td>
</tr>
<tr>
<td>Sources (all enabled)</td>
<td>Sources (one disabled)</td>
<td>Sources</td>
</tr>
</table>

Expand All @@ -38,7 +36,7 @@ Additional sources can also be installed. These sources are JavaScript sources,
<table border="0">
<tr>
<td><b style="font-size:30px"><img src="images/source-install.png" height="700" /></b></td>
<td><b style="font-size:30px"><img src="images/source-settings.jpg" height="700" /></b></td>
<td><b style="font-size:30px"><img src="images/source-settings.png" height="700" /></b></td>
</tr>
<tr>
<td>Install a new source</td>
Expand All @@ -54,8 +52,8 @@ When a user enters a search term into the search bar, the query is posted to th

<table border="0">
<tr>
<td><b style="font-size:30px"><img src="images/search-list.jpg" height="700" /></b></td>
<td><b style="font-size:30px"><img src="images/search-preview.jpg" height="700" /></b></td>
<td><b style="font-size:30px"><img src="images/search-list.png" height="700" /></b></td>
<td><b style="font-size:30px"><img src="images/search-preview.png" height="700" /></b></td>
</tr>
<tr>
<td>Search (list)</td>
Expand All @@ -71,7 +69,7 @@ Creators are able to configure their profile using NeoPass.

<table border="0">
<tr>
<td><b style="font-size:30px"><img src="images/channel.jpg" height="700" /></b></td>
<td><b style="font-size:30px"><img src="images/channel.png" height="700" /></b></td>
</tr>
<tr>
<td>Channel</td>
Expand Down Expand Up @@ -112,7 +110,7 @@ The app offers a lot of settings customizing how the app looks and feels. An exa

<table border="0">
<tr>
<td><b style="font-size:30px"><img src="images/settings.jpg" height="700" /></b></td>
<td><b style="font-size:30px"><img src="images/settings.png" height="700" /></b></td>
</tr>
<tr>
<td>Settings</td>
Expand All @@ -125,8 +123,8 @@ Playlists allow you to make a collection of videos that you can create and custo

<table border="0">
<tr>
<td><b style="font-size:30px"><img src="images/playlists.jpg" height="700" /></b></td>
<td><b style="font-size:30px"><img src="images/playlist.jpg" height="700" /></b></td>
<td><b style="font-size:30px"><img src="images/playlists.png" height="700" /></b></td>
<td><b style="font-size:30px"><img src="images/playlist.png" height="700" /></b></td>
</tr>
<tr>
<td>Playlists</td>
Expand All @@ -142,7 +140,7 @@ Both individual videos and playlists can be downloaded for local, offline playba

<table border="0">
<tr>
<td><b style="font-size:30px"><img src="images/downloads.jpg" height="700" /></b></td>
<td><b style="font-size:30px"><img src="images/downloads.png" height="700" /></b></td>
</tr>
<tr>
<td>Downloads</td>
Expand All @@ -157,7 +155,7 @@ For more information about casting please click [here](./docs/casting.md).

<table border="0">
<tr>
<td><b style="font-size:30px"><img src="images/casting.jpg" height="700" /></b></td>
<td><b style="font-size:30px"><img src="images/casting.png" height="700" /></b></td>
</tr>
<tr>
<td>Casting</td>
Expand All @@ -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.

Expand All @@ -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).
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,10 @@ class ServiceDiscoverer(names: Array<String>, 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()
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/java/com/futo/platformplayer/states/StateSync.kt
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@ class StateSync {
val deviceUpdatedOrAdded: Event2<String, SyncSession> = Event2()

fun start() {
if (_started) {
Logger.i(TAG, "Already started.")
return
}
_started = true

if (Settings.instance.synchronization.broadcast || Settings.instance.synchronization.connectDiscovered) {
Expand Down
Binary file removed images/casting.jpg
Binary file not shown.
Binary file added images/casting.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/channel.jpg
Binary file not shown.
Binary file added images/channel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/creators.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/downloads.jpg
Binary file not shown.
Binary file added images/downloads.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/history.jpg
Binary file not shown.
Binary file added images/history.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/playlist.jpg
Binary file not shown.
Binary file added images/playlist.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/playlists.jpg
Binary file not shown.
Binary file added images/playlists.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/search-list.jpg
Binary file not shown.
Binary file added images/search-list.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/search-preview.jpg
Binary file not shown.
Binary file added images/search-preview.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/search-suggestions.jpg
Binary file not shown.
Binary file added images/search-suggestions.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/settings.jpg
Binary file not shown.
Binary file added images/settings.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/source-install.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/source-settings.jpg
Binary file not shown.
Binary file added images/source-settings.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/source.jpg
Binary file not shown.
Binary file added images/source.png
Binary file removed images/sources-disabled.jpg
Diff not rendered.
Binary file removed images/sources.jpg
Diff not rendered.
Binary file modified images/subscriptions-list.png
Binary file modified images/subscriptions-preview.png
Binary file removed images/video-details.jpg
Diff not rendered.
Binary file added images/video-details.png
Binary file removed images/video.jpg
Diff not rendered.
Binary file added images/video.png

0 comments on commit df1661d

Please sign in to comment.