Skip to content

Commit

Permalink
One to one samples update
Browse files Browse the repository at this point in the history
- use 2.3.3
- add MacOS sample
  • Loading branch information
alexsorokoletov committed Jan 31, 2019
1 parent 8b72bf7 commit a2ff6e0
Show file tree
Hide file tree
Showing 75 changed files with 1,541 additions and 301 deletions.
91 changes: 60 additions & 31 deletions DT.Samples.Agora.OneToOne.sln
Expand Up @@ -7,6 +7,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DT.Samples.Agora.OneToOne.i
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DT.Samples.Agora.Shared", "DT.Samples.Agora.Shared\DT.Samples.Agora.Shared.csproj", "{2DDB7277-5ACB-4DE9-BFC7-29C5DEDA4217}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DT.Samples.Agora.OneToOne.Mac", "OneToOne\Mac\DT.Samples.Agora.OneToOne.Mac.csproj", "{EF336464-B5EF-494E-88AD-751F99E0FB3B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -25,6 +27,8 @@ Global
Store|iPhone = Store|iPhone
Store|iPhoneSimulator = Store|iPhoneSimulator
Debug|Android = Debug|Android
Debug|x86 = Debug|x86
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C3EB7FDD-25E8-4E01-B013-75979505668E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Android
Expand All @@ -43,6 +47,10 @@ Global
{C3EB7FDD-25E8-4E01-B013-75979505668E}.Store|iPhoneSimulator.ActiveCfg = Store|Android
{C3EB7FDD-25E8-4E01-B013-75979505668E}.Debug|Android.ActiveCfg = Debug|Android
{C3EB7FDD-25E8-4E01-B013-75979505668E}.Debug|Android.Build.0 = Debug|Android
{C3EB7FDD-25E8-4E01-B013-75979505668E}.Debug|x86.ActiveCfg = Debug|Android
{C3EB7FDD-25E8-4E01-B013-75979505668E}.Debug|x86.Build.0 = Debug|Android
{C3EB7FDD-25E8-4E01-B013-75979505668E}.Release|x86.ActiveCfg = Release|Android
{C3EB7FDD-25E8-4E01-B013-75979505668E}.Release|x86.Build.0 = Release|Android
{F3414B36-55D4-44E4-B874-C0731A82DF0D}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
{F3414B36-55D4-44E4-B874-C0731A82DF0D}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
{F3414B36-55D4-44E4-B874-C0731A82DF0D}.Release|iPhone.ActiveCfg = Release|iPhone
Expand All @@ -63,6 +71,10 @@ Global
{F3414B36-55D4-44E4-B874-C0731A82DF0D}.Store|iPhoneSimulator.ActiveCfg = Store|iPhoneSimulator
{F3414B36-55D4-44E4-B874-C0731A82DF0D}.Store|iPhoneSimulator.Build.0 = Store|iPhoneSimulator
{F3414B36-55D4-44E4-B874-C0731A82DF0D}.Debug|Android.ActiveCfg = Debug|iPhoneSimulator
{F3414B36-55D4-44E4-B874-C0731A82DF0D}.Debug|x86.ActiveCfg = Debug|iPhoneSimulator
{F3414B36-55D4-44E4-B874-C0731A82DF0D}.Debug|x86.Build.0 = Debug|iPhoneSimulator
{F3414B36-55D4-44E4-B874-C0731A82DF0D}.Release|x86.ActiveCfg = Release|iPhone
{F3414B36-55D4-44E4-B874-C0731A82DF0D}.Release|x86.Build.0 = Release|iPhone
{2DDB7277-5ACB-4DE9-BFC7-29C5DEDA4217}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{2DDB7277-5ACB-4DE9-BFC7-29C5DEDA4217}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{2DDB7277-5ACB-4DE9-BFC7-29C5DEDA4217}.Release|iPhone.ActiveCfg = Release|Any CPU
Expand All @@ -87,6 +99,48 @@ Global
{2DDB7277-5ACB-4DE9-BFC7-29C5DEDA4217}.Store|iPhoneSimulator.Build.0 = Store|Any CPU
{2DDB7277-5ACB-4DE9-BFC7-29C5DEDA4217}.Debug|Android.ActiveCfg = Debug|Any CPU
{2DDB7277-5ACB-4DE9-BFC7-29C5DEDA4217}.Debug|Android.Build.0 = Debug|Any CPU
{2DDB7277-5ACB-4DE9-BFC7-29C5DEDA4217}.Debug|x86.ActiveCfg = Debug|Any CPU
{2DDB7277-5ACB-4DE9-BFC7-29C5DEDA4217}.Debug|x86.Build.0 = Debug|Any CPU
{2DDB7277-5ACB-4DE9-BFC7-29C5DEDA4217}.Release|x86.ActiveCfg = Release|Any CPU
{2DDB7277-5ACB-4DE9-BFC7-29C5DEDA4217}.Release|x86.Build.0 = Release|Any CPU
{2DDB7277-5ACB-4DE9-BFC7-29C5DEDA4217}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2DDB7277-5ACB-4DE9-BFC7-29C5DEDA4217}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EF336464-B5EF-494E-88AD-751F99E0FB3B}.Debug|Any CPU.ActiveCfg = Debug|x86
{EF336464-B5EF-494E-88AD-751F99E0FB3B}.Debug|Any CPU.Build.0 = Debug|x86
{EF336464-B5EF-494E-88AD-751F99E0FB3B}.Release|Any CPU.ActiveCfg = Release|x86
{EF336464-B5EF-494E-88AD-751F99E0FB3B}.Release|Any CPU.Build.0 = Release|x86
{EF336464-B5EF-494E-88AD-751F99E0FB3B}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
{EF336464-B5EF-494E-88AD-751F99E0FB3B}.Debug|iPhoneSimulator.Build.0 = Debug|x86
{EF336464-B5EF-494E-88AD-751F99E0FB3B}.Release|iPhone.ActiveCfg = Release|x86
{EF336464-B5EF-494E-88AD-751F99E0FB3B}.Release|iPhone.Build.0 = Release|x86
{EF336464-B5EF-494E-88AD-751F99E0FB3B}.Release|iPhoneSimulator.ActiveCfg = Release|x86
{EF336464-B5EF-494E-88AD-751F99E0FB3B}.Release|iPhoneSimulator.Build.0 = Release|x86
{EF336464-B5EF-494E-88AD-751F99E0FB3B}.Debug|iPhone.ActiveCfg = Debug|x86
{EF336464-B5EF-494E-88AD-751F99E0FB3B}.Debug|iPhone.Build.0 = Debug|x86
{EF336464-B5EF-494E-88AD-751F99E0FB3B}.Staging|Any CPU.ActiveCfg = Debug|x86
{EF336464-B5EF-494E-88AD-751F99E0FB3B}.Staging|Any CPU.Build.0 = Debug|x86
{EF336464-B5EF-494E-88AD-751F99E0FB3B}.Staging|iPhone.ActiveCfg = Debug|x86
{EF336464-B5EF-494E-88AD-751F99E0FB3B}.Staging|iPhone.Build.0 = Debug|x86
{EF336464-B5EF-494E-88AD-751F99E0FB3B}.Staging|iPhoneSimulator.ActiveCfg = Debug|x86
{EF336464-B5EF-494E-88AD-751F99E0FB3B}.Staging|iPhoneSimulator.Build.0 = Debug|x86
{EF336464-B5EF-494E-88AD-751F99E0FB3B}.Staging|Android.ActiveCfg = Debug|x86
{EF336464-B5EF-494E-88AD-751F99E0FB3B}.Staging|Android.Build.0 = Debug|x86
{EF336464-B5EF-494E-88AD-751F99E0FB3B}.Release|Android.ActiveCfg = Release|x86
{EF336464-B5EF-494E-88AD-751F99E0FB3B}.Release|Android.Build.0 = Release|x86
{EF336464-B5EF-494E-88AD-751F99E0FB3B}.Store|Any CPU.ActiveCfg = Debug|x86
{EF336464-B5EF-494E-88AD-751F99E0FB3B}.Store|Any CPU.Build.0 = Debug|x86
{EF336464-B5EF-494E-88AD-751F99E0FB3B}.Store|Android.ActiveCfg = Debug|x86
{EF336464-B5EF-494E-88AD-751F99E0FB3B}.Store|Android.Build.0 = Debug|x86
{EF336464-B5EF-494E-88AD-751F99E0FB3B}.Store|iPhone.ActiveCfg = Debug|x86
{EF336464-B5EF-494E-88AD-751F99E0FB3B}.Store|iPhone.Build.0 = Debug|x86
{EF336464-B5EF-494E-88AD-751F99E0FB3B}.Store|iPhoneSimulator.ActiveCfg = Debug|x86
{EF336464-B5EF-494E-88AD-751F99E0FB3B}.Store|iPhoneSimulator.Build.0 = Debug|x86
{EF336464-B5EF-494E-88AD-751F99E0FB3B}.Debug|Android.ActiveCfg = Debug|x86
{EF336464-B5EF-494E-88AD-751F99E0FB3B}.Debug|Android.Build.0 = Debug|x86
{EF336464-B5EF-494E-88AD-751F99E0FB3B}.Debug|x86.ActiveCfg = Debug|x86
{EF336464-B5EF-494E-88AD-751F99E0FB3B}.Debug|x86.Build.0 = Debug|x86
{EF336464-B5EF-494E-88AD-751F99E0FB3B}.Release|x86.ActiveCfg = Release|x86
{EF336464-B5EF-494E-88AD-751F99E0FB3B}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
Policies = $0
Expand All @@ -96,25 +150,6 @@ Global
$1.inheritsScope = text/plain
$1.scope = application/vnd.apple-xcode-storyboard
$0.CSharpFormattingPolicy = $2
$2.IndentSwitchSection = True
$2.NewLinesForBracesInProperties = True
$2.NewLinesForBracesInAccessors = True
$2.NewLinesForBracesInAnonymousMethods = True
$2.NewLinesForBracesInControlBlocks = True
$2.NewLinesForBracesInAnonymousTypes = True
$2.NewLinesForBracesInObjectCollectionArrayInitializers = True
$2.NewLinesForBracesInLambdaExpressionBody = True
$2.NewLineForElse = True
$2.NewLineForCatch = True
$2.NewLineForFinally = True
$2.NewLineForMembersInObjectInit = True
$2.NewLineForMembersInAnonymousTypes = True
$2.NewLineForClausesInQuery = True
$2.SpacingAfterMethodDeclarationName = False
$2.SpaceAfterMethodCallName = False
$2.SpaceBeforeOpenSquareBracket = False
$2.inheritsSet = Mono
$2.inheritsScope = text/x-csharp
$2.scope = text/x-csharp
$0.XmlFormattingPolicy = $3
$3.DefaultFormat = $4
Expand All @@ -124,8 +159,6 @@ Global
$3.inheritsScope = application/xml
$3.scope = application/vnd.apple-xcode-storyboard
$0.StandardHeader = $5
$5.Text =
$5.IncludeInNewFiles = True
$0.NameConventionPolicy = $6
$6.Rules = $7
$7.NamingRule = $8
Expand All @@ -140,22 +173,18 @@ Global
$8.RequiredSuffixes = $10
$10.String = Exception
$0.DotNetNamingPolicy = $11
$11.DirectoryNamespaceAssociation = None
$11.ResourceNamePolicy = FileFormatDefault
$0.TextStylePolicy = $12
$12.inheritsSet = VisualStudio
$12.inheritsScope = text/plain
$12.scope = text/x-csharp
$12.FileWidth = 80
$12.TabsToSpaces = True
$0.TextStylePolicy = $13
$13.inheritsSet = VisualStudio
$13.inheritsScope = text/plain
$13.scope = text/plain
$13.FileWidth = 80
$13.TabsToSpaces = True
$0.TextStylePolicy = $14
$14.inheritsSet = null
$14.scope = application/xml
$0.XmlFormattingPolicy = $15
$15.inheritsSet = Mono
$15.inheritsScope = application/xml
$15.scope = application/xml
$0.TextStylePolicy = $16
$16.inheritsSet = null
Expand All @@ -170,8 +199,8 @@ Global
$19.inheritsSet = null
$19.scope = application/android+xml
$0.TextStylePolicy = $20
$20.inheritsSet = VisualStudio
$20.scope = application/json
$20.inheritsScope = text/plain
$20.FileWidth = 80
$20.TabsToSpaces = True
EndGlobalSection
EndGlobal
Expand Up @@ -61,7 +61,7 @@
<Version>3.0.0.12</Version>
</PackageReference>
<PackageReference Include="Xamarin.Agora.Full.Forms">
<Version>2.3.1</Version>
<Version>2.3.3-beta1</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
Expand Up @@ -13,7 +13,7 @@ protected override void OnCreate(Bundle savedInstanceState)
{
TabLayoutResource = Resource.Layout.Tabbar;
ToolbarResource = Resource.Layout.Toolbar;
Xamarin.Agora.Full.Forms.AgoraServiceDroid.Init();
global::Xamarin.Agora.Full.Forms.AgoraServiceDroid.Init();
Plugin.CurrentActivity.CrossCurrentActivity.Current.Init(this, savedInstanceState);
base.OnCreate(savedInstanceState);
global::Xamarin.Forms.Forms.Init(this, savedInstanceState);
Expand Down
Expand Up @@ -31,5 +31,10 @@ public override void DidFinishLaunching(NSNotification notification)
LoadApplication(new App());
base.DidFinishLaunching(notification);
}

public override bool ApplicationShouldTerminateAfterLastWindowClosed(NSApplication sender)
{
return true;
}
}
}
Expand Up @@ -54,6 +54,9 @@
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="Xamarin.Mac" />
<Reference Include="Plugin.Permissions">
<HintPath>..\..\packages\Plugin.Permissions.3.0.0.12\lib\netstandard2.0\Plugin.Permissions.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Core">
<HintPath>..\..\packages\Xamarin.Forms.3.4.0.1029999\lib\Xamarin.Mac\Xamarin.Forms.Core.dll</HintPath>
</Reference>
Expand All @@ -66,17 +69,14 @@
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\..\packages\Xamarin.Forms.3.4.0.1029999\lib\Xamarin.Mac\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
<Reference Include="Plugin.Permissions">
<HintPath>..\..\packages\Plugin.Permissions.3.0.0.12\lib\netstandard2.0\Plugin.Permissions.dll</HintPath>
<Reference Include="Xamarin.Agora.Full.Mac">
<HintPath>..\..\packages\Xamarin.Agora.Full.Forms.2.3.3-beta1\lib\Xamarin.Mac20\Xamarin.Agora.Full.Mac.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Agora.Full.Forms">
<HintPath>..\..\packages\Xamarin.Agora.Full.Forms.2.3.1\lib\Xamarin.Mac20\Xamarin.Agora.Full.Forms.dll</HintPath>
<HintPath>..\..\packages\Xamarin.Agora.Full.Forms.2.3.3-beta1\lib\Xamarin.Mac20\Xamarin.Agora.Full.Forms.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Agora.Full.Forms.MacOS">
<HintPath>..\..\packages\Xamarin.Agora.Full.Forms.2.3.1\lib\Xamarin.Mac20\Xamarin.Agora.Full.Forms.MacOS.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Agora.Full.Mac">
<HintPath>..\..\packages\Xamarin.Agora.Full.Forms.2.3.1\lib\Xamarin.Mac20\Xamarin.Agora.Full.Mac.dll</HintPath>
<HintPath>..\..\packages\Xamarin.Agora.Full.Forms.2.3.3-beta1\lib\Xamarin.Mac20\Xamarin.Agora.Full.Forms.MacOS.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Plugin.Permissions" version="3.0.0.12" targetFramework="xamarinmac20" />
<package id="Xamarin.Agora.Full.Forms" version="2.3.1" targetFramework="xamarinmac20" />
<package id="Xamarin.Agora.Full.Forms" version="2.3.3-beta1" targetFramework="xamarinmac20" />
<package id="Xamarin.Agora.Full.Mac" version="2.3.3" targetFramework="xamarinmac20" />
<package id="Xamarin.Forms" version="3.4.0.1029999" targetFramework="xamarinmac20" />
</packages>
Expand Up @@ -8,7 +8,7 @@ public partial class AppDelegate : global::Xamarin.Forms.Platform.iOS.FormsAppli
{
public override bool FinishedLaunching(UIApplication uiApplication, NSDictionary launchOptions)
{
Xamarin.Agora.Full.Forms.AgoraServiceIos.Init();
global::Xamarin.Agora.Full.Forms.AgoraServiceIos.Init();
global::Xamarin.Forms.Forms.Init();
LoadApplication(new App());

Expand Down
Expand Up @@ -113,7 +113,7 @@
<Version>3.0.0.12</Version>
</PackageReference>
<PackageReference Include="Xamarin.Agora.Full.Forms">
<Version>2.3.1</Version>
<Version>2.3.3-beta1</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
Expand Down
Expand Up @@ -12,6 +12,6 @@
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="3.4.0.1029999" />
<PackageReference Include="Plugin.Permissions" Version="3.0.0.12" />
<PackageReference Include="Xamarin.Agora.Full.Forms" Version="2.3.1" />
<PackageReference Include="Xamarin.Agora.Full.Forms" Version="2.3.3-beta1" />
</ItemGroup>
</Project>
22 changes: 0 additions & 22 deletions Mac/Xamarin.Agora.Mac/DT.Samples.Agora.Mac.sln

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

17 changes: 0 additions & 17 deletions Mac/Xamarin.Agora.Mac/DT.Samples.Agora.Mac/ViewController.cs

This file was deleted.

This file was deleted.

4 changes: 0 additions & 4 deletions Mac/Xamarin.Agora.Mac/DT.Samples.Agora.Mac/packages.config

This file was deleted.

0 comments on commit a2ff6e0

Please sign in to comment.