Zach Nelson
050a3bd1b6
## Summary **What is the goal of this PR?** Small tweaks to #1016: - Only Activity and ActivityManager can access activityResultHandler and activityResult - `[[maybe_unused]]` in RenderLock constructor - Only ActivityManager and RenderLock can access renderingMutex - Missing renderUpdate after failed wifi selection - Standardize on activities calling finish instead of activityManager.popActivity - Hold RenderLock while mutating state in EpubReaderActivity result handlers --- ### AI Usage While CrossPoint doesn't have restrictions on AI tools in contributing, please be transparent about their usage as it helps set the right context for reviewers. Did you use AI tools to help write this code? _**NO**_
62 lines
1.9 KiB
C++
62 lines
1.9 KiB
C++
#pragma once
|
|
#include <Logging.h>
|
|
|
|
#include <cassert>
|
|
#include <memory>
|
|
#include <string>
|
|
#include <utility>
|
|
|
|
#include "ActivityManager.h" // for using the ActivityManager singleton
|
|
#include "ActivityResult.h"
|
|
#include "GfxRenderer.h"
|
|
#include "MappedInputManager.h"
|
|
#include "RenderLock.h"
|
|
|
|
class Activity {
|
|
friend class ActivityManager;
|
|
|
|
protected:
|
|
std::string name;
|
|
GfxRenderer& renderer;
|
|
MappedInputManager& mappedInput;
|
|
|
|
ActivityResultHandler resultHandler;
|
|
ActivityResult result;
|
|
|
|
public:
|
|
explicit Activity(std::string name, GfxRenderer& renderer, MappedInputManager& mappedInput)
|
|
: name(std::move(name)), renderer(renderer), mappedInput(mappedInput) {}
|
|
virtual ~Activity() = default;
|
|
virtual void onEnter();
|
|
virtual void onExit();
|
|
virtual void loop() {}
|
|
|
|
virtual void render(RenderLock&&) {}
|
|
|
|
// If immediate is true, the update will be triggered immediately.
|
|
// Otherwise, it will be deferred until the end of the current loop iteration.
|
|
virtual void requestUpdate(bool immediate = false);
|
|
|
|
// Request an immediate render and block until it completes.
|
|
virtual void requestUpdateAndWait();
|
|
|
|
virtual bool skipLoopDelay() { return false; }
|
|
virtual bool preventAutoSleep() { return false; }
|
|
virtual bool isReaderActivity() const { return false; }
|
|
|
|
// Start a new activity without destroying the current one
|
|
// Note: requestUpdate() will be invoked automatically once resultHandler finishes
|
|
void startActivityForResult(std::unique_ptr<Activity>&& activity, ActivityResultHandler resultHandler);
|
|
|
|
// Set the result to be passed back to the previous activity when this activity finishes
|
|
void setResult(ActivityResult&& result);
|
|
|
|
// Finish this activity and return to the previous one on the stack (if any)
|
|
void finish();
|
|
|
|
// Convenience method to facilitate API transition to ActivityManager
|
|
// TODO: remove this in near future
|
|
void onGoHome();
|
|
void onSelectBook(const std::string& path);
|
|
};
|