From: Saksham Grover Date: Thu, 10 Apr 2025 10:13:42 +0000 (+0530) Subject: Added device icons on available and connected device list X-Git-Tag: accepted/tizen/unified/20250428.091732^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=HEAD;p=profile%2Fiot%2Fapps%2Fdotnet%2Fsetting-wifi-direct.git Added device icons on available and connected device list Change-Id: I83f1ad458609d2bef77b8e523848245dd50162c5 Signed-off-by: Saksham Grover --- diff --git a/SettingWiFiDirect/SettingWiFiDirect/SettingWiFiDirect.cs b/SettingWiFiDirect/SettingWiFiDirect/SettingWiFiDirect.cs index 05863d7..db00a02 100644 --- a/SettingWiFiDirect/SettingWiFiDirect/SettingWiFiDirect.cs +++ b/SettingWiFiDirect/SettingWiFiDirect/SettingWiFiDirect.cs @@ -287,6 +287,8 @@ namespace SettingWiFiDirect item.SubLabel.SetBinding(TextLabel.TextProperty, "StateInfo"); item.SubLabel.HorizontalAlignment = HorizontalAlignment.Begin; + var icon = GetApIconImageView(); + item.Icon = icon; item.IsSelectable = false; item.SizeWidth = mScanList.SizeWidth; diff --git a/SettingWiFiDirect/SettingWiFiDirect/model/Peer.cs b/SettingWiFiDirect/SettingWiFiDirect/model/Peer.cs index c766b01..6affe36 100644 --- a/SettingWiFiDirect/SettingWiFiDirect/model/Peer.cs +++ b/SettingWiFiDirect/SettingWiFiDirect/model/Peer.cs @@ -23,6 +23,7 @@ namespace SettingWiFiDirect private int mRssi = 0; private PeerState mState; private string mStateInfo; + private string mImageUrl; public event PropertyChangedEventHandler PropertyChanged; public Peer(WiFiDirectPeer peer) @@ -31,6 +32,7 @@ namespace SettingWiFiDirect Name = peer.Name; Address = peer.MacAddress; mRssi = peer.Rssi; + mImageUrl = GetImageUrl(peer.PrimaryType); Debug("isConnected: " + mWfdPeer.IsConnected); State = mWfdPeer.IsConnected ? PeerState.Connected : PeerState.Disconnected; mWfdPeer.ConnectionStateChanged += ConnectionStateChanged; @@ -136,6 +138,19 @@ namespace SettingWiFiDirect } } + public string ImageUrl + { + get + { + return mImageUrl; + } + set + { + mImageUrl = value; + OnPropertyChanged("ImageUrl"); + } + } + private string GetStateInfo(PeerState state) { switch (state) @@ -203,5 +218,34 @@ namespace SettingWiFiDirect } } + private string GetImageUrl(WiFiDirectPrimaryDeviceType deviceType) + { + switch (deviceType) + { + case WiFiDirectPrimaryDeviceType.Computer: + return Resources.GetPath() + "/images/A09_device_computer.png"; + case WiFiDirectPrimaryDeviceType.InputDevice: + return Resources.GetPath() + "/images/A09_device_input_device.png"; + case WiFiDirectPrimaryDeviceType.Printer: + return Resources.GetPath() + "/images/A09_device_printer.png"; + case WiFiDirectPrimaryDeviceType.Camera: + return Resources.GetPath() + "/images/A09_device_camera.png"; + case WiFiDirectPrimaryDeviceType.Storage: + return Resources.GetPath() + "/images/A09_device_storage.png"; + case WiFiDirectPrimaryDeviceType.NetworkInfrastructure: + return Resources.GetPath() + "/images/A09_device_network_infrastructure.png"; + case WiFiDirectPrimaryDeviceType.Display: + return Resources.GetPath() + "/images/A09_device_display.png"; + case WiFiDirectPrimaryDeviceType.MultimediaDevice: + return Resources.GetPath() + "/images/A09_device_multimedia.png"; + case WiFiDirectPrimaryDeviceType.GameDevice: + return Resources.GetPath() + "/images/A09_device_gaming.png"; + case WiFiDirectPrimaryDeviceType.Telephone: + return Resources.GetPath() + "/images/A09_device_telephone.png"; + default: + return Resources.GetPath() + "/images/A09_device_unknown.png"; + } + } + } } diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/00_list_bar_press_1x80.png b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/00_list_bar_press_1x80.png new file mode 100644 index 0000000..1dc6e15 Binary files /dev/null and b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/00_list_bar_press_1x80.png differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_Medical.png b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_Medical.png new file mode 100644 index 0000000..cf76d51 Binary files /dev/null and b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_Medical.png differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_camera.png b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_camera.png new file mode 100644 index 0000000..9e45d9e Binary files /dev/null and b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_camera.png differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_computer.png b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_computer.png new file mode 100644 index 0000000..5003bc5 Binary files /dev/null and b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_computer.png differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_display.png b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_display.png new file mode 100644 index 0000000..da5986e Binary files /dev/null and b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_display.png differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_gaming.png b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_gaming.png new file mode 100644 index 0000000..bf281f4 Binary files /dev/null and b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_gaming.png differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_headphone.png b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_headphone.png new file mode 100644 index 0000000..07eb0cb Binary files /dev/null and b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_headphone.png differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_headset.png b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_headset.png new file mode 100644 index 0000000..4077a49 Binary files /dev/null and b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_headset.png differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_input_device.png b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_input_device.png new file mode 100644 index 0000000..6416886 Binary files /dev/null and b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_input_device.png differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_mouse.png b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_mouse.png new file mode 100644 index 0000000..05436ca Binary files /dev/null and b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_mouse.png differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_multimedia.png b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_multimedia.png new file mode 100644 index 0000000..7500b9e Binary files /dev/null and b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_multimedia.png differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_network_infrastructure.png b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_network_infrastructure.png new file mode 100644 index 0000000..fbd618f Binary files /dev/null and b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_network_infrastructure.png differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_printer.png b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_printer.png new file mode 100644 index 0000000..1fe3d9e Binary files /dev/null and b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_printer.png differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_storage.png b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_storage.png new file mode 100644 index 0000000..34a28c7 Binary files /dev/null and b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_storage.png differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_telephone.png b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_telephone.png new file mode 100644 index 0000000..9a4bfa6 Binary files /dev/null and b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_telephone.png differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_unknown.png b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_unknown.png new file mode 100644 index 0000000..a8b93cf Binary files /dev/null and b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/A09_device_unknown.png differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/U04_device_BD.png b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/U04_device_BD.png new file mode 100644 index 0000000..cb75b50 Binary files /dev/null and b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/U04_device_BD.png differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/U04_device_Dongle.png b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/U04_device_Dongle.png new file mode 100644 index 0000000..9ac05e4 Binary files /dev/null and b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/U04_device_Dongle.png differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/U04_device_Home_Theater.png b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/U04_device_Home_Theater.png new file mode 100644 index 0000000..e0e98cf Binary files /dev/null and b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/U04_device_Home_Theater.png differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/U04_device_STB.png b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/U04_device_STB.png new file mode 100644 index 0000000..7cdd58c Binary files /dev/null and b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/U04_device_STB.png differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/icon_select_all.png b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/icon_select_all.png new file mode 100644 index 0000000..0c531fc Binary files /dev/null and b/SettingWiFiDirect/SettingWiFiDirect/res/allowed/SettingWiFiDirect/images/icon_select_all.png differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/images/00_list_bar_press_1x80.png b/SettingWiFiDirect/SettingWiFiDirect/res/images/00_list_bar_press_1x80.png deleted file mode 100644 index 1dc6e15..0000000 Binary files a/SettingWiFiDirect/SettingWiFiDirect/res/images/00_list_bar_press_1x80.png and /dev/null differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_Medical.png b/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_Medical.png deleted file mode 100644 index cf76d51..0000000 Binary files a/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_Medical.png and /dev/null differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_camera.png b/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_camera.png deleted file mode 100644 index 9e45d9e..0000000 Binary files a/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_camera.png and /dev/null differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_computer.png b/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_computer.png deleted file mode 100644 index 5003bc5..0000000 Binary files a/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_computer.png and /dev/null differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_display.png b/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_display.png deleted file mode 100644 index da5986e..0000000 Binary files a/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_display.png and /dev/null differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_gaming.png b/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_gaming.png deleted file mode 100644 index bf281f4..0000000 Binary files a/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_gaming.png and /dev/null differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_headphone.png b/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_headphone.png deleted file mode 100644 index 07eb0cb..0000000 Binary files a/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_headphone.png and /dev/null differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_headset.png b/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_headset.png deleted file mode 100644 index 4077a49..0000000 Binary files a/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_headset.png and /dev/null differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_input_device.png b/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_input_device.png deleted file mode 100644 index 6416886..0000000 Binary files a/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_input_device.png and /dev/null differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_mouse.png b/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_mouse.png deleted file mode 100644 index 05436ca..0000000 Binary files a/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_mouse.png and /dev/null differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_multimedia.png b/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_multimedia.png deleted file mode 100644 index 7500b9e..0000000 Binary files a/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_multimedia.png and /dev/null differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_network_infrastructure.png b/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_network_infrastructure.png deleted file mode 100644 index fbd618f..0000000 Binary files a/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_network_infrastructure.png and /dev/null differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_printer.png b/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_printer.png deleted file mode 100644 index 1fe3d9e..0000000 Binary files a/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_printer.png and /dev/null differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_storage.png b/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_storage.png deleted file mode 100644 index 34a28c7..0000000 Binary files a/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_storage.png and /dev/null differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_telephone.png b/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_telephone.png deleted file mode 100644 index 9a4bfa6..0000000 Binary files a/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_telephone.png and /dev/null differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_unknown.png b/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_unknown.png deleted file mode 100644 index a8b93cf..0000000 Binary files a/SettingWiFiDirect/SettingWiFiDirect/res/images/A09_device_unknown.png and /dev/null differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/images/U04_device_BD.png b/SettingWiFiDirect/SettingWiFiDirect/res/images/U04_device_BD.png deleted file mode 100644 index cb75b50..0000000 Binary files a/SettingWiFiDirect/SettingWiFiDirect/res/images/U04_device_BD.png and /dev/null differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/images/U04_device_Dongle.png b/SettingWiFiDirect/SettingWiFiDirect/res/images/U04_device_Dongle.png deleted file mode 100644 index 9ac05e4..0000000 Binary files a/SettingWiFiDirect/SettingWiFiDirect/res/images/U04_device_Dongle.png and /dev/null differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/images/U04_device_Home_Theater.png b/SettingWiFiDirect/SettingWiFiDirect/res/images/U04_device_Home_Theater.png deleted file mode 100644 index e0e98cf..0000000 Binary files a/SettingWiFiDirect/SettingWiFiDirect/res/images/U04_device_Home_Theater.png and /dev/null differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/images/U04_device_STB.png b/SettingWiFiDirect/SettingWiFiDirect/res/images/U04_device_STB.png deleted file mode 100644 index 7cdd58c..0000000 Binary files a/SettingWiFiDirect/SettingWiFiDirect/res/images/U04_device_STB.png and /dev/null differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/res/images/icon_select_all.png b/SettingWiFiDirect/SettingWiFiDirect/res/images/icon_select_all.png deleted file mode 100644 index 0c531fc..0000000 Binary files a/SettingWiFiDirect/SettingWiFiDirect/res/images/icon_select_all.png and /dev/null differ diff --git a/SettingWiFiDirect/SettingWiFiDirect/tizen-manifest.xml b/SettingWiFiDirect/SettingWiFiDirect/tizen-manifest.xml index 55d0772..874037e 100644 --- a/SettingWiFiDirect/SettingWiFiDirect/tizen-manifest.xml +++ b/SettingWiFiDirect/SettingWiFiDirect/tizen-manifest.xml @@ -1,6 +1,6 @@ diff --git a/packaging/org.tizen.cssetting-wifi-direct-1.0.5.rpk b/packaging/org.tizen.cssetting-wifi-direct-1.0.5.rpk deleted file mode 100644 index 3d134cf..0000000 Binary files a/packaging/org.tizen.cssetting-wifi-direct-1.0.5.rpk and /dev/null differ diff --git a/packaging/org.tizen.cssetting-wifi-direct-1.0.6.rpk b/packaging/org.tizen.cssetting-wifi-direct-1.0.6.rpk new file mode 100644 index 0000000..2615197 Binary files /dev/null and b/packaging/org.tizen.cssetting-wifi-direct-1.0.6.rpk differ diff --git a/packaging/org.tizen.setting-wifi-direct.spec b/packaging/org.tizen.setting-wifi-direct.spec index ddb0f1f..99433f4 100644 --- a/packaging/org.tizen.setting-wifi-direct.spec +++ b/packaging/org.tizen.setting-wifi-direct.spec @@ -1,6 +1,6 @@ Name: org.tizen.setting-wifi-direct summary: NUI wifi-direct setting application -Version: 1.0.5 +Version: 1.0.6 Release: 1 Provides: org.tizen.setting-wifi-direct = %{version}-%{release} Group: Applications/Security