Skip to content

Commit

Permalink
Merge pull request #1470 from cewert/app-spinner-to-login
Browse files Browse the repository at this point in the history
Show loading spinner and disable remote during login
  • Loading branch information
1hitsong authored Nov 11, 2023
2 parents bec8e63 + eb1c429 commit daf99dc
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 2 additions & 0 deletions source/Main.brs
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ sub Main (args as dynamic) as void
' remove previous scenes from the stack
sceneManager.callFunc("clearScenes")

stopLoadingSpinner()

' load home page
sceneManager.currentUser = m.global.session.user.name
group = CreateHomeGroup()
Expand Down
7 changes: 5 additions & 2 deletions source/ShowScenes.brs
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,13 @@ function LoginFlow()
end if
' push all users to the user select view
userSelected = CreateUserSelectGroup(publicUsersNodes)

SendPerformanceBeacon("AppDialogComplete") ' Roku Performance monitoring - Dialog Closed
if userSelected = "backPressed"
session.server.Delete()
unset_setting("server")
goto start_login
else
else if userSelected <> ""
startMediaLoadingSpinner()
print "A public user was selected with username=" + userSelected
session.user.Update("name", userSelected)
regex = CreateObject("roRegex", "[^a-zA-Z0-9\ \-\_]", "")
Expand Down Expand Up @@ -140,6 +140,7 @@ function LoginFlow()
else
userSelected = ""
end if
stopLoadingSpinner()
passwordEntry = CreateSigninGroup(userSelected)
SendPerformanceBeacon("AppDialogComplete") ' Roku Performance monitoring - Dialog Closed
if passwordEntry = "backPressed"
Expand Down Expand Up @@ -480,6 +481,7 @@ function CreateSigninGroup(user = "")
else if type(msg) = "roSGNodeEvent"
node = msg.getNode()
if node = "submit"
startMediaLoadingSpinner()
' Validate credentials
activeUser = get_token(username.value, password.value)
if isValid(activeUser)
Expand All @@ -494,6 +496,7 @@ function CreateSigninGroup(user = "")
end if
return "true"
end if
stopLoadingSpinner()
print "Login attempt failed..."
group.findNode("alert").text = tr("Login attempt failed.")
else if node = "quickConnect"
Expand Down

0 comments on commit daf99dc

Please sign in to comment.