Merge branch 'sdcard-icon'

Author: Beerosagos

.ci/check-tidy

@@ -57,5 +57,5 @@ for dir in build build-build; do
 	echo "Checking $(echo ${SOURCES} | wc -w) files with clang-tidy"
 
 	# The list of tidy checks must stay in sync with scripts/tidy
-	${CLANGTIDY} -quiet -p ${dir} -checks=-*,clang-analyzer-*,-clang-analyzer-cplusplus*,bugprone-*,performance-*,portability-*,readability-*,-readability-braces-around-statements,-readability-magic-numbers,-readability-isolate-declaration,-readability-identifier-length,-readability-function-cognitive-complexity,-bugprone-reserved-identifier,-bugprone-easily-swappable-parameters,-performance-no-int-to-ptr -warnings-as-errors=* -header-filter '.*' ${SOURCES}
+	${CLANGTIDY} -quiet -p ${dir} -checks=-*,clang-analyzer-*,-clang-analyzer-cplusplus*,bugprone-*,performance-*,portability-*,readability-*,-readability-braces-around-statements,-readability-magic-numbers,-readability-isolate-declaration,-readability-identifier-length,-readability-function-cognitive-complexity,-bugprone-reserved-identifier,-bugprone-easily-swappable-parameters,-bugprone-narrowing-conversions,-performance-no-int-to-ptr -warnings-as-errors=* -header-filter '.*' ${SOURCES}
 done

src/ui/components/sdcard.c

@@ -90,7 +90,7 @@ component_t* sdcard_create(
             screen_is_upside_down() ? RIGHT_CENTER : LEFT_CENTER,
             component));
     ui_util_add_sub_component(
-        component, icon_button_create(bottom_slider, ICON_BUTTON_CHECK, _continue_callback));
+        component, icon_button_create(top_slider, ICON_BUTTON_CHECK, _continue_callback));
 
     return component;
 }

src/ui/components/ui_images.c

@@ -110,14 +110,15 @@ void image_sdcard(bool mirror)
     int16_t x = mirror ? 0 : 127; // Position of base edge
     int16_t m = mirror ? -1 : 1;
     // Base edge
-    UG_FillFrame(x - m * (4), y - h / 2, x - m * (0), y + h / 2, C_WHITE);
+    UG_FillFrame(x - m * (4), y - m * h / 2, x - m * (0), y + m * h / 2, C_WHITE);
     // Front edge
-    UG_FillFrame(x - m * (w), y - h / 2 + c, x - m * (w - 1), y + h / 2, C_WHITE);
+    UG_FillFrame(x - m * (w), y - m * h / 2 + m * c, x - m * (w - 1), y + m * h / 2, C_WHITE);
     // Top edge
-    UG_FillFrame(x - m * (0), y - h / 2, x - m * (w - c - 1), y - h / 2 - 1, C_WHITE);
+    UG_FillFrame(x - m * (0), y - m * h / 2, x - m * (w - c - 1), y - m * h / 2 - 1, C_WHITE);
     // Bottom edge
-    UG_FillFrame(x - m * (0), y + h / 2, x - m * (w), y + h / 2 - 1, C_WHITE);
+    UG_FillFrame(x - m * (0), y + m * h / 2, x - m * (w), y + m * h / 2 - 1, C_WHITE);
     // Corner
-    UG_DrawLine(x - m * (w - c), y - h / 2, x - m * (w), y - h / 2 + c, C_WHITE);
-    UG_DrawLine(x - m * (w - c - 1), y - h / 2, x - m * (w - 1), y - h / 2 + c, C_WHITE);
+    UG_DrawLine(x - m * (w - c), y - m * h / 2, x - m * (w), y - m * h / 2 + m * c, C_WHITE);
+    UG_DrawLine(
+        x - m * (w - c - 1), y - m * h / 2, x - m * (w - 1), y - m * h / 2 + m * c, C_WHITE);
 }