change icon and colors, clean up template config 45/291345/1
authorMarcin Romaniuk <m.romaniuk@samsung.com>
Thu, 13 Apr 2023 15:43:08 +0000 (17:43 +0200)
committerMarcin Romaniuk <m.romaniuk@samsung.com>
Thu, 13 Apr 2023 15:47:40 +0000 (17:47 +0200)
- change icon to svg instead of png
- used different icon background color depends on current theme
- remove build file, which does not have to be stored in repo
- added res/ folder as list of resources to be packed in rpk
  (at tizen_dotnet_project.yaml)

Change-Id: I9677212213a457c1dc2ebbc1045a25d5c1ef239d
Signed-off-by: Marcin Romaniuk <m.romaniuk@samsung.com>
13 files changed:
.gitignore [new file with mode: 0644]
SettingBluetooth/.gn [deleted file]
SettingBluetooth/SettingBluetooth/SettingBluetooth.cs
SettingBluetooth/SettingBluetooth/SettingBluetooth.csproj
SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth.dll [deleted file]
SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth/images/bluetooth-icon.svg [new file with mode: 0644]
SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth/images/bluetooth.png [deleted file]
SettingBluetooth/SettingBluetooth/tizen_dotnet_project.yaml
SettingBluetooth/build/.exportmap [deleted file]
SettingBluetooth/build/BUILD.gn [deleted file]
SettingBluetooth/build/BUILDCONFIG.gn [deleted file]
SettingBluetooth/build/SettingBluetooth/BUILD.gn [deleted file]
SettingBluetooth/tizen_workspace.yaml

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..aec47d2
--- /dev/null
@@ -0,0 +1,10 @@
+.vs/\r
+.vscode/*\r
+**/[Bb]in/\r
+**/[Oo]bj/\r
+**/[Dd]ebug/\r
+**/[Bb]uild/\r
+**/.gn\r
+**/res/allowed/*.dll\r
+tags\r
+msbuild.log\r
diff --git a/SettingBluetooth/.gn b/SettingBluetooth/.gn
deleted file mode 100644 (file)
index 26e5e77..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-
-arg_file_template = ""
-buildconfig = "//build/BUILDCONFIG.gn"
-root = "//build:"
-script_executable = ""
-secondary_source = "//build"
\ No newline at end of file
index d469b9ea365a6e298e0471300e38563c1379720a..82364695dabb6bf59049753c9dd060f8d62a8104 100644 (file)
@@ -24,9 +24,9 @@ namespace SettingBluetooth
     {
         public static readonly string LogTag = "SettingBluetooth";
 
-        public override Color ProvideIconColor() => new Color("#DB3069");
+        public override Color ProvideIconColor() => new Color(ThemeManager.PlatformThemeId == "org.tizen.default-light-theme" ? "#FF6200" : "#FF8A00");
 
-        public override string ProvideIconPath() => GetResourcePath("images/bluetooth.png");
+        public override string ProvideIconPath() => GetResourcePath("images/bluetooth-icon.svg");
 
         public override string ProvideTitle() => "Bluetooth";
 
index 34126b81e983af630b5bb0f2669f28ac66b852cc..9c5d6833d90b47e8eb16872c5fdbddc7dee5b16c 100644 (file)
     <DebugType>None</DebugType>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Folder Include="res\" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="SettingCore" Version="1.0.0" />
-    <PackageReference Include="Tizen.NET.API11" Version="11.0.0.17724" />
+  <ItemGroup>\r
+    <PackageReference Include="SettingCore" Version="1.0.260" />\r
+    <PackageReference Include="Tizen.NET" Version="11.0.0.17739" />\r
   </ItemGroup>
 
 </Project>
-
diff --git a/SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth.dll b/SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth.dll
deleted file mode 100644 (file)
index 08d2b4d..0000000
Binary files a/SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth.dll and /dev/null differ
diff --git a/SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth/images/bluetooth-icon.svg b/SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth/images/bluetooth-icon.svg
new file mode 100644 (file)
index 0000000..1d410e5
--- /dev/null
@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17.1368 25.9993C17.0156 25.9992 16.8953 25.9776 16.7818 25.9353C16.6184 25.88 16.476 25.776 16.3737 25.6372C16.2714 25.4984 16.2142 25.3316 16.2098 25.1593V17.7183L10.8698 22.5593C10.7207 22.6897 10.5293 22.7615 10.3313 22.7615C10.1332 22.7615 9.94186 22.6897 9.79277 22.5593C9.72254 22.4987 9.66619 22.4237 9.62756 22.3394C9.58894 22.2551 9.56895 22.1635 9.56895 22.0708C9.56895 21.978 9.58894 21.8864 9.62756 21.8021C9.66619 21.7178 9.72254 21.6428 9.79277 21.5823L16.0088 15.9473L9.22577 9.79726C9.15554 9.73671 9.09919 9.66173 9.06056 9.57743C9.02194 9.49313 9.00195 9.40149 9.00195 9.30876C9.00195 9.21603 9.02194 9.12439 9.06056 9.04009C9.09919 8.95579 9.15554 8.88081 9.22577 8.82026C9.37496 8.69007 9.56626 8.61833 9.76427 8.61833C9.96227 8.61833 10.1536 8.69007 10.3028 8.82026L16.2088 14.1753V6.83926C16.2132 6.66691 16.2704 6.50008 16.3727 6.3613C16.475 6.22252 16.6175 6.11849 16.7808 6.06326C16.9496 5.99883 17.1328 5.98173 17.3106 6.0138C17.4884 6.04588 17.6541 6.12591 17.7898 6.24526L22.6728 10.6753C22.7575 10.7492 22.8253 10.8405 22.8718 10.9428C22.9183 11.0452 22.9424 11.1563 22.9424 11.2688C22.9424 11.3812 22.9183 11.4923 22.8718 11.5947C22.8253 11.6971 22.7575 11.7883 22.6728 11.8623L18.1628 15.9513L22.7308 20.0913C22.8156 20.1651 22.8836 20.2563 22.9302 20.3587C22.9768 20.4611 23.0009 20.5723 23.0009 20.6848C23.0009 20.7972 22.9768 20.9084 22.9302 21.0108C22.8836 21.1132 22.8156 21.2044 22.7308 21.2783L17.7908 25.7563C17.6103 25.9152 17.3773 26.0018 17.1368 25.9993ZM17.7368 17.5113V23.8513L21.2368 20.6813L17.7368 17.5113ZM17.7368 8.14726V14.3833L21.1768 11.2653L17.7368 8.14726Z" fill="#FAFAFA"/>
+</svg>
diff --git a/SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth/images/bluetooth.png b/SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth/images/bluetooth.png
deleted file mode 100644 (file)
index f622066..0000000
Binary files a/SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth/images/bluetooth.png and /dev/null differ
index 0a03b3dd42c596e91c531167e12ea480a2374e61..09c9e52414fc4a0c69da97daf2e801578ff9b67c 100644 (file)
@@ -4,11 +4,12 @@ csproj_file: SettingBluetooth.csproj
 # files monitored for dirty/modified status
 files:
   - SettingBluetooth.csproj
-  - SettingBluetooth.cs
   - tizen-manifest.xml
 
 # Enable to pack as rpk
 pack_as_rpk: true
 
 # List of resource files to be packed in rpk
-resources: []
\ No newline at end of file
+resources:
+  - res/
+    
\ No newline at end of file
diff --git a/SettingBluetooth/build/.exportmap b/SettingBluetooth/build/.exportmap
deleted file mode 100644 (file)
index de30516..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-       global: main;
-       _IO_*;
-       local: *;
-};
diff --git a/SettingBluetooth/build/BUILD.gn b/SettingBluetooth/build/BUILD.gn
deleted file mode 100644 (file)
index ac9592c..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-import("$tizen_core/build/workspace.gni")
-
-tizen_workspace("${hyb_final_pkg_id}") {
-
-    package_file = "$root_out_dir/${hyb_final_pkg}"
-
-    
-    projects = []
-    manifests = []
-    
-
-    executables = []
-        projects += [
-            "//SettingBluetooth",
-        ]
-        
-        # fill executables with the package_names of the tpk paths, for launch cmd
-        executables += [
-            "org.tizen.cssetting-bluetooth",
-        ]
-
-    if (test_build) {
-    }
-   
-}
diff --git a/SettingBluetooth/build/BUILDCONFIG.gn b/SettingBluetooth/build/BUILDCONFIG.gn
deleted file mode 100644 (file)
index 0e2c08a..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-declare_args() {
-    # Default Tizen profile for the build
-    profile = "mobile"
-
-    # Default Tizen version for the build
-    api_version = "7.0"
-
-    # Default build type [debug/ release/ test]
-    build_type = "debug"
-
-    ws_path = "C:\Users\wootak.jung\source\repos\SettingBluetooth"
-
-    # Build with debug info
-    debug_build = true
-
-    # Build with tests
-    test_build = false
-}
-
-contains_native_proj = false
-#Skip dotnet/msbuild for dotnet build
-skip_dotnet_build = true
-
-# Default path for dotnet-cli
-dotnet_cli_path = "C:\Program Files\dotnet\dotnet.exe"
-
-# Default path for msbuild
-msbuild_path = ""
-
-# Default tool for dotnet build [dotnet-cli/ msbuild]
-dotnet_build_tool = "dotnet-cli"
-
-# Working folder for dotnet workspace, paths to csproj or sln
-working_folder= "C:/Users/wootak.jung/source/repos/SettingBluetooth/SettingBluetooth"
-
-target_os = "linux"
-
-
-# hybrid ws
-hyb_web_pkg = ""
-hyb_native_pkg = ""
-hyb_native_pkg_id = ""
-hyb_native_pkg_ver = ""
-hyb_dotnet_pkg = ""
-hyb_dotnet_dep_pkgs = ""
-hyb_resource_pkg = "resource_build\org.tizen.cssetting-bluetooth-1.0.0.rpk"
-hyb_base_pkg = "resource_build\org.tizen.cssetting-bluetooth-1.0.0.rpk"
-hyb_final_pkg = "org.tizen.cssetting-bluetooth-1.0.0.rpk"
-hyb_final_pkg_id = "org.tizen.cssetting-bluetooth"
-hyb_final_app_id = ""
-hyb_final_pkg_type = "resource"
-hyb_web_widget_id = ""
-utc_bin_path = ""
-native_test_path = ""
-hyb_action_code = ""
-unity_pkg = ""
-hyb_pack_check = true
-contains_ime_category = false
-widget_app = false
-
-native_projects_path = [
-]
-
-profiles_path = "C:/tizen-studio-data/profile/profiles.xml"
-signing_profile = ""
-# set opt if non empty web projects
-if (hyb_web_pkg != ""){
-    opt = false
-}
-
-# using native toolchain for hybrid build,
-rootstrap = "public"
-compiler = "llvm"
-arch = "x86"
-verbose_build = false
-strip_debug_info = false
-
-
-# Use default signing profile for packaging
-default_signing_profile = "false"
-
-# Author certificate for package signing
-author_cert = "C:/tizen-studio-data/keystore/author/myprofile.p12"
-
-# Distributor certificate for package signing
-distributor_cert = "C:/tizen-studio/tools/certificate-generator/certificates/distributor/sdk-platform/tizen-distributor-signer.p12"
-
-# Distributor2 certificate for package signing
-distributor2_cert = ""
-
-# Author profile item password attr 
-author_pass_attr = "C:\tizen-studio-data\keystore\author\myprofile.pwd"
-
-# Distributor profile item password attr 
-distributor_pass_attr = "C:\tizen-studio-data\tools\certificate-generator\certificates\distributor\sdk-platform\tizen-distributor-signer.pwd"
-
-# Distributor2 profile item password attr 
-distributor2_pass_attr = ""
-
-# Tizen Studio path
-tizen_studio = "C:/tizen-studio"
-
-# Tizen core path
-tizen_core = "C:/tizen-studio/tools/tizen-core"
-
-# Out directory for native package file
-native_out_dir = "tpk"
-
-web_out_dir = "wgt"
-
-resource_out_dir = "rpk"
-
-
-# Source path filter patterns
-exclude_patterns = [
-    "_exclude*",
-]
-
-# Test source path pattern
-test_src_patterns = [
-    "_test*",
-]
-
-if (!test_build) {
-    exclude_patterns += test_src_patterns
-}
-
-set_sources_assignment_filter(exclude_patterns)
-if (contains_native_proj){
-    set_default_toolchain(":${arch}_${compiler}")
-} else {
-    set_default_toolchain("${tizen_core}/dotnet/toolchains:dotnet_builder")
-}
\ No newline at end of file
diff --git a/SettingBluetooth/build/SettingBluetooth/BUILD.gn b/SettingBluetooth/build/SettingBluetooth/BUILD.gn
deleted file mode 100644 (file)
index e1c4320..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-import("$tizen_core/build/dotnet/project.gni")
-
-dotnet_project("SettingBluetooth") {   
-  csprojpath = "SettingBluetooth.csproj"
-  is_dep = false
-  pack_as_rpk = true
-
-  files = [
-      "SettingBluetooth.csproj",
-      "SettingBluetooth.cs",
-      "tizen-manifest.xml",
-  ]
-  deps = [
-  ]
-}
index e4aef215f7dfae794b0ec4631ff45a549c2c742b..cd017c735feee848c8cc806fe0c8a8656ace6868 100644 (file)
@@ -12,7 +12,7 @@ profile: mobile
 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: C:/tizen-studio-data/profile/profiles.xml
+profiles_xml_path: 
 #  Signing profile to be used for Tizen package signing 
  # If value is empty, active signing profile will be used
 signing_profile: ''
@@ -45,7 +45,7 @@ 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: C:\Users\wootak.jung\source\repos\SettingBluetooth\SettingBluetooth
+working_folder: 
 #  Default path for Google Chrome
 chrome_path: 
 #  Default options to be passed to Chrome when running web simulator