Tilem: Move to namespace tilem

apps/tilem/Calculator.cpp

@@ -6,6 +6,8 @@
 
 using namespace rmlib;
 
+namespace tilem {
+
 namespace {
 
 constexpr auto calc_save_extension = ".sav";
@@ -123,3 +125,4 @@ CalcState::updateCalcState() {
 
   lastUpdateTime = time;
 }
+} // namespace tilem

apps/tilem/Calculator.h

@@ -7,6 +7,7 @@
 
 #include <tilem.h>
 
+namespace tilem {
 class CalcState;
 
 class Calculator : public rmlib::StatefulWidget<Calculator> {
@@ -76,3 +77,4 @@ class CalcState : public rmlib::StateBase<Calculator> {
 
   std::chrono::steady_clock::time_point lastUpdateTime;
 };
+} // namespace tilem

apps/tilem/KeyPad.cpp

@@ -5,6 +5,7 @@
 using namespace rmlib;
 using namespace rmlib::input;
 
+namespace tilem {
 struct Key {
   int scancode;
   std::string_view front;
@@ -138,8 +139,12 @@ KeypadRenderObject::drawKey(rmlib::Canvas& canvas,
   }
 
   // Draw alpha and 2nd label.
-  {
+  [&] {
     const auto upperLength = key.alpha.size() + key.shift.size();
+    if (upperLength == 0) {
+      return;
+    }
+
     const auto fontSize =
       std::min(upperLabelHeight, int(1.6 * keyWidth / upperLength));
 
@@ -163,7 +168,7 @@ KeypadRenderObject::drawKey(rmlib::Canvas& canvas,
       const auto positonA = pos + Point{ xOffset + spacing.x, yOffset };
       canvas.drawText(key.alpha, positonA, fontSize, 0xaa);
     }
-  }
+  }();
 
   canvas.drawRectangle(pos, pos + Point{ keyWidth - 1, keyHeight - 1 }, black);
 }
@@ -239,3 +244,4 @@ KeypadRenderObject::handleInput(const Event& ev) {
     },
     ev);
 }
+} // namespace tilem

apps/tilem/KeyPad.h

@@ -5,6 +5,8 @@
 
 #include "tilem.h"
 
+namespace tilem {
+
 struct Key;
 class KeypadRenderObject;
 
@@ -49,3 +51,4 @@ class KeypadRenderObject : public rmlib::LeafRenderObject<Keypad> {
   int keyHeight;
   int padding;
 };
+} // namespace tilem

apps/tilem/Screen.cpp

@@ -1,6 +1,7 @@
 #include "Screen.h"
 
 using namespace rmlib;
+namespace tilem {
 
 namespace {
 constexpr auto frame_time = std::chrono::milliseconds(50); // 50 ms ->  20 fps
@@ -112,3 +113,4 @@ std::unique_ptr<RenderObject>
 Screen::createRenderObject() const {
   return std::make_unique<ScreenRenderObject>(*this);
 }
+} // namespace tilem

apps/tilem/Screen.h

@@ -4,6 +4,8 @@
 
 #include <tilem.h>
 
+namespace tilem {
+
 class ScreenRenderObject;
 
 class Screen : public rmlib::Widget<ScreenRenderObject> {
@@ -38,3 +40,5 @@ class ScreenRenderObject : public rmlib::LeafRenderObject<Screen> {
   TilemLCDBuffer* oldLcd = nullptr;
   int timerID = -1;
 };
+
+} // namespace tilem

apps/tilem/main.cpp

@@ -15,7 +15,7 @@ int
 main(int argc, char* argv[]) {
   const auto* calc_name = argc > 1 ? argv[1] : calc_default_rom;
 
-  const auto err = runApp(Navigator(Calculator(calc_name)));
+  const auto err = runApp(Navigator(tilem::Calculator(calc_name)));
 
   if (!err.has_value()) {
     std::cerr << err.error().msg << std::endl;

test/unit/TestTilem.cpp

@@ -9,6 +9,7 @@
 #include <cstdlib>
 
 using namespace rmlib;
+using namespace tilem;
 
 class TemporaryDirectory {
 public:
@@ -47,7 +48,7 @@ TEST_CASE("Tilem", "[tilem][ui]") {
     REQUIRE(ctx.shouldStop());
   }
 
-  SECTION("Download & Run") {
+  SECTION("Download") {
 
     ctx.tap(ctx.findByText("Download"));