Skip to content
This repository has been archived by the owner on Dec 28, 2023. It is now read-only.

Commit

Permalink
Merge branch add-circularui-chart (#273)
Browse files Browse the repository at this point in the history
* Adds CircularUI.Chart

* Add RadialProgress (#272)

* Add RadialProgress

* remove unused solution file

* Change namespace of FormsCircularUI

* Fix RadialProgress namespace

* Update FormsCircularUI.Init()

Co-authored-by: Seungkeun Lee <[email protected]>
  • Loading branch information
rookiejava and myroot authored Apr 17, 2020
1 parent f5a25ec commit 8b15584
Show file tree
Hide file tree
Showing 29 changed files with 750 additions and 25 deletions.
19 changes: 19 additions & 0 deletions Tizen.Wearable.CircularUI.Chart.nupkg.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<PropertyGroup>
<DisableImplicitFrameworkReferences>false</DisableImplicitFrameworkReferences>
</PropertyGroup>

<PropertyGroup>
<IncludeBuildOutput>false</IncludeBuildOutput>
<NoPackageAnalysis>true</NoPackageAnalysis>
<NuspecFile>Tizen.Wearable.CircularUI.Chart.nuspec</NuspecFile>
<NuspecProperties Condition="'$(Version)' != ''">version=$(Version);configuration=$(configuration)</NuspecProperties>
<PackageOutputPath Condition="'$(PackageOutputPath)' == ''">$(PWD)</PackageOutputPath>
</PropertyGroup>

</Project>
37 changes: 37 additions & 0 deletions Tizen.Wearable.CircularUI.Chart.nuspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?xml version="1.0"?>
<package >
<metadata>
<id>Tizen.Wearable.CircularUI.Chart</id>
<version>$version$</version>
<authors>Samsung Electronics</authors>
<owners>Samsung Electronics</owners>
<tags>xamarin forms xamarinforms xamarin.forms circular circularui wearable gear tizen chart</tags>
<licenseUrl>http://floralicense.org/license/</licenseUrl>
<iconUrl>https://raw.githubusercontent.com/Samsung/Tizen.CircularUI/master/assets/circularui_rgb_64_64.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description> Xamarin forms UI components optimized for round screen and bezel like Samsung gear products </description>
<projectUrl>https://github.com/Samsung/Tizen.CircularUI</projectUrl>
<copyright>© Samsung Electronics Co., Ltd All Rights Reserved</copyright>
<dependencies>
<group targetFramework="netstandard2.0">
<dependency id="Xamarin.Forms" version="4.6.0.494-pre2" />
<PackageReference Include="Tizen.Wearable.CircularUI" Version="1.5.0-pre4" />
<PackageReference Include="SkiaSharp.Views.Forms" Version="1.68.2-preview.45" />
</group>
<group targetFramework="tizen40">
<dependency id="Xamarin.Forms" version="4.6.0.494-pre2" />
<PackageReference Include="Tizen.Wearable.CircularUI" Version="1.5.0-pre4" />
<PackageReference Include="SkiaSharp.Views.Forms" Version="1.68.2-preview.45" />
<dependency id="Tizen.NET" version="4.0.0" />
</group>
</dependencies>
</metadata>
<files>
<file src="src\Tizen.Wearable.CircularUI.Chart.Forms\bin\$configuration$\netstandard2.0\Tizen.Wearable.CircularUI.Chart.Forms.dll" target="lib\netstandard2.0" />
<file src="src\Tizen.Wearable.CircularUI.Chart.Forms\bin\$configuration$\netstandard2.0\Tizen.Wearable.CircularUI.Chart.Forms.pdb" target="lib\netstandard2.0" />
<file src="src\Tizen.Wearable.CircularUI.Chart.Forms.Renderer\bin\$configuration$\tizen40\Tizen.Wearable.CircularUI.Chart.Forms.dll" target="lib\tizen40" />
<file src="src\Tizen.Wearable.CircularUI.Chart.Forms.Renderer\bin\$configuration$\tizen40\Tizen.Wearable.CircularUI.Chart.Forms.pdb" target="lib\tizen40" />
<file src="src\Tizen.Wearable.CircularUI.Chart.Forms.Renderer\bin\$configuration$\tizen40\Tizen.Wearable.CircularUI.Chart.Forms.Renderer.dll" target="lib\tizen40" />
<file src="src\Tizen.Wearable.CircularUI.Chart.Forms.Renderer\bin\$configuration$\tizen40\Tizen.Wearable.CircularUI.Chart.Forms.Renderer.pdb" target="lib\tizen40" />
</files>
</package>
20 changes: 20 additions & 0 deletions Tizen.Wearable.CircularUI.Test.sln
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xaminals", "sample\ShellExa
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xaminals.Tizen", "sample\ShellExamples\Xaminals\Xaminals.Tizen\Xaminals.Tizen.csproj", "{4FE516ED-8A4C-4AA4-AC7F-D7F48FFE4BAD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Wearable.CircularUI.Chart.Forms", "src\Tizen.Wearable.CircularUI.Chart.Forms\Tizen.Wearable.CircularUI.Chart.Forms.csproj", "{E385964C-42B7-4926-A97D-92E97960CDE6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Wearable.CircularUI.Chart.Forms.Renderer", "src\Tizen.Wearable.CircularUI.Chart.Forms.Renderer\Tizen.Wearable.CircularUI.Chart.Forms.Renderer.csproj", "{D7E02E52-A51E-4CD7-9D97-D24D9A3FC16A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CircularUI", "CircularUI", "{803EA8B9-E568-44D9-BE24-6BB815D6849B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CircularUI.Chart", "CircularUI.Chart", "{71BD60A9-7086-438D-A7BE-C46D1212237B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -77,13 +85,23 @@ Global
{4FE516ED-8A4C-4AA4-AC7F-D7F48FFE4BAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4FE516ED-8A4C-4AA4-AC7F-D7F48FFE4BAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4FE516ED-8A4C-4AA4-AC7F-D7F48FFE4BAD}.Release|Any CPU.Build.0 = Release|Any CPU
{E385964C-42B7-4926-A97D-92E97960CDE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E385964C-42B7-4926-A97D-92E97960CDE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E385964C-42B7-4926-A97D-92E97960CDE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E385964C-42B7-4926-A97D-92E97960CDE6}.Release|Any CPU.Build.0 = Release|Any CPU
{D7E02E52-A51E-4CD7-9D97-D24D9A3FC16A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D7E02E52-A51E-4CD7-9D97-D24D9A3FC16A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D7E02E52-A51E-4CD7-9D97-D24D9A3FC16A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D7E02E52-A51E-4CD7-9D97-D24D9A3FC16A}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{4B3ADEDC-D646-4C8A-B6AD-F2A07F2A0ACC} = {9F1AB8B9-03B0-40A7-AB49-522B741F570A}
{BACCF137-6E0F-4A33-AEC9-5EAF95C0E892} = {9F1AB8B9-03B0-40A7-AB49-522B741F570A}
{571EFE9E-B539-4FF7-8E28-A6F451C64652} = {803EA8B9-E568-44D9-BE24-6BB815D6849B}
{8B32EE6A-0ADD-4E64-80E9-B2375690CC70} = {803EA8B9-E568-44D9-BE24-6BB815D6849B}
{1998035F-ECAF-493E-8226-E7EB33D0C982} = {E00DD78A-32EC-4AFA-BC81-EEFF9A80E7E8}
{2627189B-7F81-4878-8762-49B12E7E3C85} = {E00DD78A-32EC-4AFA-BC81-EEFF9A80E7E8}
{36C35271-6B8F-412E-B87F-5C7F41D60A60} = {E00DD78A-32EC-4AFA-BC81-EEFF9A80E7E8}
Expand All @@ -92,6 +110,8 @@ Global
{C65D5BE2-4E42-44B9-B0F7-3F736F2EF1D7} = {36C35271-6B8F-412E-B87F-5C7F41D60A60}
{BC74C370-A520-4116-B57E-18B44BE04F1E} = {318DE803-3D8C-44F9-8C27-4DED4504DC94}
{4FE516ED-8A4C-4AA4-AC7F-D7F48FFE4BAD} = {318DE803-3D8C-44F9-8C27-4DED4504DC94}
{E385964C-42B7-4926-A97D-92E97960CDE6} = {71BD60A9-7086-438D-A7BE-C46D1212237B}
{D7E02E52-A51E-4CD7-9D97-D24D9A3FC16A} = {71BD60A9-7086-438D-A7BE-C46D1212237B}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {3736C77A-08ED-442D-ADE1-5779254463ED}
Expand Down
26 changes: 24 additions & 2 deletions Tizen.Wearable.CircularUI.sln
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27130.2027
# Visual Studio Version 16
VisualStudioVersion = 16.0.29509.3
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Wearable.CircularUI.Forms", "src\Tizen.Wearable.CircularUI.Forms\Tizen.Wearable.CircularUI.Forms.csproj", "{9EB9A8C8-87DB-42E1-A0E2-295994867B2D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Wearable.CircularUI.Forms.Renderer", "src\Tizen.Wearable.CircularUI.Forms.Renderer\Tizen.Wearable.CircularUI.Forms.Renderer.csproj", "{E9AB8D47-DC00-4B06-A00B-A9855DD885A8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Wearable.CircularUI.Chart.Forms", "src\Tizen.Wearable.CircularUI.Chart.Forms\Tizen.Wearable.CircularUI.Chart.Forms.csproj", "{7DA134B9-1705-4D2E-AF51-08DAE82C4B62}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Wearable.CircularUI.Chart.Forms.Renderer", "src\Tizen.Wearable.CircularUI.Chart.Forms.Renderer\Tizen.Wearable.CircularUI.Chart.Forms.Renderer.csproj", "{B698193A-AC75-4F67-877A-50EA2DF61C01}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CircularUI", "CircularUI", "{ED00D792-6CFD-48DC-81AA-C35596DA4938}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CircularUI.Chart", "CircularUI.Chart", "{6D1FF9E1-F898-4F36-852A-8051D6F4A9D6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -21,10 +29,24 @@ Global
{E9AB8D47-DC00-4B06-A00B-A9855DD885A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E9AB8D47-DC00-4B06-A00B-A9855DD885A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E9AB8D47-DC00-4B06-A00B-A9855DD885A8}.Release|Any CPU.Build.0 = Release|Any CPU
{7DA134B9-1705-4D2E-AF51-08DAE82C4B62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7DA134B9-1705-4D2E-AF51-08DAE82C4B62}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7DA134B9-1705-4D2E-AF51-08DAE82C4B62}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7DA134B9-1705-4D2E-AF51-08DAE82C4B62}.Release|Any CPU.Build.0 = Release|Any CPU
{B698193A-AC75-4F67-877A-50EA2DF61C01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B698193A-AC75-4F67-877A-50EA2DF61C01}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B698193A-AC75-4F67-877A-50EA2DF61C01}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B698193A-AC75-4F67-877A-50EA2DF61C01}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{9EB9A8C8-87DB-42E1-A0E2-295994867B2D} = {ED00D792-6CFD-48DC-81AA-C35596DA4938}
{E9AB8D47-DC00-4B06-A00B-A9855DD885A8} = {ED00D792-6CFD-48DC-81AA-C35596DA4938}
{7DA134B9-1705-4D2E-AF51-08DAE82C4B62} = {6D1FF9E1-F898-4F36-852A-8051D6F4A9D6}
{B698193A-AC75-4F67-877A-50EA2DF61C01} = {6D1FF9E1-F898-4F36-852A-8051D6F4A9D6}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {8842E691-A0E2-4EEC-8FDA-51F86B861EA9}
EndGlobalSection
Expand Down
2 changes: 1 addition & 1 deletion sample/ShellExamples/FlyoutExample/FlyoutExample.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ static void Main(string[] args)
{
var app = new Program();
Forms.Init(app);
global::Tizen.Wearable.CircularUI.Forms.Renderer.FormsCircularUI.Init();
Tizen.Wearable.CircularUI.Forms.FormsCircularUI.Init();
app.Run(args);
}
}
Expand Down
2 changes: 1 addition & 1 deletion sample/ShellExamples/ShellNavigation/ShellNavigation.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ static void Main(string[] args)
{
var app = new Program();
Forms.Init(app);
global::Tizen.Wearable.CircularUI.Forms.Renderer.FormsCircularUI.Init();
Tizen.Wearable.CircularUI.Forms.FormsCircularUI.Init();
app.Run(args);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ static void Main(string[] args)
{
var app = new Program();
Forms.Init(app);
global::Tizen.Wearable.CircularUI.Forms.Renderer.FormsCircularUI.Init();
global::Tizen.Wearable.CircularUI.Forms.FormsCircularUI.Init();
app.Run(args);
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/*
* Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
*
* Licensed under the Flora License, Version 1.1 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://floralicense.org/license/
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

namespace Tizen.Wearable.CircularUI.Chart.Forms
{
public static class FormsCircularUIChart
{
public static readonly string Tag = "CircularUI.Chart";

public static bool IsInitialized { get; private set; }

public static void Init()
{
if (IsInitialized) return;
IsInitialized = true;
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>tizen40</TargetFramework>
<TargetFrameworkIdentifier>Tizen</TargetFrameworkIdentifier>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="SkiaSharp.Views.Forms" Version="1.68.2-preview.45" />
<PackageReference Include="Tizen.NET" Version="4.0.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Tizen.Wearable.CircularUI.Forms\Tizen.Wearable.CircularUI.Forms.csproj" />
<ProjectReference Include="..\Tizen.Wearable.CircularUI.Forms.Renderer\Tizen.Wearable.CircularUI.Forms.Renderer.csproj" />
<ProjectReference Include="..\Tizen.Wearable.CircularUI.Chart.Forms\Tizen.Wearable.CircularUI.Chart.Forms.csproj" />
</ItemGroup>

</Project>
Loading

0 comments on commit 8b15584

Please sign in to comment.