TR-core/UI: import TR code in general files

core/SConscript.firmware

@@ -584,8 +584,12 @@ if FROZEN:
                 SOURCE_PY_DIR + 'trezor/ui/layouts/tt_v2/fido.py',
             ] if not EVERYTHING else []
         ))
-    elif TREZOR_MODEL in ('1', 'R'):
-        SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/ui/layouts/tr/__init__.py'))
+    elif TREZOR_MODEL in ('R'):
+        SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/ui/layouts/tr/*.py',
+            exclude=[
+                SOURCE_PY_DIR + 'trezor/ui/layouts/tr/fido.py',
+            ] if not EVERYTHING else []
+        ))
     else:
         raise ValueError('Unknown Trezor model')
 

core/SConscript.unix

@@ -548,8 +548,12 @@ if FROZEN:
                 SOURCE_PY_DIR + 'trezor/ui/layouts/tt_v2/fido.py',
             ] if not EVERYTHING else []
         ))
-    elif TREZOR_MODEL in ('1', 'R'):
-        SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/ui/layouts/tr/__init__.py'))
+    elif TREZOR_MODEL in ('R'):
+        SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/ui/layouts/tr/*.py',
+            exclude=[
+                SOURCE_PY_DIR + 'trezor/ui/layouts/tr/fido.py',
+            ] if not EVERYTHING else []
+        ))
     else:
         raise ValueError('Unknown Trezor model')
 

core/src/trezor/ui/layouts/fido.py

@@ -1 +1,6 @@
-from .tt_v2.fido import *  # noqa: F401,F403
+from trezor import utils
+
+if utils.MODEL in ("T",):
+    from .tt_v2.fido import *  # noqa: F401,F403
+elif utils.MODEL in ("R",):
+    from .tr.fido import *  # noqa: F401,F403

core/src/trezor/ui/layouts/homescreen.py

@@ -1 +1,6 @@
-from .tt_v2.homescreen import *  # noqa: F401,F403
+from trezor import utils
+
+if utils.MODEL in ("T",):
+    from .tt_v2.homescreen import *  # noqa: F401,F403
+elif utils.MODEL in ("R",):
+    from .tr.homescreen import *  # noqa: F401,F403

core/src/trezor/ui/layouts/progress.py

@@ -1 +1,6 @@
-from .tt_v2.progress import *  # noqa: F401,F403
+from trezor import utils
+
+if utils.MODEL in ("T",):
+    from .tt_v2.progress import *  # noqa: F401,F403
+elif utils.MODEL in ("R",):
+    from .tr.progress import *  # noqa: F401,F403

core/src/trezor/ui/layouts/recovery.py

@@ -1 +1,6 @@
-from .tt_v2.recovery import *  # noqa: F401,F403
+from trezor import utils
+
+if utils.MODEL in ("T",):
+    from .tt_v2.recovery import *  # noqa: F401,F403
+elif utils.MODEL in ("R",):
+    from .tr.recovery import *  # noqa: F401,F403

core/src/trezor/ui/layouts/reset.py

@@ -1 +1,6 @@
-from .tt_v2.reset import *  # noqa: F401,F403
+from trezor import utils
+
+if utils.MODEL in ("T",):
+    from .tt_v2.reset import *  # noqa: F401,F403
+elif utils.MODEL in ("R",):
+    from .tr.reset import *  # noqa: F401,F403