From: Marcin Romaniuk Date: Thu, 13 Apr 2023 15:43:08 +0000 (+0200) Subject: change icon and colors, clean up template config X-Git-Tag: accepted/tizen/unified/20230420.153147~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=48d5d0306fcf39959eb26a184d875acba81b970e;p=profile%2Fiot%2Fapps%2Fdotnet%2Fsetting-bluetooth.git change icon and colors, clean up template config - 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 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aec47d2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,10 @@ +.vs/ +.vscode/* +**/[Bb]in/ +**/[Oo]bj/ +**/[Dd]ebug/ +**/[Bb]uild/ +**/.gn +**/res/allowed/*.dll +tags +msbuild.log diff --git a/SettingBluetooth/.gn b/SettingBluetooth/.gn deleted file mode 100644 index 26e5e77..0000000 --- a/SettingBluetooth/.gn +++ /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 diff --git a/SettingBluetooth/SettingBluetooth/SettingBluetooth.cs b/SettingBluetooth/SettingBluetooth/SettingBluetooth.cs index d469b9e..8236469 100644 --- a/SettingBluetooth/SettingBluetooth/SettingBluetooth.cs +++ b/SettingBluetooth/SettingBluetooth/SettingBluetooth.cs @@ -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"; diff --git a/SettingBluetooth/SettingBluetooth/SettingBluetooth.csproj b/SettingBluetooth/SettingBluetooth/SettingBluetooth.csproj index 34126b8..9c5d683 100644 --- a/SettingBluetooth/SettingBluetooth/SettingBluetooth.csproj +++ b/SettingBluetooth/SettingBluetooth/SettingBluetooth.csproj @@ -12,14 +12,9 @@ None - - - - - - - + + + - diff --git a/SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth.dll b/SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth.dll deleted file mode 100644 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 index 0000000..1d410e5 --- /dev/null +++ b/SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth/images/bluetooth-icon.svg @@ -0,0 +1,3 @@ + + + diff --git a/SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth/images/bluetooth.png b/SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth/images/bluetooth.png deleted file mode 100644 index f622066..0000000 Binary files a/SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth/images/bluetooth.png and /dev/null differ diff --git a/SettingBluetooth/SettingBluetooth/tizen_dotnet_project.yaml b/SettingBluetooth/SettingBluetooth/tizen_dotnet_project.yaml index 0a03b3d..09c9e52 100644 --- a/SettingBluetooth/SettingBluetooth/tizen_dotnet_project.yaml +++ b/SettingBluetooth/SettingBluetooth/tizen_dotnet_project.yaml @@ -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 index de30516..0000000 --- a/SettingBluetooth/build/.exportmap +++ /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 index ac9592c..0000000 --- a/SettingBluetooth/build/BUILD.gn +++ /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 index 0e2c08a..0000000 --- a/SettingBluetooth/build/BUILDCONFIG.gn +++ /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 index e1c4320..0000000 --- a/SettingBluetooth/build/SettingBluetooth/BUILD.gn +++ /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 = [ - ] -} diff --git a/SettingBluetooth/tizen_workspace.yaml b/SettingBluetooth/tizen_workspace.yaml index e4aef21..cd017c7 100644 --- a/SettingBluetooth/tizen_workspace.yaml +++ b/SettingBluetooth/tizen_workspace.yaml @@ -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