From: Sameer Kumar Date: Tue, 10 Dec 2024 08:22:22 +0000 (+0530) Subject: Resolves Device Renaming does not reflect in Bluetooth option issue X-Git-Tag: accepted/tizen/9.0/unified/20241212.022055^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b336cd2a22f2294c5fb8688c603f5d10d7b6ebbf;p=profile%2Fiot%2Fapps%2Fdotnet%2Fsetting-bluetooth.git Resolves Device Renaming does not reflect in Bluetooth option issue Change-Id: Iab8a68c702ef5c0dc85b345dff9673fe05f34f45 Signed-off-by: Sameer Kumar --- diff --git a/SettingBluetooth/SettingBluetooth/Directory.Build.targets b/SettingBluetooth/SettingBluetooth/Directory.Build.targets index a468954..615dfa2 100644 --- a/SettingBluetooth/SettingBluetooth/Directory.Build.targets +++ b/SettingBluetooth/SettingBluetooth/Directory.Build.targets @@ -1,21 +1,21 @@ - - - - - - - - $([System.IO.Path]::GetDirectoryName($(MSBuildProjectDirectory))) - - - - - - + + + + + + + + $([System.IO.Path]::GetDirectoryName($(MSBuildProjectDirectory))) + + + + + + diff --git a/SettingBluetooth/SettingBluetooth/SettingBluetooth.csproj b/SettingBluetooth/SettingBluetooth/SettingBluetooth.csproj index bcb1fb9..c9884cd 100644 --- a/SettingBluetooth/SettingBluetooth/SettingBluetooth.csproj +++ b/SettingBluetooth/SettingBluetooth/SettingBluetooth.csproj @@ -1,49 +1,53 @@ - - - - net6.0 - false - - - - portable - - - None - - + + + + net6.0 + false + + + + portable + + + None + + - - - - - - - True - True - Resources.resx - - - - - - PublicResXFileCodeGenerator - - - PublicResXFileCodeGenerator - - - PublicResXFileCodeGenerator - Resources.Designer.cs - - - - - org.tizen.appfw.gadget.setting-bluetooth - - - - - - - + + + + + + + True + True + Resources.resx + + + + + + PublicResXFileCodeGenerator + + + PublicResXFileCodeGenerator + + + PublicResXFileCodeGenerator + Resources.Designer.cs + + + + + org.tizen.appfw.gadget.setting-bluetooth + + + + + + + diff --git a/SettingBluetooth/SettingBluetooth/View/BtMainView.cs b/SettingBluetooth/SettingBluetooth/View/BtMainView.cs index abdd960..9f7dcb0 100644 --- a/SettingBluetooth/SettingBluetooth/View/BtMainView.cs +++ b/SettingBluetooth/SettingBluetooth/View/BtMainView.cs @@ -49,7 +49,7 @@ namespace SettingBluetooth internal static void ShowBtOnMessage() { - mBtMessage.Text = string.Format(ResourceManager.TextResourceManager.NUIGadgetResourceManager.GetString(nameof(Resources.IDS_BT_BODY_YOUR_DEVICE_IS_CURRENTLY_VISIBLE_TO_NEARBY_DEVICES)), ResourceManager.TextResourceManager.NUIGadgetResourceManager.GetString(nameof(Resources.IDS_BT_BODY_YOUR_DEVICE_IS_CURRENTLY_VISIBLE_TO_NEARBY_DEVICES_MODEL_NAME))); + mBtMessage.Text = string.Format(ResourceManager.TextResourceManager.NUIGadgetResourceManager.GetString(nameof(Resources.IDS_BT_BODY_YOUR_DEVICE_IS_CURRENTLY_VISIBLE_TO_NEARBY_DEVICES)), BtModel.Name); } internal static void ShowBtTurningOnMessage() diff --git a/SettingBluetooth/SettingBluetooth/tizen_dotnet_project.yaml b/SettingBluetooth/SettingBluetooth/tizen_dotnet_project.yaml index 09c9e52..302165e 100644 --- a/SettingBluetooth/SettingBluetooth/tizen_dotnet_project.yaml +++ b/SettingBluetooth/SettingBluetooth/tizen_dotnet_project.yaml @@ -1,15 +1,77 @@ -# csproj file path -csproj_file: SettingBluetooth.csproj - -# files monitored for dirty/modified status -files: - - SettingBluetooth.csproj - - tizen-manifest.xml - -# Enable to pack as rpk -pack_as_rpk: true - -# List of resource files to be packed in rpk -resources: - - res/ - \ No newline at end of file +# csproj file path +csproj_file: SettingBluetooth.csproj + +# Default profile, Tizen API version +profile: tizen +api_version: "9.0" + +# Build type [Debug/ Release/ Test] +build_type: Debug + +# Output path for build +output_path: + +# Signing profile to be used for Tizen package signing +# If value is empty: "", active signing profile will be used +# Else If value is ".", default signing profile will be used +signing_profile: +pack_as_rpk: true + +# files monitored for dirty/modified status +files: + - Controller/AdapterController.cs + - Controller/DeviceController.cs + - Controller/ViewController.cs + - Directory.Build.targets + - Model/BtDevice.cs + - Model/BtEnumerations.cs + - Model/BtEventArgs.cs + - Model/BtModel.cs + - Model/BtModelImpl.cs + - SettingBluetooth.cs + - SettingBluetooth.csproj + - TextResources/Resources.Designer.cs + - TextResources/Resources.en-US.resx + - TextResources/Resources.ko-KR.resx + - TextResources/Resources.resx + - View/BtDetailView.cs + - View/BtDeviceView.cs + - View/BtMainView.cs + - View/ResourceManager.cs + - res/allowed/SettingBluetooth/images/bluetooth-icon.svg + - res/allowed/SettingBluetooth/images/bluetooth_icon.svg + - res/allowed/SettingBluetooth/images/bluetooth_icon_dark.svg + - res/allowed/SettingBluetooth/images/bluetooth_info_icon.svg + - res/allowed/SettingBluetooth/images/bluetooth_info_icon_dark.svg + - res/allowed/SettingBluetooth/images/icon.png + - res/allowed/SettingBluetooth/images/icon_camera.png + - res/allowed/SettingBluetooth/images/icon_computer.png + - res/allowed/SettingBluetooth/images/icon_display.png + - res/allowed/SettingBluetooth/images/icon_gaming.png + - res/allowed/SettingBluetooth/images/icon_headphone.png + - res/allowed/SettingBluetooth/images/icon_headset.png + - res/allowed/SettingBluetooth/images/icon_health.png + - res/allowed/SettingBluetooth/images/icon_keyboard.png + - res/allowed/SettingBluetooth/images/icon_mobilephone.png + - res/allowed/SettingBluetooth/images/icon_mouse.png + - res/allowed/SettingBluetooth/images/icon_network_infrastructure.png + - res/allowed/SettingBluetooth/images/icon_printer.png + - res/allowed/SettingBluetooth/images/icon_unknown.png + - res/allowed/SettingBluetooth/images/icon_wrist.png + - res/allowed/SettingBluetooth/images/tizen.png + - res/allowed/org.tizen.appfw.gadget.setting-bluetooth/en-US/SettingBluetooth.resources.dll + - res/allowed/org.tizen.appfw.gadget.setting-bluetooth/ko-KR/SettingBluetooth.resources.dll + - tizen-manifest.xml + +# project dependencies +deps: [] + +# Source files matching these pattern will always be excluded from build +src_file_patterns: [] + +# Source files matching these patterns will only be included while building in test mode +test_file_patterns: [] + +# List of resource files to be packed in rpk +resources: + - res/ diff --git a/SettingBluetooth/tizen_workspace.yaml b/SettingBluetooth/tizen_workspace.yaml deleted file mode 100644 index cd017c7..0000000 --- a/SettingBluetooth/tizen_workspace.yaml +++ /dev/null @@ -1,88 +0,0 @@ -# Enable auto build file generation -auto_gen_build_files: true -# Workspace type, [native/web/dotnet] -type: hybrid -# Package ID for the Tizen package -package_id: -# version for the Tizen package -version: -# Default profile -profile: mobile -# Tizen API version -api_version: 7.0 -# Path of profiles.xml, containing the signing profiles - # If value is empty, the profiles.xml in the data_path specified in tizen-studio/tools/tizen-core/config.yaml will be used -profiles_xml_path: -# Signing profile to be used for Tizen package signing - # If value is empty, active signing profile will be used -signing_profile: '' -# Build type [debug/ release/ test] -build_type: debug -# Rootstrap for compiling native app -rootstrap: public -# Default compiler for native app compilation -compiler: llvm -# Default path for dotnet-cli -dotnet_cli_path: -# Default path for msbuild -msbuild_path: -# Default tool for dotnet build [dotnet-cli/ msbuild] -dotnet_build_tool: dotnet-cli -# Default nuget version for Tizen.Net -tizen_net_version: -# Default nuget version for Xamarin.Forms -tizen_net_sdk_verison: 1.1.9 -# Default nuget version for MSBuild.Tasks -xamarin_forms_version: 5.0.0.2515 -# Default nuget version for Tizen.Wearable.CircleUI -msbuild_tasks_version: -# Default nuget version for Tizen.Wearable.CircleUI -tizen_wearable_circleui_version: 1.5.0 -# Default nuget version for Tizen.OpenTK -tizen_opentk_version: 3.0.2 -# Default nuget version for Tizen.NUI.Xaml -tizen_nuixaml_version: 1.0.34 -# Default nuget version for Tizen.HotReload -tizen_hotreload_version: 1.0.1 -# Working folder for dotnet & web workspace, paths to csproj or sln or config.xml, if empty all projects will be build -working_folder: -# Default path for Google Chrome -chrome_path: -# Default options to be passed to Chrome when running web simulator -chrome_simulator_options: -- --allow-file-access-from-files -- --disable-web-security -- --proxy-auto-detect -# Default path for Web Simulator data -chrome_simulator_data_path: C:\tizen-studio\tools\websimulator\sdk-profile-data -# Default path for Samsung Tizen TV Simulator -tv_simulator_path: C:\tizen-studio\tools\sec-tv-simulator\simulator.exe -# Default options to be passed to Chrome when running web inspector -chrome_inspector_options: -- --no-first-run -- --activate-on-launch -- --no-default-browser-check -- --allow-file-access-from-files -- --disable-web-security -- --disable-translate -- --proxy-auto-detect -- --proxy-bypass-list=127.0.0.1 -- --enable-blink-features=ShadowDOMV0 -- --enable-blink-features=CustomElementsV0 -# Default path for Web Inspector data -chrome_inspector_data_path: C:\tizen-studio-data\chrome-user-data -# default arch for build, [x86/ x86_64/ arm/ aarch64] -arch: x86 -# Enable size optimization of wgt for web workspace -opt: false -# Source files matching these pattern will always be excluded from build -src_file_patterns: -- _exclude* -# Source files matching these patterns will only be included while building in test mode -test_file_patterns: -- _test* -# List of projects in the workspace and their dependencies -projects: - SettingBluetooth: [] -# Skip generating files needed for VS -skip_vs_files: false diff --git a/packaging/org.tizen.cssetting-bluetooth-1.9.0.rpk b/packaging/org.tizen.cssetting-bluetooth-1.9.0.rpk index ed69e24..b4d5153 100644 Binary files a/packaging/org.tizen.cssetting-bluetooth-1.9.0.rpk and b/packaging/org.tizen.cssetting-bluetooth-1.9.0.rpk differ