Merge pull request #207 from LedgerHQ/y333_241024/nbgl_api_update

yogh333 · web-flow · commit 1b29c342184c · 2024-10-24T12:00:24.000+02:00
use mut ref when setting start page for HomeAndSettings
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ledger_device_sdk/Cargo.toml b/ledger_device_sdk/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ledger_device_sdk"
-version = "1.17.5"
+version = "1.18.0"
 authors = ["yhql", "yogh333", "agrojean-ledger", "kingofpayne"]
 edition = "2021"
 license.workspace = true
diff --git a/ledger_device_sdk/src/nbgl/nbgl_home_and_settings.rs b/ledger_device_sdk/src/nbgl/nbgl_home_and_settings.rs
@@ -44,7 +44,7 @@ pub enum PageIndex {
 }
 
 /// Used to display the home screen of the application, with an optional glyph,
-/// information fields, and settings switches.  
+/// information fields, and settings switches.
 pub struct NbglHomeAndSettings {
     app_name: CString,
     info_contents: Vec<CString>,
@@ -134,11 +134,8 @@ impl<'a> NbglHomeAndSettings {
         }
     }
 
-    pub fn set_start_page(self, page: PageIndex) -> NbglHomeAndSettings {
-        NbglHomeAndSettings {
-            start_page: page,
-            ..self
-        }
+    pub fn set_start_page(&mut self, page: PageIndex) {
+        self.start_page = page;
     }
 
     /// Show the home screen and settings page.

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ pub enum PageIndex {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`/// Used to display the home screen of the application, with an optional glyph,`
`47`		`-/// information fields, and settings switches.`
	`47`	`+/// information fields, and settings switches.`
`48`	`48`	`pub struct NbglHomeAndSettings {`
`49`	`49`	`app_name: CString,`
`50`	`50`	`info_contents: Vec<CString>,`
`@@ -134,11 +134,8 @@ impl<'a> NbglHomeAndSettings {`
`134`	`134`	`}`
`135`	`135`	`}`
`136`	`136`
`137`		`- pub fn set_start_page(self, page: PageIndex) -> NbglHomeAndSettings {`
`138`		`- NbglHomeAndSettings {`
`139`		`- start_page: page,`
`140`		`- ..self`
`141`		`- }`
	`137`	`+ pub fn set_start_page(&mut self, page: PageIndex) {`
	`138`	`+ self.start_page = page;`
`142`	`139`	`}`
`143`	`140`
`144`	`141`	`/// Show the home screen and settings page.`