mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-10 03:47:39 +00:00
beb268ff25
I thought git would be smart enough to understand all the whitespace changes but even with all the flags I know to make it ignore theses it still blows up if there are identical changes on both sides.
I have a solution but it require creating a new commit at the merge base for each conflicting PR and merging it into develop.
I don't think blowing up all PRs is worth for now, maybe if we can coordinate this for V3 let's say.
This reverts commit 0d11331d18.
59 lines
1.7 KiB
C++
59 lines
1.7 KiB
C++
#ifdef MESHTASTIC_INCLUDE_INKHUD
|
|
|
|
/*
|
|
|
|
Pop-up notification bar, on screen top edge
|
|
Displays information we feel is important, but which is not shown on currently focused applet(s)
|
|
E.g.: messages, while viewing map, etc
|
|
|
|
Feature should be optional; enable disable via on-screen menu
|
|
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "configuration.h"
|
|
|
|
#include "concurrency/OSThread.h"
|
|
|
|
#include "graphics/niche/InkHUD/SystemApplet.h"
|
|
|
|
namespace NicheGraphics::InkHUD
|
|
{
|
|
|
|
class NotificationApplet : public SystemApplet
|
|
{
|
|
public:
|
|
NotificationApplet();
|
|
|
|
void onRender() override;
|
|
void onForeground() override;
|
|
void onBackground() override;
|
|
void onButtonShortPress() override;
|
|
void onButtonLongPress() override;
|
|
void onExitShort() override;
|
|
void onExitLong() override;
|
|
void onNavUp() override;
|
|
void onNavDown() override;
|
|
void onNavLeft() override;
|
|
void onNavRight() override;
|
|
|
|
int onReceiveTextMessage(const meshtastic_MeshPacket *p);
|
|
|
|
bool isApproved(); // Does a foreground applet make notification redundant?
|
|
void dismiss(); // Close the Notification Popup
|
|
|
|
protected:
|
|
// Get notified when a new text message arrives
|
|
CallbackObserver<NotificationApplet, const meshtastic_MeshPacket *> textMessageObserver =
|
|
CallbackObserver<NotificationApplet, const meshtastic_MeshPacket *>(this, &NotificationApplet::onReceiveTextMessage);
|
|
|
|
std::string getNotificationText(uint16_t widthAvailable); // Get text for notification, to suit screen width
|
|
|
|
bool hasNotification = false; // Only used for assert. Todo: remove?
|
|
Notification currentNotification = Notification(); // Set when something notification-worthy happens. Used by render()
|
|
};
|
|
|
|
} // namespace NicheGraphics::InkHUD
|
|
|
|
#endif |