twisla/roro9stack
Public Access
1
0
Fork 0
Code Issues 34 Pull Requests Actions Packages Releases 28 Activity

Launcher: a grid of icons, with badges; the list stays as a Setting

Browse Source 
The Launcher shows the Apps as a 4 x 3 grid of 32 x 32 icons, the
selected one's name under it (issue #9). The icons are the website's
own, doubled, and two drawn the same way for SSH and the Shell; they
are PNGs in assets/icons, turned into arrays by scripts/make_icons.py,
which CI checks. The selected tile is the website's: dark blue on cyan,
with notched corners.

- GridModel (lib/ui, host-tested) holds the selection and the scrolling.
- App::badge(): a dot on the tile for unread IRC messages, a Track
  recording, a Capture running, an SSH session open.
- Settings > Launcher: Grid or List.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0162FokPdvY2KsS4NBfwyWPk
This commit is contained in:
twisla
2026-10-09 23:14:37 +02:00
co-authored by Claude Opus 5.5
parent aadfd8cb37
commit e2326e113b
40 changed files with 907 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/gnss_app.h
+1
View File
@@ -18,6 +18,7 @@ class GnssApp : public App {
void update(uint32_t nowMs) override;
void draw(Canvas& c) override;
void help(std::vector<KeyHelp>& out) const override;
bool badge() const override { return gnss_.tracking(); }
private:
void drawPosition(Canvas& c);
src/apps/irc_app.h
+1
View File
@@ -26,6 +26,7 @@ class IrcApp : public App {
void draw(Canvas& c) override;
void help(std::vector<KeyHelp>& out) const override;
const char* helpTitle() const override;
bool badge() const override { return irc_.totalUnread() > 0; }
private:
enum class Page { Chat, Settings };
src/apps/launcher_app.cpp
+88 -5
View File
@@ -1,27 +1,110 @@
#include "launcher_app.h"
#include "ui/fonts.h"
#include "ui/icons.h"
#include "ui/widgets.h"
namespace roro {
void LauncherApp::onEnter() { list_.setCount(static_cast<int>(manager_->visibleApps().size())); }
void LauncherApp::onEnter() {
int count = static_cast<int>(manager_->visibleApps().size());
list_.setCount(count);
grid_.setCount(count);
badges_ = badges();
}
bool LauncherApp::onKey(const KeyEvent& e) {
bool list = asList();
switch (e.key) {
case Key::Up: list_.up(); break;
case Key::Down: list_.down(); break;
case Key::Up: list ? list_.up() : grid_.up(); break;
case Key::Down: list ? list_.down() : grid_.down(); break;
case Key::Left:
if (list) return false;
grid_.left();
break;
case Key::Right:
if (list) return false;
grid_.right();
break;
case Key::Select:
if (list_.selected() >= 0) manager_->open(manager_->visibleApps()[list_.selected()]->id);
return true;
default: return false;
}
// The view that didn't move follows.
if (list) grid_.select(list_.selected());
else list_.select(grid_.selected());
requestRedraw();
return true;
}
void LauncherApp::draw(Canvas& c) {
uint32_t LauncherApp::badges() const {
uint32_t bits = 0;
auto apps = manager_->visibleApps();
widgets::list(c, list_, theme::kContent, [&](int i) { return std::string(apps[i]->title); });
for (size_t i = 0; i < apps.size() && i < 32; ++i)
if (apps[i]->app->badge()) bits |= 1u << i;
return bits;
}
void LauncherApp::update(uint32_t) {
uint32_t now = badges();
if (now == badges_) return;
badges_ = now;
requestRedraw();
}
void LauncherApp::draw(Canvas& c) {
if (!asList()) return drawGrid(c);
auto apps = manager_->visibleApps();
widgets::list(c, list_, theme::kContent, [&](int i) { return std::string(apps[i]->title); },
[&](int i) { return std::string(badges_ & (1u << i) ? "*" : ""); });
}
void LauncherApp::drawGrid(Canvas& c) {
using namespace theme;
auto apps = manager_->visibleApps();
int selected = grid_.selected();
for (int row = 0; row < kRows; ++row) {
for (int col = 0; col < kCols; ++col) {
int i = (grid_.firstVisibleRow() + row) * kCols + col;
if (i >= static_cast<int>(apps.size())) break;
int x = kContent.x + col * kTileW, y = kContent.y + row * kTileH;
int ix = x + (kTileW - icons::kSize) / 2, iy = y + (kTileH - icons::kSize) / 2;
// As on the website: cyan on black, and the chosen one dark on a cyan tile with notched corners.
uint16_t ink = i == selected ? kOnAccent : kAccent;
if (i == selected) {
int tx = ix - 6, tw = icons::kSize + 12;
c.fillRect(tx + 4, y, tw - 8, kTileH, kAccent);
c.fillRect(tx + 2, y + 2, tw - 4, kTileH - 4, kAccent);
c.fillRect(tx, y + 4, tw, kTileH - 8, kAccent);
}
if (apps[i]->icon) {
c.drawBitmap(ix, iy, apps[i]->icon, icons::kSize, icons::kSize, ink);
} else { // an App without a picture: its first letter, framed
c.drawRect(ix + 2, iy + 2, icons::kSize - 4, icons::kSize - 4, ink);
c.setFont(&fonts::large);
c.setTextColor(ink);
c.setTextDatum(middle_center);
c.drawString(std::string(1, apps[i]->title[0]).c_str(), ix + icons::kSize / 2, iy + icons::kSize / 2);
}
if (badges_ & (1u << i)) { // a square dot on the icon's corner, with a margin to stand out from it
c.fillRect(ix + icons::kSize - 6, iy - 1, 10, 10, i == selected ? kAccent : kBackground);
c.fillRect(ix + icons::kSize - 4, iy + 1, 6, 6, kWarning);
}
}
}
// More rows than fit: where these are among them.
if (grid_.rows() > kRows) {
int h = kRows * kTileH, barH = h * kRows / grid_.rows();
c.fillRect(kContent.x + kContent.w - 2, kContent.y + (h - barH) * grid_.firstVisibleRow() / (grid_.rows() - kRows), 2, barH, kMuted);
}
if (selected >= 0) {
c.setFont(&fonts::bold);
c.setTextColor(kAccent);
c.setTextDatum(top_center);
c.drawString(apps[selected]->title, kContent.x + kContent.w / 2, kContent.y + kRows * kTileH + 1);
}
c.setTextDatum(top_left);
}
} // namespace roro
src/apps/launcher_app.h
+18 -1
View File
@@ -3,23 +3,40 @@
#include "app.h"
#include "app_keys.h"
#include "app_manager.h"
#include "grid_model.h"
#include "list_model.h"
#include "settings.h"
#include "ui/theme.h"
namespace roro {
// Home screen: lists the visible Apps; Select opens one.
// Home screen: the visible Apps as a grid of icons, with the selected one's name under it, or as
// a list of names (Settings > Launcher). Select opens one. An App with something going on has a
// dot on its tile (App::badge, issue #9).
class LauncherApp : public App {
public:
void setManager(AppManager& manager) { manager_ = &manager; }
void setSettings(const Settings& settings) { settings_ = &settings; }
void onEnter() override;
bool onKey(const KeyEvent& e) override;
void update(uint32_t nowMs) override;
void draw(Canvas& c) override;
void help(std::vector<KeyHelp>& out) const override { keys::add(out, keys::kLauncher); }
private:
static constexpr int kCols = 4, kRows = 3;
static constexpr int kTileW = theme::kWidth / kCols, kTileH = 36;
bool asList() const { return settings_ && settings_->getBool(Setting::LauncherList); }
uint32_t badges() const; // one bit a visible App
void drawGrid(Canvas& c);
AppManager* manager_ = nullptr;
const Settings* settings_ = nullptr;
// One selection, kept in both: the view can change in the Settings.
ListModel list_{theme::kContent.h / theme::kLineHeight};
GridModel grid_{kCols, kRows};
uint32_t badges_ = 0;
};
} // namespace roro
src/apps/lora_scanner_app.h
+1
View File
@@ -28,6 +28,7 @@ class LoraScannerApp : public App {
void draw(Canvas& c) override;
void help(std::vector<KeyHelp>& out) const override;
const char* helpTitle() const override;
bool badge() const override { return capture_.capturing(); }
private:
enum class View { Packets, Details, Presets, Sweep };
src/apps/ssh_app.h
+1
View File
@@ -28,6 +28,7 @@ class SshApp : public App {
bool textEntryActive() const override { return view_ == View::Entry || (view_ == View::Session && !dialog_); }
void help(std::vector<KeyHelp>& out) const override;
const char* helpTitle() const override;
bool badge() const override { return ssh_.active(); }
void update(uint32_t nowMs) override;
void draw(Canvas& c) override;