|
@@ -5,10 +5,10 @@ static void select_pokemon_render_callback(Canvas* canvas, void* context) {
|
|
|
canvas_clear(canvas);
|
|
canvas_clear(canvas);
|
|
|
|
|
|
|
|
SelectPokemonModel* model = (SelectPokemonModel*)context;
|
|
SelectPokemonModel* model = (SelectPokemonModel*)context;
|
|
|
- const int current_index = model->current_pokemon;
|
|
|
|
|
- const char* current_name = pokemon_names[current_index];
|
|
|
|
|
- char hex_str[5];
|
|
|
|
|
- snprintf(hex_str, sizeof(hex_str), "0x%02X", pokemon_hex_codes[current_index]);
|
|
|
|
|
|
|
+ const uint8_t current_index = model->current_pokemon;
|
|
|
|
|
+ char pokedex_num[5];
|
|
|
|
|
+
|
|
|
|
|
+ snprintf(hex_str, sizeof(hex_str), "#%03d", current_index+1);
|
|
|
canvas_set_font(canvas, FontPrimary);
|
|
canvas_set_font(canvas, FontPrimary);
|
|
|
canvas_draw_str_aligned(
|
|
canvas_draw_str_aligned(
|
|
|
canvas,
|
|
canvas,
|
|
@@ -16,18 +16,16 @@ static void select_pokemon_render_callback(Canvas* canvas, void* context) {
|
|
|
54 / 2,
|
|
54 / 2,
|
|
|
AlignLeft,
|
|
AlignLeft,
|
|
|
AlignTop,
|
|
AlignTop,
|
|
|
- ("#" + std::to_string(current_index + 1) + " " + current_name).c_str());
|
|
|
|
|
|
|
+ pokemon_names[current_index]);
|
|
|
|
|
|
|
|
canvas_set_font(canvas, FontSecondary);
|
|
canvas_set_font(canvas, FontSecondary);
|
|
|
- canvas_draw_str_aligned(canvas, 55, 37, AlignLeft, AlignTop, hex_str);
|
|
|
|
|
|
|
+ canvas_draw_str_aligned(canvas, 55, 38, AlignLeft, AlignTop, pokedex_num);
|
|
|
canvas_draw_icon(canvas, 0, 0, pokemon_icons[current_index]);
|
|
canvas_draw_icon(canvas, 0, 0, pokemon_icons[current_index]);
|
|
|
canvas_draw_icon(canvas, 128 - 80, 0, &I_Space_80x18);
|
|
canvas_draw_icon(canvas, 128 - 80, 0, &I_Space_80x18);
|
|
|
canvas_draw_str_aligned(canvas, (128 - 40), 5, AlignCenter, AlignTop, "Select Pokemon");
|
|
canvas_draw_str_aligned(canvas, (128 - 40), 5, AlignCenter, AlignTop, "Select Pokemon");
|
|
|
|
|
|
|
|
canvas_set_font(canvas, FontPrimary);
|
|
canvas_set_font(canvas, FontPrimary);
|
|
|
- elements_button_left(canvas, "Prev");
|
|
|
|
|
elements_button_center(canvas, "OK");
|
|
elements_button_center(canvas, "OK");
|
|
|
- elements_button_right(canvas, "Next");
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
static bool select_pokemon_input_callback(InputEvent* event, void* context) {
|
|
static bool select_pokemon_input_callback(InputEvent* event, void* context) {
|
|
@@ -164,4 +162,4 @@ void select_pokemon_free(App* app) {
|
|
|
View* select_pokemon_get_view(App* app) {
|
|
View* select_pokemon_get_view(App* app) {
|
|
|
furi_assert(app->select_pokemon);
|
|
furi_assert(app->select_pokemon);
|
|
|
return app->select_pokemon->view;
|
|
return app->select_pokemon->view;
|
|
|
-}
|
|
|
|
|
|
|
+}
|