Code cleanup

Code cleanup

app/src/main/java/nl/hnogames/domoticz/Adapters/TimersAdapter.java

@@ -173,8 +173,7 @@ else if (mSwitchTimerInfo.getDays() == 512)
                     else if (mSwitchTimerInfo.getDays() == 256)
                         holder.switch_name.setText(holder.switch_name.getText() + " | " + context.getString(R.string.timer_working_days));
 
-                     else if (mSwitchTimerInfo.getOccurence() > 0 && mSwitchTimerInfo.getDays() < 8)
-                    {
+                    else if (mSwitchTimerInfo.getOccurence() > 0 && mSwitchTimerInfo.getDays() < 8) {
                         String occurence = "";
                         String days = "";
 
@@ -230,14 +229,12 @@ else if (mSwitchTimerInfo.getMonth() == 11)
                         else if (mSwitchTimerInfo.getMonth() == 12)
                             month = context.getString(R.string.December);
 
-                        holder.switch_name.setText(holder.switch_name.getText() + " | " + occurence + " " + days + " " + month );
-                    }
-
-                    else
+                        holder.switch_name.setText(holder.switch_name.getText() + " | " + occurence + " " + days + " " + month);
+                    } else
                         holder.switch_name.setText(holder.switch_name.getText() + " | " + context.getString(R.string.timer_other));
                 }
 
-                if(mSwitchTimerInfo.getRandomness())
+                if (mSwitchTimerInfo.getRandomness())
                     holder.switch_status.setText(commando + " (random)");
                 else
                     holder.switch_status.setText(commando);

app/src/main/java/nl/hnogames/domoticz/Fragments/Utilities.java

@@ -316,19 +316,19 @@ public void onClick(UtilitiesInfo utility) {
     public void onLogClick(final UtilitiesInfo utility, final String range) {
         int steps = 2;
         String graphType = utility.getSubType()
-                .replace("Electric", "counter")
-                .replace("kWh", "counter")
-                .replace("Gas", "counter")
-                .replace("Energy", "counter")
-                .replace("Voltcraft", "counter")
-                .replace("Voltage", "counter")
-                .replace("SetPoint", "temp")
-                .replace("Lux", "counter")
-                .replace("BWR102", "counter")
-                .replace("Sound Level", "counter")
-                .replace("Pressure", "counter")
-                .replace("Custom Sensor", "Percentage")
-                .replace("YouLess counter", "counter");
+            .replace("Electric", "counter")
+            .replace("kWh", "counter")
+            .replace("Gas", "counter")
+            .replace("Energy", "counter")
+            .replace("Voltcraft", "counter")
+            .replace("Voltage", "counter")
+            .replace("SetPoint", "temp")
+            .replace("Lux", "counter")
+            .replace("BWR102", "counter")
+            .replace("Sound Level", "counter")
+            .replace("Pressure", "counter")
+            .replace("Custom Sensor", "Percentage")
+            .replace("YouLess counter", "counter");
 
         if (graphType.contains("counter"))
             graphType = "counter";

app/src/main/java/nl/hnogames/domoticz/GeoSettingsActivity.java

@@ -447,7 +447,8 @@ private void showRadiusEditor(final int editedLocationID, String name, LatLng la
                 public void onInput(@NonNull MaterialDialog dialog, CharSequence input) {
                     try {
                         finalLocation.setRadius(Integer.parseInt(String.valueOf(input)));
-                    } catch (Exception ex) {}
+                    } catch (Exception ex) {
+                    }
 
                     if (editedLocationID != -1 && locations != null) {
                         mSharedPrefs.updateLocation(finalLocation);

app/src/main/res/values-bg/strings_timer.xml

@@ -58,4 +58,28 @@
     <string name="timer_weekend">Уикенд</string>
     <string name="timer_other">Друг</string>
     <string name="timers">Броячи</string>
+    <string name="first">First</string>
+    <string name="second">Second</string>
+    <string name="third">Third</string>
+    <string name="fourth">Fourth</string>
+    <string name="last">Last</string>
+    <string name="monday">Monday</string>
+    <string name="tuesday">Tuesday</string>
+    <string name="wednesday">Wednesday</string>
+    <string name="thursday">Thursday</string>
+    <string name="friday">Friday</string>
+    <string name="saturday">Saturday</string>
+    <string name="sunday">Sunday</string>
+    <string name="January">January</string>
+    <string name="February">February</string>
+    <string name="March">March</string>
+    <string name="April">April</string>
+    <string name="May">May</string>
+    <string name="June">June</string>
+    <string name="July">July</string>
+    <string name="August">August</string>
+    <string name="September">September</string>
+    <string name="October">October</string>
+    <string name="November">November</string>
+    <string name="December">December</string>
 </resources>

app/src/main/res/values-bs/strings_timer.xml

@@ -58,4 +58,28 @@
     <string name="timer_weekend">Vikend</string>
     <string name="timer_other">Drugi</string>
     <string name="timers">Tajmeri</string>
+    <string name="first">First</string>
+    <string name="second">Second</string>
+    <string name="third">Third</string>
+    <string name="fourth">Fourth</string>
+    <string name="last">Last</string>
+    <string name="monday">Monday</string>
+    <string name="tuesday">Tuesday</string>
+    <string name="wednesday">Wednesday</string>
+    <string name="thursday">Thursday</string>
+    <string name="friday">Friday</string>
+    <string name="saturday">Saturday</string>
+    <string name="sunday">Sunday</string>
+    <string name="January">January</string>
+    <string name="February">February</string>
+    <string name="March">March</string>
+    <string name="April">April</string>
+    <string name="May">May</string>
+    <string name="June">June</string>
+    <string name="July">July</string>
+    <string name="August">August</string>
+    <string name="September">September</string>
+    <string name="October">October</string>
+    <string name="November">November</string>
+    <string name="December">December</string>
 </resources>

app/src/main/res/values-ca/strings_timer.xml

@@ -58,4 +58,28 @@
     <string name="timer_weekend">Cap de setmana</string>
     <string name="timer_other">Altre</string>
     <string name="timers">Temporitzadors</string>
+    <string name="first">First</string>
+    <string name="second">Second</string>
+    <string name="third">Third</string>
+    <string name="fourth">Fourth</string>
+    <string name="last">Last</string>
+    <string name="monday">Monday</string>
+    <string name="tuesday">Tuesday</string>
+    <string name="wednesday">Wednesday</string>
+    <string name="thursday">Thursday</string>
+    <string name="friday">Friday</string>
+    <string name="saturday">Saturday</string>
+    <string name="sunday">Sunday</string>
+    <string name="January">January</string>
+    <string name="February">February</string>
+    <string name="March">March</string>
+    <string name="April">April</string>
+    <string name="May">May</string>
+    <string name="June">June</string>
+    <string name="July">July</string>
+    <string name="August">August</string>
+    <string name="September">September</string>
+    <string name="October">October</string>
+    <string name="November">November</string>
+    <string name="December">December</string>
 </resources>

app/src/main/res/values-cs/strings_timer.xml

@@ -58,4 +58,28 @@
     <string name="timer_weekend">Víkend</string>
     <string name="timer_other">Jiné</string>
     <string name="timers">Časovače</string>
+    <string name="first">First</string>
+    <string name="second">Second</string>
+    <string name="third">Third</string>
+    <string name="fourth">Fourth</string>
+    <string name="last">Last</string>
+    <string name="monday">Monday</string>
+    <string name="tuesday">Tuesday</string>
+    <string name="wednesday">Wednesday</string>
+    <string name="thursday">Thursday</string>
+    <string name="friday">Friday</string>
+    <string name="saturday">Saturday</string>
+    <string name="sunday">Sunday</string>
+    <string name="January">January</string>
+    <string name="February">February</string>
+    <string name="March">March</string>
+    <string name="April">April</string>
+    <string name="May">May</string>
+    <string name="June">June</string>
+    <string name="July">July</string>
+    <string name="August">August</string>
+    <string name="September">September</string>
+    <string name="October">October</string>
+    <string name="November">November</string>
+    <string name="December">December</string>
 </resources>

app/src/main/res/values-da/strings_timer.xml

@@ -58,4 +58,28 @@
     <string name="timer_weekend">Weekend</string>
     <string name="timer_other">Andre</string>
     <string name="timers">Timere</string>
+    <string name="first">First</string>
+    <string name="second">Second</string>
+    <string name="third">Third</string>
+    <string name="fourth">Fourth</string>
+    <string name="last">Last</string>
+    <string name="monday">Monday</string>
+    <string name="tuesday">Tuesday</string>
+    <string name="wednesday">Wednesday</string>
+    <string name="thursday">Thursday</string>
+    <string name="friday">Friday</string>
+    <string name="saturday">Saturday</string>
+    <string name="sunday">Sunday</string>
+    <string name="January">January</string>
+    <string name="February">February</string>
+    <string name="March">March</string>
+    <string name="April">April</string>
+    <string name="May">May</string>
+    <string name="June">June</string>
+    <string name="July">July</string>
+    <string name="August">August</string>
+    <string name="September">September</string>
+    <string name="October">October</string>
+    <string name="November">November</string>
+    <string name="December">December</string>
 </resources>

app/src/main/res/values-de/strings_timer.xml

@@ -58,4 +58,28 @@
     <string name="timer_weekend">Wochenende</string>
     <string name="timer_other">Andere</string>
     <string name="timers">Timer-Einstellungen</string>
+    <string name="first">First</string>
+    <string name="second">Second</string>
+    <string name="third">Third</string>
+    <string name="fourth">Fourth</string>
+    <string name="last">Last</string>
+    <string name="monday">Monday</string>
+    <string name="tuesday">Tuesday</string>
+    <string name="wednesday">Wednesday</string>
+    <string name="thursday">Thursday</string>
+    <string name="friday">Friday</string>
+    <string name="saturday">Saturday</string>
+    <string name="sunday">Sunday</string>
+    <string name="January">January</string>
+    <string name="February">February</string>
+    <string name="March">March</string>
+    <string name="April">April</string>
+    <string name="May">May</string>
+    <string name="June">June</string>
+    <string name="July">July</string>
+    <string name="August">August</string>
+    <string name="September">September</string>
+    <string name="October">October</string>
+    <string name="November">November</string>
+    <string name="December">December</string>
 </resources>

app/src/main/res/values-el/strings_timer.xml

@@ -58,4 +58,28 @@
     <string name="timer_weekend">Weekend</string>
     <string name="timer_other">Other</string>
     <string name="timers">Timers</string>
+    <string name="first">First</string>
+    <string name="second">Second</string>
+    <string name="third">Third</string>
+    <string name="fourth">Fourth</string>
+    <string name="last">Last</string>
+    <string name="monday">Monday</string>
+    <string name="tuesday">Tuesday</string>
+    <string name="wednesday">Wednesday</string>
+    <string name="thursday">Thursday</string>
+    <string name="friday">Friday</string>
+    <string name="saturday">Saturday</string>
+    <string name="sunday">Sunday</string>
+    <string name="January">January</string>
+    <string name="February">February</string>
+    <string name="March">March</string>
+    <string name="April">April</string>
+    <string name="May">May</string>
+    <string name="June">June</string>
+    <string name="July">July</string>
+    <string name="August">August</string>
+    <string name="September">September</string>
+    <string name="October">October</string>
+    <string name="November">November</string>
+    <string name="December">December</string>
 </resources>

app/src/main/res/values-es/strings_timer.xml

@@ -58,4 +58,28 @@
     <string name="timer_weekend">Fin de semana</string>
     <string name="timer_other">Otro</string>
     <string name="timers">Temporizadores</string>
+    <string name="first">First</string>
+    <string name="second">Second</string>
+    <string name="third">Third</string>
+    <string name="fourth">Fourth</string>
+    <string name="last">Last</string>
+    <string name="monday">Monday</string>
+    <string name="tuesday">Tuesday</string>
+    <string name="wednesday">Wednesday</string>
+    <string name="thursday">Thursday</string>
+    <string name="friday">Friday</string>
+    <string name="saturday">Saturday</string>
+    <string name="sunday">Sunday</string>
+    <string name="January">January</string>
+    <string name="February">February</string>
+    <string name="March">March</string>
+    <string name="April">April</string>
+    <string name="May">May</string>
+    <string name="June">June</string>
+    <string name="July">July</string>
+    <string name="August">August</string>
+    <string name="September">September</string>
+    <string name="October">October</string>
+    <string name="November">November</string>
+    <string name="December">December</string>
 </resources>

app/src/main/res/values-fa/strings_timer.xml

@@ -58,4 +58,28 @@
     <string name="timer_weekend">Weekend</string>
     <string name="timer_other">Other</string>
     <string name="timers">Timers</string>
+    <string name="first">First</string>
+    <string name="second">Second</string>
+    <string name="third">Third</string>
+    <string name="fourth">Fourth</string>
+    <string name="last">Last</string>
+    <string name="monday">Monday</string>
+    <string name="tuesday">Tuesday</string>
+    <string name="wednesday">Wednesday</string>
+    <string name="thursday">Thursday</string>
+    <string name="friday">Friday</string>
+    <string name="saturday">Saturday</string>
+    <string name="sunday">Sunday</string>
+    <string name="January">January</string>
+    <string name="February">February</string>
+    <string name="March">March</string>
+    <string name="April">April</string>
+    <string name="May">May</string>
+    <string name="June">June</string>
+    <string name="July">July</string>
+    <string name="August">August</string>
+    <string name="September">September</string>
+    <string name="October">October</string>
+    <string name="November">November</string>
+    <string name="December">December</string>
 </resources>

app/src/main/res/values-fi/strings_timer.xml

@@ -58,4 +58,28 @@
     <string name="timer_weekend">Viikonloppu</string>
     <string name="timer_other">Muu</string>
     <string name="timers">Ajastimet</string>
+    <string name="first">First</string>
+    <string name="second">Second</string>
+    <string name="third">Third</string>
+    <string name="fourth">Fourth</string>
+    <string name="last">Last</string>
+    <string name="monday">Monday</string>
+    <string name="tuesday">Tuesday</string>
+    <string name="wednesday">Wednesday</string>
+    <string name="thursday">Thursday</string>
+    <string name="friday">Friday</string>
+    <string name="saturday">Saturday</string>
+    <string name="sunday">Sunday</string>
+    <string name="January">January</string>
+    <string name="February">February</string>
+    <string name="March">March</string>
+    <string name="April">April</string>
+    <string name="May">May</string>
+    <string name="June">June</string>
+    <string name="July">July</string>
+    <string name="August">August</string>
+    <string name="September">September</string>
+    <string name="October">October</string>
+    <string name="November">November</string>
+    <string name="December">December</string>
 </resources>

app/src/main/res/values-fr/strings_actions.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-  <!-- only temporarily to suppress the missing translations errors for now!! -->
-  <string name="action_switch_server">Changer de serveur</string>
-  <string name="action_settings">Paramètres</string>
-  <string name="action_filter">Filtrer</string>
-  <string name="action_camera_play">Lecture</string>
-  <string name="action_camera_pause">Pause</string>
-  <string name="action_qrcode_scan">Scanner le QR code</string>
-  <string name="action_speech">Reconnaissance vocale</string>
+    <!-- only temporarily to suppress the missing translations errors for now!! -->
+    <string name="action_switch_server">Changer de serveur</string>
+    <string name="action_settings">Paramètres</string>
+    <string name="action_filter">Filtrer</string>
+    <string name="action_camera_play">Lecture</string>
+    <string name="action_camera_pause">Pause</string>
+    <string name="action_qrcode_scan">Scanner le QR code</string>
+    <string name="action_speech">Reconnaissance vocale</string>
 </resources>

app/src/main/res/values-fr/strings_cameras.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-  <!-- only temporarily to suppress the missing translations errors for now!! -->
-  <string name="title_cameras">Caméras</string>
+    <!-- only temporarily to suppress the missing translations errors for now!! -->
+    <string name="title_cameras">Caméras</string>
 </resources>