Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-06-29 00:57:11 -04:00
Code Issues Projects Releases Packages Wiki Activity

Consolidate styles (#1116)

Browse source 
* Consolidate styles into a Styles class and clean up code

* Format

* Add style_bg_dark_grey for nav bar

* Fix bugs found in PR

* Rename styles

* Add bg_white style

---------

Co-authored-by: kallanreed <kallanreed@outlook.com>
Co-authored-by: gullradriel <3157857+gullradriel@users.noreply.github.com>
This commit is contained in:
Kyle Reed 2023-06-07 08:33:32 -07:00 • committed by GitHub
parent 496b124baf
commit 0f28fefc82
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
52 changed files with 299 additions and 400 deletions
Download patch file Download diff file Expand all files Collapse all files

12
firmware/application/apps/ui_scanner.cpp
View file

@ -179,16 +179,16 @@ void ScannerView::bigdisplay_update(int32_t v) {
switch (bigdisplay_current_color) {
case BDC_GREY:
big_display.set_style(&style_grey);
big_display.set_style(&Styles::grey);
break;
case BDC_YELLOW:
big_display.set_style(&style_yellow);
big_display.set_style(&Styles::yellow);
break;
case BDC_GREEN:
big_display.set_style(&style_green);
big_display.set_style(&Styles::green);
break;
case BDC_RED:
big_display.set_style(&style_red);
big_display.set_style(&Styles::red);
break;
default:
break;
@ -254,10 +254,10 @@ void ScannerView::show_max_index() { // show total number of freqs to scan
text_current_index.set("---");
if (frequency_list.size() == FREQMAN_MAX_PER_FILE) {
text_max_index.set_style(&style_red);
text_max_index.set_style(&Styles::red);
text_max_index.set("/ " + to_string_dec_uint(FREQMAN_MAX_PER_FILE) + " (DB MAX!)");
} else {
text_max_index.set_style(&style_grey);
text_max_index.set_style(&Styles::grey);
text_max_index.set("/ " + to_string_dec_uint(frequency_list.size()));
}
}