Skip to content

Commit 5132d71

Browse files
SimonDarksideJSimonDarksideJ
committed
Merge pull request #43 from DDReaper/SmaatoSupport
Added Smaato support to Win 8_8.1 / WP8.1 / Universal
2 parents 6df4d40 + 698793b commit 5132d71

25 files changed

+632
-49
lines changed

‎AdRotator/AdProviders/AdProviderAdDuplex.cs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,19 @@ public AdProviderAdDuplex()
5353
}
5454
}
5555
},
56+
{SupportedPlatforms.Windows81, new AdProviderDetails()
57+
{
58+
ConfigurationOptions = new Dictionary<AdProviderConfigOptions,string>()
59+
{
60+
{AdProviderConfigOptions.AppId,"AppId"},
61+
{AdProviderConfigOptions.IsTest,"IsTest"},
62+
{AdProviderConfigOptions.Size,"Size"},
63+
//{AdProviderConfigOptions.AdSuccessEvent,"AdLoaded"},
64+
//{AdProviderConfigOptions.AdFailedEvent,"AdLoadingError"},
65+
//{AdProviderConfigOptions.AdClickedEvent,"AdClick"}
66+
}
67+
}
68+
},
5669
{SupportedPlatforms.WindowsPhone81Appx, new AdProviderDetails()
5770
{
5871
ConfigurationOptions = new Dictionary<AdProviderConfigOptions,string>()

‎AdRotator/AdProviders/AdProviderInmobi.cs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,22 @@ public AdProviderInmobi()
5959
}
6060
}
6161
},
62+
{SupportedPlatforms.Windows81, new AdProviderDetails()
63+
{
64+
AssemblyName = "InMobiW8AdSDK",
65+
ElementName = "InMobi.W8.AdSDK.IMAdView",
66+
ConfigurationOptions = new Dictionary<AdProviderConfigOptions,string>()
67+
{
68+
{AdProviderConfigOptions.AppId,"AppId"},
69+
{AdProviderConfigOptions.ReloadTime,"RefreshInterval"},
70+
{AdProviderConfigOptions.StartMethod,"LoadNewAd"},
71+
{AdProviderConfigOptions.AdWidth,"Width"},
72+
{AdProviderConfigOptions.AdHeight,"Height"},
73+
{AdProviderConfigOptions.AdSuccessEvent,"OnAdRequestLoaded"},
74+
{AdProviderConfigOptions.AdFailedEvent,"OnAdRequestFailed"}
75+
}
76+
}
77+
},
6278
};
6379
}
6480
}

‎AdRotator/AdProviders/AdProviderPubCenter.cs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,20 @@ public AdProviderPubCenter()
5555
}
5656
}
5757
},
58+
{SupportedPlatforms.Windows81, new AdProviderDetails()
59+
{
60+
ConfigurationOptions = new Dictionary<AdProviderConfigOptions,string>()
61+
{
62+
{AdProviderConfigOptions.AppId,"ApplicationId"},
63+
{AdProviderConfigOptions.SecondaryId,"AdUnitId"},
64+
{AdProviderConfigOptions.AdWidth,"Width"},
65+
{AdProviderConfigOptions.AdHeight,"Height"},
66+
//WinRT components cannot dynamically bind events, the rotters :(
67+
//{AdProviderConfigOptions.AdSuccessEvent,"AdRefreshed"},
68+
//{AdProviderConfigOptions.AdFailedEvent,"ErrorOccurred"}
69+
}
70+
}
71+
},
5872
{SupportedPlatforms.WindowsPhone81Appx, new AdProviderDetails()
5973
{
6074
ConfigurationOptions = new Dictionary<AdProviderConfigOptions,string>()

‎AdRotator/AdProviders/AdProviderSmaato.cs‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,60 @@ public AdProviderSmaato()
4747
}
4848
}
4949
},
50+
{SupportedPlatforms.Windows8, new AdProviderDetails()
51+
{
52+
AssemblyName = "SOMAW81",
53+
ElementName = "SOMAW81.SomaAdViewer",
54+
ConfigurationOptions = new Dictionary<AdProviderConfigOptions,string>()
55+
{
56+
{AdProviderConfigOptions.AppId,"Adspace"},
57+
{AdProviderConfigOptions.SecondaryId,"Pub"},
58+
{AdProviderConfigOptions.StartMethod,"StartAds"},
59+
{AdProviderConfigOptions.AdWidth,"AdSpaceWidth"},
60+
{AdProviderConfigOptions.AdHeight,"AdSpaceHeight"},
61+
{AdProviderConfigOptions.ShowErrors,"ShowErrors"},
62+
{AdProviderConfigOptions.AdSuccessEvent,"NewAdAvailable"},
63+
{AdProviderConfigOptions.AdFailedEvent,"AdError"},
64+
{AdProviderConfigOptions.AdClickedEvent,"AdClick"}
65+
}
66+
}
67+
},
68+
{SupportedPlatforms.Windows81, new AdProviderDetails()
69+
{
70+
AssemblyName = "SOMAW81",
71+
ElementName = "SOMAW81.SomaAdViewer",
72+
ConfigurationOptions = new Dictionary<AdProviderConfigOptions,string>()
73+
{
74+
{AdProviderConfigOptions.AppId,"Adspace"},
75+
{AdProviderConfigOptions.SecondaryId,"Pub"},
76+
{AdProviderConfigOptions.StartMethod,"StartAds"},
77+
{AdProviderConfigOptions.AdWidth,"AdSpaceWidth"},
78+
{AdProviderConfigOptions.AdHeight,"AdSpaceHeight"},
79+
{AdProviderConfigOptions.ShowErrors,"ShowErrors"},
80+
{AdProviderConfigOptions.AdSuccessEvent,"NewAdAvailable"},
81+
{AdProviderConfigOptions.AdFailedEvent,"AdError"},
82+
{AdProviderConfigOptions.AdClickedEvent,"AdClick"}
83+
}
84+
}
85+
},
86+
{SupportedPlatforms.WindowsPhone81Appx, new AdProviderDetails()
87+
{
88+
AssemblyName = "SOMAWP81",
89+
ElementName = "SOMAWP81.SomaAdViewer",
90+
ConfigurationOptions = new Dictionary<AdProviderConfigOptions,string>()
91+
{
92+
{AdProviderConfigOptions.AppId,"Adspace"},
93+
{AdProviderConfigOptions.SecondaryId,"Pub"},
94+
{AdProviderConfigOptions.StartMethod,"StartAds"},
95+
{AdProviderConfigOptions.AdWidth,"AdSpaceWidth"},
96+
{AdProviderConfigOptions.AdHeight,"AdSpaceHeight"},
97+
{AdProviderConfigOptions.ShowErrors,"ShowErrors"},
98+
{AdProviderConfigOptions.AdSuccessEvent,"NewAdAvailable"},
99+
{AdProviderConfigOptions.AdFailedEvent,"AdError"},
100+
{AdProviderConfigOptions.AdClickedEvent,"AdClick"}
101+
}
102+
}
103+
},
50104
};
51105
}
52106
}

‎AdRotator/AdRotator.Core.Universal.csproj‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,13 @@
8282
<Folder Include="SampleXML\" />
8383
</ItemGroup>
8484
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
85+
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
86+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
87+
<PropertyGroup>
88+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
89+
</PropertyGroup>
90+
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
91+
</Target>
8592
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
8693
Other similar extension points exist, see Microsoft.Common.targets.
8794
<Target Name="BeforeBuild">

‎AdRotator/AdRotatorControl.cs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ public sealed class AdRotatorControl : Control, IAdRotatorProvider, IDisposable
3434
#endif
3535
#elif WINDOWS_PHONE_APP
3636
AdRotator.AdProviderConfig.SupportedPlatforms CurrentPlatform = AdRotator.AdProviderConfig.SupportedPlatforms.WindowsPhone81Appx;
37+
#elif WINDOWS_APP
38+
AdRotator.AdProviderConfig.SupportedPlatforms CurrentPlatform = AdRotator.AdProviderConfig.SupportedPlatforms.Windows81;
3739
#else
3840
AdRotator.AdProviderConfig.SupportedPlatforms CurrentPlatform = AdRotator.AdProviderConfig.SupportedPlatforms.Windows8;
3941
#endif
@@ -68,11 +70,13 @@ public AdRotatorControl(int id)
6870
AdType.Inmobi,
6971
AdType.DefaultHouseAd,
7072
AdType.None,
73+
#if !WP7
74+
AdType.Smaato,
75+
#endif
7176
#if WINDOWS_PHONE
7277
#if !WP7
7378
AdType.AdMob,
7479
#endif
75-
AdType.Smaato,
7680
AdType.MobFox,
7781
AdType.InnerActive,
7882
#endif

‎AdRotator/Clients/WinUniversal/AdRotator.Universal.csproj‎ renamed to ‎AdRotator/Clients/WinPhone81/AdRotator.Universal.csproj‎

File renamed without changes.

‎AdRotator/Clients/WinPhone81/AdRotator.WindowsPhone81.csproj‎

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProductVersion>8.0.30703</ProductVersion>
8+
<SchemaVersion>2.0</SchemaVersion>
9+
<ProjectGuid>{43D11F0A-C577-4B07-B7E9-E1AF99ABC5E6}</ProjectGuid>
10+
<OutputType>Library</OutputType>
11+
<AppDesignerFolder>Properties</AppDesignerFolder>
12+
<RootNamespace>AdRotator</RootNamespace>
13+
<AssemblyName>AdRotator</AssemblyName>
14+
<DefaultLanguage>en-US</DefaultLanguage>
15+
<TargetPlatformVersion>8.1</TargetPlatformVersion>
16+
<MinimumVisualStudioVersion>12</MinimumVisualStudioVersion>
17+
<FileAlignment>512</FileAlignment>
18+
<ProjectTypeGuids>{76F1466A-8B6D-4E39-A767-685A06062A39};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
19+
</PropertyGroup>
20+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
21+
<DebugSymbols>true</DebugSymbols>
22+
<DebugType>full</DebugType>
23+
<Optimize>false</Optimize>
24+
<OutputPath>bin\Debug\</OutputPath>
25+
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_PHONE_APP</DefineConstants>
26+
<ErrorReport>prompt</ErrorReport>
27+
<WarningLevel>4</WarningLevel>
28+
</PropertyGroup>
29+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
30+
<DebugType>pdbonly</DebugType>
31+
<Optimize>true</Optimize>
32+
<OutputPath>..\..\bin\WindowsPhone81\AnyCPU\</OutputPath>
33+
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_PHONE_APP;</DefineConstants>
34+
<ErrorReport>prompt</ErrorReport>
35+
<WarningLevel>4</WarningLevel>
36+
</PropertyGroup>
37+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
38+
<DebugSymbols>true</DebugSymbols>
39+
<OutputPath>bin\ARM\Debug\</OutputPath>
40+
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_PHONE_APP</DefineConstants>
41+
<NoWarn>;2008</NoWarn>
42+
<DebugType>full</DebugType>
43+
<PlatformTarget>ARM</PlatformTarget>
44+
<UseVSHostingProcess>false</UseVSHostingProcess>
45+
<ErrorReport>prompt</ErrorReport>
46+
<Prefer32Bit>true</Prefer32Bit>
47+
</PropertyGroup>
48+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
49+
<OutputPath>bin\ARM\Release\</OutputPath>
50+
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_PHONE_APP</DefineConstants>
51+
<Optimize>true</Optimize>
52+
<NoWarn>;2008</NoWarn>
53+
<DebugType>pdbonly</DebugType>
54+
<PlatformTarget>ARM</PlatformTarget>
55+
<UseVSHostingProcess>false</UseVSHostingProcess>
56+
<ErrorReport>prompt</ErrorReport>
57+
<Prefer32Bit>true</Prefer32Bit>
58+
</PropertyGroup>
59+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
60+
<DebugSymbols>true</DebugSymbols>
61+
<OutputPath>bin\x86\Debug\</OutputPath>
62+
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_PHONE_APP</DefineConstants>
63+
<NoWarn>;2008</NoWarn>
64+
<DebugType>full</DebugType>
65+
<PlatformTarget>x86</PlatformTarget>
66+
<UseVSHostingProcess>false</UseVSHostingProcess>
67+
<ErrorReport>prompt</ErrorReport>
68+
<Prefer32Bit>true</Prefer32Bit>
69+
</PropertyGroup>
70+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
71+
<OutputPath>bin\x86\Release\</OutputPath>
72+
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_PHONE_APP</DefineConstants>
73+
<Optimize>true</Optimize>
74+
<NoWarn>;2008</NoWarn>
75+
<DebugType>pdbonly</DebugType>
76+
<PlatformTarget>x86</PlatformTarget>
77+
<UseVSHostingProcess>false</UseVSHostingProcess>
78+
<ErrorReport>prompt</ErrorReport>
79+
<Prefer32Bit>true</Prefer32Bit>
80+
</PropertyGroup>
81+
<ItemGroup>
82+
<Compile Include="..\..\AdRotatorControl.cs">
83+
<Link>AdRotatorControl.cs</Link>
84+
</Compile>
85+
<Compile Include="..\..\DefaultHouseAd.cs">
86+
<Link>DefaultHouseAd.cs</Link>
87+
</Compile>
88+
<Compile Include="..\..\Properties\AssemblyInfo.cs">
89+
<Link>Properties\AssemblyInfo.cs</Link>
90+
</Compile>
91+
<Compile Include="..\..\Utilities\FileHelpers.cs">
92+
<Link>Utilities\FileHelpers.cs</Link>
93+
</Compile>
94+
</ItemGroup>
95+
<ItemGroup>
96+
<Page Include="Themes\Generic.xaml">
97+
<Generator>MSBuild:Compile</Generator>
98+
<SubType>Designer</SubType>
99+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
100+
</Page>
101+
</ItemGroup>
102+
<ItemGroup>
103+
<ProjectReference Include="..\..\AdRotator.Core.Universal.csproj">
104+
<Project>{6ec8d15e-4a48-42fd-acf1-c024c4098870}</Project>
105+
<Name>AdRotator.Core.Universal</Name>
106+
</ProjectReference>
107+
</ItemGroup>
108+
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '12.0' ">
109+
<VisualStudioVersion>12.0</VisualStudioVersion>
110+
</PropertyGroup>
111+
<PropertyGroup Condition=" '$(TargetPlatformIdentifier)' == '' ">
112+
<TargetPlatformIdentifier>WindowsPhoneApp</TargetPlatformIdentifier>
113+
</PropertyGroup>
114+
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
115+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
116+
Other similar extension points exist, see Microsoft.Common.targets.
117+
<Target Name="BeforeBuild">
118+
</Target>
119+
<Target Name="AfterBuild">
120+
</Target>
121+
-->
122+
</Project>

‎AdRotator/Clients/WinUniversal/Themes/Generic.xaml‎ renamed to ‎AdRotator/Clients/WinPhone81/Themes/Generic.xaml‎

File renamed without changes.

0 commit comments

Comments
 (0)