From: Tasuku Suzuki <tasuku.suzuki@qt.io>
Date: Thu, 22 Dec 2016 10:12:28 +0000 (+0900)
Subject: Wifi: Improve signal icon handling
X-Git-Tag: 3.0.0~7
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F19%2F7819%2F2;p=apps%2Fsettings.git

Wifi: Improve signal icon handling

Change-Id: I72fd21ef0800bc35617d5bb38ceee7de2dca2350
Signed-off-by: Tasuku Suzuki <tasuku.suzuki@qt.io>
---

diff --git a/app/wifi/Wifi.qml b/app/wifi/Wifi.qml
index 43e32b7..afcc019 100644
--- a/app/wifi/Wifi.qml
+++ b/app/wifi/Wifi.qml
@@ -84,24 +84,19 @@ SettingPage {
                 //height: 50
                 id: icon
                 source: {
+                    var svg
+                    if (strength < 30)
+                        svg = "1Bar"
+                    else if (strength < 50)
+                        svg = "2Bars"
+                    else if (strength < 70)
+                        svg = "3Bars"
+                    else
+                        svg = "Full"
                     if (securityType(security) === "unsecured") {
-                        if (strength < 30)
-                            return "images/HMI_Settings_Wifi_1Bar.svg"
-                        else if (strength < 50)
-                            return "images/HMI_Settings_Wifi_2Bars.svg"
-                        else if (strength < 70)
-                            return "images/HMI_Settings_Wifi_3Bars.svg"
-                        else
-                            return "images/HMI_Settings_Wifi_Full.svg"
+                        return 'images/HMI_Settings_Wifi_%1.svg'.arg(svg)
                     } else {
-                        if (strength < 30)
-                            return "images/HMI_Settings_Wifi_Locked_1Bar.svg"
-                        else if (strength < 50)
-                            return "images/HMI_Settings_Wifi_Locked_2Bars.svg"
-                        else if (strength < 70)
-                            return "images/HMI_Settings_Wifi_Locked_3Bars.svg"
-                        else
-                            return "images/HMI_Settings_Wifi_Locked_Full.svg"
+                        return 'images/HMI_Settings_Wifi_Locked_%1.svg'.arg(svg)
                     }
                 }
             }