-
Notifications
You must be signed in to change notification settings - Fork 360
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'hotfix/label-overlapping' into main
- Loading branch information
Showing
60 changed files
with
10,488 additions
and
503 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 7 additions & 7 deletions
14
...arts.Samples.Droid/Assets/AboutAssets.txt → ...ts.Samples.Android/Assets/AboutAssets.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,19 @@ | ||
| Any raw assets you want to be deployed with your application can be placed in | ||
| Any raw assets you want to be deployed with your application can be placed in | ||
| this directory (and child directories) and given a Build Action of "AndroidAsset". | ||
|
|
||
| These files will be deployed with your package and will be accessible using Android's | ||
| AssetManager, like this: | ||
|
|
||
| public class ReadAsset : Activity | ||
| { | ||
| protected override void OnCreate (Bundle bundle) | ||
| { | ||
| base.OnCreate (bundle); | ||
| protected override void OnCreate (Bundle bundle) | ||
| { | ||
| base.OnCreate (bundle); | ||
|
|
||
| InputStream input = Assets.Open ("my_asset.txt"); | ||
| } | ||
| InputStream input = Assets.Open ("my_asset.txt"); | ||
| } | ||
| } | ||
|
|
||
| Additionally, some Android functions will automatically load asset files: | ||
|
|
||
| Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf"); | ||
| Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf"); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
135 changes: 135 additions & 0 deletions
135
Sources/Microcharts.Samples.Android/Microcharts.Samples.Android.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup> | ||
| <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
| <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
| <ProductVersion>8.0.30703</ProductVersion> | ||
| <SchemaVersion>2.0</SchemaVersion> | ||
| <ProjectGuid>{CC996DF4-E262-45B8-A450-D1E881FBE54D}</ProjectGuid> | ||
| <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> | ||
| <TemplateGuid>{122416d6-6b49-4ee2-a1e8-b825f31c79fe}</TemplateGuid> | ||
| <OutputType>Library</OutputType> | ||
| <AppDesignerFolder>Properties</AppDesignerFolder> | ||
| <RootNamespace>Microcharts.Samples.Android</RootNamespace> | ||
| <AssemblyName>Microcharts.Samples.Android</AssemblyName> | ||
| <FileAlignment>512</FileAlignment> | ||
| <Deterministic>True</Deterministic> | ||
| <AndroidApplication>True</AndroidApplication> | ||
| <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile> | ||
| <AndroidResgenClass>Resource</AndroidResgenClass> | ||
| <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies> | ||
| <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk> | ||
| <TargetFrameworkVersion>v10.0</TargetFrameworkVersion> | ||
| <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest> | ||
| <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix> | ||
| <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix> | ||
| <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent> | ||
| <AndroidUseAapt2>true</AndroidUseAapt2> | ||
| <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
| <DebugSymbols>True</DebugSymbols> | ||
| <DebugType>portable</DebugType> | ||
| <Optimize>False</Optimize> | ||
| <OutputPath>bin\Debug\</OutputPath> | ||
| <DefineConstants>DEBUG;TRACE</DefineConstants> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>4</WarningLevel> | ||
| <AndroidUseSharedRuntime>True</AndroidUseSharedRuntime> | ||
| <AndroidLinkMode>None</AndroidLinkMode> | ||
| <EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk> | ||
| <AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a;x86_64</AndroidSupportedAbis> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
| <DebugSymbols>True</DebugSymbols> | ||
| <DebugType>portable</DebugType> | ||
| <Optimize>True</Optimize> | ||
| <OutputPath>bin\Release\</OutputPath> | ||
| <DefineConstants>TRACE</DefineConstants> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>4</WarningLevel> | ||
| <AndroidManagedSymbols>true</AndroidManagedSymbols> | ||
| <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime> | ||
| <AndroidLinkMode>SdkOnly</AndroidLinkMode> | ||
| <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <Reference Include="System" /> | ||
| <Reference Include="System.Xml" /> | ||
| <Reference Include="System.Core" /> | ||
| <Reference Include="Mono.Android" /> | ||
| <Reference Include="System.Numerics" /> | ||
| <Reference Include="System.Numerics.Vectors" /> | ||
| <Reference Include="Xamarin.AndroidX.AppCompat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null"> | ||
| <HintPath>..\..\..\..\Users\elomo\.nuget\packages\xamarin.androidx.appcompat\1.1.0.1\lib\monoandroid90\Xamarin.AndroidX.AppCompat.dll</HintPath> | ||
| </Reference> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Compile Include="MainActivity.cs" /> | ||
| <Compile Include="Resources\Resource.designer.cs" /> | ||
| <Compile Include="Properties\AssemblyInfo.cs" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <None Include="Resources\AboutResources.txt" /> | ||
| <None Include="Properties\AndroidManifest.xml" /> | ||
| <None Include="Assets\AboutAssets.txt" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <AndroidResource Include="Resources\layout\activity_main.xml"> | ||
| <SubType>Designer</SubType> | ||
| </AndroidResource> | ||
| <AndroidResource Include="Resources\values\colors.xml" /> | ||
| <AndroidResource Include="Resources\values\ic_launcher_background.xml" /> | ||
| <AndroidResource Include="Resources\values\strings.xml" /> | ||
| <AndroidResource Include="Resources\values\styles.xml" /> | ||
| <AndroidResource Include="Resources\mipmap-anydpi-v26\ic_launcher.xml" /> | ||
| <AndroidResource Include="Resources\mipmap-anydpi-v26\ic_launcher_round.xml" /> | ||
| <AndroidResource Include="Resources\mipmap-hdpi\ic_launcher.png" /> | ||
| <AndroidResource Include="Resources\mipmap-hdpi\ic_launcher_foreground.png" /> | ||
| <AndroidResource Include="Resources\mipmap-hdpi\ic_launcher_round.png" /> | ||
| <AndroidResource Include="Resources\mipmap-mdpi\ic_launcher.png" /> | ||
| <AndroidResource Include="Resources\mipmap-mdpi\ic_launcher_foreground.png" /> | ||
| <AndroidResource Include="Resources\mipmap-mdpi\ic_launcher_round.png" /> | ||
| <AndroidResource Include="Resources\mipmap-xhdpi\ic_launcher.png" /> | ||
| <AndroidResource Include="Resources\mipmap-xhdpi\ic_launcher_foreground.png" /> | ||
| <AndroidResource Include="Resources\mipmap-xhdpi\ic_launcher_round.png" /> | ||
| <AndroidResource Include="Resources\mipmap-xxhdpi\ic_launcher.png" /> | ||
| <AndroidResource Include="Resources\mipmap-xxhdpi\ic_launcher_foreground.png" /> | ||
| <AndroidResource Include="Resources\mipmap-xxhdpi\ic_launcher_round.png" /> | ||
| <AndroidResource Include="Resources\mipmap-xxxhdpi\ic_launcher.png" /> | ||
| <AndroidResource Include="Resources\mipmap-xxxhdpi\ic_launcher_foreground.png" /> | ||
| <AndroidResource Include="Resources\mipmap-xxxhdpi\ic_launcher_round.png" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Folder Include="Resources\drawable\" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="SkiaSharp" Version="2.80.2" /> | ||
| <PackageReference Include="SkiaSharp.Views" Version="2.80.2" /> | ||
| <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.2.0.4" /> | ||
| <PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="1.1.0.5" /> | ||
| <PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0.1" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\Microcharts.Droid\Microcharts.Droid.csproj"> | ||
| <Project>{18125022-45e6-46ec-855c-b36e4d41484d}</Project> | ||
| <Name>Microcharts.Droid</Name> | ||
| </ProjectReference> | ||
| <ProjectReference Include="..\Microcharts.Samples\Microcharts.Samples.csproj"> | ||
| <Project>{6fbe798d-bb43-4bb5-9c61-d6dd5b0e623a}</Project> | ||
| <Name>Microcharts.Samples</Name> | ||
| </ProjectReference> | ||
| <ProjectReference Include="..\Microcharts\Microcharts.csproj"> | ||
| <Project>{d07d3e94-e645-4035-a142-5f933a15d585}</Project> | ||
| <Name>Microcharts</Name> | ||
| </ProjectReference> | ||
| </ItemGroup> | ||
| <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" /> | ||
| <!-- To modify your build process, add your task inside one of the targets below and uncomment it. | ||
| Other similar extension points exist, see Microsoft.Common.targets. | ||
| <Target Name="BeforeBuild"> | ||
| </Target> | ||
| <Target Name="AfterBuild"> | ||
| </Target> | ||
| --> | ||
| </Project> |
10 changes: 10 additions & 0 deletions
10
Sources/Microcharts.Samples.Android/Properties/AndroidManifest.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:versionCode="1" | ||
| android:versionName="1.0" | ||
| package="com.companyname.microcharts.samples.android"> | ||
| <uses-sdk android:minSdkVersion="24" android:targetSdkVersion="29" /> | ||
| <application android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> | ||
| </application> | ||
| <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> | ||
| </manifest> |
26 changes: 26 additions & 0 deletions
26
Sources/Microcharts.Samples.Android/Properties/AssemblyInfo.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| using System.Reflection; | ||
| using System.Runtime.CompilerServices; | ||
| using System.Runtime.InteropServices; | ||
| using Android.App; | ||
|
|
||
| // General Information about an assembly is controlled through the following | ||
| // set of attributes. Change these attribute values to modify the information | ||
| // associated with an assembly. | ||
| [assembly: AssemblyTitle("Microcharts.Samples.Android")] | ||
| [assembly: AssemblyDescription("")] | ||
| [assembly: AssemblyConfiguration("")] | ||
| [assembly: AssemblyCompany("")] | ||
| [assembly: AssemblyProduct("Microcharts.Samples.Android")] | ||
| [assembly: AssemblyCopyright("Copyright © 2018")] | ||
| [assembly: AssemblyTrademark("")] | ||
| [assembly: AssemblyCulture("")] | ||
| [assembly: ComVisible(false)] | ||
|
|
||
| // Version information for an assembly consists of the following four values: | ||
| // | ||
| // Major Version | ||
| // Minor Version | ||
| // Build Number | ||
| // Revision | ||
| [assembly: AssemblyVersion("1.0.0.0")] | ||
| [assembly: AssemblyFileVersion("1.0.0.0")] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.