Merge pull request #13 from nativecode-dev/development

Development

Author: mikepham

src/Demo/Demo.Droid/Demo.Droid.csproj

@@ -111,17 +111,9 @@
       <Name>Demo</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\values\styles.xml">
-      <SubType>Designer</SubType>
-    </AndroidResource>
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\launcher.png" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\values-v21\styles.xml" />
-  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <Import Project="..\..\packages\Xamarin.Forms.1.4.2.6359\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.1.4.2.6359\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

src/Demo/Demo.Droid/MainActivity.cs

@@ -6,17 +6,14 @@
 
     using NativeCode.Mobile.AppCompat.FormsAppCompat;
     using NativeCode.Mobile.AppCompat.Renderers;
-    using NativeCode.Mobile.AppCompat.Renderers.Renderers;
 
     using Xamarin.Forms;
 
-    [Activity(ConfigurationChanges = AppConfig, MainLauncher = true, Theme = AppTheme)]
+    [Activity(ConfigurationChanges = AppConfig, MainLauncher = true, Theme = CompatThemeLightDarkActionBar)]
     public class MainActivity : AppCompatFormsApplicationActivity
     {
         private const ConfigChanges AppConfig = ConfigChanges.Orientation | ConfigChanges.ScreenSize;
 
-        private const string AppTheme = "@style/AppTheme";
-
         protected override void OnCreate(Bundle savedInstanceState)
         {
             base.OnCreate(savedInstanceState);

src/Demo/Demo.Droid/Resources/Resource.Designer.cs

@@ -26,15 +26,7 @@ private static Page CreateMainPage()
 
         private static MasterDetailPage CreateMasterDetailPage(Page master, Page detail)
         {
-            MasterDetail = new MasterDetailPage
-            {
-                Detail = detail,
-                Master = master,
-                MasterBehavior = MasterBehavior.Popover,
-                Title = "AppCompat Demo"
-            };
-
-            return MasterDetail;
+            return MasterDetail = new MasterDetailPage { Detail = detail, Master = master, MasterBehavior = MasterBehavior.Popover, Title = "AppCompat Demo" };
         }
 
         private static NavigationPage CreateNavigationPage(Page page)

src/Demo/Demo.Droid/Resources/values-v21/styles.xml

@@ -11,8 +11,8 @@
       </StackLayout>
     </controls:NavigationLayout.HeaderView>
     <controls:NavigationLayout.Children>
-      <controls:NavigationMenu Command="{Binding HomeCommand}" Text="{Binding HomeText}" />
-      <controls:NavigationMenu Command="{Binding LoremIpsumCommand}" Text="{Binding LoremIpsumText}" />
+      <controls:NavigationLayoutMenu Command="{Binding HomeCommand}" Text="{Binding HomeText}" />
+      <controls:NavigationLayoutMenu Command="{Binding LoremIpsumCommand}" Text="{Binding LoremIpsumText}" />
     </controls:NavigationLayout.Children>
   </controls:NavigationLayout>
 </ContentPage>

src/Demo/Demo.Droid/Resources/values/styles.xml

@@ -39,7 +39,7 @@
     <Compile Include="FloatingButtonSize.cs" />
     <Compile Include="ICommandProvider.cs" />
     <Compile Include="NavigationLayout.cs" />
-    <Compile Include="NavigationMenu.cs" />
+    <Compile Include="NavigationLayoutMenu.cs" />
     <Compile Include="Platforms\IUserNotifier.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

src/Demo/Demo/App.xaml.cs

@@ -2,7 +2,7 @@
 {
     using Xamarin.Forms;
 
-    public class NavigationLayout : Layout<NavigationMenu>
+    public class NavigationLayout : Layout<NavigationLayoutMenu>
     {
         public static readonly BindableProperty HeaderViewProperty = BindableProperty.Create<NavigationLayout, View>(x => x.HeaderView, default(View));
 

src/Demo/Demo/Views/MenuView.xaml

@@ -4,17 +4,17 @@
 
     using Xamarin.Forms;
 
-    public class NavigationMenu : View, ICommandProvider
+    public class NavigationLayoutMenu : View, ICommandProvider
     {
-        public static readonly BindableProperty CommandProperty = BindableProperty.Create<NavigationMenu, ICommand>(x => x.Command, default(ICommand));
+        public static readonly BindableProperty CommandProperty = BindableProperty.Create<NavigationLayoutMenu, ICommand>(x => x.Command, default(ICommand));
 
-        public static readonly BindableProperty CommandParameterProperty = BindableProperty.Create<NavigationMenu, object>(
+        public static readonly BindableProperty CommandParameterProperty = BindableProperty.Create<NavigationLayoutMenu, object>(
             x => x.CommandParameter,
             default(object));
 
-        public static readonly BindableProperty IconProperty = BindableProperty.Create<NavigationMenu, ImageSource>(x => x.Icon, default(ImageSource));
+        public static readonly BindableProperty IconProperty = BindableProperty.Create<NavigationLayoutMenu, ImageSource>(x => x.Icon, default(ImageSource));
 
-        public static readonly BindableProperty TextProperty = BindableProperty.Create<NavigationMenu, string>(x => x.Text, default(string));
+        public static readonly BindableProperty TextProperty = BindableProperty.Create<NavigationLayoutMenu, string>(x => x.Text, default(string));
 
         public ICommand Command
         {

src/NativeCode.Mobile.AppCompat.Controls/NativeCode.Mobile.AppCompat.Controls.csproj

@@ -1,7 +1,9 @@
 namespace NativeCode.Mobile.AppCompat.Renderers.Extensions
 {
     using System;
-    using System.Linq;
+    using System.Reflection;
+
+    using NativeCode.Mobile.AppCompat.Renderers.Helpers;
 
     using Xamarin.Forms;
 
@@ -10,10 +12,21 @@ namespace NativeCode.Mobile.AppCompat.Renderers.Extensions
     /// </summary>
     public static class ElementExtensions
     {
-        private const string ButtonController = "IButtonController";
+        private const string ButtonControllerType = "Xamarin.Forms.IButtonController, Xamarin.Forms.Core";
 
         private const string ButtonControllerSendClicked = "SendClicked";
 
+        private static readonly MethodInfo MethodSendClicked;
+
+        /// <summary>
+        /// Initializes static members of the <see cref="ElementExtensions"/> class.
+        /// </summary>
+        static ElementExtensions()
+        {
+            var type = Type.GetType(ButtonControllerType, true);
+            MethodSendClicked = type.GetMethod(ButtonControllerSendClicked);
+        }
+
         /// <summary>
         /// Tries to cast the element to a button controller and invoke the SendClicked method.
         /// </summary>
@@ -22,27 +35,7 @@ public static class ElementExtensions
         /// <remarks>The IButtonController is an internal interface, so we have to use reflection.</remarks>
         public static void InvokeSendClicked(this Element element)
         {
-            var type = GetImplementedInterface(element, ButtonController);
-            var method = type.GetMethod(ButtonControllerSendClicked);
-
-            if (method == null)
-            {
-                throw new MissingMethodException(type.Name, ButtonControllerSendClicked);
-            }
-
-            method.Invoke(element, new object[0]);
-        }
-
-        private static Type GetImplementedInterface(object instance, string name)
-        {
-            var type = instance.GetType().GetInterfaces().Single(x => x.Name == ButtonController);
-
-            if (type == null)
-            {
-                throw new InvalidCastException("Type does not implement interface " + name + ".");
-            }
-
-            return type;
+            MethodSendClicked.Invoke(element, ReflectionHelper.EmptyParameters);
         }
     }
 }

src/NativeCode.Mobile.AppCompat.Controls/NavigationLayout.cs

@@ -1,8 +1,9 @@
 namespace NativeCode.Mobile.AppCompat.Renderers.Extensions
 {
-    using System;
     using System.Reflection;
 
+    using NativeCode.Mobile.AppCompat.Renderers.Helpers;
+
     using Xamarin.Forms;
 
     /// <summary>
@@ -12,21 +13,24 @@ public static class EntryExtensions
     {
         private const string EntrySendCompleted = "SendCompleted";
 
+        private static readonly MethodInfo MethodSendCompleted;
+
+        /// <summary>
+        /// Initializes static members of the <see cref="EntryExtensions"/> class.
+        /// </summary>
+        static EntryExtensions()
+        {
+            var type = typeof(Entry);
+            MethodSendCompleted = type.GetMethod(EntrySendCompleted, ReflectionHelper.InstanceNonPublic);
+        }
+
         /// <summary>
         /// Invokes the send completed.
         /// </summary>
         /// <param name="entry">The entry.</param>
         public static void InvokeSendCompleted(this Entry entry)
         {
-            var type = entry.GetType();
-            var method = type.GetMethod(EntrySendCompleted, BindingFlags.Instance | BindingFlags.NonPublic);
-
-            if (method == null)
-            {
-                throw new MissingMethodException(type.Name, EntrySendCompleted);
-            }
-
-            method.Invoke(entry, new object[0]);
+            MethodSendCompleted.Invoke(entry, ReflectionHelper.EmptyParameters);
         }
     }
 }