From 4aba999eaca222cee92da3fe3a06a97fc8bdbb18 Mon Sep 17 00:00:00 2001 From: Mike Pham Date: Sun, 12 Jul 2015 18:50:12 -0500 Subject: [PATCH 1/6] Minor code changes. --- .../Demo/Views/Shared/MenuHeaderView.xaml | 7 +-- .../Demo/Views/Shared/MenuHeaderView.xaml.cs | 4 +- ...ativeCode.Mobile.AppCompat.Controls.csproj | 1 - .../NavigationLayout.cs | 10 ++-- .../NavigationLayoutHeader.cs | 8 --- ...tiveCode.Mobile.AppCompat.Renderers.csproj | 1 - .../AppCompatMasterDetailRenderer.cs | 1 - .../NavigationLayoutHeaderRenderer.cs | 33 ----------- .../Renderers/NavigationLayoutRenderer.cs | 57 ++----------------- src/Xamarin.sln.DotSettings | 7 ++- 10 files changed, 20 insertions(+), 109 deletions(-) delete mode 100644 src/NativeCode.Mobile.AppCompat.Controls/NavigationLayoutHeader.cs delete mode 100644 src/NativeCode.Mobile.AppCompat.Renderers/Renderers/NavigationLayoutHeaderRenderer.cs diff --git a/src/Demo/Demo/Views/Shared/MenuHeaderView.xaml b/src/Demo/Demo/Views/Shared/MenuHeaderView.xaml index e7a2ce1..628bc84 100644 --- a/src/Demo/Demo/Views/Shared/MenuHeaderView.xaml +++ b/src/Demo/Demo/Views/Shared/MenuHeaderView.xaml @@ -1,7 +1,6 @@  - + - + diff --git a/src/Demo/Demo/Views/Shared/MenuHeaderView.xaml.cs b/src/Demo/Demo/Views/Shared/MenuHeaderView.xaml.cs index 862cacf..5c87aa4 100644 --- a/src/Demo/Demo/Views/Shared/MenuHeaderView.xaml.cs +++ b/src/Demo/Demo/Views/Shared/MenuHeaderView.xaml.cs @@ -1,8 +1,8 @@ namespace Demo.Views.Shared { - using NativeCode.Mobile.AppCompat.Controls; + using Xamarin.Forms; - public partial class MenuHeaderView : NavigationLayoutHeader + public partial class MenuHeaderView : ContentView { public MenuHeaderView() { diff --git a/src/NativeCode.Mobile.AppCompat.Controls/NativeCode.Mobile.AppCompat.Controls.csproj b/src/NativeCode.Mobile.AppCompat.Controls/NativeCode.Mobile.AppCompat.Controls.csproj index 87db941..bfe9124 100644 --- a/src/NativeCode.Mobile.AppCompat.Controls/NativeCode.Mobile.AppCompat.Controls.csproj +++ b/src/NativeCode.Mobile.AppCompat.Controls/NativeCode.Mobile.AppCompat.Controls.csproj @@ -43,7 +43,6 @@ - diff --git a/src/NativeCode.Mobile.AppCompat.Controls/NavigationLayout.cs b/src/NativeCode.Mobile.AppCompat.Controls/NavigationLayout.cs index 428fa6c..57fcf7b 100644 --- a/src/NativeCode.Mobile.AppCompat.Controls/NavigationLayout.cs +++ b/src/NativeCode.Mobile.AppCompat.Controls/NavigationLayout.cs @@ -1,18 +1,16 @@ namespace NativeCode.Mobile.AppCompat.Controls { - using NativeCode.Mobile.AppCompat.Controls.Platforms; - using Xamarin.Forms; public class NavigationLayout : Layout { - public static readonly BindableProperty HeaderViewProperty = BindableProperty.Create( + public static readonly BindableProperty HeaderViewProperty = BindableProperty.Create( x => x.HeaderView, - default(NavigationLayoutHeader)); + default(ContentView)); - public NavigationLayoutHeader HeaderView + public ContentView HeaderView { - get { return (NavigationLayoutHeader)this.GetValue(HeaderViewProperty); } + get { return (ContentView)this.GetValue(HeaderViewProperty); } set { this.SetValue(HeaderViewProperty, value); } } diff --git a/src/NativeCode.Mobile.AppCompat.Controls/NavigationLayoutHeader.cs b/src/NativeCode.Mobile.AppCompat.Controls/NavigationLayoutHeader.cs deleted file mode 100644 index ae19022..0000000 --- a/src/NativeCode.Mobile.AppCompat.Controls/NavigationLayoutHeader.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace NativeCode.Mobile.AppCompat.Controls -{ - using Xamarin.Forms; - - public class NavigationLayoutHeader : ContentView - { - } -} \ No newline at end of file diff --git a/src/NativeCode.Mobile.AppCompat.Renderers/NativeCode.Mobile.AppCompat.Renderers.csproj b/src/NativeCode.Mobile.AppCompat.Renderers/NativeCode.Mobile.AppCompat.Renderers.csproj index 518df26..fd44188 100644 --- a/src/NativeCode.Mobile.AppCompat.Renderers/NativeCode.Mobile.AppCompat.Renderers.csproj +++ b/src/NativeCode.Mobile.AppCompat.Renderers/NativeCode.Mobile.AppCompat.Renderers.csproj @@ -89,7 +89,6 @@ - diff --git a/src/NativeCode.Mobile.AppCompat.Renderers/Renderers/AppCompatMasterDetailRenderer.cs b/src/NativeCode.Mobile.AppCompat.Renderers/Renderers/AppCompatMasterDetailRenderer.cs index 0272dfa..6c343e8 100644 --- a/src/NativeCode.Mobile.AppCompat.Renderers/Renderers/AppCompatMasterDetailRenderer.cs +++ b/src/NativeCode.Mobile.AppCompat.Renderers/Renderers/AppCompatMasterDetailRenderer.cs @@ -3,7 +3,6 @@ namespace NativeCode.Mobile.AppCompat.Renderers.Renderers using System.ComponentModel; using Android.App; - using Android.Provider; using Android.Support.V4.Widget; using Android.Support.V7.App; diff --git a/src/NativeCode.Mobile.AppCompat.Renderers/Renderers/NavigationLayoutHeaderRenderer.cs b/src/NativeCode.Mobile.AppCompat.Renderers/Renderers/NavigationLayoutHeaderRenderer.cs deleted file mode 100644 index e6afa1d..0000000 --- a/src/NativeCode.Mobile.AppCompat.Renderers/Renderers/NavigationLayoutHeaderRenderer.cs +++ /dev/null @@ -1,33 +0,0 @@ -using NativeCode.Mobile.AppCompat.Controls; -using NativeCode.Mobile.AppCompat.Controls.Platforms; -using NativeCode.Mobile.AppCompat.Renderers.Renderers; - -using Xamarin.Forms; - -[assembly: ExportRenderer(typeof(NavigationLayoutHeader), typeof(NavigationLayoutHeaderRenderer))] - -namespace NativeCode.Mobile.AppCompat.Renderers.Renderers -{ - using Android.Widget; - - using NativeCode.Mobile.AppCompat.Controls.Platforms; - using NativeCode.Mobile.AppCompat.Extensions; - - using Xamarin.Forms.Platform.Android; - - public class NavigationLayoutHeaderRenderer : ViewRenderer - { - protected override void OnElementChanged(ElementChangedEventArgs e) - { - base.OnElementChanged(e); - - if (this.Control == null) - { - var context = this.Context.GetAppCompatThemedContext(); - var control = new FrameLayout(context); - - this.SetNativeControl(control); - } - } - } -} \ No newline at end of file diff --git a/src/NativeCode.Mobile.AppCompat.Renderers/Renderers/NavigationLayoutRenderer.cs b/src/NativeCode.Mobile.AppCompat.Renderers/Renderers/NavigationLayoutRenderer.cs index fadd4ef..f5c72ce 100644 --- a/src/NativeCode.Mobile.AppCompat.Renderers/Renderers/NavigationLayoutRenderer.cs +++ b/src/NativeCode.Mobile.AppCompat.Renderers/Renderers/NavigationLayoutRenderer.cs @@ -3,16 +3,13 @@ namespace NativeCode.Mobile.AppCompat.Renderers.Renderers using System.Collections.Generic; using System.Linq; - using Android.Content; using Android.Support.Design.Widget; using Android.Views; using NativeCode.Mobile.AppCompat.Controls; using NativeCode.Mobile.AppCompat.Extensions; using NativeCode.Mobile.AppCompat.Renderers.Extensions; - using NativeCode.Mobile.AppCompat.Renderers.Helpers; - using Xamarin.Forms; using Xamarin.Forms.Platform.Android; public class NavigationLayoutRenderer : ViewRenderer, NavigationView.IOnNavigationItemSelectedListener @@ -74,12 +71,14 @@ private void Reset() private void UpdateHeaderView() { - if (this.Element.HeaderView != null) + if (this.Element.HeaderView == null) { - // TODO: It's adding it, but it never shows up in the XML in monitor. - var renderer = this.Element.HeaderView.GetRenderer(); - this.Control.AddHeaderView(new HeaderContainer(this.Context, renderer)); + return; } + + // TODO: It's adding it, but it never shows up in the XML in monitor. + var header = this.Element.HeaderView.GetNativeView(); + this.Control.AddHeaderView(header); } private void UpdateMenuItems() @@ -99,49 +98,5 @@ private void UpdateMenuItems() this.mappings.Add(item, menu); } } - - internal class HeaderContainer : ViewGroup - { - private readonly IVisualElementRenderer child; - - public HeaderContainer(Context context, IVisualElementRenderer child) - : base(context) - { - this.child = child; - } - - protected override void OnMeasure(int widthMeasureSpec, int heightMeasureSpec) - { - if (this.child == null) - { - this.SetMeasuredDimension(widthMeasureSpec, heightMeasureSpec); - } - else - { - var element = this.child.Element; - var context = this.Context; - var width = (int)context.FromPixels(MeasureSpecFactory.GetSize(widthMeasureSpec)); - var size = this.child.Element.GetSizeRequest(width, double.PositiveInfinity); - - this.child.Element.Layout(new Rectangle(0.0, 0.0, width, size.Request.Height)); - - var measuredWidth = MeasureSpecFactory.MakeMeasureSpec((int)context.ToPixels(element.Width), MeasureSpecMode.Exactly); - var measuredHeight = MeasureSpecFactory.MakeMeasureSpec((int)context.ToPixels(element.Height), MeasureSpecMode.Exactly); - - this.child.ViewGroup.Measure(widthMeasureSpec, heightMeasureSpec); - this.SetMeasuredDimension(measuredWidth, measuredHeight); - } - } - - protected override void OnLayout(bool changed, int l, int t, int r, int b) - { - if (this.child == null) - { - return; - } - - this.child.UpdateLayout(); - } - } } } \ No newline at end of file diff --git a/src/Xamarin.sln.DotSettings b/src/Xamarin.sln.DotSettings index c984ad4..10e166e 100644 --- a/src/Xamarin.sln.DotSettings +++ b/src/Xamarin.sln.DotSettings @@ -1,5 +1,5 @@  - <?xml version="1.0" encoding="utf-16"?><Profile name="NativeCode"><RemoveCodeRedundancies>True</RemoveCodeRedundancies><CSUseAutoProperty>True</CSUseAutoProperty><CSMakeFieldReadonly>True</CSMakeFieldReadonly><CSMakeAutoPropertyGetOnly>True</CSMakeAutoPropertyGetOnly><CSArrangeQualifiers>True</CSArrangeQualifiers><CSFixBuiltinTypeReferences>True</CSFixBuiltinTypeReferences><CSEnforceVarKeywordUsageSettings>True</CSEnforceVarKeywordUsageSettings><CSReorderTypeMembers>True</CSReorderTypeMembers><CSOptimizeUsings><OptimizeUsings>True</OptimizeUsings><EmbraceInRegion>False</EmbraceInRegion><RegionName></RegionName></CSOptimizeUsings><CSShortenReferences>True</CSShortenReferences><CSReformatCode>True</CSReformatCode><AspOptimizeRegisterDirectives>True</AspOptimizeRegisterDirectives><HtmlReformatCode>True</HtmlReformatCode><FormatAttributeQuoteDescriptor>True</FormatAttributeQuoteDescriptor><CorrectVariableKindsDescriptor>True</CorrectVariableKindsDescriptor><VariablesToInnerScopesDescriptor>True</VariablesToInnerScopesDescriptor><StringToTemplatesDescriptor>True</StringToTemplatesDescriptor><JsReformatCode>True</JsReformatCode><JsFormatDocComments>True</JsFormatDocComments><JsInsertSemicolon>True</JsInsertSemicolon><RemoveRedundantQualifiersTs>True</RemoveRedundantQualifiersTs><OptimizeImportsTs>True</OptimizeImportsTs><OptimizeReferenceCommentsTs>True</OptimizeReferenceCommentsTs><PublicModifierStyleTs>True</PublicModifierStyleTs><ExplicitAnyTs>True</ExplicitAnyTs><TypeAnnotationStyleTs>True</TypeAnnotationStyleTs><RelativePathStyleTs>True</RelativePathStyleTs><XMLReformatCode>True</XMLReformatCode><CssAlphabetizeProperties>True</CssAlphabetizeProperties><CssReformatCode>True</CssReformatCode><StyleCop.Documentation><SA1600ElementsMustBeDocumented>True</SA1600ElementsMustBeDocumented><SA1604ElementDocumentationMustHaveSummary>True</SA1604ElementDocumentationMustHaveSummary><SA1609PropertyDocumentationMustHaveValueDocumented>True</SA1609PropertyDocumentationMustHaveValueDocumented><SA1611ElementParametersMustBeDocumented>True</SA1611ElementParametersMustBeDocumented><SA1615ElementReturnValueMustBeDocumented>True</SA1615ElementReturnValueMustBeDocumented><SA1617VoidReturnValueMustNotBeDocumented>True</SA1617VoidReturnValueMustNotBeDocumented><SA1618GenericTypeParametersMustBeDocumented>True</SA1618GenericTypeParametersMustBeDocumented><SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes>True</SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes><SA1628DocumentationTextMustBeginWithACapitalLetter>True</SA1628DocumentationTextMustBeginWithACapitalLetter><SA1629DocumentationTextMustEndWithAPeriod>True</SA1629DocumentationTextMustEndWithAPeriod><SA1633SA1641UpdateFileHeader>False</SA1633SA1641UpdateFileHeader><SA1639FileHeaderMustHaveSummary>True</SA1639FileHeaderMustHaveSummary><SA1642ConstructorSummaryDocumentationMustBeginWithStandardText>True</SA1642ConstructorSummaryDocumentationMustBeginWithStandardText><SA1643DestructorSummaryDocumentationMustBeginWithStandardText>True</SA1643DestructorSummaryDocumentationMustBeginWithStandardText><SA1644DocumentationHeadersMustNotContainBlankLines>True</SA1644DocumentationHeadersMustNotContainBlankLines></StyleCop.Documentation></Profile> + <?xml version="1.0" encoding="utf-16"?><Profile name="NativeCode"><RemoveCodeRedundancies>True</RemoveCodeRedundancies><CSUseAutoProperty>True</CSUseAutoProperty><CSMakeFieldReadonly>True</CSMakeFieldReadonly><CSMakeAutoPropertyGetOnly>True</CSMakeAutoPropertyGetOnly><CSArrangeQualifiers>True</CSArrangeQualifiers><CSFixBuiltinTypeReferences>True</CSFixBuiltinTypeReferences><CSEnforceVarKeywordUsageSettings>True</CSEnforceVarKeywordUsageSettings><CSOptimizeUsings><OptimizeUsings>True</OptimizeUsings><EmbraceInRegion>False</EmbraceInRegion><RegionName></RegionName></CSOptimizeUsings><CSShortenReferences>True</CSShortenReferences><CSReformatCode>True</CSReformatCode><CSharpFormatDocComments>True</CSharpFormatDocComments><AspOptimizeRegisterDirectives>True</AspOptimizeRegisterDirectives><HtmlReformatCode>True</HtmlReformatCode><FormatAttributeQuoteDescriptor>True</FormatAttributeQuoteDescriptor><CorrectVariableKindsDescriptor>True</CorrectVariableKindsDescriptor><VariablesToInnerScopesDescriptor>True</VariablesToInnerScopesDescriptor><StringToTemplatesDescriptor>True</StringToTemplatesDescriptor><JsReformatCode>True</JsReformatCode><JsFormatDocComments>True</JsFormatDocComments><JsInsertSemicolon>True</JsInsertSemicolon><OptimizeImportsTs>True</OptimizeImportsTs><RemoveRedundantQualifiersTs>True</RemoveRedundantQualifiersTs><OptimizeReferenceCommentsTs>True</OptimizeReferenceCommentsTs><PublicModifierStyleTs>True</PublicModifierStyleTs><ExplicitAnyTs>True</ExplicitAnyTs><TypeAnnotationStyleTs>True</TypeAnnotationStyleTs><RelativePathStyleTs>True</RelativePathStyleTs><XMLReformatCode>True</XMLReformatCode><CssReformatCode>True</CssReformatCode><CssAlphabetizeProperties>True</CssAlphabetizeProperties><VBOptimizeImports>True</VBOptimizeImports><VBShortenReferences>True</VBShortenReferences><VBReformatCode>True</VBReformatCode><VBFormatDocComments>True</VBFormatDocComments><StyleCop.Documentation><SA1600ElementsMustBeDocumented>True</SA1600ElementsMustBeDocumented><SA1604ElementDocumentationMustHaveSummary>True</SA1604ElementDocumentationMustHaveSummary><SA1609PropertyDocumentationMustHaveValueDocumented>True</SA1609PropertyDocumentationMustHaveValueDocumented><SA1611ElementParametersMustBeDocumented>True</SA1611ElementParametersMustBeDocumented><SA1615ElementReturnValueMustBeDocumented>True</SA1615ElementReturnValueMustBeDocumented><SA1617VoidReturnValueMustNotBeDocumented>True</SA1617VoidReturnValueMustNotBeDocumented><SA1618GenericTypeParametersMustBeDocumented>True</SA1618GenericTypeParametersMustBeDocumented><SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes>True</SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes><SA1628DocumentationTextMustBeginWithACapitalLetter>True</SA1628DocumentationTextMustBeginWithACapitalLetter><SA1629DocumentationTextMustEndWithAPeriod>True</SA1629DocumentationTextMustEndWithAPeriod><SA1633SA1641UpdateFileHeader>False</SA1633SA1641UpdateFileHeader><SA1639FileHeaderMustHaveSummary>True</SA1639FileHeaderMustHaveSummary><SA1642ConstructorSummaryDocumentationMustBeginWithStandardText>True</SA1642ConstructorSummaryDocumentationMustBeginWithStandardText><SA1643DestructorSummaryDocumentationMustBeginWithStandardText>True</SA1643DestructorSummaryDocumentationMustBeginWithStandardText><SA1644DocumentationHeadersMustNotContainBlankLines>True</SA1644DocumentationHeadersMustNotContainBlankLines></StyleCop.Documentation><StyleCop.Readability><SA1100DoNotPrefixCallsWithBaseUnlessLocalImplementationExists>False</SA1100DoNotPrefixCallsWithBaseUnlessLocalImplementationExists><SA1106CodeMustNotContainEmptyStatements>True</SA1106CodeMustNotContainEmptyStatements><SA1108BlockStatementsMustNotContainEmbeddedComments>True</SA1108BlockStatementsMustNotContainEmbeddedComments><SA1109BlockStatementsMustNotContainEmbeddedRegions>True</SA1109BlockStatementsMustNotContainEmbeddedRegions><SA1120CommentsMustContainText>True</SA1120CommentsMustContainText><SA1121UseBuiltInTypeAlias>True</SA1121UseBuiltInTypeAlias><SA1122UseStringEmptyForEmptyStrings>True</SA1122UseStringEmptyForEmptyStrings><SA1123DoNotPlaceRegionsWithinElements>True</SA1123DoNotPlaceRegionsWithinElements><SA1124CodeMustNotContainEmptyRegions>True</SA1124CodeMustNotContainEmptyRegions></StyleCop.Readability></Profile> <?xml version="1.0" encoding="utf-16"?><Profile name="StyleCop"><CSArrangeQualifiers>True</CSArrangeQualifiers><CSOptimizeUsings><OptimizeUsings>True</OptimizeUsings><EmbraceInRegion>False</EmbraceInRegion><RegionName></RegionName></CSOptimizeUsings><CSReformatCode>True</CSReformatCode><CSReorderTypeMembers>True</CSReorderTypeMembers><StyleCop.Documentation><SA1600ElementsMustBeDocumented>True</SA1600ElementsMustBeDocumented><SA1604ElementDocumentationMustHaveSummary>True</SA1604ElementDocumentationMustHaveSummary><SA1609PropertyDocumentationMustHaveValueDocumented>True</SA1609PropertyDocumentationMustHaveValueDocumented><SA1611ElementParametersMustBeDocumented>True</SA1611ElementParametersMustBeDocumented><SA1615ElementReturnValueMustBeDocumented>True</SA1615ElementReturnValueMustBeDocumented><SA1617VoidReturnValueMustNotBeDocumented>True</SA1617VoidReturnValueMustNotBeDocumented><SA1618GenericTypeParametersMustBeDocumented>True</SA1618GenericTypeParametersMustBeDocumented><SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes>True</SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes><SA1628DocumentationTextMustBeginWithACapitalLetter>True</SA1628DocumentationTextMustBeginWithACapitalLetter><SA1629DocumentationTextMustEndWithAPeriod>True</SA1629DocumentationTextMustEndWithAPeriod><SA1633SA1641UpdateFileHeader>True</SA1633SA1641UpdateFileHeader><SA1639FileHeaderMustHaveSummary>True</SA1639FileHeaderMustHaveSummary><SA1642ConstructorSummaryDocumentationMustBeginWithStandardText>True</SA1642ConstructorSummaryDocumentationMustBeginWithStandardText><SA1643DestructorSummaryDocumentationMustBeginWithStandardText>True</SA1643DestructorSummaryDocumentationMustBeginWithStandardText><SA1644DocumentationHeadersMustNotContainBlankLines>True</SA1644DocumentationHeadersMustNotContainBlankLines></StyleCop.Documentation><StyleCop.Layout><SA1500CurlyBracketsForMultiLineStatementsMustNotShareLine>True</SA1500CurlyBracketsForMultiLineStatementsMustNotShareLine><SA1509OpeningCurlyBracketsMustNotBePrecededByBlankLine>True</SA1509OpeningCurlyBracketsMustNotBePrecededByBlankLine><SA1510ChainedStatementBlocksMustNotBePrecededByBlankLine>True</SA1510ChainedStatementBlocksMustNotBePrecededByBlankLine><SA1511WhileDoFooterMustNotBePrecededByBlankLine>True</SA1511WhileDoFooterMustNotBePrecededByBlankLine><SA1512SingleLineCommentsMustNotBeFollowedByBlankLine>True</SA1512SingleLineCommentsMustNotBeFollowedByBlankLine><SA1513ClosingCurlyBracketMustBeFollowedByBlankLine>True</SA1513ClosingCurlyBracketMustBeFollowedByBlankLine><SA1514ElementDocumentationHeaderMustBePrecededByBlankLine>True</SA1514ElementDocumentationHeaderMustBePrecededByBlankLine><SA1515SingleLineCommentMustBeProceededByBlankLine>True</SA1515SingleLineCommentMustBeProceededByBlankLine></StyleCop.Layout><StyleCop.Maintainability><SA1119StatementMustNotUseUnnecessaryParenthesis>True</SA1119StatementMustNotUseUnnecessaryParenthesis></StyleCop.Maintainability><StyleCop.Ordering><ExpandUsingDirectives>True</ExpandUsingDirectives><SA1212PropertyAccessorsMustFollowOrder>True</SA1212PropertyAccessorsMustFollowOrder><SA1213EventAccessorsMustFollowOrder>True</SA1213EventAccessorsMustFollowOrder></StyleCop.Ordering><StyleCop.Readability><SA1100DoNotPrefixCallsWithBaseUnlessLocalImplementationExists>True</SA1100DoNotPrefixCallsWithBaseUnlessLocalImplementationExists><SA1106CodeMustNotContainEmptyStatements>True</SA1106CodeMustNotContainEmptyStatements><SA1108BlockStatementsMustNotContainEmbeddedComments>True</SA1108BlockStatementsMustNotContainEmbeddedComments><SA1109BlockStatementsMustNotContainEmbeddedRegions>True</SA1109BlockStatementsMustNotContainEmbeddedRegions><SA1120CommentsMustContainText>True</SA1120CommentsMustContainText><SA1121UseBuiltInTypeAlias>True</SA1121UseBuiltInTypeAlias><SA1122UseStringEmptyForEmptyStrings>True</SA1122UseStringEmptyForEmptyStrings><SA1123DoNotPlaceRegionsWithinElements>True</SA1123DoNotPlaceRegionsWithinElements><SA1124CodeMustNotContainEmptyRegions>True</SA1124CodeMustNotContainEmptyRegions></StyleCop.Readability><StyleCop.Spacing><SA1001CommasMustBeSpacedCorrectly>True</SA1001CommasMustBeSpacedCorrectly><SA1005SingleLineCommentsMustBeginWithSingleSpace>True</SA1005SingleLineCommentsMustBeginWithSingleSpace><SA1006PreprocessorKeywordsMustNotBePrecededBySpace>True</SA1006PreprocessorKeywordsMustNotBePrecededBySpace><SA1021NegativeSignsMustBeSpacedCorrectly>True</SA1021NegativeSignsMustBeSpacedCorrectly><SA1022PositiveSignsMustBeSpacedCorrectly>True</SA1022PositiveSignsMustBeSpacedCorrectly><SA1025CodeMustNotContainMultipleWhitespaceInARow>True</SA1025CodeMustNotContainMultipleWhitespaceInARow></StyleCop.Spacing></Profile> NativeCode Field, Property, Event, Method @@ -35,6 +35,7 @@ True False + True @@ -408,4 +409,6 @@ True True True - True \ No newline at end of file + True + False + False \ No newline at end of file From d655d20a04c1ff4b35acfe563d465fa1436811a3 Mon Sep 17 00:00:00 2001 From: Mike Pham Date: Sun, 12 Jul 2015 19:59:42 -0500 Subject: [PATCH 2/6] Updating manifest and disabled all linking. --- src/Demo/Demo.Droid/Properties/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Demo/Demo.Droid/Properties/AndroidManifest.xml b/src/Demo/Demo.Droid/Properties/AndroidManifest.xml index e3a4a60..89f23d4 100644 --- a/src/Demo/Demo.Droid/Properties/AndroidManifest.xml +++ b/src/Demo/Demo.Droid/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@  - + \ No newline at end of file From 0be3c6b81a3533448e7b8effec22956866b5e770 Mon Sep 17 00:00:00 2001 From: Mike Pham Date: Tue, 14 Jul 2015 20:38:24 -0500 Subject: [PATCH 3/6] Updating packages. --- src/Demo/Demo.Droid/Demo.Droid.csproj | 31 +++-- src/Demo/Demo.Droid/MainActivity.cs | 2 +- src/Demo/Demo.Droid/packages.config | 2 +- src/Demo/Demo/Demo.csproj | 19 +-- src/Demo/Demo/Views/MainView.xaml | 10 +- src/Demo/Demo/packages.config | 2 +- ...ativeCode.Mobile.AppCompat.Controls.csproj | 21 +-- .../packages.config | 2 +- .../FormsAppCompat.cs | 2 +- ...tiveCode.Mobile.AppCompat.Renderers.csproj | 32 +++-- .../Renderers/AppCompatEntryLayoutRenderer.cs | 129 ++++++++++++++++++ .../packages.config | 2 +- .../NativeCode.Mobile.AppCompat.csproj | 16 +-- .../packages.config | 2 +- 14 files changed, 209 insertions(+), 63 deletions(-) create mode 100644 src/NativeCode.Mobile.AppCompat.Renderers/Renderers/AppCompatEntryLayoutRenderer.cs diff --git a/src/Demo/Demo.Droid/Demo.Droid.csproj b/src/Demo/Demo.Droid/Demo.Droid.csproj index 89f4cd5..5bc99ec 100644 --- a/src/Demo/Demo.Droid/Demo.Droid.csproj +++ b/src/Demo/Demo.Droid/Demo.Droid.csproj @@ -16,7 +16,7 @@ True v5.0 Properties\AndroidManifest.xml - e08ce7ee + 7efdbe4c true @@ -49,8 +49,9 @@ False - - ..\..\packages\Xamarin.Forms.1.4.3.6374\lib\MonoAndroid10\FormsViewGroup.dll + + ..\..\packages\Xamarin.Forms.1.4.3.6376\lib\MonoAndroid10\FormsViewGroup.dll + True @@ -74,17 +75,21 @@ ..\..\packages\Xamarin.Android.Support.v7.CardView.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll True - - ..\..\packages\Xamarin.Forms.1.4.3.6374\lib\MonoAndroid10\Xamarin.Forms.Core.dll + + ..\..\packages\Xamarin.Forms.1.4.3.6376\lib\MonoAndroid10\Xamarin.Forms.Core.dll + True - - ..\..\packages\Xamarin.Forms.1.4.3.6374\lib\MonoAndroid10\Xamarin.Forms.Platform.dll + + ..\..\packages\Xamarin.Forms.1.4.3.6376\lib\MonoAndroid10\Xamarin.Forms.Platform.dll + True - - ..\..\packages\Xamarin.Forms.1.4.3.6374\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll + + ..\..\packages\Xamarin.Forms.1.4.3.6376\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll + True - - ..\..\packages\Xamarin.Forms.1.4.3.6374\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll + + ..\..\packages\Xamarin.Forms.1.4.3.6376\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll + True @@ -131,11 +136,11 @@ - + 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}. - + \ No newline at end of file diff --git a/src/Demo/Demo.Droid/MainActivity.cs b/src/Demo/Demo.Droid/MainActivity.cs index 62a91b5..c71a495 100644 --- a/src/Demo/Demo.Droid/MainActivity.cs +++ b/src/Demo/Demo.Droid/MainActivity.cs @@ -9,7 +9,7 @@ using Xamarin.Forms; - [Activity(ConfigurationChanges = AppConfig, MainLauncher = true, Theme = CompatThemeLightDarkActionBar)] + [Activity(ConfigurationChanges = AppConfig, MainLauncher = true, Theme = CompatTheme)] public class MainActivity : AppCompatFormsApplicationActivity { private const ConfigChanges AppConfig = ConfigChanges.Orientation | ConfigChanges.ScreenSize; diff --git a/src/Demo/Demo.Droid/packages.config b/src/Demo/Demo.Droid/packages.config index 6f3333f..2332755 100644 --- a/src/Demo/Demo.Droid/packages.config +++ b/src/Demo/Demo.Droid/packages.config @@ -5,5 +5,5 @@ - + diff --git a/src/Demo/Demo/Demo.csproj b/src/Demo/Demo/Demo.csproj index 046864c..a446685 100644 --- a/src/Demo/Demo/Demo.csproj +++ b/src/Demo/Demo/Demo.csproj @@ -15,7 +15,7 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Profile78 v4.5 - bf239a56 + f9abc86c true @@ -76,14 +76,17 @@ ..\..\packages\PropertyChanged.Fody.1.50.1\Lib\portable-net4+sl4+wp8+win8+wpa81+MonoAndroid16+MonoTouch40\PropertyChanged.dll False - - ..\..\packages\Xamarin.Forms.1.4.3.6374\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll + + ..\..\packages\Xamarin.Forms.1.4.3.6376\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll + True - - ..\..\packages\Xamarin.Forms.1.4.3.6374\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Platform.dll + + ..\..\packages\Xamarin.Forms.1.4.3.6376\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Platform.dll + True - ..\..\packages\Xamarin.Forms.1.4.3.6374\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll + ..\..\packages\Xamarin.Forms.1.4.3.6376\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll + True @@ -143,10 +146,10 @@ 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}. - + - +