rocket: auto rotate on pogo keyboard connect

Author: timower

apps/rocket/AppWidgets.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <UI.h>
+#include <UI/Rotate.h>
 
 #include "App.h"
 
@@ -12,10 +13,12 @@ class RunningAppWidget : public rmlib::StatelessWidget<RunningAppWidget> {
   RunningAppWidget(const App& app,
                    rmlib::Callback onTap,
                    rmlib::Callback onKill,
-                   bool isCurrent)
+                   bool isCurrent,
+                   rmlib::Rotation rotation)
     : app(app)
     , onTap(std::move(onTap))
     , onKill(std::move(onKill))
+    , rotation(rotation)
     , isCurrent(isCurrent) {}
 
   auto build(rmlib::AppContext& /*unused*/,
@@ -26,7 +29,7 @@ class RunningAppWidget : public rmlib::StatelessWidget<RunningAppWidget> {
                                                      : getMissingImage().canvas;
 
     return container(
-      Column(GestureDetector(Sized(Image(canvas), 234, 300),
+      Column(GestureDetector(Rotated(rotation, Sized(Image(canvas), 234, 300)),
                              Gestures{}.onTap(onTap)),
              Row(Text(app.description().name), Button("X", onKill))),
       Insets::all(isCurrent ? 1 : 2),
@@ -38,6 +41,7 @@ class RunningAppWidget : public rmlib::StatelessWidget<RunningAppWidget> {
   const App& app;
   rmlib::Callback onTap;
   rmlib::Callback onKill;
+  rmlib::Rotation rotation;
   bool isCurrent;
 };
 

apps/rocket/Launcher.cpp

@@ -109,6 +109,7 @@ LauncherState
 LauncherWidget::createState() {
   return LauncherState{};
 }
+
 void
 LauncherState::init(rmlib::AppContext& context,
                     const rmlib::BuildContext& /*unused*/) {
@@ -139,6 +140,10 @@ LauncherState::init(rmlib::AppContext& context,
       }
     },
     std::chrono::minutes(1));
+
+  updateRotation(context);
+  context.onDeviceUpdate(
+    [this, &context] { modify().updateRotation(context); });
 }
 
 bool
@@ -378,3 +383,10 @@ void
 LauncherState::resetInactivity() const {
   inactivityCountdown = default_inactivity_timeout;
 }
+
+void
+LauncherState::updateRotation(rmlib::AppContext& ctx) {
+  rotation = ctx.getInputManager().getBaseDevices().pogoKeyboard != nullptr
+               ? Rotation::Clockwise
+               : Rotation::None;
+}

apps/rocket/Launcher.h

@@ -4,6 +4,7 @@
 #include "AppWidgets.h"
 
 #include <UI.h>
+#include <UI/Rotate.h>
 
 class LauncherState;
 
@@ -75,7 +76,8 @@ class LauncherState : public rmlib::StateBase<LauncherWidget> {
               self.stopTimer();
             });
           },
-          app.description().path == currentAppPath);
+          app.description().path == currentAppPath,
+          invert(rotation));
       }
     }
     return Wrap(widgets);
@@ -119,16 +121,18 @@ class LauncherState : public rmlib::StateBase<LauncherWidget> {
 
     auto ui = [&]() -> DynamicWidget {
       if (visible) {
-        return launcher(context);
+        return Rotated(rotation, launcher(context));
       }
 
       if (background == nullptr) {
         return Colored(white);
       }
 
       if (backgroundSize.has_value()) {
-        return Center(Sized(
-          Image(*background), backgroundSize->width, backgroundSize->height));
+        return Center(Rotated(rotation,
+                              Sized(Image(*background),
+                                    backgroundSize->width,
+                                    backgroundSize->height)));
       }
       return Image(*background);
     }();
@@ -168,6 +172,8 @@ class LauncherState : public rmlib::StateBase<LauncherWidget> {
 
   void resetInactivity() const;
 
+  void updateRotation(rmlib::AppContext& ctx);
+
   std::vector<App> apps;
   std::string currentAppPath;
 
@@ -179,6 +185,8 @@ class LauncherState : public rmlib::StateBase<LauncherWidget> {
   const rmlib::Canvas* fbCanvas = nullptr;
   rmlib::input::InputDeviceBase* touchDevice = nullptr;
 
+  rmlib::Rotation rotation = rmlib::Rotation::None;
+
   int sleepCountdown = -1;
   mutable int inactivityCountdown = default_inactivity_timeout;
   bool visible = true;

test/unit/TestRocket.cpp

@@ -166,8 +166,8 @@ TEST_CASE("AppWidget", "[rocket]") {
 
     bool current = GENERATE(true, false);
 
-    ctx.pumpWidget(Center(
-      RunningAppWidget(app, [&] { tapped++; }, [&] { killed++; }, current)));
+    ctx.pumpWidget(Center(RunningAppWidget(
+      app, [&] { tapped++; }, [&] { killed++; }, current, Rotation::None)));
 
     auto appWidget = ctx.findByType<RunningAppWidget>();
     REQUIRE_THAT(
@@ -183,12 +183,12 @@ TEST_CASE("AppWidget", "[rocket]") {
   }
 }
 
-TEST_CASE("Launcher", "[rocket]") {
+TemporaryDirectory
+makeDrafts() {
   TemporaryDirectory tmp;
 
   const auto configPath = tmp.dir / ".config" / "draft";
   REQUIRE_NOTHROW(std::filesystem::create_directories(configPath));
-  setenv("HOME", tmp.dir.c_str(), true);
 
   writeFile(configPath / "a.draft", R"(
 name=a
@@ -202,6 +202,24 @@ name=b
 call=yes
     )");
 
+  return tmp;
+}
+
+TEST_CASE("Landscape", "[rocket]") {
+  auto tmp = makeDrafts();
+  setenv("HOME", tmp.dir.c_str(), true);
+
+  auto ctx = TestContext::make(/*keyboardAttached=*/true);
+  ctx.pumpWidget(Center(LauncherWidget()));
+  auto launcher = ctx.findByType<LauncherWidget>();
+
+  REQUIRE_THAT(launcher, ctx.matchesGolden("rocket-landscape.png"));
+}
+
+TEST_CASE("Launcher", "[rocket]") {
+  auto tmp = makeDrafts();
+  setenv("HOME", tmp.dir.c_str(), true);
+
   auto ctx = TestContext::make();
   ctx.pumpWidget(Center(LauncherWidget()));
   auto launcher = ctx.findByType<LauncherWidget>();