Skip to content

Commit

Permalink
Merge pull request #13 from Guruumeditation/Develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Guruumeditation committed Sep 6, 2018
2 parents 05c7b81 + d1f1bb3 commit f87dd73
Show file tree
Hide file tree
Showing 9 changed files with 52 additions and 19 deletions.
27 changes: 26 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -258,4 +258,29 @@ paket-files/

# Python Tools for Visual Studio (PTVS)
__pycache__/
*.pyc
*.pyc
ColorPickerDemo/Docs/untitled2.gif
ColorPickerDemo/Docs/untitled.gif
ColorPickerDemo/Docs/svg/small/picture-colors.svg
ColorPickerDemo/Docs/png/picture-colors_large@2x.png
ColorPickerDemo/Docs/png/picture-colors@512px.png
ColorPickerDemo/Docs/large/picture-colors.svg
ColorPicker/ColorPreferenceSupport.java
ColorPicker/ColorPreference.java
ColorPicker/ColorPickerView.java
ColorPicker/ColorPickerDialogPreference.java
ColorPicker/ColorPickerDialogListener.java
ColorPicker/ColorPanelView.java
ColorPicker/ColorPaletteAdapter.java
ColorPicker/AlphaPatternDrawable.java
ColorPickerDemo/Docs/svg/large/picture-colors.svg
ColorPickerDemo/Docs/small/picture-colors.svg
ColorPickerDemo/Docs/activity.webm
ColorPickerDemo/Docs/Activity.gif
ColorPicker/Net.ArcanaStudio.ColorPicker.1.0.0.nuspec
ColorPicker/DrawingUtils.java
ColorPicker/ColorShape.java
ColorPicker/ColorPickerDialog.java
ColorPickerDemo/Docs/untitled5555.gif
ColorPicker/NestedGridView.java
ColorPickerDemo/Docs/png/picture-colors_small@2x.png
2 changes: 1 addition & 1 deletion ColorPicker/ColorPickerView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -496,8 +496,8 @@ private void Init(Context context, IAttributeSet attrs)

InitPaintTools();

Focusable = true;
//Needed for receiving trackball motion events.
SetFocusable(ViewFocusability.Focusable);
FocusableInTouchMode = true;
}

Expand Down
2 changes: 1 addition & 1 deletion ColorPicker/Net.ArcanaStudio.ColorPicker.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down
12 changes: 11 additions & 1 deletion ColorPicker/Net.ArcanaStudio.ColorPicker.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,17 @@
<projectUrl>https://github.com/Guruumeditation/ColorPicker/</projectUrl>
<iconUrl>https://github.com/Guruumeditation/ColorPicker/blob/master/NugetIcon.png?raw=true</iconUrl>
<description>Color picker library for Xamarin Android</description>
<releaseNotes>Version 1.0.0</releaseNotes>
<releaseNotes>[1.0.3]
- Fixed problem with API below 26

[1.0.2]
- Fixed icons

[1.0.1]
- Maintenance release

[1.0.0]
First release</releaseNotes>
<copyright>Copyright 2018</copyright>
<tags>Colorpicker Xamarin Android</tags>
<dependencies>
Expand Down
10 changes: 6 additions & 4 deletions ColorPickerDemo/Net.ArcanaStudio.ColorPickerDemo.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<AndroidResgenClass>Resource</AndroidResgenClass>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
Expand Down Expand Up @@ -63,7 +63,9 @@
</ItemGroup>
<ItemGroup>
<None Include="Resources\AboutResources.txt" />
<None Include="Properties\AndroidManifest.xml" />
<None Include="Properties\AndroidManifest.xml">
<SubType>Designer</SubType>
</None>
<None Include="Assets\AboutAssets.txt" />
</ItemGroup>
<ItemGroup>
Expand All @@ -74,8 +76,8 @@
<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-anydpi-v23\ic_launcher.xml" />
<AndroidResource Include="Resources\mipmap-anydpi-v23\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" />
Expand Down
12 changes: 4 additions & 8 deletions ColorPickerDemo/Properties/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
<?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="Net.ArcanaStudio.ColorPickerDemo">
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="27" />
<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>
</manifest>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="Net.ArcanaStudio.ColorPickerDemo">
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="23" />
<application android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:supportsRtl="true" android:theme="@style/AppTheme"></application>
</manifest>
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ This is the Xamarin version of Jared Rummler ColorPicker https://github.com/jare

## Status

| Target | Branch | Status | Package version|
| Target | Branch | Status | SonarCloud | Package version|
--------------|------------- | --------- | --------|
| Release | master | <a target="_blank" href="https://equinoxe.visualstudio.com/ColorPicker/_build/latest?definitionId=27"><img src="https://equinoxe.visualstudio.com/ColorPicker/_apis/build/status/ColorPicker-Master" alt="Build status" /></a> | <a target="_blank" href="https://www.nuget.org/packages/Net.ArcanaStudio.ColorPicker/"><img src="https://img.shields.io/nuget/v/Net.ArcanaStudio.ColorPicker.svg" alt="Nuget package" /></a>
| Preview | develop | <a target="_blank" href="https://equinoxe.visualstudio.com/ColorPicker/_build/latest?definitionId=25"><img src="https://equinoxe.visualstudio.com/ColorPicker/_apis/build/status/ColorPicker-Develop" alt="Build status" /></a>| <a target="_blank" href="https://www.nuget.org/packages/Net.ArcanaStudio.ColorPicker/"><img src="https://img.shields.io/nuget/vpre/Net.ArcanaStudio.ColorPicker.svg" alt="Nuget package"/></a>
| Release | master | <a target="_blank" href="https://equinoxe.visualstudio.com/ColorPicker/_build/latest?definitionId=27"><img src="https://equinoxe.visualstudio.com/ColorPicker/_apis/build/status/ColorPicker-Master" alt="Build status" /></a> | <a target="_blank" href="https://sonarcloud.io/dashboard?id=75453910be17a48308232718dee64abe956d46c8"><img src="https://sonarcloud.io/api/project_badges/measure?project=75453910be17a48308232718dee64abe956d46c8&metric=alert_status" alt="Nuget package" /></a> | <a target="_blank" href="https://www.nuget.org/packages/Net.ArcanaStudio.ColorPicker/"><img src="https://img.shields.io/nuget/v/Net.ArcanaStudio.ColorPicker.svg" alt="Nuget package" /></a>
| Preview | develop | <a target="_blank" href="https://equinoxe.visualstudio.com/ColorPicker/_build/latest?definitionId=25"><img src="https://equinoxe.visualstudio.com/ColorPicker/_apis/build/status/ColorPicker-Develop" alt="Build status" /></a>| <a target="_blank" href="https://sonarcloud.io/dashboard?id=75453910be17a48308232718dee64abe956d46c8"><img src="https://sonarcloud.io/api/project_badges/measure?project=75453910be17a48308232718dee64abe956d46c8&metric=alert_status" alt="Nuget package" /></a> | <a target="_blank" href="https://www.nuget.org/packages/Net.ArcanaStudio.ColorPicker/"><img src="https://img.shields.io/nuget/vpre/Net.ArcanaStudio.ColorPicker.svg" alt="Nuget package"/></a>

## Screenshots

Expand Down

0 comments on commit f87dd73

Please sign in to comment.