Feat/use ledger device sdk only

Cargo.toml

@@ -1,14 +1,13 @@
 [package]
 name = "app-boilerplate-rust"
-version = "1.0.0"
+version = "1.1.0"
 authors = ["yhql", "agrojean-ledger"]
 edition = "2021"
 
 [dependencies]
-ledger_device_sdk = "1.0.1"
-ledger_device_ui_sdk = "1.1.1"
-ledger_secure_sdk_sys = "1.0.1"
-include_gif = "1.0.0"
+ledger_device_sdk = "1.1.0"
+ledger_secure_sdk_sys = "1.0.2"
+include_gif = "1.0.1"
 serde = {version="1.0.192", default_features = false, features = ["derive"]}
 serde-json-core = { git = "https://github.com/rust-embedded-community/serde-json-core"}
 hex = { version = "0.4.3", default-features = false, features = ["serde"] }

src/app_ui/address.rs

@@ -17,8 +17,8 @@
 
 use crate::AppSW;
 use core::str::from_utf8_mut;
-use ledger_device_ui_sdk::bitmaps::{CROSSMARK, EYE, VALIDATE_14};
-use ledger_device_ui_sdk::ui::{Field, MultiFieldReview};
+use ledger_device_sdk::ui::bitmaps::{CROSSMARK, EYE, VALIDATE_14};
+use ledger_device_sdk::ui::gadgets::{Field, MultiFieldReview};
 
 // Display only the last 20 bytes of the address
 const DISPLAY_ADDR_BYTES_LEN: usize = 20;

src/app_ui/menu.rs

@@ -17,8 +17,8 @@
 
 use include_gif::include_gif;
 use ledger_device_sdk::io::{ApduHeader, Comm, Event};
-use ledger_device_ui_sdk::bitmaps::{Glyph, BACK, CERTIFICATE, DASHBOARD_X};
-use ledger_device_ui_sdk::ui::{EventOrPageIndex, MultiPageMenu, Page};
+use ledger_device_sdk::ui::bitmaps::{Glyph, BACK, CERTIFICATE, DASHBOARD_X};
+use ledger_device_sdk::ui::gadgets::{EventOrPageIndex, MultiPageMenu, Page};
 
 fn ui_about_menu(comm: &mut Comm) -> Event<ApduHeader> {
  let pages = [

src/app_ui/sign.rs

@@ -17,8 +17,8 @@
 use crate::handlers::sign_tx::Tx;
 use crate::utils::concatenate;
 use crate::AppSW;
-use ledger_device_ui_sdk::bitmaps::{CROSSMARK, EYE, VALIDATE_14};
-use ledger_device_ui_sdk::ui::{Field, MultiFieldReview};
+use ledger_device_sdk::ui::bitmaps::{CROSSMARK, EYE, VALIDATE_14};
+use ledger_device_sdk::ui::gadgets::{Field, MultiFieldReview};
 use numtoa::NumToA;
 
 const MAX_COIN_LENGTH: usize = 10;

src/main.rs

@@ -103,9 +103,9 @@ fn display_pending_review(comm: &mut Comm) {
  use ledger_device_sdk::buttons::ButtonEvent::{
  BothButtonsRelease, LeftButtonRelease, RightButtonRelease,
  };
- use ledger_device_ui_sdk::layout::{Layout, Location, StringPlace};
- use ledger_device_ui_sdk::screen_util::screen_update;
- use ledger_device_ui_sdk::ui::clear_screen;
+ use ledger_device_sdk::ui::gadgets::clear_screen;
+ use ledger_device_sdk::ui::layout::{Layout, Location, StringPlace};
+ use ledger_device_sdk::ui::screen_util::screen_update;
 
  clear_screen();
  "Pending Review".place(Location::Middle, Layout::Centered, false);

tests/test_version_cmd.py

@@ -3,7 +3,7 @@
 
 # Taken from the Cargo.toml, to update every time the version is bumped
 MAJOR = 1
-MINOR = 0
+MINOR = 1
 PATCH = 0
 
 # In this test we check the behavior of the device when asked to provide the app version