Resolves Device Renaming does not reflect in Bluetooth option issue

Change-Id: Ieada6ea6435133212fb6cc5b3de6ed77c614ddff
Signed-off-by: Sameer Kumar <sameer.kumar@samsung.com>

diff --git a/SettingBluetooth/SettingBluetooth/Directory.Build.targets b/SettingBluetooth/SettingBluetooth/Directory.Build.targets
index a468954a9ba6e9f6832eb54ce258228566757038..49b3ab6410d2d0cd871a9c08db51f80ed717333a 100644 (file)
--- a/SettingBluetooth/SettingBluetooth/Directory.Build.targets
+++ b/SettingBluetooth/SettingBluetooth/Directory.Build.targets
@@ -16,6 +16,6 @@ WARNING:  DO NOT MODIFY this file. Incorrect changes to this file will make it
         </PropertyGroup>
         <Message Text="Workspace: '$(WorkspaceFolder)'"  Importance="high" />
 
-               <Exec Command="C:\tizen-studio\tools\tizen-core\tz.exe pack  -S $(ProjectDir) $(WorkspaceFolder)"> </Exec>
+               <Exec Command="C:\tizen-studio\tools\tizen-core\tz.exe pack-chain -w $(ProjectDir) -S $(ProjectDir)"> </Exec>
     </Target>
 </Project>

diff --git a/SettingBluetooth/SettingBluetooth/SettingBluetooth.csproj b/SettingBluetooth/SettingBluetooth/SettingBluetooth.csproj
index bcb1fb9ab4bbe5df78c43e90c26a8ce2258909ab..0985990fe137021133812df5d06721c23b3e3c4f 100644 (file)
--- a/SettingBluetooth/SettingBluetooth/SettingBluetooth.csproj
+++ b/SettingBluetooth/SettingBluetooth/SettingBluetooth.csproj
@@ -1,49 +1,57 @@
-<Project Sdk="Tizen.NET.Sdk/1.2.0">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <TizenCreateTpkOnBuild>false</TizenCreateTpkOnBuild>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>portable</DebugType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>None</DebugType>
-  </PropertyGroup>
-
+<Project Sdk="Tizen.NET.Sdk/1.2.0">\r
+\r
+  <PropertyGroup>\r
+    <TargetFramework>net6.0</TargetFramework>\r
+    <TizenCreateTpkOnBuild>false</TizenCreateTpkOnBuild>\r
+  </PropertyGroup>\r
+\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
+    <DebugType>portable</DebugType>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
+    <DebugType>None</DebugType>\r
+  </PropertyGroup>\r
+\r
   <ItemGroup>\r
-    <PackageReference Include="SettingCore" Version="1.0.346" />
-    <PackageReference Include="Tizen.NET" Version="12.0.0.18044" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="TextResources\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="TextResources\Resources.en-US.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="TextResources\Resources.ko-KR.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="TextResources\Resources.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
-  <PropertyGroup>
-    <GadgetResourceType>org.tizen.appfw.gadget.setting-bluetooth</GadgetResourceType>
-  </PropertyGroup>
-
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command=":: Copy resource dll&#xD;&#xA;rmdir /S /Q res\allowed\$(GadgetResourceType)&#xD;&#xA;mkdir res\allowed\$(GadgetResourceType)&#xD;&#xA;rmdir /S /Q res\allowed\locale&#xD;&#xA;mkdir res\allowed\locale&#xD;&#xA;dir $(OutDir)\&#xD;&#xA;xcopy /S /K /D /H /Y $(OutDir)\ res\allowed\locale&#xD;&#xA;del /Q res\allowed\locale\*.*&#xD;&#xA;xcopy /S /K /D /H /Y res\allowed\locale\* res\allowed\$(GadgetResourceType)&#xD;&#xA;rmdir /S /Q res\allowed\locale&#xD;&#xA;" />
-  </Target>
-
-</Project>
+    <PackageReference Include="SettingCore" Version="1.0.346" />\r
+    <PackageReference Include="Tizen.NET" Version="12.0.0.18044" />\r
+  </ItemGroup>\r
+\r
+  <ItemGroup>\r
+    <Compile Update="TextResources\Resources.Designer.cs">\r
+      <DesignTime>True</DesignTime>\r
+      <AutoGen>True</AutoGen>\r
+      <DependentUpon>Resources.resx</DependentUpon>\r
+    </Compile>\r
+  </ItemGroup>\r
+\r
+  <ItemGroup>\r
+    <EmbeddedResource Update="TextResources\Resources.en-US.resx">\r
+      <Generator>PublicResXFileCodeGenerator</Generator>\r
+    </EmbeddedResource>\r
+    <EmbeddedResource Update="TextResources\Resources.ko-KR.resx">\r
+      <Generator>PublicResXFileCodeGenerator</Generator>\r
+    </EmbeddedResource>\r
+    <EmbeddedResource Update="TextResources\Resources.resx">\r
+      <Generator>PublicResXFileCodeGenerator</Generator>\r
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>\r
+    </EmbeddedResource>\r
+  </ItemGroup>\r
+\r
+  <PropertyGroup>\r
+    <GadgetResourceType>org.tizen.appfw.gadget.setting-bluetooth</GadgetResourceType>\r
+  </PropertyGroup>\r
+\r
+  <!--<Target Name="PostBuild" AfterTargets="PostBuildEvent">\r
+    <Exec Command=":: Copy resource dll&#xD;&#xA;rmdir /S /Q res\allowed\$(GadgetResourceType)&#xD;&#xA;mkdir res\allowed\$(GadgetResourceType)&#xD;&#xA;rmdir /S /Q res\allowed\locale&#xD;&#xA;mkdir res\allowed\locale&#xD;&#xA;dir $(OutDir)\&#xD;&#xA;xcopy /S /K /D /H /Y $(OutDir)\ res\allowed\locale&#xD;&#xA;del /Q res\allowed\locale\*.*&#xD;&#xA;xcopy /S /K /D /H /Y res\allowed\locale\* res\allowed\$(GadgetResourceType)&#xD;&#xA;rmdir /S /Q res\allowed\locale&#xD;&#xA;" />\r
+  </Target>-->\r
+\r
+       <Target Name="PostBuild" AfterTargets="PostBuildEvent">\r
+               <Exec Command=":: Copy resource dll&#xD;&#xA;\r
+       dir $(OutDir)\&#xD;&#xA;\r
+       mkdir res\allowed\$(GadgetResourceType)&#xD;&#xA;\r
+       xcopy /S /K /D /H /Y $(OutDir)\en-US res\allowed\$(GadgetResourceType)\en-US\&#xD;&#xA;\r
+       xcopy /S /K /D /H /Y $(OutDir)\ko-KR res\allowed\$(GadgetResourceType)\ko-KR\&#xD;&#xA;" />\r
+       </Target>\r
+\r
+</Project>\r

diff --git a/SettingBluetooth/SettingBluetooth/View/BtMainView.cs b/SettingBluetooth/SettingBluetooth/View/BtMainView.cs
index abdd960b2d6f497ba8b56f7f56fc4124e752c113..9f7dcb09779c8172778ce3787ae74bc6cc4c166c 100644 (file)
--- 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 09c9e52414fc4a0c69da97daf2e801578ff9b67c..ef5ad2a6ac20411917a046b25057981ef50649f0 100644 (file)
--- 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
 
+# 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
 
-# Enable to pack as rpk
-pack_as_rpk: true
+# 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/
-    
\ No newline at end of file

diff --git a/SettingBluetooth/tizen_workspace.yaml b/SettingBluetooth/tizen_workspace.yaml
deleted file mode 100644 (file)
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 ed69e240d07a8dfadfcb59e4b55ce411bde13959..98595f0e288af027d016bf08852ce4228ac02bd2 100644 (file)
Binary files a/packaging/org.tizen.cssetting-bluetooth-1.9.0.rpk and b/packaging/org.tizen.cssetting-bluetooth-1.9.0.rpk differ