summaryrefslogtreecommitdiff
path: root/Xamarin.Forms.Controls
diff options
context:
space:
mode:
authorE.Z. Hart <hartez@gmail.com>2016-03-22 23:16:53 (GMT)
committerE.Z. Hart <hartez@gmail.com>2016-03-30 22:22:35 (GMT)
commit17e2a4b94d5105b53c5875d9416d043f14313305 (patch)
tree6f03e5d6f562f230ed79d2e820327fe0bddc5069 /Xamarin.Forms.Controls
parentb3a64fadb3951d4e5e65b5f000a5f930772c01ed (diff)
downloadxamarin-forms-17e2a4b94d5105b53c5875d9416d043f14313305.zip
xamarin-forms-17e2a4b94d5105b53c5875d9416d043f14313305.tar.gz
xamarin-forms-17e2a4b94d5105b53c5875d9416d043f14313305.tar.bz2
Add options for specifying layout of button text/image content
Also make the layout and layout defaults consistent across platforms
Diffstat (limited to 'Xamarin.Forms.Controls')
-rw-r--r--Xamarin.Forms.Controls/App.cs7
1 files changed, 3 insertions, 4 deletions
diff --git a/Xamarin.Forms.Controls/App.cs b/Xamarin.Forms.Controls/App.cs
index 2556bc8..d75b35a 100644
--- a/Xamarin.Forms.Controls/App.cs
+++ b/Xamarin.Forms.Controls/App.cs
@@ -10,7 +10,7 @@ namespace Xamarin.Forms.Controls
{
public const string AppName = "XamarinFormsControls";
static string s_insightsKey;
-
+
// ReSharper disable once InconsistentNaming
public static int IOSVersion = -1;
@@ -24,8 +24,7 @@ namespace Xamarin.Forms.Controls
_testCloudService = DependencyService.Get<ITestCloudService>();
InitInsights();
// MainPage = new MainPageLifeCycleTests ();
- MainPage = new MasterDetailPage
- {
+ MainPage = new MasterDetailPage {
Master = new ContentPage { Title = "Master", BackgroundColor = Color.Red },
Detail = CoreGallery.GetMainPage()
};
@@ -65,7 +64,7 @@ namespace Xamarin.Forms.Controls
static Assembly GetAssembly(out string assemblystring)
{
- assemblystring = typeof (App).AssemblyQualifiedName.Split(',')[1].Trim();
+ assemblystring = typeof(App).AssemblyQualifiedName.Split(',')[1].Trim();
var assemblyname = new AssemblyName(assemblystring);
return Assembly.Load(assemblyname);
}