From: Seonah Moon Date: Fri, 14 Oct 2022 07:27:37 +0000 (+0900) Subject: Add loading icon for scan X-Git-Tag: accepted/tizen/unified/20221216.024031~10^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=80454319f17509f34b4cfb1875f00bfc0787c457;p=profile%2Fiot%2Fapps%2Fdotnet%2Fsetting-wifi.git Add loading icon for scan Change-Id: Ic9a43ab72675363b4724ba332901b6629382eb1f --- diff --git a/SettingWiFi/SettingWiFi/res/loading/Iot_Loading_1.png b/SettingWiFi/SettingWiFi/res/loading/Iot_Loading_1.png new file mode 100644 index 0000000..99a46ce Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/Iot_Loading_1.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/Iot_Loading_2.png b/SettingWiFi/SettingWiFi/res/loading/Iot_Loading_2.png new file mode 100644 index 0000000..7d88032 Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/Iot_Loading_2.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/Iot_Loading_3.png b/SettingWiFi/SettingWiFi/res/loading/Iot_Loading_3.png new file mode 100644 index 0000000..eb91c32 Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/Iot_Loading_3.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/Iot_Loading_4.png b/SettingWiFi/SettingWiFi/res/loading/Iot_Loading_4.png new file mode 100644 index 0000000..87eb621 Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/Iot_Loading_4.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/Iot_Loading_5.png b/SettingWiFi/SettingWiFi/res/loading/Iot_Loading_5.png new file mode 100644 index 0000000..99a46ce Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/Iot_Loading_5.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/Iot_Loading_6.png b/SettingWiFi/SettingWiFi/res/loading/Iot_Loading_6.png new file mode 100644 index 0000000..99a46ce Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/Iot_Loading_6.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/loading_00.png b/SettingWiFi/SettingWiFi/res/loading/loading_00.png new file mode 100755 index 0000000..ca1d5d9 Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/loading_00.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/loading_01.png b/SettingWiFi/SettingWiFi/res/loading/loading_01.png new file mode 100755 index 0000000..86b77c0 Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/loading_01.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/loading_02.png b/SettingWiFi/SettingWiFi/res/loading/loading_02.png new file mode 100755 index 0000000..0eeff64 Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/loading_02.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/loading_03.png b/SettingWiFi/SettingWiFi/res/loading/loading_03.png new file mode 100755 index 0000000..4442e23 Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/loading_03.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/loading_04.png b/SettingWiFi/SettingWiFi/res/loading/loading_04.png new file mode 100755 index 0000000..bbd389f Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/loading_04.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/loading_05.png b/SettingWiFi/SettingWiFi/res/loading/loading_05.png new file mode 100755 index 0000000..b4b4bb5 Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/loading_05.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/loading_06.png b/SettingWiFi/SettingWiFi/res/loading/loading_06.png new file mode 100755 index 0000000..a24c141 Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/loading_06.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/loading_07.png b/SettingWiFi/SettingWiFi/res/loading/loading_07.png new file mode 100755 index 0000000..61e6d34 Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/loading_07.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/loading_08.png b/SettingWiFi/SettingWiFi/res/loading/loading_08.png new file mode 100755 index 0000000..da2cbbc Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/loading_08.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/loading_09.png b/SettingWiFi/SettingWiFi/res/loading/loading_09.png new file mode 100755 index 0000000..8f6c615 Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/loading_09.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/loading_10.png b/SettingWiFi/SettingWiFi/res/loading/loading_10.png new file mode 100755 index 0000000..1249c95 Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/loading_10.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/loading_11.png b/SettingWiFi/SettingWiFi/res/loading/loading_11.png new file mode 100755 index 0000000..83c5504 Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/loading_11.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/loading_12.png b/SettingWiFi/SettingWiFi/res/loading/loading_12.png new file mode 100755 index 0000000..f269195 Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/loading_12.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/loading_13.png b/SettingWiFi/SettingWiFi/res/loading/loading_13.png new file mode 100755 index 0000000..fbfc7cb Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/loading_13.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/loading_14.png b/SettingWiFi/SettingWiFi/res/loading/loading_14.png new file mode 100755 index 0000000..c102c7a Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/loading_14.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/loading_15.png b/SettingWiFi/SettingWiFi/res/loading/loading_15.png new file mode 100755 index 0000000..86c5881 Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/loading_15.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/loading_16.png b/SettingWiFi/SettingWiFi/res/loading/loading_16.png new file mode 100755 index 0000000..c6eb586 Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/loading_16.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/loading_17.png b/SettingWiFi/SettingWiFi/res/loading/loading_17.png new file mode 100755 index 0000000..bc0eb70 Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/loading_17.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/loading_18.png b/SettingWiFi/SettingWiFi/res/loading/loading_18.png new file mode 100755 index 0000000..7d32720 Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/loading_18.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/loading_19.png b/SettingWiFi/SettingWiFi/res/loading/loading_19.png new file mode 100755 index 0000000..53c86f1 Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/loading_19.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/loading_20.png b/SettingWiFi/SettingWiFi/res/loading/loading_20.png new file mode 100755 index 0000000..a834c14 Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/loading_20.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/loading_21.png b/SettingWiFi/SettingWiFi/res/loading/loading_21.png new file mode 100755 index 0000000..fb61793 Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/loading_21.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/loading_22.png b/SettingWiFi/SettingWiFi/res/loading/loading_22.png new file mode 100755 index 0000000..652be89 Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/loading_22.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/loading_23.png b/SettingWiFi/SettingWiFi/res/loading/loading_23.png new file mode 100755 index 0000000..ac1c231 Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/loading_23.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/loading_24.png b/SettingWiFi/SettingWiFi/res/loading/loading_24.png new file mode 100755 index 0000000..978bad3 Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/loading_24.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/loading_25.png b/SettingWiFi/SettingWiFi/res/loading/loading_25.png new file mode 100755 index 0000000..9616903 Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/loading_25.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/loading_26.png b/SettingWiFi/SettingWiFi/res/loading/loading_26.png new file mode 100755 index 0000000..8e1e46d Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/loading_26.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/loading_27.png b/SettingWiFi/SettingWiFi/res/loading/loading_27.png new file mode 100755 index 0000000..86637e1 Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/loading_27.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/loading_28.png b/SettingWiFi/SettingWiFi/res/loading/loading_28.png new file mode 100755 index 0000000..ef9a78d Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/loading_28.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/loading_29.png b/SettingWiFi/SettingWiFi/res/loading/loading_29.png new file mode 100755 index 0000000..91bcadf Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/loading_29.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/loading_30.png b/SettingWiFi/SettingWiFi/res/loading/loading_30.png new file mode 100755 index 0000000..201fb94 Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/loading_30.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/loading_31.png b/SettingWiFi/SettingWiFi/res/loading/loading_31.png new file mode 100755 index 0000000..91ff05e Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/loading_31.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/loading_32.png b/SettingWiFi/SettingWiFi/res/loading/loading_32.png new file mode 100755 index 0000000..2413591 Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/loading_32.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/loading_33.png b/SettingWiFi/SettingWiFi/res/loading/loading_33.png new file mode 100755 index 0000000..44c9015 Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/loading_33.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/loading_34.png b/SettingWiFi/SettingWiFi/res/loading/loading_34.png new file mode 100755 index 0000000..88eb10f Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/loading_34.png differ diff --git a/SettingWiFi/SettingWiFi/res/loading/loading_35.png b/SettingWiFi/SettingWiFi/res/loading/loading_35.png new file mode 100755 index 0000000..a950a3a Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/loading/loading_35.png differ diff --git a/SettingWiFi/SettingWiFi/view/APSource.cs b/SettingWiFi/SettingWiFi/view/APSource.cs index 17c1981..0fe3313 100755 --- a/SettingWiFi/SettingWiFi/view/APSource.cs +++ b/SettingWiFi/SettingWiFi/view/APSource.cs @@ -16,10 +16,12 @@ namespace SettingWiFi public class DeviceCollection : ObservableCollection { private string title; + private float iconOpacity; public DeviceCollection(string groupTitle) { title = groupTitle; + iconOpacity = 0.0f; this.UpdateScanList(null); } @@ -35,6 +37,15 @@ namespace SettingWiFi OnPropertyChanged(new PropertyChangedEventArgs("Title")); } } + public float IconOpacity + { + get => iconOpacity; + set + { + iconOpacity = value; + OnPropertyChanged(new PropertyChangedEventArgs("IconOpacity")); + } + } public void UpdateScanList(List apList) { @@ -55,7 +66,6 @@ namespace SettingWiFi { this.Add(item); } - } public void RemoveScanList() @@ -133,6 +143,11 @@ namespace SettingWiFi available.UpdateState(ap); } + public void SetScanningState(bool isScanning) + { + available.IconOpacity = isScanning ? 1.0f : 0.0f; + } + internal void UpdateApState(string bssid, WiFiState state) { available.UpdateApState(bssid, state); diff --git a/SettingWiFi/SettingWiFi/view/MainPage.cs b/SettingWiFi/SettingWiFi/view/MainPage.cs index 9ca9b18..1074ba2 100644 --- a/SettingWiFi/SettingWiFi/view/MainPage.cs +++ b/SettingWiFi/SettingWiFi/view/MainPage.cs @@ -29,6 +29,30 @@ namespace SettingWiFi mWifi = wifi; } + internal Loading CreateLoadingIcon() + { + var path = Tizen.Applications.Application.Current.DirectoryInfo.Resource; + var imageArray = new string[36]; + for (int i = 0; i < 36; i++) + { + if (i < 10) + { + imageArray[i] = path + "loading/loading_0" + i + ".png"; + } + else + { + imageArray[i] = path + "loading/loading_" + i + ".png"; + } + } + + return new Loading() + { + WidthSpecification = 40, + HeightSpecification = 40, + ImageArray = imageArray, + }; + } + internal void CreateComponents() { mApSource = new APSource(); @@ -93,10 +117,12 @@ namespace SettingWiFi { DefaultTitleItem group = new DefaultTitleItem(); group.WidthSpecification = LayoutParamPolicies.MatchParent; - group.Label.SetBinding(TextLabel.TextProperty, "Title"); group.Label.HorizontalAlignment = HorizontalAlignment.Begin; + var icon = CreateLoadingIcon(); + icon.SetBinding(View.OpacityProperty, "IconOpacity"); + group.Icon = icon; return group; }), IsGrouped = true, @@ -305,9 +331,11 @@ namespace SettingWiFi { if (IsWiFiActive()) { + mApSource.SetScanningState(true); await mWifi.Scan(); List apList = mWifi.GetScanResult(); mApSource.UpdateScanList(apList); + mApSource.SetScanningState(false); } }