From: Wootak Jung Date: Wed, 12 Oct 2022 02:55:43 +0000 (+0900) Subject: Add detail view X-Git-Tag: accepted/tizen/unified/20221111.105330~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=52508b9d3a9fb7b79a11d0d80eed49cd09a77a6a;p=profile%2Fiot%2Fapps%2Fdotnet%2Fsetting-bluetooth.git Add detail view add device icon property Change-Id: I469b1420bc6846f043f0a9f616edd7d77edf4eaf Signed-off-by: Wootak Jung --- diff --git a/SettingBluetooth/SettingBluetooth/Controller/DeviceController.cs b/SettingBluetooth/SettingBluetooth/Controller/DeviceController.cs index f519305..88e5535 100644 --- a/SettingBluetooth/SettingBluetooth/Controller/DeviceController.cs +++ b/SettingBluetooth/SettingBluetooth/Controller/DeviceController.cs @@ -32,12 +32,13 @@ namespace SettingBluetooth.Controller DialogPage.ShowAlertDialog(Resources.IDS_BT_HEADER_DISCONNECT_DEVICE_ABB, String.Format(Resources.IDS_WMGR_POP_THIS_WILL_END_YOUR_CONNECTION_WITH_PS, btDevice.Name), cancelButton, disconnectButton); } - private static void ConnectA2dp(BtDevice device) + internal static void ConnectA2dp(BtDevice device) { + Log.Info(Program.LogTag, "Connect to the remote audio device"); device.ConnectAudio(); } - private static void DisconnectA2dp(BtDevice btDevice) + internal static void DisconnectA2dp(BtDevice btDevice) { var disconnectButton = new Button() { @@ -54,6 +55,7 @@ namespace SettingBluetooth.Controller private static void ConnectHid(BtDevice device) { + Log.Info(Program.LogTag, "Connect to the remote hid device"); device.ConnectHid(); } @@ -78,37 +80,35 @@ namespace SettingBluetooth.Controller var device = deviceItem.BindingContext as Device; Log.Info(Program.LogTag, "DeviceItem clicked. Address: " + device.Address + ", Name: " + device.Name); - if (device.BtItem.IsPaired) + if (device.BtDevice.IsPaired) { - if (device.BtItem.IsA2dpSupported) + if (device.BtDevice.IsA2dpSupported) { - if (device.BtItem.IsA2dpConnected) + if (device.BtDevice.IsA2dpConnected) { - DisconnectA2dp(device.BtItem); + DisconnectA2dp(device.BtDevice); } else { - Log.Info(Program.LogTag, "Connect to the remote audio device"); - ConnectA2dp(device.BtItem); + ConnectA2dp(device.BtDevice); } } - else if (device.BtItem.IsHidSupported) + else if (device.BtDevice.IsHidSupported) { - if (device.BtItem.IsHidConnected) + if (device.BtDevice.IsHidConnected) { - DisconnectHid(device.BtItem); + DisconnectHid(device.BtDevice); } else { - Log.Info(Program.LogTag, "Connect to the remote hid device"); - ConnectHid(device.BtItem); + ConnectHid(device.BtDevice); } } } else { Log.Info(Program.LogTag, "Pair to the remote device"); - device.BtItem.Pair(); + device.BtDevice.Pair(); } } } diff --git a/SettingBluetooth/SettingBluetooth/Model/BtDevice.cs b/SettingBluetooth/SettingBluetooth/Model/BtDevice.cs index fc78f77..4ce0a43 100644 --- a/SettingBluetooth/SettingBluetooth/Model/BtDevice.cs +++ b/SettingBluetooth/SettingBluetooth/Model/BtDevice.cs @@ -16,6 +16,7 @@ namespace SettingBluetooth.Model private BluetoothDevice mBluetoothDevice; private string[] mServiceUuids = null; private BluetoothServiceClassType mServiceMask = 0; + private BtDeviceIcon mDeviceIcon; private bool mIsA2dpSupported = false; private BluetoothAudio mBluetoothAudio = null; @@ -48,6 +49,81 @@ namespace SettingBluetooth.Model mIsHidSupported = true; } } + + switch (device.Class.MajorDeviceClassType) + { + case BluetoothMajorDeviceClassType.Computer: + mDeviceIcon = BtDeviceIcon.Computer; + break; + case BluetoothMajorDeviceClassType.Phone: + mDeviceIcon = BtDeviceIcon.Phone; + break; + case BluetoothMajorDeviceClassType.AudioVideo: + if (device.Class.MinorDeviceClassType == BluetoothMinorDeviceClassType.AudioVideoHeadphones) + { + mDeviceIcon = BtDeviceIcon.Headphone; + } + else if (device.Class.MinorDeviceClassType == BluetoothMinorDeviceClassType.AudioVideoLoudspeaker) + { + mDeviceIcon = BtDeviceIcon.Display; + } + else + { + mDeviceIcon = BtDeviceIcon.Headset; + } + break; + case BluetoothMajorDeviceClassType.LanNetworkAccessPoint: + mDeviceIcon = BtDeviceIcon.Network; + break; + case BluetoothMajorDeviceClassType.Imaging: + if (device.Class.MinorDeviceClassType == BluetoothMinorDeviceClassType.ImagingPrinter) + { + mDeviceIcon = BtDeviceIcon.Printer; + } + else if (device.Class.MinorDeviceClassType == BluetoothMinorDeviceClassType.ImagingCamera) + { + mDeviceIcon = BtDeviceIcon.Camera; + } + else + { + mDeviceIcon = BtDeviceIcon.Display; + } + break; + case BluetoothMajorDeviceClassType.Peripheral: + if (device.Class.MinorDeviceClassType == BluetoothMinorDeviceClassType.PeripheralKeyBoard) + { + mDeviceIcon = BtDeviceIcon.Keyboard; + } + else if (device.Class.MinorDeviceClassType == BluetoothMinorDeviceClassType.PeripheralPointingDevice) + { + mDeviceIcon = BtDeviceIcon.Mouse; + } + else if (device.Class.MinorDeviceClassType == BluetoothMinorDeviceClassType.PeripheralGamePad) + { + mDeviceIcon = BtDeviceIcon.Gaming; + } + else + { + mDeviceIcon = BtDeviceIcon.Mouse; + } + break; + case BluetoothMajorDeviceClassType.Health: + mDeviceIcon = BtDeviceIcon.Health; + break; + case BluetoothMajorDeviceClassType.Wearable: + if (device.Class.MinorDeviceClassType == BluetoothMinorDeviceClassType.WearableWristWatch) + { + mDeviceIcon = BtDeviceIcon.Watch; + } + else + { + mDeviceIcon = BtDeviceIcon.Unknown; + } + break; + default: + mDeviceIcon = BtDeviceIcon.Unknown; + break; + } } // for dummy instance (No devices found, Paired device) @@ -97,6 +173,14 @@ namespace SettingBluetooth.Model } } + internal BtDeviceIcon DeviceIcon + { + get + { + return mDeviceIcon; + } + } + internal bool IsA2dpSupported { get diff --git a/SettingBluetooth/SettingBluetooth/Model/BtEnumerations.cs b/SettingBluetooth/SettingBluetooth/Model/BtEnumerations.cs index 29abae2..cdd6487 100644 --- a/SettingBluetooth/SettingBluetooth/Model/BtEnumerations.cs +++ b/SettingBluetooth/SettingBluetooth/Model/BtEnumerations.cs @@ -28,4 +28,22 @@ namespace SettingBluetooth.Model Disconnecting, ServiceSearching, } + + public enum BtDeviceIcon + { + Phone, + Headset, + Headphone, + Computer, + Keyboard, + Mouse, + Printer, + Health, + Network, + Gaming, + Display, + Camera, + Watch, + Unknown, + } } diff --git a/SettingBluetooth/SettingBluetooth/View/BtDetailView.cs b/SettingBluetooth/SettingBluetooth/View/BtDetailView.cs index cd0a487..9f67aaa 100644 --- a/SettingBluetooth/SettingBluetooth/View/BtDetailView.cs +++ b/SettingBluetooth/SettingBluetooth/View/BtDetailView.cs @@ -1,10 +1,101 @@ -using System; +using SettingBluetooth.res.locale; +using System; using System.Collections.Generic; using System.Text; +using Tizen.NUI; +using Tizen.NUI.Components; +using Tizen.NUI.BaseComponents; +using Tizen; +using SettingBluetooth.Controller; namespace SettingBluetooth { - class BtDetailView + internal static class BtDetailView { + static View mDetailView; + static ContentPage mDetailPage; + + internal static void CreateDetailView(Device device) + { + Window window = NUIApplication.GetDefaultWindow(); + + var appBar = new AppBar() + { + Title = Resources.IDS_BT_BODY_DETAILS, + }; + + mDetailView = new View() + { + Layout = new LinearLayout() + { + LinearOrientation = LinearLayout.Orientation.Vertical, + HorizontalAlignment = HorizontalAlignment.Center, + }, + WidthSpecification = LayoutParamPolicies.MatchParent, + HeightSpecification = LayoutParamPolicies.MatchParent, + }; + + var deviceName = new DefaultLinearItem() + { + WidthSpecification = LayoutParamPolicies.MatchParent, + Text = device.Name, + SubText = Resources.IDS_BT_BODY_DEVICENAME, + }; + mDetailView.Add(deviceName); + + var unpairButton = new DefaultLinearItem() + { + WidthSpecification = LayoutParamPolicies.MatchParent, + Text = Resources.IDS_BT_OPT_UNPAIR, + }; + unpairButton.Clicked += (obj, ev) => + { + Log.Info(Program.LogTag, "Unpair to the remote device. Address: " + device.BtDevice.Address + ", Name: " + device.BtDevice.Name); + device.BtDevice.Unpair(); + window.GetDefaultNavigator().Pop(); + }; + mDetailView.Add(unpairButton); + + var connOption = new DefaultLinearItem() + { + WidthSpecification = LayoutParamPolicies.MatchParent, + Text = Resources.IDS_BT_BODY_CONNECTION_OPTIONS, + }; + mDetailView.Add(connOption); + + if (device.BtDevice.IsA2dpSupported) + { + var mediaAudioItem = new DefaultLinearItem() + { + WidthSpecification = LayoutParamPolicies.MatchParent, + Text = Resources.IDS_BT_BODY_MEDIA_AUDIO, + }; + var mediaAudioSwitch = new Switch() + { + IsSelected = device.BtDevice.IsA2dpConnected ? true : false, + }; + mediaAudioSwitch.SelectedChanged += (obj, ev) => + { + if (ev.IsSelected) + { + DeviceController.ConnectA2dp(device.BtDevice); + } + else + { + DeviceController.DisconnectA2dp(device.BtDevice); + } + }; + mediaAudioItem.Extra = mediaAudioSwitch; + mDetailView.Add(mediaAudioItem); + } + + mDetailPage = new ContentPage() + { + AppBar = appBar, + Content = mDetailView, + }; + + window.GetDefaultNavigator().Push(mDetailPage); + } } } diff --git a/SettingBluetooth/SettingBluetooth/View/BtDeviceView.cs b/SettingBluetooth/SettingBluetooth/View/BtDeviceView.cs index 2645713..a1d6cd1 100644 --- a/SettingBluetooth/SettingBluetooth/View/BtDeviceView.cs +++ b/SettingBluetooth/SettingBluetooth/View/BtDeviceView.cs @@ -13,13 +13,14 @@ namespace SettingBluetooth { public class Device : INotifyPropertyChanged { - string mIconDir = Tizen.Applications.Application.Current.DirectoryInfo.Resource + "icon.png"; + private string mResourcePath = Tizen.Applications.Application.Current.DirectoryInfo.Resource; + private string mIconDir; private string mAddress; private string mName; //private bool connected; //private bool registered; public event PropertyChangedEventHandler PropertyChanged; - BtDevice mBtItem; + BtDevice mBtDevice; private string mState; private void OnPropertyChanged(string propertyName) @@ -38,14 +39,63 @@ namespace SettingBluetooth { mAddress = btDevice.Address; mName = btDevice.Name; - mBtItem = btDevice; + mBtDevice = btDevice; + //string icon; + //switch (btDevice.DeviceIcon) + //{ + // case BtDeviceIcon.Phone: + // icon = "/images/icon_mobilephone.png"; // TODO: need to replace image file + // break; + // case BtDeviceIcon.Headset: + // icon = "/images/icon_headset.png"; + // break; + // case BtDeviceIcon.Headphone: + // icon = "/images/icon_headphone.png"; + // break; + // case BtDeviceIcon.Computer: + // icon = "/images/icon_computer.png"; + // break; + // case BtDeviceIcon.Keyboard: + // icon = "/images/icon_keyboard.png"; + // break; + // case BtDeviceIcon.Mouse: + // icon = "/images/icon_mouse.png"; + // break; + // case BtDeviceIcon.Printer: + // icon = "/images/icon_printer.png"; + // break; + // case BtDeviceIcon.Health: + // icon = "/images/icon_health.png"; + // break; + // case BtDeviceIcon.Network: + // icon = "/images/icon_network_infrastructure.png"; + // break; + // case BtDeviceIcon.Gaming: + // icon = "/images/icon_gaming.png"; + // break; + // case BtDeviceIcon.Display: + // icon = "/images/icon_display.png"; + // break; + // case BtDeviceIcon.Camera: + // icon = "/images/icon_camera.png"; + // break; + // case BtDeviceIcon.Watch: + // icon = "/images/icon_wrist.png"; + // break; + // case BtDeviceIcon.Unknown: + // default: + // icon = "/images/icon_unknown.png"; + // break; + //} + //mIconDir = mResourcePath + icon; + mIconDir = mResourcePath + "/images/icon.png"; } - internal BtDevice BtItem + internal BtDevice BtDevice { get { - return mBtItem; + return mBtDevice; } } @@ -89,32 +139,12 @@ namespace SettingBluetooth { return mIconDir; } + set + { + mIconDir = value; + OnPropertyChanged("ImageUrl"); + } } - - //public bool Connected - //{ - // get - // { - // return connected; - // } - // set - // { - // connected = value; - // OnPropertyChanged("Connected"); - // } - //} - //public bool Registered - //{ - // get - // { - // return registered; - // } - // set - // { - // registered = value; - // OnPropertyChanged("Registered"); - // } - //} } public class DeviceCollection : ObservableCollection @@ -203,33 +233,31 @@ namespace SettingBluetooth internal void UpdateState(BtDevice btDevice) { var device = FindDevice(btDevice); - string state = null; switch (btDevice.DeviceState) { case BtDeviceState.Idle: case BtDeviceState.Unpaired: - state = ""; + device.State = ""; break; case BtDeviceState.Pairing: case BtDeviceState.Connecting: - state = Resources.IDS_BT_SBODY_CONNECTING_ING; + device.State = Resources.IDS_BT_SBODY_CONNECTING_ING; break; case BtDeviceState.Unpairing: case BtDeviceState.Disconnecting: - state = Resources.IDS_BT_BODY_DISCONNECTING; + device.State = Resources.IDS_BT_BODY_DISCONNECTING; break; case BtDeviceState.Paired: - state = Resources.IDS_BT_BODY_PAIRED; + device.State = Resources.IDS_BT_BODY_PAIRED; break; case BtDeviceState.Connected: - state = Resources.IDS_BT_SBODY_CONNECTED_M_STATUS; + device.State = Resources.IDS_BT_SBODY_CONNECTED_M_STATUS; break; case BtDeviceState.ServiceSearching: - state = Resources.IDS_BT_POP_SEARCHING_SERVICES_ING; + device.State = Resources.IDS_BT_POP_SEARCHING_SERVICES_ING; break; } - //Log.Info(Program.LogTag, "Device(" + btDevice.Address + ") updated. state: " + state); - device.State = state; + //Log.Info(Program.LogTag, "Device(" + btDevice.Address + ") updated. state: " + device.State); } } } diff --git a/SettingBluetooth/SettingBluetooth/View/BtMainView.cs b/SettingBluetooth/SettingBluetooth/View/BtMainView.cs index 060c28d..752121a 100644 --- a/SettingBluetooth/SettingBluetooth/View/BtMainView.cs +++ b/SettingBluetooth/SettingBluetooth/View/BtMainView.cs @@ -29,7 +29,7 @@ namespace SettingBluetooth } // TODO: Need to move device view related functions to BtDeviceView.cs. - private static CollectionView CreateCollectionView(DeviceSource source, bool fixHeight = true) + private static CollectionView CreateCollectionView(DeviceSource source, bool isPairedDeviceView = false) { var view = new CollectionView() { @@ -48,22 +48,26 @@ namespace SettingBluetooth item.Icon.SetBinding(ImageView.ResourceUrlProperty, "ImageUrl"); item.Icon.WidthSpecification = 40; item.Icon.HeightSpecification = 40; - var detailButton = new Button // TODO: need to use other type instead of Button - { - Text = "i" - }; - detailButton.WidthSpecification = 40; - detailButton.Clicked += (obj, ev) => - { - Button button = (Button)obj; - var device = button.BindingContext as Device; - Log.Debug(Program.LogTag, "Button clicked. Name: " + device.Name); - // TODO: add BtDetailView with device - }; - item.Extra = detailButton; item.Clicked += DeviceController.DeviceItemClicked; item.IsSelectable = false; + if (isPairedDeviceView == true) + { + var detailButton = new Button // TODO: need to use other type instead of Button + { + Text = "i" + }; + detailButton.WidthSpecification = 40; + detailButton.Clicked += (obj, ev) => + { + Button button = (Button)obj; + var device = button.BindingContext as Device; + Log.Debug(Program.LogTag, "Button clicked. Name: " + device.Name); + BtDetailView.CreateDetailView(device); + }; + item.Extra = detailButton; + } + return item; }), @@ -86,7 +90,7 @@ namespace SettingBluetooth SelectionMode = ItemSelectionMode.Single, }; - if (fixHeight) // for searched view + if (isPairedDeviceView == false) { view.HeightSpecification = LayoutParamPolicies.MatchParent; } @@ -98,7 +102,7 @@ namespace SettingBluetooth private static void AddPairedDeviceView() { mPairedDevice = new DeviceSource(); - mPairedDeviceView = CreateCollectionView(mPairedDevice, false); + mPairedDeviceView = CreateCollectionView(mPairedDevice, true); mPairedDevice.AddDevice(new BtDevice("dummy paired device")); // temporary device mPairedDevice.UpdateTitle(Resources.IDS_BT_BODY_PAIRED_DEVICES); mMainView.Add(mPairedDeviceView); @@ -150,10 +154,8 @@ namespace SettingBluetooth } } - private static void RemoveAllView() + private static void RemovePairedDeviceView() { - RemoveSearchedDeviceView(); - if (mPairedDeviceView) { mMainView.Remove(mPairedDeviceView); @@ -167,7 +169,8 @@ namespace SettingBluetooth switch (ev.OperationState) { case BtOperationState.Deactivated: - RemoveAllView(); + RemoveSearchedDeviceView(); + RemovePairedDeviceView(); break; case BtOperationState.Deactivating: break; diff --git a/SettingBluetooth/SettingBluetooth/res/images/icon.png b/SettingBluetooth/SettingBluetooth/res/images/icon.png new file mode 100644 index 0000000..e50b223 Binary files /dev/null and b/SettingBluetooth/SettingBluetooth/res/images/icon.png differ diff --git a/SettingBluetooth/SettingBluetooth/res/images/icon_camera.png b/SettingBluetooth/SettingBluetooth/res/images/icon_camera.png new file mode 100644 index 0000000..398f268 Binary files /dev/null and b/SettingBluetooth/SettingBluetooth/res/images/icon_camera.png differ diff --git a/SettingBluetooth/SettingBluetooth/res/images/icon_computer.png b/SettingBluetooth/SettingBluetooth/res/images/icon_computer.png new file mode 100644 index 0000000..ebb0cd3 Binary files /dev/null and b/SettingBluetooth/SettingBluetooth/res/images/icon_computer.png differ diff --git a/SettingBluetooth/SettingBluetooth/res/images/icon_display.png b/SettingBluetooth/SettingBluetooth/res/images/icon_display.png new file mode 100644 index 0000000..159cf56 Binary files /dev/null and b/SettingBluetooth/SettingBluetooth/res/images/icon_display.png differ diff --git a/SettingBluetooth/SettingBluetooth/res/images/icon_gaming.png b/SettingBluetooth/SettingBluetooth/res/images/icon_gaming.png new file mode 100644 index 0000000..8f567cb Binary files /dev/null and b/SettingBluetooth/SettingBluetooth/res/images/icon_gaming.png differ diff --git a/SettingBluetooth/SettingBluetooth/res/images/icon_headphone.png b/SettingBluetooth/SettingBluetooth/res/images/icon_headphone.png new file mode 100644 index 0000000..58b3bc4 Binary files /dev/null and b/SettingBluetooth/SettingBluetooth/res/images/icon_headphone.png differ diff --git a/SettingBluetooth/SettingBluetooth/res/images/icon_headset.png b/SettingBluetooth/SettingBluetooth/res/images/icon_headset.png new file mode 100644 index 0000000..476db24 Binary files /dev/null and b/SettingBluetooth/SettingBluetooth/res/images/icon_headset.png differ diff --git a/SettingBluetooth/SettingBluetooth/res/images/icon_health.png b/SettingBluetooth/SettingBluetooth/res/images/icon_health.png new file mode 100644 index 0000000..91abcf3 Binary files /dev/null and b/SettingBluetooth/SettingBluetooth/res/images/icon_health.png differ diff --git a/SettingBluetooth/SettingBluetooth/res/images/icon_keyboard.png b/SettingBluetooth/SettingBluetooth/res/images/icon_keyboard.png new file mode 100644 index 0000000..912f939 Binary files /dev/null and b/SettingBluetooth/SettingBluetooth/res/images/icon_keyboard.png differ diff --git a/SettingBluetooth/SettingBluetooth/res/images/icon_mobilephone.png b/SettingBluetooth/SettingBluetooth/res/images/icon_mobilephone.png new file mode 100644 index 0000000..327683f Binary files /dev/null and b/SettingBluetooth/SettingBluetooth/res/images/icon_mobilephone.png differ diff --git a/SettingBluetooth/SettingBluetooth/res/images/icon_mouse.png b/SettingBluetooth/SettingBluetooth/res/images/icon_mouse.png new file mode 100644 index 0000000..9ef4068 Binary files /dev/null and b/SettingBluetooth/SettingBluetooth/res/images/icon_mouse.png differ diff --git a/SettingBluetooth/SettingBluetooth/res/images/icon_network_infrastructure.png b/SettingBluetooth/SettingBluetooth/res/images/icon_network_infrastructure.png new file mode 100644 index 0000000..0bf0bff Binary files /dev/null and b/SettingBluetooth/SettingBluetooth/res/images/icon_network_infrastructure.png differ diff --git a/SettingBluetooth/SettingBluetooth/res/images/icon_printer.png b/SettingBluetooth/SettingBluetooth/res/images/icon_printer.png new file mode 100644 index 0000000..d39ff02 Binary files /dev/null and b/SettingBluetooth/SettingBluetooth/res/images/icon_printer.png differ diff --git a/SettingBluetooth/SettingBluetooth/res/images/icon_unknown.png b/SettingBluetooth/SettingBluetooth/res/images/icon_unknown.png new file mode 100644 index 0000000..9ab1854 Binary files /dev/null and b/SettingBluetooth/SettingBluetooth/res/images/icon_unknown.png differ diff --git a/SettingBluetooth/SettingBluetooth/res/images/icon_wrist.png b/SettingBluetooth/SettingBluetooth/res/images/icon_wrist.png new file mode 100644 index 0000000..882b160 Binary files /dev/null and b/SettingBluetooth/SettingBluetooth/res/images/icon_wrist.png differ diff --git a/SettingBluetooth/SettingBluetooth/res/locale/Resources.Designer.cs b/SettingBluetooth/SettingBluetooth/res/locale/Resources.Designer.cs index 18a9f84..7094fdb 100644 --- a/SettingBluetooth/SettingBluetooth/res/locale/Resources.Designer.cs +++ b/SettingBluetooth/SettingBluetooth/res/locale/Resources.Designer.cs @@ -87,6 +87,33 @@ namespace SettingBluetooth.res.locale { } } + /// + /// 과(와) 유사한 지역화된 문자열을 찾습니다. + /// + public static string IDS_BT_BODY_CONNECTION_OPTIONS { + get { + return ResourceManager.GetString("IDS_BT_BODY_CONNECTION_OPTIONS", resourceCulture); + } + } + + /// + /// 과(와) 유사한 지역화된 문자열을 찾습니다. + /// + public static string IDS_BT_BODY_DETAILS { + get { + return ResourceManager.GetString("IDS_BT_BODY_DETAILS", resourceCulture); + } + } + + /// + /// 과(와) 유사한 지역화된 문자열을 찾습니다. + /// + public static string IDS_BT_BODY_DEVICENAME { + get { + return ResourceManager.GetString("IDS_BT_BODY_DEVICENAME", resourceCulture); + } + } + /// /// 과(와) 유사한 지역화된 문자열을 찾습니다. /// @@ -96,6 +123,15 @@ namespace SettingBluetooth.res.locale { } } + /// + /// 과(와) 유사한 지역화된 문자열을 찾습니다. + /// + public static string IDS_BT_BODY_MEDIA_AUDIO { + get { + return ResourceManager.GetString("IDS_BT_BODY_MEDIA_AUDIO", resourceCulture); + } + } + /// /// 과(와) 유사한 지역화된 문자열을 찾습니다. /// @@ -132,6 +168,15 @@ namespace SettingBluetooth.res.locale { } } + /// + /// 과(와) 유사한 지역화된 문자열을 찾습니다. + /// + public static string IDS_BT_OPT_UNPAIR { + get { + return ResourceManager.GetString("IDS_BT_OPT_UNPAIR", resourceCulture); + } + } + /// /// 과(와) 유사한 지역화된 문자열을 찾습니다. /// diff --git a/SettingBluetooth/SettingBluetooth/res/locale/Resources.en.resx b/SettingBluetooth/SettingBluetooth/res/locale/Resources.en.resx index 8f57d73..4d67d9b 100644 --- a/SettingBluetooth/SettingBluetooth/res/locale/Resources.en.resx +++ b/SettingBluetooth/SettingBluetooth/res/locale/Resources.en.resx @@ -126,9 +126,21 @@ Bluetooth + + Connection options + + + Details + + + Device name + Disconnecting... + + Media audio + Paired @@ -141,6 +153,9 @@ Disconnect device + + Unpair + Searching services... diff --git a/SettingBluetooth/SettingBluetooth/res/locale/Resources.ko-KR.resx b/SettingBluetooth/SettingBluetooth/res/locale/Resources.ko-KR.resx index 8716301..8d6810f 100644 --- a/SettingBluetooth/SettingBluetooth/res/locale/Resources.ko-KR.resx +++ b/SettingBluetooth/SettingBluetooth/res/locale/Resources.ko-KR.resx @@ -126,9 +126,21 @@ 블루투스 + + 연결 옵션 + + + 상세정보 + + + 디바이스 이름 + 연결을 해제하는 중... + + 미디어 오디오 + 등록됨 @@ -141,6 +153,9 @@ 디바이스 연결 해제 + + 등록 해제 + 서비스 검색 중... diff --git a/SettingBluetooth/SettingBluetooth/res/locale/Resources.resx b/SettingBluetooth/SettingBluetooth/res/locale/Resources.resx index 7cf6660..baf6e43 100644 --- a/SettingBluetooth/SettingBluetooth/res/locale/Resources.resx +++ b/SettingBluetooth/SettingBluetooth/res/locale/Resources.resx @@ -126,9 +126,21 @@ + + + + + + + + + + + + @@ -141,6 +153,9 @@ + + + diff --git a/SettingBluetooth/SettingView/res/images/close.png b/SettingBluetooth/SettingView/res/images/close.png new file mode 100644 index 0000000..c49e480 Binary files /dev/null and b/SettingBluetooth/SettingView/res/images/close.png differ diff --git a/SettingBluetooth/SettingView/res/images/leftCorner.png b/SettingBluetooth/SettingView/res/images/leftCorner.png new file mode 100644 index 0000000..6f82440 Binary files /dev/null and b/SettingBluetooth/SettingView/res/images/leftCorner.png differ diff --git a/SettingBluetooth/SettingView/res/images/maximalize.png b/SettingBluetooth/SettingView/res/images/maximalize.png new file mode 100644 index 0000000..c5cbbaf Binary files /dev/null and b/SettingBluetooth/SettingView/res/images/maximalize.png differ diff --git a/SettingBluetooth/SettingView/res/images/minimalize.png b/SettingBluetooth/SettingView/res/images/minimalize.png new file mode 100644 index 0000000..6b116b2 Binary files /dev/null and b/SettingBluetooth/SettingView/res/images/minimalize.png differ diff --git a/SettingBluetooth/SettingView/res/images/rightCorner.png b/SettingBluetooth/SettingView/res/images/rightCorner.png new file mode 100644 index 0000000..68d837f Binary files /dev/null and b/SettingBluetooth/SettingView/res/images/rightCorner.png differ diff --git a/SettingBluetooth/SettingView/res/images/smallwindow.png b/SettingBluetooth/SettingView/res/images/smallwindow.png new file mode 100644 index 0000000..8f4263b Binary files /dev/null and b/SettingBluetooth/SettingView/res/images/smallwindow.png differ diff --git a/packaging/org.tizen.cssetting-bluetooth-1.0.0.tpk b/packaging/org.tizen.cssetting-bluetooth-1.0.0.tpk index c697ae8..8732af3 100644 Binary files a/packaging/org.tizen.cssetting-bluetooth-1.0.0.tpk and b/packaging/org.tizen.cssetting-bluetooth-1.0.0.tpk differ