Fixed color rendering for good
This commit was merged in pull request #26.
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
use crate::display::sprite::render_sprite_onto_ili9341;
|
||||
use alloc::{format, string::String};
|
||||
use alloc::format;
|
||||
use embedded_graphics::mono_font::MonoTextStyle;
|
||||
use embedded_graphics::mono_font::ascii::FONT_6X10;
|
||||
use embedded_graphics::pixelcolor::Rgb565;
|
||||
|
||||
@@ -2,7 +2,7 @@ use alloc::vec;
|
||||
use core::future;
|
||||
|
||||
use crate::card::model::Card;
|
||||
use crate::card::{decoder::split_nfc_hex, mock::MOCK_PAYLOAD, mock::MOCK_PAYLOAD2};
|
||||
use crate::card::{decoder::split_nfc_hex, mock::*};
|
||||
use crate::display::primary_lcd::PrimaryLcdDisplay;
|
||||
|
||||
use crate::views::card_view::CardView;
|
||||
@@ -36,7 +36,7 @@ impl Navigable for MainMenu {
|
||||
}
|
||||
|
||||
fn handle_input(&self, input: Action) -> impl core::future::Future<Output = View> + Send {
|
||||
let card_mock1 = Card::try_from(split_nfc_hex(&MOCK_PAYLOAD).unwrap()).unwrap();
|
||||
let card_mock1 = Card::try_from(split_nfc_hex(&MOCK_PAYLOAD3).unwrap()).unwrap();
|
||||
let card_mock2 = Card::try_from(split_nfc_hex(&MOCK_PAYLOAD2).unwrap()).unwrap();
|
||||
|
||||
let new_menu = match input {
|
||||
|
||||
@@ -4,8 +4,7 @@ use embedded_graphics::pixelcolor::Rgb565;
|
||||
use embedded_graphics::prelude::Point;
|
||||
use embedded_graphics::prelude::RgbColor;
|
||||
use embedded_graphics::text::Text;
|
||||
use embedded_graphics::{Drawable, geometry::Size, primitives::Rectangle};
|
||||
use embedded_graphics_core::draw_target::DrawTarget;
|
||||
use embedded_graphics::Drawable;
|
||||
|
||||
use crate::display::primary_lcd::PrimaryLcdDisplay;
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@ impl Navigable for SettingsMenu {
|
||||
core::future::ready(())
|
||||
}
|
||||
|
||||
fn handle_input(&self, input: Action) -> impl core::future::Future<Output = View> + Send {
|
||||
fn handle_input(&self, _input: Action) -> impl core::future::Future<Output = View> + Send {
|
||||
async move { View::Settings(SettingsMenu { selected: 0 }) }
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user