lgladsden/jf-roku
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/637-replay-back

Browse Source
This commit is contained in:
Jimi 2022-06-25 15:30:34 -06:00 committed by GitHub
commit f3ee72e812
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 195 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/ItemGrid/ItemGrid.brs
View File

@ -223,7 +223,11 @@ end sub
' Set Music view, sort, and filter options
sub setMusicOptions(options)
options.views = [{ "Title": tr("Music"), "Name": "music" }]
options.views = [
{ "Title": tr("Default"), "Name": "music-default" },
{ "Title": tr("Artists"), "Name": "music-artist" },
{ "Title": tr("Albums"), "Name": "music-album" },
]
options.sort = [
{ "Title": tr("TITLE"), "Name": "SortName" },
{ "Title": tr("DATE_ADDED"), "Name": "DateCreated" },

13
components/ListPoster.brs
View File

@ -56,7 +56,18 @@ sub itemContentChanged() as void
end if
m.staticTitle.text = m.title.text
m.poster.uri = itemData.posterUrl
imageUrl = itemData.posterURL
if get_user_setting("ui.tvshows.blurunwatched") = "true"
if itemData.json.lookup("Type") = "Episode"
if not itemData.json.userdata.played
imageUrl = imageUrl + "&blur=15"
end if
end if
end if
m.poster.uri = imageUrl
updateSize()
end sub

2
components/ListPoster.xml
View File

@ -23,5 +23,5 @@
</interface>
<script type="text/brightscript" uri="ListPoster.brs" />
<script type="text/brightscript" uri="pkg:/source/utils/config.brs" />
</component>

5
components/home/Home.brs
View File

@ -1,6 +1,11 @@
sub init()
m.top.overhangTitle = "Home"
m.top.optionsAvailable = true
if get_user_setting("ui.home.splashBackground") = "true"
m.backdrop = m.top.findNode("backdrop")
m.backdrop.uri = buildURL("/Branding/Splashscreen?format=jpg&foregroundLayer=0.15&fillWidth=1280&width=1280&fillHeight=720&height=720&tag=splash")
end if
end sub
sub refresh()

3
components/home/Home.xml
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<component name="Home" extends="JFGroup">
<children>
<Poster id="backdrop" loadDisplayMode="scaleToZoom" width="1920" height="1200" />
<HomeRows id="homeRows" />
<OptionsSlider id="options" />
</children>
@ -13,4 +14,6 @@
<function name="loadLibraries" />
</interface>
<script type="text/brightscript" uri="Home.brs" />
<script type="text/brightscript" uri="pkg:/source/api/baserequest.brs" />
<script type="text/brightscript" uri="pkg:/source/utils/config.brs" />
</component>

13
components/movies/MovieDetails.brs
View File

@ -12,6 +12,9 @@ sub init()
overview = m.top.findNode("overview")
overview.width = 1920 - 96 - 300 - 96 - 30
m.details = m.top.findNode("details")
m.tagline = m.top.findNode("tagline")
m.buttonGrp = m.top.findNode("buttons")
m.buttonGrp.setFocus(true)
m.top.lastFocus = m.buttonGrp
@ -90,9 +93,13 @@ sub itemContentChanged()
if itemData.mediaStreams[0] <> invalid
setFieldText("video_codec", tr("Video") + ": " + itemData.mediaStreams[0].displayTitle)
end if
' TODO - cmon now. these are buttons, not words
if itemData.taglines.count() > 0
setFieldText("tagline", itemData.taglines[0])
if get_user_setting("ui.details.hidetagline") = "false"
if itemData.taglines.count() > 0
setFieldText("tagline", itemData.taglines[0])
end if
else
m.details.removeChild(m.tagline)
end if
setFavoriteColor()

3
components/movies/MovieDetails.xml
View File

@ -5,7 +5,7 @@
<Poster id="moviePoster"
translation="[250,150]"
width="300" height="450" />
<LayoutGroup layoutDirection="vert" translation="[455, 150]" itemSpacings="[25]">
<LayoutGroup layoutDirection="vert" translation="[455, 150]" itemSpacings="[25]" id="details">
<LayoutGroup layoutDirection="horiz" itemSpacings="[100]" id="infoGroup">
<Label id="releaseYear" />
<Label id="runtime" />
@ -50,5 +50,6 @@
<field id="selectedVideoStreamId" type="string" />
</interface>
<script type="text/brightscript" uri="pkg:/source/utils/misc.brs" />
<script type="text/brightscript" uri="pkg:/source/utils/config.brs" />
<script type="text/brightscript" uri="MovieDetails.brs" />
</component>

5
components/screensaver/Screensaver.brs
View File

@ -8,4 +8,9 @@ sub init()
m.BounceAnimation = m.top.findNode("BounceAnimation")
m.BounceAnimation.control = "start" 'Start BounceAnimation
if get_user_setting("ui.screensaver.splashBackground") = "true"
m.backdrop = m.top.findNode("backdrop")
m.backdrop.uri = buildURL("/Branding/Splashscreen?format=jpg&foregroundLayer=0.15&fillWidth=1280&width=1280&fillHeight=720&height=720&tag=splash")
end if
end sub

3
components/screensaver/Screensaver.xml
View File

@ -4,6 +4,7 @@
<script type="text/brightscript" uri = "Screensaver.brs"/>
<children>
<Poster id="backdrop" loadDisplayMode="scaleToZoom" width="1920" height="1200" />
<!-- Makes 2 Posters on top of each other -->
<Poster
@ -140,4 +141,6 @@
</SequentialAnimation>
</children>
<script type="text/brightscript" uri="pkg:/source/api/baserequest.brs" />
<script type="text/brightscript" uri="pkg:/source/utils/config.brs" />
</component>

14
components/tvshows/TVListDetails.brs
View File

@ -3,6 +3,7 @@ sub init()
m.title.text = tr("Loading...")
m.options = m.top.findNode("tvListOptions")
m.overview = m.top.findNode("overview")
m.poster = m.top.findNode("poster")
m.deviceInfo = CreateObject("roDeviceInfo")
end sub
@ -15,9 +16,20 @@ sub itemContentChanged()
indexNumber = ""
end if
m.title.text = indexNumber + item.title
m.top.findNode("poster").uri = item.posterURL
m.overview.text = item.overview
imageUrl = item.posterURL
if get_user_setting("ui.tvshows.blurunwatched") = "true"
if itemData.lookup("Type") = "Episode"
if not itemData.userdata.played
imageUrl = imageUrl + "&blur=15"
end if
end if
end if
m.poster.uri = imageUrl
if type(itemData.RunTimeTicks) = "LongInteger"
m.top.findNode("runtime").text = stri(getRuntime()).trim() + " mins"
m.top.findNode("endtime").text = tr("Ends at %1").Replace("%1", getEndTime())

1
components/tvshows/TVListDetails.xml
View File

@ -33,4 +33,5 @@
</interface>
<script type="text/brightscript" uri="TVListDetails.brs" />
<script type="text/brightscript" uri="pkg:/source/utils/misc.brs" />
<script type="text/brightscript" uri="pkg:/source/utils/config.brs" />
</component>

91
locale/en_US/translations.ts
View File

@ -574,14 +574,87 @@
<translation>There was an error authenticating via Quick Connect.</translation>
</message>
<message>
<source>Return to Top</source>
<translation>Return to Top</translation>
<extracomment>UI -> Media Grid -> Item Title in user setting screen.</extracomment>
</message>
<message>
<source>Use the replay button to slowly animate to the first item in the folder. (If disabled, The folder will reset to the first item immediately)</source>
<translation>Use the replay button to slowly animate to the first item in the folder. (If disabled, The folder will reset to the first item immediately)</translation>
<extracomment>Description for option in Setting Screen</extracomment>
</message>
<source>Return to Top</source>
<translation>Return to Top</translation>
<extracomment>UI -> Media Grid -> Item Title in user setting screen.</extracomment>
</message>
<message>
<source>Use the replay button to slowly animate to the first item in the folder. (If disabled, The folder will reset to the first item immediately)</source>
<translation>Use the replay button to slowly animate to the first item in the folder. (If disabled, The folder will reset to the first item immediately)</translation>
<extracomment>Description for option in Setting Screen</extracomment>
</message>
<message>
<source>Detail Page</source>
<translation>Detail Page</translation>
</message>
<message>
<source>Options for details pages.</source>
<translation>Options for details pages.</translation>
<extracomment>Description for Detail Page user settings.</extracomment>
</message>
<message>
<source>Hide Taglines</source>
<translation>Hide Taglines</translation>
<extracomment>Option Title in user setting screen</extracomment>
</message>
<message>
<source>Hides tagline text on details pages.</source>
<translation>Hides tagline text on details pages.</translation>
</message>
<message>
<source>TV Shows</source>
<translation>TV Shows</translation>
</message>
<message>
<source>Options for TV Shows.</source>
<translation>Options for TV Shows.</translation>
<extracomment>Description for TV Shows user settings.</extracomment>
</message>
<message>
<source>Blur Unwatched Episodes</source>
<translation>Blur Unwatched Episodes</translation>
<extracomment>Option Title in user setting screen</extracomment>
</message>
<message>
<source>If enabled, images for unwatched episodes will be blurred.</source>
<translation>If enabled, images for unwatched episodes will be blurred.</translation>
</message>
<message>
<source>Screensaver</source>
<translation>Screensaver</translation>
</message>
<message>
<source>Options for Jellyfin's screensaver.</source>
<translation>Options for Jellyfin's screensaver.</translation>
<extracomment>Description for Screensaver user settings.</extracomment>
</message>
<message>
<source>Use Splashscreen as Screensaver Background</source>
<translation>Use Splashscreen as Screensaver Background</translation>
<extracomment>Option Title in user setting screen</extracomment>
</message>
<message>
<source>Use generated splashscreen image as Jellyfin's screensaver background.</source>
<translation>Use generated splashscreen image as Jellyfin's screensaver background.</translation>
</message>
<message>
<source>Design Elements</source>
<translation>Design Elements</translation>
</message>
<message>
<source>Options that alter the design of Jellyfin.</source>
<translation>Options that alter the design of Jellyfin.</translation>
<extracomment>Description for Design Elements user settings.</extracomment>
</message>
<message>
<source>Use Splashscreen as Home Background</source>
<translation>Use Splashscreen as Home Background</translation>
<extracomment>Option Title in user setting screen</extracomment>
</message>
<message>
<source>Use generated splashscreen image as Jellyfin home background. Jellyfin will need to be closed and reopened for change to take effect.</source>
<translation>Use generated splashscreen image as Jellyfin home background. Jellyfin will need to be closed and reopened for change to take effect.</translation>
<extracomment>Description for option in Setting Screen</extracomment>
</message>
</context>
</TS>

54
settings/settings.json
View File

@ -14,8 +14,60 @@
},
{
"title": "User Interface",
"description": "Settings relating to how the how the applications looks",
"description": "Settings relating to how the how the application looks",
"children": [
{
"title": "Detail Page",
"description": "Options for details pages.",
"children": [
{
"title": "Hide Taglines",
"description": "Hides tagline text on details pages.",
"settingName": "ui.details.hidetagline",
"type": "bool",
"default": "false"
}
]
},
{
"title": "TV Shows",
"description": "Options for TV Shows.",
"children": [
{
"title": "Blur Unwatched Episodes",
"description": "If enabled, images for unwatched episodes will be blurred.",
"settingName": "ui.tvshows.blurunwatched",
"type": "bool",
"default": "false"
}
]
},
{
"title": "Screensaver",
"description": "Options for Jellyfin's screensaver.",
"children": [
{
"title": "Use Splashscreen as Screensaver Background",
"description": "Use generated splashscreen image as Jellyfin's screensaver background.",
"settingName": "ui.screensaver.splashBackground",
"type": "bool",
"default": "false"
}
]
},
{
"title": "Design Elements",
"description": "Options that alter the design of Jellyfin.",
"children": [
{
"title": "Use Splashscreen as Home Background",
"description": "Use generated splashscreen image as Jellyfin home background. Jellyfin will need to be closed and reopened for change to take effect.",
"settingName": "ui.home.splashBackground",
"type": "bool",
"default": "false"
}
]
},
{
"title": "Media Grid",
"description": "Media Grid Options",