diff options
Diffstat (limited to 'Xamarin.Forms.Platform.Android')
19 files changed, 82 insertions, 7 deletions
diff --git a/Xamarin.Forms.Platform.Android/AppCompat/ButtonRenderer.cs b/Xamarin.Forms.Platform.Android/AppCompat/ButtonRenderer.cs index 7b7503e0..817519c7 100644 --- a/Xamarin.Forms.Platform.Android/AppCompat/ButtonRenderer.cs +++ b/Xamarin.Forms.Platform.Android/AppCompat/ButtonRenderer.cs @@ -127,7 +127,9 @@ namespace Xamarin.Forms.Platform.Android.AppCompat { Resources.Theme theme = context.Theme; if (theme != null && theme.ResolveAttribute(id, value, true)) +#pragma warning disable 618 Control.SupportBackgroundTintList = Resources.GetColorStateList(value.Data); +#pragma warning restore 618 else Control.SupportBackgroundTintList = new ColorStateList(States, new[] { (int)0xffd7d6d6, 0x7fd7d6d6 }); } diff --git a/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs b/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs index b7c02205..ac9e091c 100644 --- a/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs +++ b/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs @@ -303,7 +303,9 @@ namespace Xamarin.Forms.Platform.Android if (value.Type >= DataType.FirstInt && value.Type <= DataType.LastInt) return value.Data; if (value.Type == DataType.String) +#pragma warning disable 618 return context.Resources.GetColor(value.ResourceId); +#pragma warning restore 618 } } catch (Exception ex) diff --git a/Xamarin.Forms.Platform.Android/AppCompat/Platform.cs b/Xamarin.Forms.Platform.Android/AppCompat/Platform.cs index 12c6a02a..6c5d86ff 100644 --- a/Xamarin.Forms.Platform.Android/AppCompat/Platform.cs +++ b/Xamarin.Forms.Platform.Android/AppCompat/Platform.cs @@ -245,7 +245,9 @@ namespace Xamarin.Forms.Platform.Android.AppCompat return; Android.Platform.SetPageContext(page, _context); +#pragma warning disable 618 IVisualElementRenderer renderView = RendererFactory.GetRenderer(page); +#pragma warning restore 618 Android.Platform.SetRenderer(page, renderView); if (layout) @@ -330,7 +332,9 @@ namespace Xamarin.Forms.Platform.Android.AppCompat AddView(_backgroundView); Android.Platform.SetPageContext(modal, context); +#pragma warning disable 618 _renderer = RendererFactory.GetRenderer(modal); +#pragma warning restore 618 Android.Platform.SetRenderer(modal, _renderer); AddView(_renderer.ViewGroup); diff --git a/Xamarin.Forms.Platform.Android/Cells/BaseCellView.cs b/Xamarin.Forms.Platform.Android/Cells/BaseCellView.cs index 46959c08..60267c3e 100644 --- a/Xamarin.Forms.Platform.Android/Cells/BaseCellView.cs +++ b/Xamarin.Forms.Platform.Android/Cells/BaseCellView.cs @@ -39,7 +39,9 @@ namespace Xamarin.Forms.Platform.Android SetPadding(padding, padding, padding, padding); _imageView = new ImageView(context); +#pragma warning disable 618 var imageParams = new LayoutParams(ViewGroup.LayoutParams.WrapContent, ViewGroup.LayoutParams.FillParent) +#pragma warning restore 618 { Width = (int)context.ToPixels(60), Height = (int)context.ToPixels(60), @@ -55,8 +57,13 @@ namespace Xamarin.Forms.Platform.Android _mainText.SetSingleLine(true); _mainText.Ellipsize = TextUtils.TruncateAt.End; _mainText.SetPadding((int)context.ToPixels(15), padding, padding, padding); +#pragma warning disable 618 _mainText.SetTextAppearance(context, global::Android.Resource.Attribute.TextAppearanceListItem); +#pragma warning restore 618 + +#pragma warning disable 618 using (var lp = new LayoutParams(ViewGroup.LayoutParams.FillParent, ViewGroup.LayoutParams.WrapContent)) +#pragma warning restore 618 textLayout.AddView(_mainText, lp); _detailText = new TextView(context); @@ -64,8 +71,13 @@ namespace Xamarin.Forms.Platform.Android _detailText.Ellipsize = TextUtils.TruncateAt.End; _detailText.SetPadding((int)context.ToPixels(15), padding, padding, padding); _detailText.Visibility = ViewStates.Gone; +#pragma warning disable 618 _detailText.SetTextAppearance(context, global::Android.Resource.Attribute.TextAppearanceListItemSmall); +#pragma warning restore 618 + +#pragma warning disable 618 using (var lp = new LayoutParams(ViewGroup.LayoutParams.FillParent, ViewGroup.LayoutParams.WrapContent)) +#pragma warning restore 618 textLayout.AddView(_detailText, lp); var layoutParams = new LayoutParams(ViewGroup.LayoutParams.MatchParent, ViewGroup.LayoutParams.WrapContent) { Width = 0, Weight = 1, Gravity = GravityFlags.Center }; @@ -118,7 +130,9 @@ namespace Xamarin.Forms.Platform.Android if (view != null) { +#pragma warning disable 618 using (var layout = new LayoutParams(ViewGroup.LayoutParams.WrapContent, ViewGroup.LayoutParams.FillParent)) +#pragma warning restore 618 AddView(view, layout); AccessoryView = view; diff --git a/Xamarin.Forms.Platform.Android/Cells/EntryCellView.cs b/Xamarin.Forms.Platform.Android/Cells/EntryCellView.cs index f94709d0..c1ae1911 100644 --- a/Xamarin.Forms.Platform.Android/Cells/EntryCellView.cs +++ b/Xamarin.Forms.Platform.Android/Cells/EntryCellView.cs @@ -29,7 +29,9 @@ namespace Xamarin.Forms.Platform.Android SetPadding((int)context.ToPixels(15), padding, padding, padding); _label = new TextView(context); +#pragma warning disable 618 _label.SetTextAppearance(context, global::Android.Resource.Attribute.TextAppearanceListItem); +#pragma warning restore 618 var layoutParams = new LayoutParams(ViewGroup.LayoutParams.WrapContent, ViewGroup.LayoutParams.WrapContent) { Gravity = GravityFlags.CenterVertical }; using (layoutParams) diff --git a/Xamarin.Forms.Platform.Android/ColorExtensions.cs b/Xamarin.Forms.Platform.Android/ColorExtensions.cs index 707363ed..f6ac113b 100644 --- a/Xamarin.Forms.Platform.Android/ColorExtensions.cs +++ b/Xamarin.Forms.Platform.Android/ColorExtensions.cs @@ -17,7 +17,9 @@ namespace Xamarin.Forms.Platform.Android if (self == Color.Default) { using (Resources resources = Resources.System) +#pragma warning disable 618 return resources.GetColor(defaultColorResourceId); +#pragma warning restore 618 } return ToAndroid(self); diff --git a/Xamarin.Forms.Platform.Android/Platform.cs b/Xamarin.Forms.Platform.Android/Platform.cs index d3e56336..87bf5354 100644 --- a/Xamarin.Forms.Platform.Android/Platform.cs +++ b/Xamarin.Forms.Platform.Android/Platform.cs @@ -144,7 +144,9 @@ namespace Xamarin.Forms.Platform.Android } } +#pragma warning disable 618 ActionBarDrawerToggle MasterDetailPageToggle { get; set; } +#pragma warning restore 618 void IDisposable.Dispose() { @@ -456,10 +458,10 @@ namespace Xamarin.Forms.Platform.Android Color colorToUse = Color.Default; if (CurrentNavigationPage != null) { -//#pragma warning disable 618 +#pragma warning disable 618 if (CurrentNavigationPage.Tint != Color.Default) colorToUse = CurrentNavigationPage.Tint; -//#pragma warning restore 618 +#pragma warning restore 618 else if (CurrentNavigationPage.BarBackgroundColor != Color.Default) colorToUse = CurrentNavigationPage.BarBackgroundColor; } @@ -524,12 +526,16 @@ namespace Xamarin.Forms.Platform.Android _renderer.AddView(renderView.ViewGroup); } +#pragma warning disable 618 ActionBar.Tab AddTab(Page page, int index) +#pragma warning restore 618 { ActionBar actionBar = ((Activity)_context).ActionBar; TabbedPage currentTabs = CurrentTabbedPage; +#pragma warning disable 618 ActionBar.Tab atab = actionBar.NewTab(); +#pragma warning restore 618 atab.SetText(page.Title); atab.TabSelected += (sender, e) => { @@ -588,7 +594,9 @@ namespace Xamarin.Forms.Platform.Android void CurrentNavigationPageOnPropertyChanged(object sender, PropertyChangedEventArgs e) { +#pragma warning disable 618 if (e.PropertyName == NavigationPage.TintProperty.PropertyName) +#pragma warning restore 618 UpdateActionBarBackgroundColor(); else if (e.PropertyName == NavigationPage.BarBackgroundColorProperty.PropertyName) UpdateActionBarBackgroundColor(); @@ -680,7 +688,9 @@ namespace Xamarin.Forms.Platform.Android var drawer = GetRenderer(CurrentMasterDetailPage) as MasterDetailRenderer; if (drawer == null) return; +#pragma warning disable 618 MasterDetailPageToggle = new ActionBarDrawerToggle(_context as Activity, drawer, icon, 0, 0); +#pragma warning restore 618 MasterDetailPageToggle.SyncState(); } @@ -731,7 +741,9 @@ namespace Xamarin.Forms.Platform.Android return; var page = sender as Page; +#pragma warning disable 618 ActionBar.Tab atab = actionBar.GetTabAt(currentTabs.Children.IndexOf(page)); +#pragma warning restore 618 atab.SetText(page.Title); } } @@ -815,7 +827,9 @@ namespace Xamarin.Forms.Platform.Android var i = 0; foreach (Page tab in CurrentTabbedPage.Children.OfType<Page>()) { +#pragma warning disable 618 ActionBar.Tab realTab = AddTab(tab, i++); +#pragma warning restore 618 if (tab == CurrentTabbedPage.CurrentPage) realTab.Select(); } diff --git a/Xamarin.Forms.Platform.Android/Renderers/ButtonRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/ButtonRenderer.cs index 0d93207a..14046448 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/ButtonRenderer.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/ButtonRenderer.cs @@ -195,7 +195,9 @@ namespace Xamarin.Forms.Platform.Android return; if (_defaultDrawable != null) +#pragma warning disable 618 Control.SetBackgroundDrawable(_defaultDrawable); +#pragma warning restore 618 _drawableEnabled = false; } @@ -212,7 +214,9 @@ namespace Xamarin.Forms.Platform.Android if (_defaultDrawable == null) _defaultDrawable = Control.Background; +#pragma warning disable 618 Control.SetBackgroundDrawable(_backgroundDrawable); +#pragma warning restore 618 _drawableEnabled = true; } diff --git a/Xamarin.Forms.Platform.Android/Renderers/CarouselPageRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/CarouselPageRenderer.cs index 1533005a..5053b698 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/CarouselPageRenderer.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/CarouselPageRenderer.cs @@ -30,7 +30,9 @@ namespace Xamarin.Forms.Platform.Android base.OnAttachedToWindow(); var adapter = new CarouselPageAdapter(_viewPager, Element, Context); _viewPager.Adapter = adapter; +#pragma warning disable 618 _viewPager.SetOnPageChangeListener(adapter); +#pragma warning restore 618 adapter.UpdateCurrentItem(); @@ -50,7 +52,9 @@ namespace Xamarin.Forms.Platform.Android if (_viewPager != null) { RemoveView(_viewPager); +#pragma warning disable 618 _viewPager.SetOnPageChangeListener(null); +#pragma warning restore 618 _viewPager.Dispose(); } diff --git a/Xamarin.Forms.Platform.Android/Renderers/FormattedStringExtensions.cs b/Xamarin.Forms.Platform.Android/Renderers/FormattedStringExtensions.cs index 2a65c98f..f049cd0c 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/FormattedStringExtensions.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/FormattedStringExtensions.cs @@ -50,7 +50,9 @@ namespace Xamarin.Forms.Platform.Android } if (!span.IsDefault()) +#pragma warning disable 618 spannable.SetSpan(new FontSpan(span.Font, view), start, end, SpanTypes.InclusiveInclusive); +#pragma warning restore 618 else if (defaultFont != Font.Default) spannable.SetSpan(new FontSpan(defaultFont, view), start, end, SpanTypes.InclusiveInclusive); } diff --git a/Xamarin.Forms.Platform.Android/Renderers/FrameRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/FrameRenderer.cs index a0cbd4d3..4e1881c4 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/FrameRenderer.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/FrameRenderer.cs @@ -32,7 +32,9 @@ namespace Xamarin.Forms.Platform.Android void UpdateBackground() { +#pragma warning disable 618 SetBackgroundDrawable(new FrameDrawable(Element)); +#pragma warning restore 618 } class FrameDrawable : Drawable diff --git a/Xamarin.Forms.Platform.Android/Renderers/LabelRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/LabelRenderer.cs index 45068838..98406ca0 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/LabelRenderer.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/LabelRenderer.cs @@ -125,7 +125,9 @@ namespace Xamarin.Forms.Platform.Android void UpdateFont() { +#pragma warning disable 618 Font f = Element.Font; +#pragma warning restore 618 Typeface newTypeface = f.ToTypeface(); if (newTypeface != _lastTypeface) @@ -190,7 +192,9 @@ namespace Xamarin.Forms.Platform.Android if (Element.FormattedText != null) { FormattedString formattedText = Element.FormattedText ?? Element.Text; +#pragma warning disable 618 _view.TextFormatted = formattedText.ToAttributed(Element.Font, Element.TextColor, _view); +#pragma warning restore 618 _wasFormatted = true; } else diff --git a/Xamarin.Forms.Platform.Android/Renderers/ListViewAdapter.cs b/Xamarin.Forms.Platform.Android/Renderers/ListViewAdapter.cs index 53426644..ee1eba07 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/ListViewAdapter.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/ListViewAdapter.cs @@ -270,7 +270,9 @@ namespace Xamarin.Forms.Platform.Android AView bline; if (makeBline) { +#pragma warning disable 618 bline = new AView(_context) { LayoutParameters = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FillParent, 1) }; +#pragma warning restore 618 layout.AddView(bline); } diff --git a/Xamarin.Forms.Platform.Android/Renderers/MasterDetailRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/MasterDetailRenderer.cs index ce3fb267..6f514aff 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/MasterDetailRenderer.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/MasterDetailRenderer.cs @@ -305,7 +305,9 @@ namespace Xamarin.Forms.Platform.Android void UpdateBackgroundImage(Page view) { if (!string.IsNullOrEmpty(view.BackgroundImage)) +#pragma warning disable 618 SetBackgroundDrawable(Context.Resources.GetDrawable(view.BackgroundImage)); +#pragma warning restore 618 } void UpdateDetail() diff --git a/Xamarin.Forms.Platform.Android/Renderers/TableViewModelRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/TableViewModelRenderer.cs index ea07dbf2..c7ff2636 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/TableViewModelRenderer.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/TableViewModelRenderer.cs @@ -110,7 +110,9 @@ namespace Xamarin.Forms.Platform.Android AView bline; if (makeBline) { +#pragma warning disable 618 bline = new AView(Context) { LayoutParameters = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FillParent, 1) }; +#pragma warning restore 618 layout.AddView(bline); } diff --git a/Xamarin.Forms.Platform.Android/Renderers/WebViewRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/WebViewRenderer.cs index d2c0f0d6..01c74b02 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/WebViewRenderer.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/WebViewRenderer.cs @@ -61,7 +61,9 @@ namespace Xamarin.Forms.Platform.Android if (Control == null) { var webView = new AWebView(Context); +#pragma warning disable 618 webView.LayoutParameters = new global::Android.Widget.AbsoluteLayout.LayoutParams(LayoutParams.MatchParent, LayoutParams.MatchParent, 0, 0); +#pragma warning restore 618 webView.SetWebViewClient(new WebClient(this)); _webChromeClient = GetFormsWebChromeClient(); @@ -178,7 +180,9 @@ namespace Xamarin.Forms.Platform.Android _navigationResult = WebNavigationResult.Failure; if (errorCode == ClientError.Timeout) _navigationResult = WebNavigationResult.Timeout; +#pragma warning disable 618 base.OnReceivedError(view, errorCode, description, failingUrl); +#pragma warning restore 618 } public override bool ShouldOverrideUrlLoading(AWebView view, string url) diff --git a/Xamarin.Forms.Platform.Android/ResourceManager.cs b/Xamarin.Forms.Platform.Android/ResourceManager.cs index 4c150a05..e7eb81bb 100644 --- a/Xamarin.Forms.Platform.Android/ResourceManager.cs +++ b/Xamarin.Forms.Platform.Android/ResourceManager.cs @@ -33,7 +33,9 @@ namespace Xamarin.Forms.Platform.Android Log.Warning("Could not load image named: {0}", name); return null; } +#pragma warning disable 618 return resource.GetDrawable(id); +#pragma warning restore 618 } public static int GetDrawableByName(string name) diff --git a/Xamarin.Forms.Platform.Android/ViewExtensions.cs b/Xamarin.Forms.Platform.Android/ViewExtensions.cs index 4266ce53..db7c3d4a 100644 --- a/Xamarin.Forms.Platform.Android/ViewExtensions.cs +++ b/Xamarin.Forms.Platform.Android/ViewExtensions.cs @@ -27,9 +27,9 @@ namespace Xamarin.Forms.Platform.Android if (s_apiLevel < 16) { -//#pragma warning disable 618 +#pragma warning disable 618 view.SetBackgroundDrawable(drawable); -//#pragma warning restore 618 +#pragma warning restore 618 } else view.Background = drawable; @@ -46,12 +46,19 @@ namespace Xamarin.Forms.Platform.Android switch (type) { case "color": +#pragma warning disable 618 global::Android.Graphics.Color color = context.Resources.GetColor(background.ResourceId); +#pragma warning restore 618 view.SetBackgroundColor(color); break; case "drawable": +#pragma warning disable 618 using (Drawable drawable = context.Resources.GetDrawable(background.ResourceId)) +#pragma warning restore 618 + +#pragma warning disable 618 view.SetBackgroundDrawable(drawable); +#pragma warning restore 618 break; } } diff --git a/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj b/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj index dec94f99..5b679ee0 100644 --- a/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj +++ b/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj @@ -28,7 +28,7 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> - <NoWarn>0642;0618;0114;0108;0672;0168;0169;0184;0649;1998;0414</NoWarn> + <NoWarn>0642;0114;0108;0672;0168;0169;0184;0649;1998;0414</NoWarn> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> @@ -38,7 +38,7 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> - <NoWarn>0642;0618;0114;0108;0672;0168;0169;0184;0649;1998;0414</NoWarn> + <NoWarn>0642;0114;0108;0672;0168;0169;0184;0649;1998;0414</NoWarn> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Turkey|AnyCPU'"> <DebugSymbols>true</DebugSymbols> @@ -50,7 +50,7 @@ <ErrorReport>prompt</ErrorReport> <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> - <NoWarn>0642;0618;0114;0108;0672;0168;0169;0184;0649;1998;0414</NoWarn> + <NoWarn>0642;0114;0108;0672;0168;0169;0184;0649;1998;0414</NoWarn> </PropertyGroup> <ItemGroup> <Reference Include="Mono.Android" /> |