Skip to content

Commit

Permalink
[roget1911] update to 1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@conceptdev
conceptdev committed Dec 27, 2014
1 parent 2065f6c commit 6ae2a55
Show file tree
Hide file tree
Showing 10 changed files with 131 additions and 124 deletions.
9 changes: 6 additions & 3 deletions Roget1911/Roget1911.Android/MainActivity.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,14 @@
using Android.Widget;
using Android.OS;
using System.IO;
using Android.Content.PM;

namespace Roget1911
{
[Activity (Label = "Roget1911", MainLauncher = true)]
public class Activity1 : Xamarin.Forms.Platform.Android.AndroidActivity
[Activity (Label = "Roget1911",
MainLauncher = true,
ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
public class Activity1 : Xamarin.Forms.Platform.Android.FormsApplicationActivity
{
protected override void OnCreate (Bundle bundle)
{
Expand Down Expand Up @@ -51,7 +54,7 @@ protected override void OnCreate (Bundle bundle)

// App.SetTextToSpeech (new Speech ());

SetPage (App.GetMainPage ());
LoadApplication (new App ());
}

void ReadWriteStream(Stream readStream, Stream writeStream)
Expand Down
17 changes: 10 additions & 7 deletions Roget1911/Roget1911.Android/Roget1911.Android.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,22 +46,25 @@
<Reference Include="System.Core" />
<Reference Include="Mono.Android" />
<Reference Include="Xamarin.Android.Support.v4">
<HintPath>..\packages\Xamarin.Android.Support.v4.19.1.0\lib\MonoAndroid10\Xamarin.Android.Support.v4.dll</HintPath>
<HintPath>..\packages\Xamarin.Android.Support.v4.21.0.3.0\lib\MonoAndroid10\Xamarin.Android.Support.v4.dll</HintPath>
</Reference>
<Reference Include="PCLStorage">
<HintPath>..\packages\PCLStorage.0.9.6\lib\monoandroid\PCLStorage.dll</HintPath>
<HintPath>..\packages\PCLStorage.1.0.0\lib\monoandroid\PCLStorage.dll</HintPath>
</Reference>
<Reference Include="PCLStorage.Abstractions">
<HintPath>..\packages\PCLStorage.0.9.6\lib\monoandroid\PCLStorage.Abstractions.dll</HintPath>
<HintPath>..\packages\PCLStorage.1.0.0\lib\monoandroid\PCLStorage.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform.Android">
<HintPath>..\packages\Xamarin.Forms.1.2.2.6240-pre2\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.1.3.0.6292\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
</Reference>
<Reference Include="FormsViewGroup">
<HintPath>..\packages\Xamarin.Forms.1.3.0.6292\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Core">
<HintPath>..\packages\Xamarin.Forms.1.2.2.6240-pre2\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.1.3.0.6292\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\packages\Xamarin.Forms.1.2.2.6240-pre2\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.1.3.0.6292\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand All @@ -84,7 +87,7 @@
<AndroidResource Include="Resources\drawable\Icon.png" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
<Import Project="..\packages\Xamarin.Forms.1.2.2.6240-pre2\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets" />
<Import Project="..\packages\Xamarin.Forms.1.3.0.6292\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.3.0.6292\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets')" />
<ItemGroup>
<Folder Include="Resources\raw\" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Roget1911/Roget1911.Android/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<packages>
<package id="PCLStorage" version="1.0.0" targetFramework="MonoAndroid403" />
<package id="Xamarin.Android.Support.v4" version="21.0.3.0" targetFramework="MonoAndroid403" />
<package id="Xamarin.Forms" version="1.2.3.6257" targetFramework="MonoAndroid403" />
<package id="Xamarin.Forms" version="1.3.0.6292" targetFramework="MonoAndroid403" />
</packages>
12 changes: 4 additions & 8 deletions Roget1911/Roget1911.iOS/AppDelegate.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@
using MonoTouch.UIKit;
using Xamarin.Forms;
using System.IO;
using Xamarin.Forms.Platform.iOS;

namespace Roget1911
{
// The UIApplicationDelegate for the application. This class is responsible for launching the
// User Interface of the application, as well as listening (and optionally responding) to
// application events from iOS.
[Register ("AppDelegate")]
public partial class AppDelegate : UIApplicationDelegate
public partial class AppDelegate : FormsApplicationDelegate
{
// class-level declarations
UIWindow window;
Expand Down Expand Up @@ -54,14 +55,9 @@ public override bool FinishedLaunching (UIApplication app, NSDictionary options)

App.SetTextToSpeech (new Speech ());

// If you have defined a view, add it here:
// window.RootViewController = navigationController;
window.RootViewController = App.GetMainPage ().CreateViewController ();
LoadApplication (new App ());

// make the window visible
window.MakeKeyAndVisible ();

return true;
return base.FinishedLaunching(app, options);
}
}
}
Expand Down
21 changes: 13 additions & 8 deletions Roget1911/Roget1911.iOS/Roget1911.iOS.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<OutputType>Exe</OutputType>
<RootNamespace>Roget1911.iOS</RootNamespace>
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
<AssemblyName>QuickTodoiOS</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -24,6 +23,7 @@
<MtouchLink>None</MtouchLink>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchDebug>true</MtouchDebug>
<AssemblyName>Roget1911iOS</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
<DebugType>full</DebugType>
Expand All @@ -35,6 +35,7 @@
<MtouchLink>None</MtouchLink>
<ConsolePause>false</ConsolePause>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<AssemblyName>Roget1911iOS</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -48,6 +49,7 @@
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchDebug>true</MtouchDebug>
<CodesignKey>iPhone Developer</CodesignKey>
<AssemblyName>QuickTodoiOS</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>full</DebugType>
Expand All @@ -59,6 +61,7 @@
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<ConsolePause>false</ConsolePause>
<CodesignKey>iPhone Developer</CodesignKey>
<AssemblyName>QuickTodoiOS</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">
<DebugType>full</DebugType>
Expand All @@ -72,6 +75,7 @@
<BuildIpa>true</BuildIpa>
<CodesignProvision>Automatic:AdHoc</CodesignProvision>
<CodesignKey>iPhone Distribution</CodesignKey>
<AssemblyName>QuickTodoiOS</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|iPhone' ">
<DebugType>full</DebugType>
Expand All @@ -84,25 +88,26 @@
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<CodesignProvision>Automatic:AppStore</CodesignProvision>
<CodesignKey>iPhone Distribution</CodesignKey>
<AssemblyName>QuickTodoiOS</AssemblyName>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="monotouch" />
<Reference Include="PCLStorage">
<HintPath>..\packages\PCLStorage.0.9.6\lib\monotouch\PCLStorage.dll</HintPath>
<HintPath>..\packages\PCLStorage.1.0.0\lib\portable-monotouch+Xamarin.iOS+Xamarin.Mac\PCLStorage.dll</HintPath>
</Reference>
<Reference Include="PCLStorage.Abstractions">
<HintPath>..\packages\PCLStorage.0.9.6\lib\monotouch\PCLStorage.Abstractions.dll</HintPath>
<HintPath>..\packages\PCLStorage.1.0.0\lib\portable-monotouch+Xamarin.iOS+Xamarin.Mac\PCLStorage.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform.iOS">
<HintPath>..\packages\Xamarin.Forms.1.2.2.6240-pre2\lib\MonoTouch10\Xamarin.Forms.Platform.iOS.dll</HintPath>
<Reference Include="Xamarin.Forms.Platform.iOS.Classic">
<HintPath>..\packages\Xamarin.Forms.1.3.0.6292\lib\MonoTouch10\Xamarin.Forms.Platform.iOS.Classic.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Core">
<HintPath>..\packages\Xamarin.Forms.1.2.2.6240-pre2\lib\MonoTouch10\Xamarin.Forms.Core.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.1.3.0.6292\lib\MonoTouch10\Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\packages\Xamarin.Forms.1.2.2.6240-pre2\lib\MonoTouch10\Xamarin.Forms.Xaml.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.1.3.0.6292\lib\MonoTouch10\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand All @@ -126,7 +131,7 @@
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="../packages/Xamarin.Forms.Master.1.0.6460/build/portable-win+net45+wp80+MonoAndroid10+MonoTouch10/Xamarin.Forms.Master.targets" Condition="Exists('../packages/Xamarin.Forms.Master.1.0.6460/build/portable-win+net45+wp80+MonoAndroid10+MonoTouch10/Xamarin.Forms.Master.targets')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<Import Project="..\packages\Xamarin.Forms.1.2.2.6240-pre2\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets" />
<Import Project="..\packages\Xamarin.Forms.1.3.0.6292\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.3.0.6292\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets')" />
<ItemGroup>
<ProjectReference Include="..\Roget1911\Roget1911.csproj">
<Project>{5F610EA1-9E35-4870-AE9B-5E18B4B4D5B8}</Project>
Expand Down
8 changes: 4 additions & 4 deletions Roget1911/Roget1911.iOS/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="PCLStorage" version="0.9.6" targetFramework="MonoTouch10" />
<package id="Xamarin.Forms" version="1.2.2.6240-pre2" targetFramework="MonoTouch10" />
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="PCLStorage" version="1.0.0" targetFramework="MonoTouch10" />
<package id="Xamarin.Forms" version="1.3.0.6292" targetFramework="MonoTouch10" />
</packages>
Loading

0 comments on commit 6ae2a55

Please sign in to comment.