Skip to content

Commit 48d2a09

Browse files
committed
views/select_pokemon: Clean up select screen
Pokemon name on its own line, all names fit now. Pokemon number in #%03d format printed in place of hex value Left and right canvas buttons removed (not really needed since up/down/left/right all do something)
1 parent 04e0332 commit 48d2a09

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

views/select_pokemon.cpp

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,27 @@ static void select_pokemon_render_callback(Canvas* canvas, void* context) {
55
canvas_clear(canvas);
66

77
SelectPokemonModel* model = (SelectPokemonModel*)context;
8-
const int current_index = model->current_pokemon;
9-
const char* current_name = pokemon_names[current_index];
10-
char hex_str[5];
11-
snprintf(hex_str, sizeof(hex_str), "0x%02X", pokemon_hex_codes[current_index]);
8+
const uint8_t current_index = model->current_pokemon;
9+
char pokedex_num[5];
10+
11+
snprintf(hex_str, sizeof(hex_str), "#%03d", current_index+1);
1212
canvas_set_font(canvas, FontPrimary);
1313
canvas_draw_str_aligned(
1414
canvas,
1515
55,
1616
54 / 2,
1717
AlignLeft,
1818
AlignTop,
19-
("#" + std::to_string(current_index + 1) + " " + current_name).c_str());
19+
pokemon_names[current_index]);
2020

2121
canvas_set_font(canvas, FontSecondary);
22-
canvas_draw_str_aligned(canvas, 55, 37, AlignLeft, AlignTop, hex_str);
22+
canvas_draw_str_aligned(canvas, 55, 38, AlignLeft, AlignTop, pokedex_num);
2323
canvas_draw_icon(canvas, 0, 0, pokemon_icons[current_index]);
2424
canvas_draw_icon(canvas, 128 - 80, 0, &I_Space_80x18);
2525
canvas_draw_str_aligned(canvas, (128 - 40), 5, AlignCenter, AlignTop, "Select Pokemon");
2626

2727
canvas_set_font(canvas, FontPrimary);
28-
elements_button_left(canvas, "Prev");
2928
elements_button_center(canvas, "OK");
30-
elements_button_right(canvas, "Next");
3129
}
3230

3331
static bool select_pokemon_input_callback(InputEvent* event, void* context) {
@@ -164,4 +162,4 @@ void select_pokemon_free(App* app) {
164162
View* select_pokemon_get_view(App* app) {
165163
furi_assert(app->select_pokemon);
166164
return app->select_pokemon->view;
167-
}
165+
}

0 commit comments

Comments
 (0)