wip

core/embed/rust/src/ui/component/base.rs

@@ -3,7 +3,7 @@ use core::mem;
 use heapless::Vec;
 
 use crate::{
-    strutil::TString,
+    strutil::{ShortString, TString},
     time::Duration,
     ui::{
         button_request::{ButtonRequest, ButtonRequestCode},
@@ -584,12 +584,13 @@ impl EventCtx {
 ///
 /// Also currently the type for message emitted by Flow::event to
 /// micropython. They don't need to be the same.
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub enum FlowMsg {
     Confirmed,
     Cancelled,
     Info,
     Choice(usize),
+    Text(ShortString),
 }
 
 #[cfg(feature = "micropython")]
@@ -604,6 +605,7 @@ impl TryFrom<FlowMsg> for crate::micropython::obj::Obj {
             FlowMsg::Choice(i) => {
                 Ok((crate::ui::layout::result::CONFIRMED.as_obj(), i.try_into()?).try_into()?)
             }
+            FlowMsg::Text(_s) => todo!(),
         }
     }
 }

core/embed/rust/src/ui/flow/base.rs

@@ -1,28 +1,15 @@
 use crate::{
-    strutil::ShortString,
     ui::component::{base::AttachType, swipe_detect::SwipeConfig, SwipeDirection},
 };
 
+pub use crate::ui::component::FlowMsg;
+
 pub trait Swipable {
     fn get_swipe_config(&self) -> SwipeConfig;
 
     fn get_internal_page_count(&self) -> usize;
 }
 
-/// Component::Msg for component parts of a flow. Converting results of
-/// different screens to a shared type makes things easier to work with.
-///
-/// Also currently the type for message emitted by Flow::event to
-/// micropython. They don't need to be the same.
-#[derive(Clone)]
-pub enum FlowMsg {
-    Confirmed,
-    Cancelled,
-    Info,
-    Choice(usize),
-    Text(ShortString),
-}
-
 /// Composable event handler result.
 #[derive(Clone)]
 pub enum Decision {

core/embed/rust/src/ui/flow/page.rs

@@ -35,6 +35,10 @@ impl<T: Component + Paginate> SwipePage<T> {
             current: 0,
         }
     }
+
+    pub fn inner(&self) -> &T {
+        &self.inner
+    }
 }
 
 impl<T: Component + Paginate> Component for SwipePage<T> {