Skip to content

fix: built-in apps theme compiance #854

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.

Sign up for GitHub

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
nborodikhin wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix: built-in apps theme compiance #854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd6f80b
fix: palette compliance on built-in apps
nborodikhin Oct 3, 2026
8a37b6c
fix minarch menus
nborodikhin Oct 3, 2026
de7c07e
Merge remote-tracking branch 'origin/main' into fix/theme_compliance
nborodikhin Oct 3, 2026
56ae0b4
fix battery icon color
nborodikhin Oct 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
154 changes: 101 additions & 53 deletions workspace/all/battery/battery.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include <stdio.h>
#include <unistd.h>
#include <stdbool.h>
#include <stdint.h>
#include <signal.h>
#include <msettings.h>

Expand All @@ -13,9 +14,7 @@
#include <batmondb.h>

#define GRAPH_LINE_WIDTH 1

// Space between pixels, higher is more transparent
#define GRAPH_BACKGROUND_OPACITY 4
#define GRAPH_AREA_ALPHA 127

// A multiple of 4 is recommended
#define GRAPH_MAX_FULL_PAGES 8
Expand Down Expand Up @@ -304,6 +303,10 @@ void compute_graph(void)
}

current_index = (graph.layout.graph_max_size - 1) - duration_to_pixel(total_duration);
if (current_index < 0) {
// the history fills the graph; this row is out of range
break;
}
graph.graphic[current_index].is_charging = is_charging;

if (bat_perc > 100)
Expand Down Expand Up @@ -389,14 +392,14 @@ void compute_graph(void)
}
}

void drawBatteryIcon(int percent, SDL_Rect dst) {
void drawBatteryIcon(int percent, SDL_Rect dst, Uint32 color) {
// taken from GFX_blitBattery

int x = dst.x;
int y = dst.y;
//SDL_Rect rect = asset_rects[ASSET_BATTERY];
SDL_Rect rect = (SDL_Rect){SCALE4(47,51,17,10)};
GFX_blitAsset(ASSET_BATTERY, NULL, screen, &(SDL_Rect){x,y});
GFX_blitAssetColor(ASSET_BATTERY, NULL, screen, &(SDL_Rect){x,y}, color);
//rect = asset_rects[ASSET_BATTERY_FILL];
rect = (SDL_Rect){SCALE4(81,33,12,6)};
SDL_Rect clip = rect;
Expand All @@ -406,23 +409,83 @@ void drawBatteryIcon(int percent, SDL_Rect dst) {
clip.x = rect.w - clip.w;
clip.y = 0;

GFX_blitAsset(ASSET_BATTERY_FILL, &clip, screen, &(SDL_Rect){x+SCALE1(3)+clip.x,y+SCALE1(2)});
GFX_blitAssetColor(ASSET_BATTERY_FILL, &clip, screen, &(SDL_Rect){x+SCALE1(3)+clip.x,y+SCALE1(2)}, color);
}

// Returns pixel drawn over bg at the given alpha (Porter-Duff "over"). The screen surface
// holds premultiplied alpha (the display composes it that way), thus a transparent bg
// gives a translucent pixel and an opaque bg (a grid line) stays visible below.
static Uint32 blendOver(const SDL_PixelFormat *format, Uint32 pixel, Uint32 bg, Uint8 alpha)
{
Uint8 pr, pg, pb, pa, br, bgg, bb, ba;
SDL_GetRGBA(pixel, format, &pr, &pg, &pb, &pa);
SDL_GetRGBA(bg, format, &br, &bgg, &bb, &ba);
int sa = alpha * pa / 255; // effective alpha of the pixel
int inv = 255 - sa;
return SDL_MapRGBA(format,
(pr * sa + br * inv) / 255,
(pg * sa + bgg * inv) / 255,
(pb * sa + bb * inv) / 255,
sa + ba * inv / 255);
}

// Returns color1 mixed with color2 (percent1 : 100 - percent1), alpha included
static SDL_Color mix_colors(SDL_Color color1, int percent1, SDL_Color color2)
{
int percent2 = 100 - percent1;
return (SDL_Color){
(Uint8)((color1.r * percent1 + color2.r * percent2) / 100),
(Uint8)((color1.g * percent1 + color2.g * percent2) / 100),
(Uint8)((color1.b * percent1 + color2.b * percent2) / 100),
(Uint8)((color1.a * percent1 + color2.a * percent2) / 100)};
}

// Returns the RGBA (CFG_getColor) of the theme color with the larger chroma
static uint32_t moreColorfulColor(int colorId1, int colorId2)
{
int chroma[2];
int colors[2] = {colorId1, colorId2};
for (int i = 0; i < 2; i++) {
SDL_Color c = uintToColour(CFG_getColor(colors[i]));
int hi = c.r, lo = c.r;
if (c.g > hi) hi = c.g;
if (c.b > hi) hi = c.b;
if (c.g < lo) lo = c.g;
if (c.b < lo) lo = c.b;
chroma[i] = hi - lo;
}
return CFG_getColor(chroma[1] > chroma[0] ? colorId2 : colorId1);
}

void renderPage()
{
const SDL_Color bg_color = uintToColour(CFG_getColor(COLOR_BACKGROUND));
const SDL_Color text_color = uintToColour(CFG_getColor(COLOR_LIST_TEXT));
const SDL_Color grid_color = mix_colors(bg_color, 80, text_color);
const SDL_Color discharging_color = text_color;
const SDL_Color charging_color = uintToColour(moreColorfulColor(COLOR_MAIN, COLOR_ACCENT));
const SDL_Color estimated_color = uintToColour(CFG_getColor(COLOR_HINT));

const Uint32 text_color_rgb = SDL_MapRGBA(screen->format, text_color.r, text_color.g, text_color.b, text_color.a);
const Uint32 grid_color_rgb = SDL_MapRGBA(screen->format, grid_color.r, grid_color.g, grid_color.b, grid_color.a);
const Uint32 discharging_color_rgb = SDL_MapRGBA(screen->format, discharging_color.r, discharging_color.g, discharging_color.b, discharging_color.a);
const Uint32 charging_color_rgb = SDL_MapRGBA(screen->format, charging_color.r, charging_color.g, charging_color.b, charging_color.a);
const Uint32 estimated_color_rgb = SDL_MapRGBA(screen->format, estimated_color.r, estimated_color.g, estimated_color.b, estimated_color.a);

const uint32_t red_battery_color = 0xff0000ff;

const struct SDL_Point tl = {graph.layout.graph_display_start_x, graph.layout.graph_display_start_y};
const struct SDL_Point br = {graph.layout.graph_display_start_x + graph.layout.graph_display_size_x, graph.layout.graph_display_start_y + graph.layout.graph_display_size_y};
const int grid_step_x = 2 * (int)(graph.layout.graph_display_size_x / GRAPH_SEGMENTS); // every second "segment"
const int grid_step_y = graph.layout.graph_display_size_y / 4;

// grid verticals
for (int x = tl.x; x <= br.x; x+= grid_step_x)
drawLine(x, tl.y, x, br.y, RGB_DARK_GRAY);
drawLine(br.x, tl.y, br.x, br.y, RGB_DARK_GRAY); // close the last segment early
drawLine(x, tl.y, x, br.y, grid_color_rgb);
drawLine(br.x, tl.y, br.x, br.y, grid_color_rgb); // close the last segment early
// grid horizontals
for (int y = tl.y; y <= br.y; y += grid_step_y)
drawLine(tl.x, y, br.x, y, RGB_DARK_GRAY);
drawLine(tl.x, y, br.x, y, grid_color_rgb);

switch (current_zoom)
{
Expand Down Expand Up @@ -453,52 +516,39 @@ void renderPage()
switch_zoom_profile(segment_duration);

// x axis labels
renderText(label[0], font.small, COLOR_WHITE, &(SDL_Rect){graph.layout.label1_x, graph.layout.label_y, 32, 32});
renderText(label[1], font.small, COLOR_WHITE, &(SDL_Rect){graph.layout.label2_x, graph.layout.label_y, 32, 32});
renderText(label[2], font.small, COLOR_WHITE, &(SDL_Rect){graph.layout.label3_x, graph.layout.label_y, 32, 32});
renderText(label[3], font.small, COLOR_WHITE, &(SDL_Rect){graph.layout.label4_x, graph.layout.label_y, 32, 32});
renderText(label[0], font.small, text_color, &(SDL_Rect){graph.layout.label1_x, graph.layout.label_y, 32, 32});
renderText(label[1], font.small, text_color, &(SDL_Rect){graph.layout.label2_x, graph.layout.label_y, 32, 32});
renderText(label[2], font.small, text_color, &(SDL_Rect){graph.layout.label3_x, graph.layout.label_y, 32, 32});
renderText(label[3], font.small, text_color, &(SDL_Rect){graph.layout.label4_x, graph.layout.label_y, 32, 32});

// y axis "labels"
drawBatteryIcon(100, (SDL_Rect){graph.layout.icon_x, graph.layout.icon1_y});
drawBatteryIcon(66, (SDL_Rect){graph.layout.icon_x, graph.layout.icon2_y});
drawBatteryIcon(33, (SDL_Rect){graph.layout.icon_x, graph.layout.icon3_y});
drawBatteryIcon(0, (SDL_Rect){graph.layout.icon_x, graph.layout.icon4_y});
drawBatteryIcon(100, (SDL_Rect){graph.layout.icon_x, graph.layout.icon1_y}, text_color_rgb);
drawBatteryIcon(66, (SDL_Rect){graph.layout.icon_x, graph.layout.icon2_y}, text_color_rgb);
drawBatteryIcon(33, (SDL_Rect){graph.layout.icon_x, graph.layout.icon3_y}, text_color_rgb);
drawBatteryIcon(0, (SDL_Rect){graph.layout.icon_x, graph.layout.icon4_y}, text_color_rgb);

char text_line[255];
sprintf(text_line, "Since Charge: %s", session_duration);
renderText(text_line, font.medium, COLOR_WHITE, &(SDL_Rect){graph.layout.label_session_x, graph.layout.label_session_y, graph.layout.label_size_x, graph.layout.label_size_y});
renderText(text_line, font.medium, text_color, &(SDL_Rect){graph.layout.label_session_x, graph.layout.label_session_y, graph.layout.label_size_x, graph.layout.label_size_y});

sprintf(text_line, "Current: %s", current_percentage);
renderText(text_line, font.medium, COLOR_WHITE, &(SDL_Rect){graph.layout.label_current_x, graph.layout.label_current_y, graph.layout.label_size_x, graph.layout.label_size_y});
renderText(text_line, font.medium, text_color, &(SDL_Rect){graph.layout.label_current_x, graph.layout.label_current_y, graph.layout.label_size_x, graph.layout.label_size_y});

sprintf(text_line, "Remaining: %s", session_left);
renderTextAlignRight(text_line, font.medium, COLOR_WHITE, &(SDL_Rect){graph.layout.label_left_x, graph.layout.label_left_y, graph.layout.label_size_x, graph.layout.label_size_y});
renderTextAlignRight(text_line, font.medium, text_color, &(SDL_Rect){graph.layout.label_left_x, graph.layout.label_left_y, graph.layout.label_size_x, graph.layout.label_size_y});

sprintf(text_line, "Longest: %s", session_best);
renderTextAlignRight(text_line, font.medium, COLOR_WHITE, &(SDL_Rect){graph.layout.label_best_x, graph.layout.label_best_y, graph.layout.label_size_x, graph.layout.label_size_y});
renderTextAlignRight(text_line, font.medium, text_color, &(SDL_Rect){graph.layout.label_best_x, graph.layout.label_best_y, graph.layout.label_size_x, graph.layout.label_size_y});

int half_line_width = (int)(GRAPH_LINE_WIDTH) / 2;

Uint32 white_pixel_color = RGB_GRAY;
Uint32 red_pixel_color = RGB_WHITE;
Uint32 blue_pixel_color = RGB_LIGHT_GRAY;
Uint32 pixel_color = white_pixel_color;

// monochrome is more MinUI, but some colours are nice
const bool ilikeitcolourful = true;
if(ilikeitcolourful) {
white_pixel_color = SDL_MapRGBA(screen->format, 255, 255, 255, 255);
red_pixel_color = SDL_MapRGBA(screen->format, 255, 170, 170, 255);
blue_pixel_color = SDL_MapRGBA(screen->format, 89, 167, 255, 255);
pixel_color = white_pixel_color;
}

int x;
int y;
int x_end = 0;
int y_end = 0;

int zoom_level = (int)segment_duration / GRAPH_SEGMENT_HIGH;
Uint32 pixel_color = discharging_color_rgb;

if (SDL_LockSurface(screen) == 0)
{
Expand All @@ -513,21 +563,21 @@ void renderPage()

bool is_charging = graph.graphic[i + current_index].is_charging;
bool is_estimated = graph.graphic[i + current_index].is_estimated;
// if ((!is_charging)
if ((!is_charging) && (!is_estimated))
pixel_color = white_pixel_color;
else if (is_charging)
pixel_color = red_pixel_color;

if (is_charging)
pixel_color = charging_color_rgb;
else if (is_estimated)
{
pixel_color = blue_pixel_color;
pixel_color = estimated_color_rgb;
// magic numbers everywhere...
if (y < 5 && x < graph_display_right)
{
x_end = x - 12;
y_end = graph_display_bottom - 45;
}
}
else
pixel_color = discharging_color_rgb;

if (x < graph_display_right && y > 0)
{
Expand All @@ -542,22 +592,18 @@ void renderPage()
}

// Area under the graph
if ((x % GRAPH_BACKGROUND_OPACITY) == 0)
for (int k = y - half_line_width - 1; k > 0; k--)
{
for (int k = y; k > 0; k--)
{
if ((k % GRAPH_BACKGROUND_OPACITY) == 0)
{
int index = (graph_display_bottom - k) * screen->pitch + x * screen->format->BytesPerPixel;
*((Uint32 *)((Uint8 *)screen->pixels + index)) = pixel_color;
}
}
int index = (graph_display_bottom - k) * screen->pitch + x * screen->format->BytesPerPixel;
Uint32 *pixel = (Uint32 *)((Uint8 *)screen->pixels + index);
*pixel = blendOver(screen->format, pixel_color, *pixel, GRAPH_AREA_ALPHA);
}
}
}
SDL_UnlockSurface(screen);
if (x_end != 0)
GFX_blitAsset(ASSET_BATTERY_LOW, NULL, screen, &(SDL_Rect){x_end, y_end});
if (x_end != 0) {
GFX_blitAssetColor(ASSET_BATTERY_LOW, NULL, screen, &(SDL_Rect){x_end, y_end}, red_battery_color);
}
}
}

Expand Down Expand Up @@ -647,6 +693,8 @@ int main(int argc, char *argv[])
signal(SIGINT, sigHandler);
signal(SIGTERM, sigHandler);

const SDL_Color title_color = uintToColour(CFG_getColor(COLOR_HINT));

initLayout();
compute_graph();
renderPage();
Expand Down Expand Up @@ -750,7 +798,7 @@ int main(int argc, char *argv[])
max_width = MIN(max_width, text_width);

SDL_Surface *text;
text = TTF_RenderUTF8_Blended(font.large, title, COLOR_WHITE);
text = TTF_RenderUTF8_Blended(font.large, title, title_color);

GFX_blitPill(ASSET_BLACK_PILL, screen, &(SDL_Rect){SCALE1(PADDING), SCALE1(PADDING), max_width, SCALE1(PILL_SIZE)});
SDL_BlitSurface(text, &(SDL_Rect){0, 0, max_width - SCALE1(BUTTON_PADDING * 2), text->h}, screen, &(SDL_Rect){SCALE1(PADDING + BUTTON_PADDING), SCALE1(PADDING + 4)});
Expand Down
15 changes: 9 additions & 6 deletions workspace/all/clock/clock.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,15 @@ enum {
int main(int argc , char* argv[]) {
PWR_setCPUSpeed(CPU_SPEED_AUTO);

SDL_Surface* screen = GFX_init(MODE_MENU);
SDL_Surface* screen = GFX_init(MODE_MAIN);
PAD_init();
PWR_init();
InitSettings();

// TODO: make use of SCALE1()
SDL_Surface* digits = SDL_CreateRGBSurfaceWithFormat(SDL_SWSURFACE, SCALE1(120), SCALE1(16), 32, screen->format->format);
SDL_FillRect(digits, NULL, RGB_BLACK);
SDL_FillRect(digits, NULL, SDL_MapRGBA(digits->format, 0, 0, 0, 0));
SDL_Color text_color = uintToColour(CFG_getColor(COLOR_LIST_TEXT));
SDL_Color selected_bar_color = uintToColour(CFG_getColor(COLOR_HINT));

SDL_Surface* digit;
char* chars[] = { "0","1","2","3","4","5","6","7","8","9","/",":", NULL };
Expand All @@ -41,7 +42,8 @@ int main(int argc , char* argv[]) {
#define CHAR_SLASH 10
#define CHAR_COLON 11
while (c = chars[i]) {
digit = TTF_RenderUTF8_Blended(font.large, c, COLOR_WHITE);
digit = TTF_RenderUTF8_Blended(font.large, c, text_color);
SDL_SetSurfaceBlendMode(digit, SDL_BLENDMODE_NONE); // copy glyph alpha into the transparent strip
int y = i==CHAR_COLON ? SCALE1(-1.5) : 0; // : sits too low naturally
// TODO: y offset is wrong here
// printf("%s x:%i y:%i SCALE1(DIGIT_HEIGHT):%i SCALE1(DIGIT_HEIGHT) - digit->h:%i\n", c, (i * SCALE1(DIGIT_WIDTH)), y, SCALE1(DIGIT_HEIGHT), SCALE1(DIGIT_HEIGHT) - digit->h); fflush(stdout);
Expand Down Expand Up @@ -73,7 +75,8 @@ int main(int argc , char* argv[]) {
return x + SCALE1(10);
}
void blitBar(int x, int y, int w) {
GFX_blitPill(ASSET_UNDERLINE, screen, &(SDL_Rect){x,y,w});
Uint32 bar_color_rgb = SDL_MapRGB(screen->format, selected_bar_color.r, selected_bar_color.g, selected_bar_color.b);
GFX_blitPillColor(ASSET_UNDERLINE, screen, &(SDL_Rect){x,y,w}, bar_color_rgb, RGB_WHITE);
}
int blitNumber(int num, int x, int y) {
int n;
Expand Down Expand Up @@ -294,7 +297,7 @@ int main(int argc , char* argv[]) {
int ampm_w;
if (!show_24hour) {
x += SCALE1(10); // space
SDL_Surface* text = TTF_RenderUTF8_Blended(font.large, am_selected ? "AM" : "PM", COLOR_WHITE);
SDL_Surface* text = TTF_RenderUTF8_Blended(font.large, am_selected ? "AM" : "PM", text_color);
ampm_w = text->w + SCALE1(2);
SDL_BlitSurface(text, NULL, screen, &(SDL_Rect){x,y-SCALE1(3)});
SDL_FreeSurface(text);
Expand Down
7 changes: 6 additions & 1 deletion workspace/all/common/api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2169,6 +2169,11 @@ void GFX_blitButton(char *hint, char *button, SDL_Surface *dst, SDL_Rect *dst_re
SDL_FreeSurface(text);
}
void GFX_blitMessage(TTF_Font *font, char *msg, SDL_Surface *dst, SDL_Rect *dst_rect)
{
GFX_blitMessageColor(font, msg, uintToColour(CFG_getColor(COLOR_LIST_TEXT)), dst, dst_rect);
}

void GFX_blitMessageColor(TTF_Font *font, char *msg, SDL_Color color, SDL_Surface *dst, SDL_Rect *dst_rect)
{
if (!dst_rect)
dst_rect = &(SDL_Rect){0, 0, dst->w, dst->h};
Expand Down Expand Up @@ -2213,7 +2218,7 @@ void GFX_blitMessage(TTF_Font *font, char *msg, SDL_Surface *dst, SDL_Rect *dst_

if (len)
{
text = TTF_RenderUTF8_Blended_Wrapped(font, line, uintToColour(CFG_getColor(COLOR_LIST_TEXT)), dst_rect->w);
text = TTF_RenderUTF8_Blended_Wrapped(font, line, color, dst_rect->w);
int x = dst_rect->x;
x += (dst_rect->w - text->w) / 2;
SDL_BlitSurface(text, NULL, dst, &(SDL_Rect){x, y});
Expand Down
1 change: 1 addition & 0 deletions workspace/all/common/api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,7 @@ void GFX_blitBatteryAtPosition(SDL_Surface *dst, int x, int y);
int GFX_getButtonWidth(char* hint, char* button);
void GFX_blitButton(char* hint, char*button, SDL_Surface* dst, SDL_Rect* dst_rect);
void GFX_blitMessage(TTF_Font* font, char* msg, SDL_Surface* dst, SDL_Rect* dst_rect);
void GFX_blitMessageColor(TTF_Font* font, char* msg, SDL_Color color, SDL_Surface* dst, SDL_Rect* dst_rect);

int GFX_blitHardwareGroup(SDL_Surface* dst, int show_setting);
void GFX_blitHardwareHints(SDL_Surface* dst, int show_setting);
Expand Down
Loading
Loading