Skip to content
This repository has been archived by the owner on Jul 5, 2024. It is now read-only.

Commit

Permalink
Merge pull request #293 from jamesmontemagno/3-0-standard
Browse files Browse the repository at this point in the history
Finalize 3.0 - Upgrade to .NET Standard
  • Loading branch information
jamesmontemagno authored Jul 3, 2017
2 parents 5f73c06 + 3229f4a commit 0ac3820
Show file tree
Hide file tree
Showing 83 changed files with 819 additions and 3,977 deletions.
97 changes: 97 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
# Suppress: EC112
# top-most EditorConfig file
root = true

# Don't use tabs for indentation.
[*]
indent_style = tab
# (Please don't specify an indent_size here; that has too many unintended consequences.)

# Code files
[*.{cs,csx,vb,vbx}]
indent_size = 4

# Xml project files
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
indent_size = 2

# Xml config files
[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
indent_size = 2

# JSON files
[*.json]
indent_size = 2

# Dotnet code style settings:
[*.{cs,vb}]
# Sort using and Import directives with System.* appearing first
dotnet_sort_system_directives_first = false
# Avoid "this." and "Me." if not necessary
dotnet_style_qualification_for_field = false:suggestion
dotnet_style_qualification_for_property = false:suggestion
dotnet_style_qualification_for_method = false:suggestion
dotnet_style_qualification_for_event = false:suggestion

# Use language keywords instead of framework type names for type references
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
dotnet_style_predefined_type_for_member_access = true:suggestion

# Suggest more modern language features when available
dotnet_style_object_initializer = true:suggestion
dotnet_style_collection_initializer = true:suggestion
dotnet_style_coalesce_expression = true:suggestion
dotnet_style_null_propagation = true:suggestion
dotnet_style_explicit_tuple_names = true:suggestion

# Naming Conventions:
# Pascal Casing
dotnet_naming_symbols.method_and_property_symbols.applicable_kinds= method,property,enum
dotnet_naming_symbols.method_and_property_symbols.applicable_accessibilities = *
dotnet_naming_style.pascal_case_style.capitalization = pascal_case

dotnet_naming_rule.methods_and_properties_must_be_pascal_case.severity = warning
dotnet_naming_rule.methods_and_properties_must_be_pascal_case.symbols = method_and_property_symbols
dotnet_naming_rule.methods_and_properties_must_be_pascal_case.style = pascal_case_style

# Non-public members must be lower-case
dotnet_naming_symbols.non_public_symbols.applicable_kinds = property,method,field,event,delegate
dotnet_naming_symbols.non_public_symbols.applicable_accessibilities = private
dotnet_naming_style.all_lower_case_style.capitalization = camel_case

dotnet_naming_rule.non_public_members_must_be_lower_case.severity = warning
dotnet_naming_rule.non_public_members_must_be_lower_case.symbols = non_public_symbols
dotnet_naming_rule.non_public_members_must_be_lower_case.style = all_lower_case_style

# CSharp code style settings:
[*.cs]
# Do not prefer "var" everywhere
csharp_style_var_for_built_in_types = true:suggestion
csharp_style_var_when_type_is_apparent = true:suggestion
csharp_style_var_elsewhere = true:suggestion

# Prefer method-like constructs to have a block body
csharp_style_expression_bodied_methods = true:suggestion
csharp_style_expression_bodied_constructors = true:none
csharp_style_expression_bodied_operators = true:none

# Prefer property-like constructs to have an expression-body
csharp_style_expression_bodied_properties = true:suggestion
csharp_style_expression_bodied_indexers = true:none
csharp_style_expression_bodied_accessors = true:none

# Suggest more modern language features when available
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
csharp_style_inlined_variable_declaration = true:suggestion
csharp_style_throw_expression = true:suggestion
csharp_style_conditional_delegate_call = true:suggestion

# Newline settings
csharp_new_line_before_open_brace = all
csharp_new_line_before_else = true
csharp_new_line_before_catch = true
csharp_new_line_before_finally = true
csharp_new_line_before_members_in_object_initializers = true
csharp_new_line_before_members_in_anonymous_types = true

9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
## Changelog

### [3.0.0]
* Upgrade to .NET Standard
* Deprecate Windows Phone 8/8.1 and Windows Store
* Update to 25.x Support Libraries on Android
* iOS: Fix Pop-over position on iPad in landscape
* Add Exif Information to iOS and Android
* Optimize rotations on iOS and Android


### [2.6.3]
* All: No longer delete files when picked. You are in control.
* Windows Phone 8.1 RT: Handle button mashing on photo button better.
Expand Down
46 changes: 8 additions & 38 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,11 @@ Build Status:

**Platform Support**

|Platform|Supported|Version|
| ------------------- | :-----------: | :------------------: |
|Xamarin.iOS|Yes|iOS 7+|
|Xamarin.iOS Unified|Yes|iOS 7+|
|Xamarin.Android|Yes|API 14+|
|Windows Phone Silverlight|Yes|8.0+|
|Windows Phone RT|Yes|8.1+|
|Windows Store RT|Yes|8.1+|
|Windows 10 UWP|Yes|10+|
|Xamarin.Mac|No||
|Platform|Version|
| ------------------- | :------------------: |
|Xamarin.iOS|iOS 7+|
|Xamarin.Android|API 14+|
|Windows 10 UWP|10+|


### API Usage
Expand Down Expand Up @@ -294,8 +289,8 @@ Add the following code:
```
<?xml version="1.0" encoding="utf-8"?>
<paths xmlns:android="http://schemas.android.com/apk/res/android">
<external-path name="my_images" path="Android/data/YOUR_APP_PACKAGE_NAME/files/Pictures" />
<external-path name="my_movies" path="Android/data/YOUR_APP_PACKAGE_NAME/files/Movies" />
<external-files-path name="my_images" path="Pictures" />
<external-files-path name="my_movies" path="Movies" />
</paths>
```

Expand All @@ -320,36 +315,11 @@ Such as:

If you want the dialogs to be translated you must support the specific languages in your app. Read the [iOS Localization Guide](https://developer.xamarin.com/guides/ios/advanced_topics/localization_and_internationalization/)

**Windows Phone 8/8.1 Silverlight:**

You must set the `IC_CAP_ISV_CAMERA` permission.

WP 8/8.1 Silverlight only supports photo, not video.

**Windows Phone 8.1 RT:**

Set `Webcam` permission.

In your App.xaml.cs you MUST place the following code inside of the `OnLaunched` method:

```csharp
protected override void OnActivated(IActivatedEventArgs args)
{

Plugin.Media.MediaImplementation.OnFilesPicked(args);

base.OnActivated(args);
}
```
**Windows Store:**
#### UWP

Set `Webcam` permission.


#### Windows Phone 8.1 RT Photo Capture
This feature was made possible by Daniel Meixner and his great open source project: https://diycameracaptureui.codeplex.com/

Made possible under Ms-PL license: https://diycameracaptureui.codeplex.com/license

### Permission Recommendations
By default, the Media Plugin will attempt to request multiple permissions, but each platform handles this a bit differently, such as iOS which will only pop up permissions once. I recommend adding the [Permissions Plugin](http://github.com/jamesmontemagno/PermissionsPlugin) into your application and before taking any photo or picking photos that you check permissions ahead of time.
Expand Down
13 changes: 8 additions & 5 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
version: 2.7.0.{build}-beta
version: 3.0.0.{build}-alpha
image: Visual Studio 2017
assembly_info:
patch: true
file: '**\AssemblyInfo.*'
assembly_version: '{version}'
assembly_file_version: '{version}'
assembly_informational_version: '{version}'
install:
- echo y | "C:\Program Files (x86)\Android\android-sdk\tools\android.bat" update sdk -u -a -t tools
- echo y | "C:\Program Files (x86)\Android\android-sdk\tools\android.bat" update sdk -u -a -t platform-tools
- echo y | "C:\Program Files (x86)\Android\android-sdk\tools\android.bat" update sdk -u -a -t build-tools-25.0.6
- echo y | "C:\Program Files (x86)\Android\android-sdk\tools\android.bat" update sdk -u -a -t android-25
- echo y | "C:\Program Files (x86)\Android\android-sdk\tools\android.bat" update sdk -u -a -t android-15
build_script:
- cmd: >-
powershell .\install-android-sdk.ps1
powershell .\bootstrapper.ps1 -Target Default -Verbosity diagnostic
artifacts:
- path: ./Build/nuget/*.nupkg
name: NuGet
- path: ./component/*.xam
name: Component
3 changes: 0 additions & 3 deletions build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ var libraries = new Dictionary<string, string> {
{ "./src/Media.sln", "Any" },
};

var samples = new Dictionary<string, string> {
{ "./samples/MediaSample.sln", "Win" },
};

var BuildAction = new Action<Dictionary<string, string>> (solutions =>
{
Expand Down
110 changes: 36 additions & 74 deletions nuget/Plugin.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,88 +19,50 @@
<summary>Take or pick photos and videos from a cross platform API.</summary>
<tags>xamarin, pcl, xam.pcl, media, photo, video, plugin, plugin for xamarin, windows phone, winphone, wp8, winrt, android, xamarin.forms, ios</tags>
<dependencies>
<group targetFramework="MonoAndroid10">
<dependency id="Plugin.Permissions" version="1.2.1"/>
</group>
<group targetFramework="net">
</group>
<group targetFramework="win">
</group>
<group targetFramework="wp">
</group>
<group targetFramework="wpa">
</group>
<group targetFramework="netstandard1.0">
<dependency id="NETStandard.Library" version="1.6.1" />
</group>
<group targetFramework="MonoAndroid10">
<dependency id="Plugin.Permissions" version="2.0.1"/>
<dependency id="Xamarin.Android.Support.Core.Utils" version="25.3.1"/>
</group>
<group targetFramework="Xamarin.iOS10">
</group>
<group targetFramework="Xamarin.Mac20">
</group>
<group targetFramework="portable-net45+win+wpa81+wp80">
</group>
<group targetFramework="uap">
</group>
<group targetFramework="dotnet">
</group>
<group targetFramework="xamarintvos">
</group>
<group targetFramework="xamarinwatchos">
</group>
</dependencies>
</metadata>
<files>
<file src="nuget\readme.txt" target="readme.txt" />
<!--PCL-->
<file src="src\Media.Plugin\bin\Release\Plugin.Media.dll" target="lib\portable-net45+wp80+win8+wpa81\Plugin.Media.dll" />
<file src="src\Media.Plugin\bin\Release\Plugin.Media.xml" target="lib\portable-net45+wp80+win8+wpa81\Plugin.Media.xml" />
<file src="src\Media.Plugin\bin\Release\Plugin.Media.pdb" target="lib\portable-net45+wp80+win8+wpa81\Plugin.Media.pdb" />
<file src="src\Media.Plugin.Abstractions\bin\Release\Plugin.Media.Abstractions.dll" target="lib\portable-net45+wp80+win8+wpa81\Plugin.Media.Abstractions.dll" />
<file src="src\Media.Plugin.Abstractions\bin\Release\Plugin.Media.Abstractions.xml" target="lib\portable-net45+wp80+win8+wpa81\Plugin.Media.Abstractions.xml" />
<file src="src\Media.Plugin.Abstractions\bin\Release\Plugin.Media.Abstractions.pdb" target="lib\portable-net45+wp80+win8+wpa81\Plugin.Media.Abstractions.pdb" />

<!--Win Phone Silverlight-->
<file src="src\Media.Plugin.WindowsPhone8\bin\Release\Plugin.Media.dll" target="lib\wp8\Plugin.Media.dll" />
<file src="src\Media.Plugin.WindowsPhone8\bin\Release\Plugin.Media.xml" target="lib\wp8\Plugin.Media.xml" />
<file src="src\Media.Plugin.WindowsPhone8\bin\Release\Plugin.Media.pdb" target="lib\wp8\Plugin.Media.pdb" />
<file src="src\Media.Plugin.Abstractions\bin\Release\Plugin.Media.Abstractions.dll" target="lib\wp8\Plugin.Media.Abstractions.dll" />
<file src="src\Media.Plugin.Abstractions\bin\Release\Plugin.Media.Abstractions.xml" target="lib\wp8\Plugin.Media.Abstractions.xml" />
<file src="src\Media.Plugin.Abstractions\bin\Release\Plugin.Media.Abstractions.pdb" target="lib\wp8\Plugin.Media.Abstractions.pdb" />

<!--Win Phone 81-->
<file src="src\Media.Plugin.WindowsPhone81\bin\Release\Plugin.Media.dll" target="lib\wpa81\Plugin.Media.dll" />
<file src="src\Media.Plugin.WindowsPhone81\bin\Release\Plugin.Media.xml" target="lib\wpa81\Plugin.Media.xml" />
<file src="src\Media.Plugin.WindowsPhone81\bin\Release\Plugin.Media.pdb" target="lib\wpa81\Plugin.Media.pdb" />
<file src="src\Media.Plugin.WindowsPhone81\bin\Release\Plugin.Media.pri" target="lib\wpa81\Plugin.Media.pri" />
<file src="src\Media.Plugin.Abstractions\bin\Release\Plugin.Media.Abstractions.dll" target="lib\wpa81\Plugin.Media.Abstractions.dll" />
<file src="src\Media.Plugin.Abstractions\bin\Release\Plugin.Media.Abstractions.xml" target="lib\wpa81\Plugin.Media.Abstractions.xml" />
<file src="src\Media.Plugin.Abstractions\bin\Release\Plugin.Media.Abstractions.pdb" target="lib\wpa81\Plugin.Media.Abstractions.pdb" />
<file src="src\Media.Plugin.WindowsPhone81\bin\Release\CameraCaptureUIPage.xbf" target="lib\wpa81\Plugin.Media\CameraCaptureUIPage.xbf" />
<file src="src\Media.Plugin.WindowsPhone81\bin\Release\CameraCaptureUI.xbf" target="lib\wpa81\Plugin.Media\CameraCaptureUI.xbf" />


<file src="src\Media.Plugin.WindowsPhone81\CameraCaptureUIPage.xaml" target="lib\wpa81\Plugin.Media\CameraCaptureUIPage.xaml" />
<file src="src\Media.Plugin.WindowsPhone81\CameraCaptureUI.xaml" target="lib\wpa81\Plugin.Media\CameraCaptureUI.xaml" />

<file src="src\Media.Plugin.WindowsPhone81\bin\Release\Plugin.Media.xr.xml" target="lib\wpa81\Plugin.Media\Plugin.Media.xr.xml" />


<!--WinStore-->
<file src="src\Media.Plugin.WindowsStore\bin\Release\Plugin.Media.dll" target="lib\win8\Plugin.Media.dll" />
<file src="src\Media.Plugin.WindowsStore\bin\Release\Plugin.Media.xml" target="lib\win8\Plugin.Media.xml" />
<file src="src\Media.Plugin.WindowsStore\bin\Release\Plugin.Media.pdb" target="lib\win8\Plugin.Media.pdb" />
<file src="src\Media.Plugin.Abstractions\bin\Release\Plugin.Media.Abstractions.dll" target="lib\win8\Plugin.Media.Abstractions.dll" />
<file src="src\Media.Plugin.Abstractions\bin\Release\Plugin.Media.Abstractions.xml" target="lib\win8\Plugin.Media.Abstractions.xml" />
<file src="src\Media.Plugin.Abstractions\bin\Release\Plugin.Media.Abstractions.pdb" target="lib\win8\Plugin.Media.Abstractions.pdb" />

<!--Standard/PCL-->
<file src="src\Media.Plugin\bin\Release\netstandard1.0\Plugin.Media.*" target="lib\netstandard1.0" />

<!--Xamarin.Android-->
<file src="src\Media.Plugin.Android\bin\Release\Plugin.Media.dll" target="lib\MonoAndroid10\Plugin.Media.dll" />
<file src="src\Media.Plugin.Android\bin\Release\Plugin.Media.xml" target="lib\MonoAndroid10\Plugin.Media.xml" />
<file src="src\Media.Plugin.Android\bin\Release\Plugin.Media.pdb" target="lib\MonoAndroid10\Plugin.Media.pdb" />
<file src="src\Media.Plugin.Abstractions\bin\Release\Plugin.Media.Abstractions.dll" target="lib\MonoAndroid10\Plugin.Media.Abstractions.dll" />
<file src="src\Media.Plugin.Abstractions\bin\Release\Plugin.Media.Abstractions.xml" target="lib\MonoAndroid10\Plugin.Media.Abstractions.xml" />
<file src="src\Media.Plugin.Abstractions\bin\Release\Plugin.Media.Abstractions.pdb" target="lib\MonoAndroid10\Plugin.Media.Abstractions.pdb" />

<file src="src\Media.Plugin.Android\bin\Release\Plugin.Media.*" target="lib\MonoAndroid10" />

<!--Xamarin.iOS-->
<file src="src\Media.Plugin.iOS\bin\iPhone\Release\Plugin.Media.dll" target="lib\Xamarin.iOS10\Plugin.Media.dll" />
<file src="src\Media.Plugin.iOS\bin\iPhone\Release\Plugin.Media.xml" target="lib\Xamarin.iOS10\Plugin.Media.xml" />
<file src="src\Media.Plugin.Abstractions\bin\Release\Plugin.Media.Abstractions.dll" target="lib\Xamarin.iOS10\Plugin.Media.Abstractions.dll" />
<file src="src\Media.Plugin.Abstractions\bin\Release\Plugin.Media.Abstractions.xml" target="lib\Xamarin.iOS10\Plugin.Media.Abstractions.xml" />


<file src="src\Media.Plugin.iOS\bin\iPhone\Release\Plugin.Media.*" target="lib\Xamarin.iOS10" />

<!--UWP-->
<file src="src\Media.Plugin.UWP\bin\Release\Plugin.Media.dll" target="lib\UAP10\Plugin.Media.dll" />
<file src="src\Media.Plugin.UWP\bin\Release\Plugin.Media.xml" target="lib\UAP10\Plugin.Media.xml" />
<file src="src\Media.Plugin.UWP\bin\Release\Plugin.Media.pdb" target="lib\UAP10\Plugin.Media.pdb" />
<file src="src\Media.Plugin.Abstractions\bin\Release\Plugin.Media.Abstractions.dll" target="lib\UAP10\Plugin.Media.Abstractions.dll" />
<file src="src\Media.Plugin.Abstractions\bin\Release\Plugin.Media.Abstractions.xml" target="lib\UAP10\Plugin.Media.Abstractions.xml" />
<file src="src\Media.Plugin.Abstractions\bin\Release\Plugin.Media.Abstractions.pdb" target="lib\UAP10\Plugin.Media.Abstractions.pdb" />


<!--net 4.5-->
<file src="src\Media.Plugin.Net45\bin\Release\Plugin.Media.dll" target="lib\net45\Plugin.Media.dll" />
<file src="src\Media.Plugin.Net45\bin\Release\Plugin.Media.xml" target="lib\net45\Plugin.Media.xml" />
<file src="src\Media.Plugin.Abstractions\bin\Release\Plugin.Media.Abstractions.dll" target="lib\net45\Plugin.Media.Abstractions.dll" />
<file src="src\Media.Plugin.Abstractions\bin\Release\Plugin.Media.Abstractions.xml" target="lib\net45\Plugin.Media.Abstractions.xml" />



<file src="src\Media.Plugin.UWP\bin\Release\Plugin.Media.*" target="lib\UAP10" />

</files>
</package>
Loading

0 comments on commit 0ac3820

Please sign in to comment.