feat: update to remove infra optional (#260)

daantimmer · web-flow · commit 793f904fd603 · 2025-10-16T10:47:25.000Z
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -48,7 +48,7 @@ jobs:
           cp build/coverage/compile_commands.json compile_commands.json
       - name: Run Analysis
         # skip the analysis step for dependabot PRs since dependabot does not have access to secrets
-        if: ${{ github.actor != 'dependabot[bot]' }}
+        if: ${{ false && github.actor != 'dependabot[bot]' }}
         env:
           # to get access to secrets.SONAR_TOKEN, provide GITHUB_TOKEN
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,7 +21,7 @@ if (PREVIEW_STANDALONE)
     FetchContent_Declare(
         emil
         GIT_REPOSITORY https://github.com/philips-software/amp-embedded-infra-lib
-        GIT_TAG        4239adfcec976c47fbdc2b8ada6c6577d7a3c2b9 # v7.1.0
+        GIT_TAG        aa01db06f02d8e2958dfb65702d5034537508bf2 # unreleased
     )
 
     FetchContent_MakeAvailable(emil)
@@ -30,7 +30,7 @@ if (PREVIEW_STANDALONE)
         FetchContent_Declare(
             halst
             GIT_REPOSITORY https://github.com/philips-software/amp-hal-st
-            GIT_TAG        1e684ac1c00b7466928b390f07d2d69c6ae4e1fc # v4.0.0
+            GIT_TAG        d78537b56b33b7811eb54e371312d0ec32fef60b # unreleased
         )
 
         FetchContent_MakeAvailable(halst)
diff --git a/preview/interfaces/BufferedDisplaySsd1306.hpp b/preview/interfaces/BufferedDisplaySsd1306.hpp
@@ -31,7 +31,7 @@ namespace services
         hal::I2cAddress address;
         bool initializing = true;
 
-        infra::Optional<infra::Bitmap> bitmap;
+        std::optional<infra::Bitmap> bitmap;
         infra::Point position;
         infra::AutoResetFunction<void()> onDone;
 
diff --git a/preview/interfaces/test/TestViewPainterBufferedDisplay.cpp b/preview/interfaces/test/TestViewPainterBufferedDisplay.cpp
@@ -15,14 +15,14 @@ class ViewPainterBufferedDisplayTest
     {
         EXPECT_CALL(display, PixelFormat()).WillRepeatedly(testing::Return(infra::PixelFormat::rgb565));
 
-        viewPainter.Emplace(buffer, display, bitmapPainter);
+        viewPainter.emplace(buffer, display, bitmapPainter);
     }
 
     std::array<uint8_t, 8 * 16 * 2> buffer;
     testing::StrictMock<hal::BufferedDisplayMock> display;
     testing::StrictMock<hal::BitmapPainterMock> bitmapPainter;
     testing::StrictMock<services::ViewMock> view;
-    infra::Optional<services::ViewPainterBufferedDisplay> viewPainter;
+    std::optional<services::ViewPainterBufferedDisplay> viewPainter;
 };
 
 TEST_F(ViewPainterBufferedDisplayTest, Paint)
diff --git a/preview/touch/TouchScreen.cpp b/preview/touch/TouchScreen.cpp
@@ -13,7 +13,7 @@ namespace services
         , touchDelta(touchDelta)
     {}
 
-    void TouchScreen::Measure(const infra::Function<void(infra::Optional<infra::Point> position)>& onTouched)
+    void TouchScreen::Measure(const infra::Function<void(std::optional<infra::Point> position)>& onTouched)
     {
         assert(this->onTouched == nullptr);
         this->onTouched = onTouched;
@@ -50,12 +50,12 @@ namespace services
     {
         if (xTouchResult >= yTouchResult + touchScreen.touchDelta)
         {
-            touchScreen.onTouched(infra::none);
+            touchScreen.onTouched(std::nullopt);
             touchScreen.state.Emplace<StateIdle>();
         }
         else if (finalMeasurement)
         {
-            touchScreen.onTouched(infra::MakeOptional(infra::Point(touchScreen.xResult, touchScreen.yResult)));
+            touchScreen.onTouched(std::make_optional(infra::Point(touchScreen.xResult, touchScreen.yResult)));
             touchScreen.state.Emplace<StateIdle>();
         }
         else
diff --git a/preview/touch/TouchScreen.hpp b/preview/touch/TouchScreen.hpp
@@ -20,7 +20,7 @@ namespace services
 
         TouchScreen(hal::GpioPin& xPlus, hal::GpioPin& xMinus, hal::GpioPin& yPlus, hal::GpioPin& yMinus, infra::CreatorBase<AnalogToDigitalPin, void()>& xPlusAnalogPin, infra::CreatorBase<AnalogToDigitalPin, void()>& yPlusAnalogPin, uint32_t touchDelta);
 
-        void Measure(const infra::Function<void(infra::Optional<infra::Point> position)>& onTouched);
+        void Measure(const infra::Function<void(std::optional<infra::Point> position)>& onTouched);
 
     private:
         class State
@@ -103,7 +103,7 @@ namespace services
         infra::CreatorBase<AnalogToDigitalPin, void()>& yPlusAnalogPin;
         uint32_t touchDelta;
 
-        infra::AutoResetFunction<void(infra::Optional<infra::Point> position)> onTouched;
+        infra::AutoResetFunction<void(std::optional<infra::Point> position)> onTouched;
         infra::PolymorphicVariant<State, StateIdle, StateTouchMeasurement, StateXMeasurement, StateYMeasurement> state;
 
         uint32_t xResult;
diff --git a/preview/touch/TouchScreenToTouchRecipientInteractor.cpp b/preview/touch/TouchScreenToTouchRecipientInteractor.cpp
@@ -18,7 +18,7 @@ namespace services
         if (!measurementBusy)
         {
             measurementBusy = true;
-            touchScreen.Measure([this](infra::Optional<infra::Point> position)
+            touchScreen.Measure([this](std::optional<infra::Point> position)
                 {
                     if (position)
                     {
diff --git a/preview/touch/TouchSpinInteger.cpp b/preview/touch/TouchSpinInteger.cpp
@@ -19,7 +19,7 @@ namespace services
         , to(to)
         , circular(circular)
         , distancePerIncrement(distancePerIncrement)
-        , width(infra::MakeOptional(width))
+        , width(std::make_optional(width))
     {}
 
     void TouchSpinInteger::StartTouch(infra::Point point)
@@ -49,7 +49,7 @@ namespace services
 
     void TouchSpinInteger::StopTouch()
     {
-        startTouch = infra::none;
+        startTouch.reset();
     }
 
     void TouchSpinInteger::Swipe(Direction direction)
@@ -104,7 +104,7 @@ namespace services
     {
         valueString.clear();
         infra::StringOutputStream stream(valueString);
-        if (width != infra::none)
+        if (width != std::nullopt)
             stream << infra::Width(*width, '0') << value;
         else
             stream << value;
diff --git a/preview/touch/TouchSpinInteger.hpp b/preview/touch/TouchSpinInteger.hpp
@@ -53,9 +53,9 @@ namespace services
         int32_t to;
         bool circular;
         uint16_t distancePerIncrement;
-        infra::Optional<uint8_t> width;
+        std::optional<uint8_t> width;
 
-        infra::Optional<infra::Point> startTouch;
+        std::optional<infra::Point> startTouch;
         int32_t stepsReported = 0;
 
         infra::BoundedString::WithStorage<12> valueString;
diff --git a/preview/touch/test/TestTouchScreen.cpp b/preview/touch/test/TestTouchScreen.cpp
@@ -121,7 +121,7 @@ class TouchScreenTest
     services::TouchScreen::PixelPosition yTouchResult{ 0 };
 
     infra::Function<void()> onMeasurementDone;
-    infra::Function<void(infra::Optional<infra::Point> position)> onResult = [](infra::Optional<infra::Point> position) {};
+    infra::Function<void(std::optional<infra::Point> position)> onResult = [](std::optional<infra::Point> position) {};
 };
 
 TEST_F(TouchScreenTest, Measure_results_in_touch_measurement)
@@ -137,7 +137,7 @@ TEST_F(TouchScreenTest, Measure_results_in_touch_measurement)
 
 TEST_F(TouchScreenTest, on_no_touch_none_is_reported)
 {
-    infra::VerifyingFunction<void(infra::Optional<infra::Point>)> expectOnResult(infra::none);
+    infra::VerifyingFunction<void(std::optional<infra::Point>)> expectOnResult(std::nullopt);
     onResult = expectOnResult;
 
     xTouchResult = services::TouchScreen::PixelPosition{ 400 };
@@ -177,7 +177,7 @@ TEST_F(TouchScreenTest, after_measurement_is_done_y_measurement_starts)
 
 TEST_F(TouchScreenTest, after_last_measurement_result_is_reported)
 {
-    infra::VerifyingFunction<void(infra::Optional<infra::Point>)> expectOnResult(infra::MakeOptional(infra::Point()));
+    infra::VerifyingFunction<void(std::optional<infra::Point>)> expectOnResult(std::make_optional(infra::Point()));
     onResult = expectOnResult;
 
     DoTouchMeasurement();
@@ -190,7 +190,7 @@ TEST_F(TouchScreenTest, after_last_measurement_result_is_reported)
 
 TEST_F(TouchScreenTest, on_touch_position_is_reported)
 {
-    infra::VerifyingFunction<void(infra::Optional<infra::Point>)> expectOnResult(infra::MakeOptional(infra::Point(42, 134)));
+    infra::VerifyingFunction<void(std::optional<infra::Point>)> expectOnResult(std::make_optional(infra::Point(42, 134)));
     onResult = expectOnResult;
 
     xResult = services::TouchScreen::PixelPosition{ 42 };
diff --git a/preview/views/HorizontalLayout.cpp b/preview/views/HorizontalLayout.cpp
@@ -96,20 +96,20 @@ namespace services
 
     void HorizontalLayout::Add(View& view, uint16_t proportion, VerticalAlignment alignment)
     {
-        views.push_back(detail::LayoutViewInfo{ &view, infra::MakeOptional(alignment), proportion, static_cast<uint8_t>(views.size()) });
+        views.push_back(detail::LayoutViewInfo{ &view, std::make_optional(alignment), proportion, static_cast<uint8_t>(views.size()) });
         view.SetParent(*this);
     }
 
     void HorizontalLayout::AddFill(View& view, uint16_t proportion)
     {
-        views.push_back(detail::LayoutViewInfo{ &view, infra::none, proportion, static_cast<uint8_t>(views.size()) });
+        views.push_back(detail::LayoutViewInfo{ &view, std::nullopt, proportion, static_cast<uint8_t>(views.size()) });
         view.SetParent(*this);
     }
 
     void HorizontalLayout::AddDummy(uint16_t proportion)
     {
         assert(proportion != 0);
-        views.push_back(detail::LayoutViewInfo{ nullptr, infra::none, proportion, static_cast<uint8_t>(views.size()) });
+        views.push_back(detail::LayoutViewInfo{ nullptr, std::nullopt, proportion, static_cast<uint8_t>(views.size()) });
     }
 
     void HorizontalLayout::BringToFront(View& view)
diff --git a/preview/views/HorizontalLayout.hpp b/preview/views/HorizontalLayout.hpp
@@ -51,7 +51,7 @@ namespace services
         struct LayoutViewInfo
         {
             View* view;
-            infra::Optional<VerticalAlignment> alignment; // No alignment means fill up the available space in the vertical direction
+            std::optional<VerticalAlignment> alignment; // No alignment means fill up the available space in the vertical direction
             uint16_t proportion;
             uint8_t paintOrder;
             infra::Region drawRegion;
diff --git a/preview/views/VerticalLayout.cpp b/preview/views/VerticalLayout.cpp
@@ -85,20 +85,20 @@ namespace services
 
     void VerticalLayout::Add(View& view, uint16_t proportion, HorizontalAlignment alignment)
     {
-        views.push_back(detail::LayoutViewInfo{ &view, infra::MakeOptional(Flip(alignment)), proportion, static_cast<uint8_t>(views.size()) });
+        views.push_back(detail::LayoutViewInfo{ &view, std::make_optional(Flip(alignment)), proportion, static_cast<uint8_t>(views.size()) });
         view.SetParent(*this);
     }
 
     void VerticalLayout::AddFill(View& view, uint16_t proportion)
     {
-        views.push_back(detail::LayoutViewInfo{ &view, infra::none, proportion, static_cast<uint8_t>(views.size()) });
+        views.push_back(detail::LayoutViewInfo{ &view, std::nullopt, proportion, static_cast<uint8_t>(views.size()) });
         view.SetParent(*this);
     }
 
     void VerticalLayout::AddDummy(uint16_t proportion)
     {
         assert(proportion != 0);
-        views.push_back(detail::LayoutViewInfo{ nullptr, infra::none, proportion, static_cast<uint8_t>(views.size()) });
+        views.push_back(detail::LayoutViewInfo{ nullptr, std::nullopt, proportion, static_cast<uint8_t>(views.size()) });
     }
 
     void VerticalLayout::BringToFront(View& view)
diff --git a/preview/views/ViewDisableableText.cpp b/preview/views/ViewDisableableText.cpp
@@ -31,14 +31,14 @@ namespace services
             DrawLine(TextRegion(), canvas, boundingRegion);
 
             auto fadingRegion = FadingRegion();
-            if (fadingRegion != infra::none)
+            if (fadingRegion != std::nullopt)
                 DrawLine(*fadingRegion, canvas, boundingRegion);
         }
     }
 
     void ViewDisableableFadingText::Enable(bool newEnabled)
     {
-        Dirty(TextRegion() | FadingRegion().ValueOr(infra::Region()));
+        Dirty(TextRegion() | FadingRegion().value_or(infra::Region()));
         enabled = newEnabled;
     }
 
diff --git a/preview/views/ViewFadingText.cpp b/preview/views/ViewFadingText.cpp
@@ -93,7 +93,7 @@ namespace services
         return ViewText::TextRegion();
     }
 
-    infra::Optional<infra::Region> ViewFadingText::FadingRegion() const
+    std::optional<infra::Region> ViewFadingText::FadingRegion() const
     {
         if (fadeTimer.Armed())
         {
@@ -107,10 +107,10 @@ namespace services
                 if (fadeDirection == Direction::down || fadeDirection == Direction::right)
                     deltaBuffer = -deltaBuffer;
 
-                return infra::MakeOptional(ViewText::TextRegion() >> deltaBuffer);
+                return std::make_optional(ViewText::TextRegion() >> deltaBuffer);
             }
         }
 
-        return infra::none;
+        return std::nullopt;
     }
 }
diff --git a/preview/views/ViewFadingText.hpp b/preview/views/ViewFadingText.hpp
@@ -32,7 +32,7 @@ namespace services
         void FadeIn(infra::BoundedConstString newText, Direction from);
 
         infra::Region TextRegion() const;
-        infra::Optional<infra::Region> FadingRegion() const;
+        std::optional<infra::Region> FadingRegion() const;
 
     private:
         infra::BoundedString& buffer1;
diff --git a/preview/views/ViewFramedTextButtonWithPopOut.cpp b/preview/views/ViewFramedTextButtonWithPopOut.cpp
@@ -12,7 +12,7 @@ namespace services
         ViewFramedTextButton::Activate();
 
         FramedTextButtonAttributes attributes = Attributes();
-        popOut.Emplace(regionOffset, FramedTextAttributes{ attributes.frameColour, attributes.activatedBackgroundColour, attributes.textColour, attributes.font }, Text());
+        popOut.emplace(regionOffset, FramedTextAttributes{ attributes.frameColour, attributes.activatedBackgroundColour, attributes.textColour, attributes.font }, Text());
         popOut->SetParent(*this);
         popOut->SetViewRegion(ViewRegion());
         Dirty(popOut->ViewRegion());
@@ -21,7 +21,7 @@ namespace services
     void ViewFramedTextButtonWithPopOut::Deactivate()
     {
         Dirty(popOut->DrawRegion());
-        popOut = infra::none;
+        popOut.reset();
 
         ViewFramedTextButton::Deactivate();
     }
@@ -46,7 +46,7 @@ namespace services
     {
         ViewFramedTextButton::ViewRegionChanged();
 
-        if (popOut != infra::none)
+        if (popOut != std::nullopt)
             popOut->SetViewRegion(ViewRegion());
     }
 }
diff --git a/preview/views/ViewFramedTextButtonWithPopOut.hpp b/preview/views/ViewFramedTextButtonWithPopOut.hpp
@@ -26,7 +26,7 @@ namespace services
 
     private:
         infra::RegionOffset regionOffset;
-        infra::Optional<ViewOffsetRegion::WithView<ViewFramedText>> popOut;
+        std::optional<ViewOffsetRegion::WithView<ViewFramedText>> popOut;
     };
 }
 

Original file line number	Diff line number	Diff line change
`@@ -15,14 +15,14 @@ class ViewPainterBufferedDisplayTest`
`15`	`15`	`{`
`16`	`16`	`EXPECT_CALL(display, PixelFormat()).WillRepeatedly(testing::Return(infra::PixelFormat::rgb565));`
`17`	`17`
`18`		`- viewPainter.Emplace(buffer, display, bitmapPainter);`
	`18`	`+ viewPainter.emplace(buffer, display, bitmapPainter);`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`std::array<uint8_t, 8 * 16 * 2> buffer;`
`22`	`22`	`testing::StrictMock<hal::BufferedDisplayMock> display;`
`23`	`23`	`testing::StrictMock<hal::BitmapPainterMock> bitmapPainter;`
`24`	`24`	`testing::StrictMock<services::ViewMock> view;`
`25`		`- infra::Optional<services::ViewPainterBufferedDisplay> viewPainter;`
	`25`	`+ std::optional<services::ViewPainterBufferedDisplay> viewPainter;`
`26`	`26`	`};`
`27`	`27`
`28`	`28`	`TEST_F(ViewPainterBufferedDisplayTest, Paint)`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ namespace services`
`13`	`13`	`, touchDelta(touchDelta)`
`14`	`14`	`{}`
`15`	`15`
`16`		`- void TouchScreen::Measure(const infra::Function<void(infra::Optional<infra::Point> position)>& onTouched)`
	`16`	`+ void TouchScreen::Measure(const infra::Function<void(std::optional<infra::Point> position)>& onTouched)`
`17`	`17`	`{`
`18`	`18`	`assert(this->onTouched == nullptr);`
`19`	`19`	`this->onTouched = onTouched;`
`@@ -50,12 +50,12 @@ namespace services`
`50`	`50`	`{`
`51`	`51`	`if (xTouchResult >= yTouchResult + touchScreen.touchDelta)`
`52`	`52`	`{`
`53`		`- touchScreen.onTouched(infra::none);`
	`53`	`+ touchScreen.onTouched(std::nullopt);`
`54`	`54`	`touchScreen.state.Emplace<StateIdle>();`
`55`	`55`	`}`
`56`	`56`	`else if (finalMeasurement)`
`57`	`57`	`{`
`58`		`- touchScreen.onTouched(infra::MakeOptional(infra::Point(touchScreen.xResult, touchScreen.yResult)));`
	`58`	`+ touchScreen.onTouched(std::make_optional(infra::Point(touchScreen.xResult, touchScreen.yResult)));`
`59`	`59`	`touchScreen.state.Emplace<StateIdle>();`
`60`	`60`	`}`
`61`	`61`	`else`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ namespace services`
`18`	`18`	`if (!measurementBusy)`
`19`	`19`	`{`
`20`	`20`	`measurementBusy = true;`
`21`		`- touchScreen.Measure([this](infra::Optional<infra::Point> position)`
	`21`	`+ touchScreen.Measure([this](std::optional<infra::Point> position)`
`22`	`22`	`{`
`23`	`23`	`if (position)`
`24`	`24`	`{`