From 2bc338ceede540aabbb9d6054e14760c7f4fc95b Mon Sep 17 00:00:00 2001
From: Eli Weiss <eliwss0@gmail.com>
Date: Mon, 3 Jan 2022 18:13:47 -0500
Subject: Cleaned up redundant if statements, spacing

Removed redundant if statements in hour button logic. Spacing is now in line with repo guidelines.
---
 src/displayapp/screens/settings/SettingSetTime.cpp | 86 +++++++++++-----------
 1 file changed, 41 insertions(+), 45 deletions(-)

(limited to 'src/displayapp/screens/settings/SettingSetTime.cpp')

diff --git a/src/displayapp/screens/settings/SettingSetTime.cpp b/src/displayapp/screens/settings/SettingSetTime.cpp
index a432c758..8d64dd92 100644
--- a/src/displayapp/screens/settings/SettingSetTime.cpp
+++ b/src/displayapp/screens/settings/SettingSetTime.cpp
@@ -24,9 +24,9 @@ namespace {
 }
 
 SettingSetTime::SettingSetTime(
-	Pinetime::Applications::DisplayApp *app,
-	Pinetime::Controllers::DateTime& dateTimeController,
-	Pinetime::Controllers::Settings& settingsController)
+    Pinetime::Applications::DisplayApp *app,
+    Pinetime::Controllers::DateTime& dateTimeController,
+    Pinetime::Controllers::Settings& settingsController)
   : Screen(app),
   dateTimeController {dateTimeController},
   settingsController {settingsController} {
@@ -82,16 +82,16 @@ SettingSetTime::SettingSetTime(
   lv_obj_align(lblampm, lv_scr_act(), LV_ALIGN_CENTER, POS_X_SECONDS, POS_Y_TEXT - 40);
   lv_label_set_text_fmt(lblampm, "%02c", ampmValue);
   if (settingsController.GetClockType() == Controllers::Settings::ClockType::H24)
-	lv_label_set_text(lblampm, "  ");
+    lv_label_set_text(lblampm, "  ");
   else {
-	if (hoursValue > 11)
+    if (hoursValue > 11)
       lv_label_set_text(lblampm, "PM");
     else
-	  lv_label_set_text(lblampm, "AM");
-	if (hoursValue > 12)
-	  lv_label_set_text_fmt(lblHours, "%02d", hoursValue-12);
-	else if (hoursValue == 0)
-	  lv_label_set_text_fmt(lblHours, "%02d", hoursValue+1);
+      lv_label_set_text(lblampm, "AM");
+    if (hoursValue > 12)
+      lv_label_set_text_fmt(lblHours, "%02d", hoursValue-12);
+    else if (hoursValue == 0)
+      lv_label_set_text_fmt(lblHours, "%02d", hoursValue+1);
   }
 
   btnHoursPlus = lv_btn_create(lv_scr_act(), nullptr);
@@ -135,20 +135,20 @@ SettingSetTime::~SettingSetTime() {
 }
 
 int timeConvert(int time24H) {
-	switch (time24H) {
-		case 0:
-		  return 12;
-		  break;
-		case 1 ... 12:
-		  return time24H;
-		  break;
-		case 13 ... 23:
-		  return time24H - 12;
-		  break;
-		default:
-		  return 99;
-		  break;
-	}
+    switch (time24H) {
+        case 0:
+          return 12;
+          break;
+        case 1 ... 12:
+          return time24H;
+          break;
+        case 13 ... 23:
+          return time24H - 12;
+          break;
+        default:
+          return 99;
+          break;
+    }
 }
 
 void SettingSetTime::HandleButtonPress(lv_obj_t *object, lv_event_t event) {
@@ -156,41 +156,36 @@ void SettingSetTime::HandleButtonPress(lv_obj_t *object, lv_event_t event) {
     return;
 
   if (settingsController.GetClockType() == Controllers::Settings::ClockType::H24) {
-	is24H = true;
+    is24H = true;
   }
   else {
-	is24H = false;
+    is24H = false;
   }
-
   if (object == btnHoursPlus) {
     hoursValue++;
     if (hoursValue > 23)
       hoursValue = 0;
-	if (!is24H) {
-	  if (hoursValue < 12)
-	    lv_label_set_text(lblampm, "AM");
-	  else
-	    lv_label_set_text(lblampm, "PM");
-	}
-	if (!is24H)
+    if (!is24H) {
+      if (hoursValue < 12)
+        lv_label_set_text(lblampm, "AM");
+      else
+        lv_label_set_text(lblampm, "PM");
       lv_label_set_text_fmt(lblHours, "%02d", timeConvert(hoursValue));
-	else
-	  lv_label_set_text_fmt(lblHours, "%02d", hoursValue);
+    } else
+      lv_label_set_text_fmt(lblHours, "%02d", hoursValue);
     lv_btn_set_state(btnSetTime, LV_BTN_STATE_RELEASED);
   } else if (object == btnHoursMinus) {
     hoursValue--;
     if (hoursValue < 0)
       hoursValue = 23;
-	if (!is24H) {
-	  if (hoursValue < 12)
-	    lv_label_set_text(lblampm, "AM");
-	  else
-	    lv_label_set_text(lblampm, "PM");
-	}
-	if (!is24H)
+    if (!is24H) {
+      if (hoursValue < 12)
+        lv_label_set_text(lblampm, "AM");
+      else
+        lv_label_set_text(lblampm, "PM");
       lv_label_set_text_fmt(lblHours, "%02d", timeConvert(hoursValue));
-	else
-	  lv_label_set_text_fmt(lblHours, "%02d", hoursValue);
+    } else
+      lv_label_set_text_fmt(lblHours, "%02d", hoursValue);
     lv_btn_set_state(btnSetTime, LV_BTN_STATE_RELEASED);
   } else if (object == btnMinutesPlus) {
     minutesValue++;
@@ -217,3 +212,4 @@ void SettingSetTime::HandleButtonPress(lv_obj_t *object, lv_event_t event) {
     lv_btn_set_state(btnSetTime, LV_BTN_STATE_DISABLED);
   }
 }
+}
-- 
cgit v1.2.3