-
Notifications
You must be signed in to change notification settings - Fork 1
Now loading a book screen and showing a notification #3
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
rlalance
wants to merge
4
commits into
develop
Choose a base branch
from
Notifications
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
4ba2ed1
Now loading a book screen and showing a notification
rlalance ff573b0
Export and UX: Loading book and notifications
rlalance aa76067
Hooked up quest manager signals to notifications
rlalance 45d57c7
Quest and objective should now show a dialog on screen.
rlalance File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added
BIN
+599 Bytes
AE/assets/layout/tablet/Notifications_ErrorMessage-Fullscreen-ButtonContainer.layout
Binary file not shown.
Binary file added
BIN
+72 Bytes
AE/assets/layout/tablet/Notifications_ErrorMessage-Fullscreen-ButtonContainer.timeline
Binary file not shown.
Binary file added
BIN
+1005 Bytes
AE/assets/layout/tablet/Notifications_ErrorMessage-Fullscreen.layout
Binary file not shown.
Binary file added
BIN
+152 Bytes
AE/assets/layout/tablet/Notifications_ErrorMessage-Fullscreen.timeline
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added
BIN
+893 Bytes
AE/assets/layout/tablet/Notifications_MainComp-Fullscreen-Error.layout
Binary file not shown.
Binary file added
BIN
+5.96 KB
AE/assets/layout/tablet/Notifications_MainComp-Fullscreen-Error.timeline
Binary file not shown.
Binary file added
BIN
+916 Bytes
AE/assets/layout/tablet/Notifications_MainComp-Popup-Error-Long.layout
Binary file not shown.
Binary file added
BIN
+5.95 KB
AE/assets/layout/tablet/Notifications_MainComp-Popup-Error-Long.timeline
Binary file not shown.
Binary file added
BIN
+1.06 KB
AE/assets/layout/tablet/Notifications_MainComp-Popup-Error-Short.layout
Binary file not shown.
Binary file added
BIN
+6.02 KB
AE/assets/layout/tablet/Notifications_MainComp-Popup-Error-Short.timeline
Binary file not shown.
Binary file added
BIN
+1.05 KB
AE/assets/layout/tablet/Notifications_MainComp-Popup-Favorite-Long.layout
Binary file not shown.
Binary file added
BIN
+10.2 KB
AE/assets/layout/tablet/Notifications_MainComp-Popup-Favorite-Long.timeline
Binary file not shown.
Binary file added
BIN
+1.07 KB
AE/assets/layout/tablet/Notifications_MainComp-Popup-Favorite-Short.layout
Binary file not shown.
Binary file added
BIN
+10.2 KB
AE/assets/layout/tablet/Notifications_MainComp-Popup-Favorite-Short.timeline
Binary file not shown.
Binary file added
BIN
+918 Bytes
AE/assets/layout/tablet/Notifications_MainComp-Popup-General-Long.layout
Binary file not shown.
Binary file added
BIN
+5.95 KB
AE/assets/layout/tablet/Notifications_MainComp-Popup-General-Long.timeline
Binary file not shown.
Binary file added
BIN
+1.06 KB
AE/assets/layout/tablet/Notifications_MainComp-Popup-General-Short.layout
Binary file not shown.
Binary file added
BIN
+6.02 KB
AE/assets/layout/tablet/Notifications_MainComp-Popup-General-Short.timeline
Binary file not shown.
Binary file added
BIN
+918 Bytes
AE/assets/layout/tablet/Notifications_MainComp-Popup-Success-Long.layout
Binary file not shown.
Binary file added
BIN
+5.95 KB
AE/assets/layout/tablet/Notifications_MainComp-Popup-Success-Long.timeline
Binary file not shown.
Binary file added
BIN
+1.06 KB
AE/assets/layout/tablet/Notifications_MainComp-Popup-Success-Short.layout
Binary file not shown.
Binary file added
BIN
+6.02 KB
AE/assets/layout/tablet/Notifications_MainComp-Popup-Success-Short.timeline
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| { | ||
| "QUEST_AVAILABLE" : { | ||
| "type": "Success", | ||
| "title": "New Quest Available", | ||
| "message": "" | ||
| }, | ||
|
|
||
| "QUEST_ACCEPTED" : { | ||
| "type": "Success", | ||
| "title": "Quest Accepted", | ||
| "message": "" | ||
| }, | ||
|
|
||
| "QUEST_COMPLETED" : { | ||
| "type": "Success", | ||
| "title": "Quest Completed", | ||
| "message": "" | ||
| }, | ||
|
|
||
| "QUEST_OBJECTIVE_COMPLETED" : { | ||
| "type": "Success", | ||
| "title": "Quest Objective Completed", | ||
| "message": "" | ||
| }, | ||
|
|
||
| "APP_CONFIGURATION_ERROR" : { | ||
| "type": "Dialog", | ||
| "title": "App configuration failed", | ||
| "message": "There was a problem when the app tried to reach the server", | ||
| "action": "", | ||
| "dismiss": "" | ||
| }, | ||
|
|
||
| "VSTB_SERVER_ERROR" : { | ||
| "type": "Dialog", | ||
| "title": "Server Error", | ||
| "message": "Please check your network and restart the application (%1)", | ||
| "action": "", | ||
| "dismiss": "" | ||
| }, | ||
|
|
||
| "VIDEO_PLAYBACK_ERROR" : { | ||
| "type": "Error", | ||
| "title": "Error", | ||
| "message": "Video Playback Error: %1", | ||
| "autodismiss": false | ||
| }, | ||
|
|
||
| "VIDEO_PLAYBACK_CHANNEL_AUTH_ERROR" : { | ||
| "type": "Error", | ||
| "title": "Channel Access Denied", | ||
| "message": "The active account does not have access to this content channel", | ||
| "autodismiss": false | ||
| }, | ||
|
|
||
| "VIDEO_CONTENT_AUTH_LEVEL_ERROR" : { | ||
| "type": "Error", | ||
| "title": "Premium Content - Please Log In", | ||
| "message": "Please log in to a premium account to view this content", | ||
| "autodismiss": false | ||
| }, | ||
|
|
||
| "NETWORK_CONNECTION_ERROR" : { | ||
| "type": "Error", | ||
| "title": "Network Connection Error", | ||
| "message": "Unable to reach the server" | ||
| }, | ||
|
|
||
| "LOGOUT_CONFIRMATION" : { | ||
| "type": "Dialog", | ||
| "title": "Logout", | ||
| "message": "Are you sure you would like to logout of FoxPlay?", | ||
| "action": "OK", | ||
| "dismiss": "Cancel" | ||
| }, | ||
|
|
||
| "LOGOUT_SUCCESS" : { | ||
| "type": "Success", | ||
| "title": "Logout succeeded", | ||
| "message": "Logout succeeded" | ||
| }, | ||
|
|
||
| "LOGOUT_FAIL" : { | ||
| "type": "Error", | ||
| "title": "Logout failed", | ||
| "message": "Logout failed" | ||
| } | ||
| } | ||
|
|
||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| #include "customviews/FullScreenNotificationView.h" | ||
|
|
||
| #include "utilities/NodeUtilities.h" | ||
|
|
||
| #include <view/YiPushButtonView.h> | ||
| #include <scenetree/YiTextSceneNode.h> | ||
|
|
||
| const CYIString TAG("FullScreenNotificationView.h"); | ||
|
|
||
| YI_RTTI_DEF1_INST(FullScreenNotificationView, "FullScreenNotificationView", CYISceneView) | ||
|
|
||
| FullScreenNotificationView::FullScreenNotificationView() | ||
| { | ||
| }; | ||
|
|
||
| FullScreenNotificationView::~FullScreenNotificationView() | ||
| { | ||
| }; | ||
|
|
||
| bool FullScreenNotificationView::Init() | ||
| { | ||
| return NotificationView::Init(); | ||
| } | ||
|
|
||
|
|
||
| void FullScreenNotificationView::ConnectButtons() | ||
| { | ||
| Utility::GetNode<CYIPushButtonView>(this, "Btn-Action1")->ButtonReleased.Connect(*this, &FullScreenNotificationView::DoAction); | ||
| Utility::GetNode<CYIPushButtonView>(this, "Btn-Action2")->ButtonReleased.Connect(*this, &FullScreenNotificationView::DoDismiss); | ||
| } | ||
|
|
||
| void FullScreenNotificationView::DoAction() | ||
| { | ||
| Actioned(this); | ||
| } | ||
|
|
||
| void FullScreenNotificationView::DoDismiss() | ||
| { | ||
| NotificationView::DoDismiss(); | ||
| } | ||
|
|
||
| void FullScreenNotificationView::SetActionButtonText(const CYIString &text) | ||
| { | ||
| SetButtonText("Btn-Action1", text); | ||
| } | ||
|
|
||
| void FullScreenNotificationView::SetDismissButtonText(const CYIString &text) | ||
| { | ||
| SetButtonText("Btn-Action2", text); | ||
| } | ||
|
|
||
| void FullScreenNotificationView::SetButtonText(const CYIString &button, const CYIString &text) | ||
| { | ||
| CYIPushButtonView *pButton = Utility::GetNode<CYIPushButtonView>(this, button); | ||
|
|
||
| if(text.IsNotEmpty()) | ||
| { | ||
| pButton->Show(); | ||
| pButton->SetText(text); | ||
| Utility::GetNode<CYITextSceneNode>(pButton, "Placeholder-Title")->SetText(text); | ||
| } | ||
| else | ||
| { | ||
| pButton->Hide(); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| #ifndef _FULLSCREEN_NOTIFICATION_VIEW_H_ | ||
| #define _FULLSCREEN_NOTIFICATION_VIEW_H_ | ||
|
|
||
| #include "customviews/NotificationView.h" | ||
|
|
||
| /*! | ||
| \Template for a After Effects composition representing a full screen notification. | ||
|
|
||
| <B>Full Screen Notification Template Specification </B> | ||
|
|
||
| | Type | Labels | Property | Description | | ||
| | :-------- | :----------------------- | :---------------: | :--------------------------------------------------------------- | | ||
| | Marker | In | <B>Required</B> | representing the animations to open the full screen notification | | ||
| | Marker | Out | <B>Required</B> | representing the animations to close the full screen notification | | ||
| | Node | Btn-Action1 | <B>Required</B> | When pressed, the signal Actioned() is emitted | | ||
| | Node | Btn-Action2 | <B>Required</B> | When pressed, the signal Dismissed() is emitted | | ||
| */ | ||
|
|
||
| class FullScreenNotificationView : public NotificationView | ||
| { | ||
| public: | ||
| FullScreenNotificationView(); | ||
| virtual ~FullScreenNotificationView(); | ||
|
|
||
| virtual bool Init(); | ||
|
|
||
| void SetActionButtonText(const CYIString &text); | ||
| void SetDismissButtonText(const CYIString &text); | ||
|
|
||
| void ConnectButtons(); | ||
|
|
||
| void DoAction(); | ||
| void DoDismiss(); | ||
|
|
||
| CYISignal<FullScreenNotificationView *> Actioned; | ||
|
|
||
| private: | ||
| void SetButtonText(const CYIString &button, const CYIString &text); | ||
|
|
||
| YI_DISALLOW_COPY_AND_ASSIGN(FullScreenNotificationView) | ||
| YI_TYPE_DATA | ||
| }; | ||
|
|
||
| #endif // _FULLSCREEN_NOTIFICATION_VIEW_H_ |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
m_NavigationController starts with a capital, but m_notificationController doesn't.