Граф коммитов

852 Коммитов

Автор SHA1 Сообщение Дата
Pavel Yakovlev 87a93774ab [Shell, iOS, Android] added tab order on Shell flyout menu items (#5930)
* [Shell, Android] added tab order on Shell flyout menu items

* [iOS mac] fix build

* support iOS
2019-04-23 20:33:09 -06:00
Rui Marinho 998dc3534c Merge branch '4.0.0' 2019-04-18 16:27:58 +01:00
Shane Neuville 6c0a9405a2 [Android] move runtime registration of renderers to its own method (#5946)
* move renderer registration to its own method

* - move to static
2019-04-18 16:25:58 +01:00
Shane Neuville dbf4037a31 [Shell] Propagate Page bindings to TitleView and Shell Binding to Flyout (#5934) fixes #5650 fixes #5501
* propagate bindingcontext

* - add exception message and fix poorly named xaml file

* add ui test automation

* - fix unit test to represent new code

* - changed from ui test to unit test

* - propagate visual, parent, bc to titleview

* - style fixes
2019-04-18 16:25:31 +01:00
Larry O'Brien f4d87bbf04 s/SearchBoxVisiblity/SearchBoxVisibility/ from base 4.0.0 (#5931)
* s/SearchBoxVisiblty/SearchBoxVisibility/

Fix typo in type name.

* s/Collapsable/Collapsible/

* Changed capitalization in comment
2019-04-16 15:04:55 -07:00
Samantha Houts 5aa469f755 Merge branch '4.0.0' 2019-04-15 14:54:48 -07:00
Pavel Yakovlev 2ecd834873 [Android, shell] fixes visibility of tabs after their changes (#5896) 2019-04-12 10:33:33 -06:00
Samantha Houts 105ded9353 Merge branch '4.0.0' 2019-04-10 22:03:02 -07:00
Samantha Houts 0fcb349e1d Merge branch '3.6.0' into 4.0.0 2019-04-10 21:59:38 -07:00
Samantha Houts a58f4d7e97
[Android/iOS] TabIndex sets focus order for TalkBack traversal (#3989)
fixes #2789
2019-04-10 21:53:37 -07:00
E.Z. Hart 6aad281eda Porting fix from 4794 to handle clip bounds on sub-API-19 Android; fixes #4790 (#5863)
fixes #4790
2019-04-10 21:28:11 -07:00
Samantha Houts 618ed187d7
[Android] Null check on Switch TrackDrawable (#5851)
* [Android] Null check on Switch TrackDrawable

fixes #5553

* Add a few more checks, dispose Drawable, fix copy/paste error

* Couple more for safety's sake
2019-04-10 17:25:45 -07:00
Kevin Petit a00c85800f [Android] Fix ObjectDisposedException on MasterDetailPageRenderer update (#4955)
* Android - MasterDetailPageRenderer - Fix ObjectDisposedException on update.

* Fix update call to master.

* Move checks inside update methods.
Add HandleMasterPropertyChanged handler unsubscribing.
2019-04-10 09:58:50 -07:00
E.Z. Hart 94d442d891 Increase API level check for setting Android ripple effect on selection (#5760) fixes #5693
Fixes #5693
2019-04-05 13:02:29 +01:00
kingces95 4b2df54aa2
Revert "Man init (#5587) closes #5248" (#5814)
This reverts commit 0b69ead5a0.
2019-04-04 10:38:27 -10:00
kingces95 0b69ead5a0 Man init (#5587) closes #5248
* man init

* man init w/o profile

* Update Xamarin.Forms.Platform.Android/Forms.cs

Co-Authored-By: rmarinho <me@ruimarinho.net>
2019-04-04 19:50:39 +01:00
Stephane Delcroix c92fb05acd Merge branch '4.0.0' 2019-04-04 08:55:24 +02:00
E.Z. Hart d1dc874dab Allow EmptyView swapping in Android CollectionView (#5720) fixes #5535
* Automated test for issue

* Fix empty view swapping for Android (fixes #5535)

* Remove private modifier

* Account for null Flags when setting flags for test

* Fix rebase issue
2019-04-03 17:49:05 +01:00
Rui Marinho e822046427 Merge branch '3.6.0' into 4.0.0 2019-04-02 18:28:23 +01:00
Matthew Leibowitz 6950db8bfe [nuspec] Start using the 28.x versions of Android support (#5512) 2019-04-02 16:06:59 +01:00
Samantha Houts 723f2de439 Merge branch '4.0.0' 2019-03-27 17:14:57 -07:00
E.Z. Hart 85e75046c2 Handle DataTemplateSelector on iOS/Android CollectionView (#5429)
* DataTemplateSelector working on Android for ItemTemplate and EmptyTemplate

* Demonstrate DataTemplateSelector working with EmptyViewTemplate

* Handle DataTemplateSelector on iOS CollectionView

* Add UI test
Fixes #4826

* Temporarily patching EditorRenderer to get tests running

* Add test for binding errors;
Fix binding errors on Android;

* Fix binding errors for iOS

* Add flag setting to allow UI test to run

* Fix rebase errors
2019-03-27 17:03:35 -06:00
Rui Marinho 23b61a434b
Merge branch '3.6.0' into 4.0.0 2019-03-27 18:51:38 +00:00
E.Z. Hart f1297f93d5 Re-enable "Treat warnings as errors" (#5602)
* Enable "treat warnings as errors"

* Remove unnecessary for loop

* Remove properties which already exist in base class

* Make property hiding explicit and obsolete hiding property

* Move Treat Warnings as Errors setting to props file

* Fix weird quotation changes in Xamarin.Forms.Build.Tasks.csproj

* Scrub empty WarningsAsErrors tags

* Remove unused variable

* Fix TearDown method hiding in UI tests

* Fix Id member hiding in test for Bugzilla32871

* Fix RootPage member hiding in Bugzilla51503

* Fix RooPage member hiding in Issue1483

* Disable warnings for deprecated OpenGL calls

* Fix member hiding in test view models

* Fix RootPage member hiding in Issue1931

* Fix Id member hiding in Bugzilla42620

* Fix AutomationId member hiding in Bugzilla57114

* Fix Layout member hiding in Bugzilla40911

* Remove unused variables from Bugzilla31114

* Remove unused variable

* Fix various unused variable warnings

* Disable warning to leave example code for reference

* Fix unused variable from macOS test

* Remove unused members

* Fix unused variable warnings

* Fixed unused property warnings

* Fix warnings for unused code

* Disable 'await' warning

* Remove unused variable

* Adding pragma directives for await warnings

* Remove member hiding

* Turn off global "Treat warnings as errors" in other platforms

* Use MarkerId instead of obsolete Id member

* Fix await warnings in WPF GeocoderBackend

* Add missing await

* Disable warning for unused event
2019-03-27 18:38:38 +00:00
Rui Marinho db7e702ecf
[Shell] Add FlyoutIcon (#5567) fixes #4766 fixes #4767 fixes #4845 fixes #5219
* [Controls]  Add repo for shell issue

* [iOS] Allow specify SetPaddingInsets on the ShellContent

* [iOS,Shell] Fix issue when disposing ToolbarItems  of old page

* [Controls] Add demo repo for #5466

* [Shell,Core] Fix navigating to a registered route

* [Shell,Core] Add better exception messages for wrong or non existing content fixes #5081

* [Core,Shell,iOS,Android] Add FlyoutIcon property

* [Controls] Make shell sample work on Android

* [Controls,Android] Add ImageSource support to FlyoutIcon

* [Android]Allow to set text on the back button

* [Android] Create default text back button

* [Controls] Add example to push with back button behavior

* [Android] Fix back button tint color

* [Android] Cleanup and refactor UpdateDrawerArrow

* Update Xamarin.Forms.Platform.Android/Renderers/ShellToolbarTracker.cs

Co-Authored-By: rmarinho <me@ruimarinho.net>

* [iOS,Shell] Fix go back (Pop) when proving BackButtonBehavior

* [iOS] Check the ParentViewController since we were push to it

* [Android,iOS,Shell] Remove extra code implement feedback

* removed old code

* minor cleanup
2019-03-27 17:05:21 +00:00
Shane Neuville 927c1058ae
[Android] Fix various issues with material found by a full run of the UI Tests with Material active (#5676)
* - locate activity

* get tests to run

* - fix and force core gallery to work against default

* - fix check if control already disposed

* - fixing what automationid assigns to

* - input transparent fixes

* - fix sandbox back

* - set default visual back to default

* Update Xamarin.Forms.Material.Android/MaterialStepperRenderer.cs

* Update Xamarin.Forms.Material.Android/MaterialSliderRenderer.cs

* - fix core gallery ui tests to find container

* - ui test tweak

* - fix background color on pickers

* - suggested changes

* - suggested fix
2019-03-27 10:07:15 -06:00
Shane Neuville d707f74d96 [Android] don't clear shell content because native page isn't visible (#5671) fixes #4684
* [Android] don't clear shell content because native page isn't visible

* - move checks up a line
2019-03-27 11:58:35 +00:00
kingces95 afe481b9c4 dispose FrameRenderer's FrameDrawable (#5617) fixes #5446 2019-03-27 11:20:21 +00:00
Rui Marinho 097af8f757
[CollectionView] Fixes for ObservableCollection usage on Android and iOS (#4664)
* [Controls] Update CollectionView observable gallery

* [Controls] Add test case with timer to add items to ObservableCollection

* [Android] Implement IDisposable on IItemsViewSource

* [iOS] ObservableItemSource takes a IList

* [iOS] Update ItemsViewLayout.cs

* [Android] Implement review feedback

* [Controls] Fix adder

* [Build] Update submodule

* [Android] Make similar change to iOS for consistency

* [iOS] Unsubscribe from ObservableCollection on ItemsViewController

* [iOS] Dispose ItemsController

* [Build] Update submodule
2019-03-26 22:58:29 +00:00
Pavel Yakovlev 5d85cf8621 [Android] Fixes ObjectDisposedException when call Unfocus of Entry (#5670)
* [Android] Fixes ObjectDisposedException when call Unfocus of Entry

* address comment

* fix ui test
2019-03-26 12:42:05 -06:00
jcmanke 08c6bdf2dd Set ImeOptions to Done on Android Editor (#5653)
* Set ImeOptions to Done on Android Editor

* Apply fix to Material Editor renderer

- fixes #4832
- fixes #5030
2019-03-26 15:02:30 +01:00
Kevin Petit 598f6b80be [Android] Fix old root page dispose when main page change (#4707) Fixes #4706 Fixes #4325
* Android - Fix old root page dispose when main page change.

* Revert dead code cleanup.

* Use direct cast for IApplicationController

Co-Authored-By: kvpt <kevin.petit@outlook.com>

* Use direct cast for IApplicationController (bis).

* Unsubscribe the event handler on the right application object.

* Prevent disruptive layout request from toolbar + Revert renderer clearing modification.

* If the page change, do nothing (dont dispose).

* Unsubscribe activity from application on destroy.

* Paused activity must not react to application changes

* Use nameof.
2019-03-22 12:10:04 +00:00
Stephane Delcroix 534a261e30 Merge branch '3.6.0' into 4.0.0 2019-03-21 14:37:08 +01:00
Stephane Delcroix f0f9415d73 Merge branch '3.5.0' into 3.6.0 2019-03-21 14:35:44 +01:00
Shane Neuville 353081bb53 fix abi breaks (#5620) fixes #5288 2019-03-21 10:00:59 +00:00
Pavel Yakovlev ee01ce0cf6 [Android] fixes redraw element when changing renderer (#5233)
fixes #1760
2019-03-20 10:31:55 -07:00
Pavel Yakovlev 6a3a10afea [Android] Fixes cancel Webview Navigation (#5458) fixes #4891 fixes #4919 closes #5460
* [Android] Fixes cancel Webview Navigation

* - added fix 4891
- refactoring

* Fix obsolete message

Co-authored-by: Ralph Brackert <brackert@baselineconnect.com>
2019-03-19 20:05:38 +00:00
Samantha Houts 0a7e7352b8 Merge branch '3.6.0' into 4.0.0 2019-03-18 18:25:50 -07:00
Shane Neuville dd8ed7ee23 [Android] fall back to using native get identifier if reflection fails to retrieve drawable (#5585)
* - first try to use native get identifier before reflection

* add dummy types

* - try reflection first

* - add null check for resource requests

* fix fall through checks

* Update Xamarin.Forms.Platform.Android/ResourceManager.cs

Co-Authored-By: PureWeen <shane94@hotmail.com>

* - remove "smart" code for simpler code

* - fix replace

* - cleanup

* remove using

* - better if placement

* - hide LogInfoToPreviewer

* - hide LogInfoToPreviewer
2019-03-18 18:22:34 -07:00
David Ortinau 08a015d8f7 [iOS,Shell] Fix tab bar style color alignment to match Android (#5075)
* Set the same TabBar color styles as Android

* unified on title color, made names consistent, and commented unused properties.
2019-03-18 18:52:49 +00:00
E.Z. Hart c297cc768f Handle CollectionView multiple selection on Android and iOS (#5352)
* Handle multiple selection on Android and iOS

* Fire SelectionChanged events and commands when switching modes

* Do not fire the selection change if the mode change results in identical selection

* Fix rebase

* Temporarily patching EditorRenderer to get iOS tests running

* Fix bug where native selection is lost when items are off-screen

* [Core] Cleanup drop private o SelectionList

* [Android] Use local variable on foreach
2019-03-18 14:46:41 +00:00
Stephane Delcroix fb169ce976 Merge branch '3.6.0' into 4.0.0 2019-03-18 09:40:11 +01:00
Rui Marinho 13eb097062 [Android] Fix issue when Message is null on Android API19 (#5562)
* [Android] Fix issue when Message is null on Android API19

* added kitkat check and moved check to extension method

* - remove awaken for kit kat and just catch all NPE

* - remove using
2019-03-15 18:13:14 -07:00
Shane Neuville 0376a5f692 [Android] fix focus event on android and add UI Tests (#5528)
* fix focus event for material entry and add ui tests

* fix iOS

* - Focused
fixes #5509
2019-03-15 14:43:04 -07:00
Samantha Houts d196f6c46b Merge branch '3.6.0' into 4.0.0 2019-03-13 15:40:27 -07:00
Shane Neuville fa5c4fb371
[Android] ensure scrollbar has been initialized (#5462)
* [Android] ensure scrollbar has been initialized

* fix comments

* Update Xamarin.Forms.ControlGallery.Android/CustomRenderers.cs
2019-03-13 10:03:32 -06:00
Tim Barham e434184f64 Fix NamedSize in Previewer (#5496)
In the previewer, ConvertTextAppearanceToSize() returns -0.5 for all values. Return default value if we get a size of 0 or less.
2019-03-12 14:36:12 -07:00
kingces95 92ffeb324f ContextCompat.getColor if API < 23 (#5450)
Update Xamarin.Forms.Platform.Android/Forms.cs

Does this do all the suggestions?

Co-Authored-By: kingces95 <kingces95@users.noreply.github.com>

ContextCompat.getColor if API < 23
2019-03-07 09:18:57 -08:00
Samantha Houts 28af473d53 Merge branch '3.6.0' into 4.0.0 2019-03-01 19:16:42 -08:00
Shane Neuville f1660e85f5 fix changed apis (#5426)
* fix changed apis

* increment language version

* bring some back

* update font

* VisualElement fixes

fixes #4644
fixes #5170
2019-03-01 19:15:08 -08:00
Gerald Versluis e60bfde9bf [C, iOS, AND, UWP] TabbedPage SelectedTabColor and UnselectedTabColor (#4899)
* Implemented Core and iOS

* Implemented Android

* Supressed platform specific obsolete warnings for now

* Implemented UWP

* Make selected page on UWP not rely on title

* Review feedback

* Removed references to (now) obsolete members

* Review feedback fixes

* Code review feedback

* Changed obsolete msg to reflect right XF version

* Apply suggestions from code review

Co-Authored-By: jfversluis <github@geraldversluis.nl>
fixes #3478
2019-03-01 15:47:31 -08:00
Samantha Houts 799d2d7742 Merge branch '3.6.0' 2019-02-28 18:12:27 -08:00
Shane Neuville 70a2a628a5 [Android] Remove changes to IVisualElementRenderer so it remains backwards compatible (#5398)
* return IVisualElementRenderer to previous state

* set to internal
2019-02-28 10:57:20 -08:00
Samantha Houts 42345ed82e Merge branch '3.6.0' 2019-02-27 18:22:37 -08:00
Samantha Houts a08e954eaa Merge branch '3.5.0' into 3.6.0 2019-02-27 18:21:59 -08:00
Samantha Houts 0b7965f811
[iOS, Android] Prevent NREs in ScrollViews (#5383)
* Add null checks on new code paths added in #4522

fixes #5161

* Fix cast...

Fixes #5247
2019-02-27 18:08:47 -08:00
E.Z. Hart de0ac02b53 Allow SelectableItemsViewRenderer/Adapted to deselect ViewHolders not in the RecyclerView's child collection (#5358)
Fixes #5078
2019-02-27 18:06:48 -08:00
Pavel Yakovlev aef568a7c6 [Android, iOS] added re-measure of TimePicker after change value (#4999) 2019-02-27 17:49:11 -08:00
ShaneN 24b4b554ad Merge branch '3.6.0' 2019-02-27 18:20:24 -07:00
Shane Neuville a9af592006
[Android] move android renderers to separate nuget (#5405)
* [Android] move renderers to separate nuget

* additional android dependency

* rebase with material changes

* add android to material check

* simplify assembly info

* - add context to Init for future cases
2019-02-27 18:04:52 -07:00
Shane Neuville 2e6bc92583
[Visual] Visual tidy (#5356)
* [Visual] remove visual flag and tidy up code

* - added basic loading ui test

* change material namespaces to be Xamarin.Forms.Material.<Platform>

* api 19 fixes

* fix casing on resources
2019-02-27 16:48:45 -07:00
Shane Neuville cca80ca763
[Visual] Material Editor (#5345)
* [Material] Visual

* - gallery and simplify android renderers

* Update Xamarin.Forms.Material.iOS/MaterialEditorRenderer.cs

* Update Xamarin.Forms.Platform.Android/Material/MaterialEditorRenderer.cs

* wire up done and fix ph bug

* - ios fix auto sizing issues

* fix NRE

* - Android: fix bounce and IsreadOnly
- iOS: fix IsReadonly and sizing issue

* - fix editor

* Fix ios Editor to shrink when lines are deleted

* Update Xamarin.Forms.Material.iOS/MaterialMultiLineTextField.cs

* - formatting fixes
2019-02-26 12:46:48 -07:00
Stephane Delcroix 55937add66 Merge branch '3.6.0' 2019-02-26 20:12:27 +01:00
Shane Neuville 16aa48fb1e
[Visual] Visual xaml and Visual registrations (#5304)
* [visual] add intellisense popups for visual

* Add visual registrations into type converter

* combine VisualMarker and VisualRendererMarker

* remove visual from class name for intellisense

* set Match Parent to internal

* Remove register code and just scan assemblies

* [Visual] Add Visual Attribute and some additional attribute checks

* remove registrar changes

* renamed to specific VisualTypes

* - move check up to LINQ statement

* Make sure the other platforms can create visuals

* fix renderer names

* move stepper renderer

* rename converter
2019-02-25 13:54:02 -07:00
Stephane Delcroix 533e130191 Merge branch '3.6.0' 2019-02-25 08:33:25 +01:00
Stephane Delcroix a3bcb65988 Merge branch '3.5.0' into 3.6.0 2019-02-25 08:20:29 +01:00
Shane Neuville afa2c780b3
[Visual] Material Pickers (#5194)
* [Material] Change Picker EditText fields to Material

* [Visual] add material placeholder properties

* - add ios placeholder changes

* - remove placeholder apis

* - shrink entry fields when they have no place holder

* - invalidate measure

* - remove marshalling
2019-02-24 20:21:39 -07:00
Pavel Yakovlev bd8a6bb2b4 [Android CollectionView] Fixes crash when ItemSource Changed (#5146) 2019-02-24 11:00:31 -07:00
Pavel Yakovlev 33dd68b7b1 [Android iOS Visual] fixes background in ActivityIndicator (#5283)
* [Android, iOS Visual] fixes background in AcrivityIndicator

* [Android] reduce nesting layouts

* [Android] simplification

* Some calculations for iOS

* [Android] removed padding, added size limit
[iOS] fixes stroke width

* [iOS] default size as in Android

* Use the Android ratio of 10 instead of the spec of 12

* [Android] fix API23

* [iOS] fix unexpected padding

* [Android] fixes padding in API 23 -- IsRunning -- added gallery

* [Android] fixes start with IsRunning = false

* [Android] again fix isRunning

* address comments
2019-02-23 02:30:47 -07:00
Matthew Leibowitz c4df5b2883 [Material] [Android, iOS] Materializing the stepper (#5027)
* [Android] [Material] Refactored the Stepper on Android #5011
 - reuse code between default and material
 - added material stepper

* [Android] [Material] Using the "Fast" renderer style for the stepper #5011
 - switched the button style to the outlined buttons

* [Android] [Material] Adding the tab stops support (#5000)

* [Android] [Material] Switching back to a traditional renderer for now to get tabstops working

* [Material] [iOS] Added a Material stepper for iOS

* [Material] [Android, iOS] Addressed the PR feedback

* [Material] Remove private

* Update MaterialStepperRenderer.cs

* Update StepperRendererManager.cs

* Fixed the merge issues

* add steppers to visual gallery

* The material stepper buttons now resize to fit the available space.

* Update Xamarin.Forms.Controls/ControlGalleryPages/VisualGallery.xaml

Co-Authored-By: mattleibow <mattleibow@live.com>

* [Material] [Stepper] Don't set the background color for steppers
 - we still need to decide on the logic behind the coloring of outline buttons

* Fixed the Android accessibility

* Change UI tests to not use a Text search for locating stepper controls
2019-02-22 12:51:45 -07:00
Rui Marinho 7d34a847b2 [Android] Fix SearchBar renderer height on API24 (#5329) 2019-02-21 16:23:32 -08:00
Tim Barham 583fad6855
Fix NRE in Android ResourceManager when reference resource in Previewer (#5331)
Fixes part of #5300

(cherry picked from commit fb59591580)
2019-02-21 11:24:18 +10:00
Tim Barham fb59591580 Fix NRE in Android ResourceManager when reference resource in Previewer (#5305)
Fixes part of #5300
2019-02-19 11:34:26 +00:00
Alan McGovern 00b44f6777 Revert "Update Forms.cs"
This reverts commit e4fa2c0603.
2019-02-19 08:56:36 +00:00
Alan McGovern e4fa2c0603
Update Forms.cs
If you want a foolproof way of getting a reference to the assembly from
the Android head project, then just use the EntryAssembly
property of the AppDomain.
2019-02-19 08:56:08 +00:00
Stephane Delcroix 0efd26cb30 Merge branch '3.6.0' 2019-02-18 12:49:32 +01:00
Kevin Petit 7c72459b29 [Android] Fix ObjectDisposedException on MasterDetailPageRenderer update (#4955)
* Android - MasterDetailPageRenderer - Fix ObjectDisposedException on update.

* Fix update call to master.

* Move checks inside update methods.
Add HandleMasterPropertyChanged handler unsubscribing.
2019-02-18 11:24:26 +00:00
E.Z. Hart ee511d8781 Implement FlowDirection propagation to items in CollectionView (#5051) * fixes #4583
* Implement FlowDirection propagation to items in CollectionView; fixes #4583

* Run logical child detachment via CellDisplayingEnded

* Fix Visual propagation on iOS

* Fix Visual propagation on Android

* Fix rebase error
2019-02-18 11:21:10 +00:00
Andrei Nitescu 2277ce8e72 [Android] Set Page background color (#5066) * Fixes #5057 * closes #4916 * Fixes #5073
* [Android] Fix setting Page background color

* Update Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5057.xaml.cs

Co-Authored-By: andreinitescu <nitescua@yahoo.com>

* Update Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5057.xaml.cs

Co-Authored-By: andreinitescu <nitescua@yahoo.com>

* Refactoring and added test info

* Update Xamarin.Forms.Platform.Android/Renderers/PageRenderer.cs

Co-Authored-By: andreinitescu <nitescua@yahoo.com>
2019-02-18 11:19:57 +00:00
Samantha Houts 4cfa82569d Merge branch '3.6.0' 2019-02-13 16:57:13 -08:00
Samantha Houts 3581e88f6c Merge branch '3.5.0' into 3.6.0 2019-02-13 16:55:00 -08:00
Rui Marinho 116000f3a2 [Android] Fix ImageRenderer URI (#5241)
* ignore check if imageview isn't set

* [Controls] Add repo case for #5172

* [Controls] Use xf github image url

fixes #5172
2019-02-13 16:22:40 -08:00
Matthew Leibowitz 9ab1fff85f [Material] [Android, iOS] Added Slider and ProgressBar (#5209)
* [Android Material] Linear Progress Indicator (#5079)

Merging into the material "slider" / "progress" bar branch so that we can share some code as they are the same control

* [Material] [Slider, ProgressBar] Updated the progress bard and added the slider

* Renamed the gallery

fixes #5008
fixes #5079
fixes #5018
2019-02-13 15:36:55 -08:00
Samantha Houts 0bf0e580fe
Revert "[Android] fixes issue content set after an await is not visible (#4861)" (#5245)
This reverts commit bf0733129d.
2019-02-13 15:21:31 -08:00
Shane c1ae194404 Merge branch '3.5.0' into 3.6.0 2019-02-13 10:31:49 -05:00
E.Z. Hart c439585878 Reinstate and obsolete IPlatform, et al (#5181)
* Reanimate IPlatform and mark it obsolete

* Reinstate IPlatform everywhere in case someone is using it or subscribing to
PlatformSet

* Revert breaking parameter name change

* Obsolete IsEnabledPropertyName

* Reinstate and obsolete Realized property and constructor

* Escape string format so solution will build

* Fix previewer reflection test

* Fix interface on Tizen/TizenPlatformServices

* Update Xamarin.Forms.Core/Element.cs

Co-Authored-By: hartez <hartez@users.noreply.github.com>
2019-02-12 12:27:00 -08:00
Pavel Yakovlev 8747919ae5 [Android, WPF] Fixes rounding down the size of visual elements (#2697) Fixes #1544
* [Android, WPF] Fixes rounding down the size of visual elements
[Android] Fixes settting background color for BoxView

* refactoring PrepareLayout action

* address comments
2019-02-12 17:48:56 +00:00
Pavel Yakovlev cd1cf19fca [Android] fixes TabStop on Stepper Control (#5000) fixes #4956 2019-02-12 13:39:03 +00:00
Gerald Versluis c60b58de69 Fixed opening of multiple picker dialogs on Android (#4911) fixes #4909 2019-02-12 13:25:22 +00:00
Gerald Versluis 2c3df0ac0e [Enhancement] Android: WebView - Control over Zoom controls (#3607) fixes #1661
* Started implementation of zoom support on Android WebView

* Implemented fully working zoom and zoom controls for Android WebView

* Corrected merge error

* Removed redundant API checks

* Update Xamarin.Forms.Core/PlatformConfiguration/AndroidSpecific/WebView.cs

Co-Authored-By: jfversluis <github@geraldversluis.nl>

* Update Xamarin.Forms.Core/PlatformConfiguration/AndroidSpecific/WebView.cs

Co-Authored-By: jfversluis <github@geraldversluis.nl>

* Update Xamarin.Forms.Core/PlatformConfiguration/AndroidSpecific/WebView.cs

Co-Authored-By: jfversluis <github@geraldversluis.nl>

* Update Xamarin.Forms.Core/PlatformConfiguration/AndroidSpecific/WebView.cs

Co-Authored-By: jfversluis <github@geraldversluis.nl>

* Update Xamarin.Forms.Core/PlatformConfiguration/AndroidSpecific/WebView.cs

Co-Authored-By: jfversluis <github@geraldversluis.nl>

* Update Xamarin.Forms.Core/PlatformConfiguration/AndroidSpecific/WebView.cs

Co-Authored-By: jfversluis <github@geraldversluis.nl>
2019-02-12 13:10:33 +00:00
E.Z. Hart 94f65ce530
Prevent snap helpers from snapping until the user interacts with scro… (#5065)
* Prevent snap helpers from snapping until the user interacts with scrolling; fixes #4935

* Lower sensitivity for snapping to kick in on Android

* Remove underscore in method name
2019-02-06 13:24:57 -07:00
Samantha Houts bb8dbec363 Merge branch '3.5.0' 2019-01-30 19:02:38 -08:00
Samantha Houts 8def46a897 Revert "[Android] Ensure the page background can be un-set (#4916)"
This reverts commit 1c27d0bcff.
2019-01-30 18:57:42 -08:00
Matthew Leibowitz 0dd61b71ec [Material] + [Android, iOS] Refactored and fixed lots of button layout issues (#4967)
* [Android] Refactored and fixed lots of button layout issues
 - All text, image and content layout logic has been extracted into a separate manager
 - Fixed the issue buttons with just an image changing size
 - Fixed a few button padding issues (still needs another look)
 - Fixed the issue with the content layout changes not updating the actual button layout
 - Fixed image positioning for all (not legacy) buttons
 - Material button no longer uses material image layout as it overrides the custom positioning
 - Fixed a few other issues where properties don't change the native button, or layouts break the positioning of the image

* [Button] Fixed a whole bunch of issues
 - added a platform specific "BorderAdjustsPadding" to Android and iOS to prevent border overlap
 - added a new gallery with all sorts of buttons
 - improvements to the Android button layout manager
 - fixed to the Android button measure/layout process

* [Android] [Button] The preservation of default padding is now a flag

* [iOS] [Button] Extracted all the layout logic for the classic button
 - yet to update Material button to use this
 - fixed a few issues with the iOS layout
    - content layout changes were not updating the control
    - top/bottom did not respect spacing
    - the native control trimmed text in the getter, so use the value from the element

* Removing the platform specifics as they were the wrong property
 - the property is part of the renderer implementation
 - Material button on iOS still needs implementing

* Updated the material button to use the layout manager
 - the iOS layout logic needs some more investigation

* remove old comments

* A fix for when there is no text and some backwards compatibility

* Added a more realistic set of values

* Restrict the material button border to 1px. See #4951.

* Fixed that issue with the buttons and the padding...
 - Removed the inset so that layout is accurate
 - set the padding to 8dp to match that of iOS and Material
 - set the minimum height to 36 according to Material (it was 48dp, with 12dp total inset, and, 48-12=36)

* Update Xamarin.Forms.Core/Button.cs

Co-Authored-By: mattleibow <mattleibow@live.com>

* Don't add members to the public type

* [Material] Added a button to change text size in the demo page

* appcompat regression fixes

* move state checks around

* fix bad merge

* adding delay to ui tests
2019-01-30 16:44:23 -07:00
Pavel Yakovlev b4d12ab5f7 [Android iOS Material] ActivityIndicator (#5088)
* [Android iOS Material] ActivityIndicator

* address comments

* [iOS] background path optimization
2019-01-30 15:21:03 -07:00
Pavel Yakovlev b2cbef6b19 [Android] fixes app crash when next control in FocusSearch isn't focusable (#5031)
fixes #5030
2019-01-30 14:01:02 -08:00
Shane Neuville c809a441a9
Material Entry v1 (#5056)
* Fixing entry style positioning to match ios/android

* centralize colors more

* [Android] underline alpha

* fix underline colors

* font and height tweaks

* Core Gallery updates

* add materials target to SLN

* implement suggestions
2019-01-30 14:44:34 -07:00
ShaneN 3c14c06425 Merge branch '3.5.0' 2019-01-29 15:57:44 -07:00
Shane Neuville 8ef50d5214
update to support less prone to freezing (#5080) 2019-01-29 15:52:41 -07:00
ShaneN 0ca98cf182 Merge branch '3.5.0' 2019-01-29 15:32:55 -07:00
Pavel Yakovlev bf0733129d [Android] fixes issue content set after an await is not visible (#4861)
* [Android] fixes issue content set after an await is not visible

* [Android] refactoring. Fixes frame inside frame does not resize after visibility changed.

* - add on-screen description to 1332 test

* - add 1760 uitest uses StackLayout

* fix autotest
2019-01-28 20:29:18 -07:00
Stephane Delcroix d0b710b600 Merge branch '3.5.0' 2019-01-28 10:33:23 +01:00
E.Z. Hart b56e4635a9
[iOS] CollectionView single selection (#4985)
* Working single selection on iOS

* Fix rebase errors

* Make ItemsLayout a constructor parameter for the Delegator

* Make common VSM states public consts

* Make file and type name match

* Simplify method we'll be completely rewriting while implementing the next feature

* VS didn't save project file changes

* Update submodule
2019-01-25 09:40:17 -07:00
Pavel Yakovlev a597ad2134 [Android] Fixes keyboard navigation in custom view (#4612) 2019-01-24 12:50:54 -08:00
E.Z. Hart 416b3eb37b
[Android] Tests for multiple item collection changes in CollectionView (#4869)
* Add multi-item removal test; handle multi-item removal scenarios on Android;

* Add test harness for adding multiple items to CollectionView at once

* Add test harness for multi-item move/replace; handle Android multi-item move;
Fix bug when replacing differently-sized item sets on Android;

* Add test harness for INotifyCollectionChanged Reset

* Performance improvements and clearer test code

* Remove private modifier

* Fix bug where updating items sources changed source types

* Remove private modifier

* Make index checks clearer

* Remove private modifier

* Remove private modifier

* Move code into if clause

* Use local variable

* Better indication of how to use collection modification tests

* Include end index in items moved

* Make update range include items between source and destination indexes

* Remove commented code
2019-01-24 11:22:18 -07:00
Matthew Leibowitz 9eac84a1fd Remove Unused Types (#4948)
* Remove NavigationMenu & Renderers
 - Never completed and there is the new CollectionView
 - Only (partially) implemented on iOS/Android

* Removing ToolbarButton and related types
 - `ToolbarButton`, `ToolbarImageButton`, `IToolbarButton`
 - this appears not to be used at all
 - was part of `ToolbarRenderer` in the old Duplo repo, which has since been removed

* Update Xamarin.Forms.Platform.cs
2019-01-16 08:37:02 +01:00
Matthew Richardson 9494ed5006 Null/disposed check for spannableString to fix ObjectDisposedException. (#4878) Fixes #4864 2019-01-15 09:57:51 +00:00
Stephane Delcroix aa76e0dab0 Merge branch '3.5.0' 2019-01-14 14:45:30 +01:00
Rui Marinho 691e4e886b
[Build] Fix method accessibility 2019-01-14 12:39:11 +00:00
E.Z. Hart f97fb08263 [iOS, Android] Implement Snap alignment for CollectionView (#4414)
* Implement snap alignment for iOS CollectionView

* Add missing End/MandatorySingle implementation for Android

* Implement MandatorySingle snapping on iOS

* Fix issues with Android MandatorySingle skipping items;

* Fix rebase issue
2019-01-14 11:48:59 +00:00
Stephane Delcroix 590e03f661 fix merge 2019-01-14 12:35:29 +01:00
Stephane Delcroix 599c90485d fix merge 2019-01-14 12:07:51 +01:00
Stephane Delcroix 7cc9a282bd Merge branch '3.5.0' 2019-01-14 09:32:43 +01:00
E.Z. Hart 411d2f60b2
[Android] Fix brief display of incorrect keyboard (#4384)
* Automate test for 39072

* Add Focus test category

* Add test instructions

* Use named flags value instead of magic number

* Rearrange keyboard hide/show handling when focus changes; fixes #3647

Clean up usings

Add null checks in case Controls are unloaded before the handler executes

* Update Xamarin.Forms.Platform.Android/ContextExtensions.cs

Co-Authored-By: hartez <hartez@users.noreply.github.com>

* Update Xamarin.Forms.Platform.Android/ViewRenderer.cs

Co-Authored-By: hartez <hartez@users.noreply.github.com>

* Fix bug where programmatic focus of SearchView does not display keyboard;
Add test for programmatic focus of SearchBar, Entry, Editor;

* Prevent object disposed exception if control is disposed before posted ShowKeyboard is run
2019-01-12 15:43:08 -07:00
Pavel Yakovlev 6546689bd7 [Android] fixes Right-to-Left Hamburger icon in MasterDetailPage (#4716) fixes #2818 2019-01-10 17:56:11 +00:00
Almir Vuk 5001460dd2 [Enhancement] Entry: Read-only Entry and Editor (#1972)
- fixes #1678
- fixes #4834

* InputView BindableProperty IsReadOnly

* Android Editor and Entry setup

* MacOS Editor and Entry setup

* Tizen Editor and Entry setup

* UAP Editor and Entry setup

* WPF Editor and Entry setup

* iOS Editor and Entry setup

* Issue1678 - TestContentPage added

* Tests added

* Tizen Editor and Entry fix

* UI Test fix

* Android fix for Entry and Editor.

* Unit Tests fix.

* Android Renderer first try.

* MacOS Entry renderer small fix.

* UpdateEditable fix.

* Android Entry and Editor reduced number of calls to BP.

* fix TestAttributes conflicts

* Remove keyboard

* [macOS] relinquish first responder

* [Android] remove call to UpdateCursorSelection

* [UWP] fix tabs
2019-01-10 09:21:28 -07:00
Joris Vergeer eab7e08cfd [Android] Fix for ListViewRenderer causing ObjectDisposedException (#4931)
* [Android] Fix for ListViewRenderer causing ObjectDisposedException

* Probably cleaner to use _refresh for IsDisposed check
2019-01-10 16:01:18 +00:00
Stephane Delcroix 6d20db1a3c
hide obsolete API from editor (#4938)
- fixes #4772
2019-01-10 12:53:48 +01:00
E.Z. Hart 23ee5a3999 Only post DisableTimer to the queue if it's not on the UI thread (#4866) 2019-01-10 11:42:40 +00:00
Shane Neuville 884d4a4e14 [Android] If drawable doesn't exist don't dispose of it (#4904) 2019-01-09 15:06:49 +01:00
Matthew Leibowitz 1c27d0bcff [Android] Ensure the page background can be un-set (#4916) 2019-01-09 15:06:00 +01:00
Shane Neuville e3a83e1fa7
Material Design Renderers for the Material Visual (#4733)
* Use the auto-generated constants

* [Visual] Work on the Material Frame

* Improving the code for the sample

* Added a controller to help with frames that have additional padding
 - Android MaterialCardView does not use the default padding to determine where the content starts, rather it uses the content padding of the view because there is a border that does not affect the content

* [Visual] Added a few extra checks on Android to reduce unnecessary interop

* [Visual] A few more frame changes and some button tweaks

* [Visual] use the themers on iOS and save default properties

* [Visual] Add placeholders for themer and cache defaults

* [Visual] Added the material slider for iOS
 - Android does not have a custom control, so uses the existing renderer

* [enhancements] Move from duplicate LoadImageAsync code to GetNativeImageAsync

* [visual] Updated the controls to use the new iOS bits

* [visual] some fixes for material components

* [visual] Added hacks for material alerts

* [visual] removing the alert changes for the main branch

* [visual] Update the MaterialComponents NuGet

* [visual] Rework the theming/customization of Material controls on iOS

* [visual] fix the places where the user colors were being changed

* [visual] Improve the ColorStateList management for Android

* [visual] Re-implemented the Android ProgressBar as a fast, material renderer

* Material Entry

* [visual] Add Android ActivityIndicator

* filter out material layouts for 8.1

* remove folder

* fix __ANDROID_28__

* MaterialContextThemeWrapper

* [visual] remove the `IFrameController` interface

* [visual] reverting the changes to the Frame layout

* [visual] reverting whitespace

* [visual] make sure to raise both property changed

* formatting changes

* fixing colors on android to match with ios themes

* Update Xamarin.Forms.Platform.Android/Material/MaterialButtonRenderer.cs

Co-Authored-By: mattleibow <mattleibow@live.com>

* fix sizing of entry with infinite width size request

* update to release 28 of support

* Update Xamarin.Forms.Platform.Android/Resources/values/styles.xml

Co-Authored-By: PureWeen <shane94@hotmail.com>

* Update Xamarin.Forms.Platform.Android/Resources/values/styles.xml

Co-Authored-By: PureWeen <shane94@hotmail.com>

* PR Comment changes
2019-01-07 17:07:50 -07:00
Stephane Delcroix 57d507ef0b Merge branch '3.5.0' 2019-01-07 11:32:11 +01:00
kingces95 5716f8d757 Min viable FontImageSource (#4747)
* min viable fontImageSource

* [UWP] Min viable FontImageSource (#4817)

* [UWP] font image source

* address comment

* [UWP] performance optimization of the rendering of icons font
- the minimum Dpi of the icon is 300

* char -> string; CR feedback
2019-01-03 09:46:40 -08:00
E.Z. Hart 4bab273f46
Implement Android single selection in CollectionView (#4651)
* Implement Android single selection

* Fix naming conflicts with SelectionChangedEventArgs

* Split files by class; make SelectionChangedEventArgs constructors internal;
Optimizations for SelectionChangedEventArgs;
Fire selection changed event/command from property changed handler;

* Update Xamarin.Forms.Core/Items/SelectableItemsView.cs

Co-Authored-By: StephaneDelcroix <stephane@delcroix.org>

* Set default value for SelectedItemProperty

* Remove unnecessary null check

* Fix order of OnElementChanged and Setup/Teardown Element

* Fix project file weirdness
2018-12-26 19:16:36 -07:00
Stephane Delcroix a6088feb81
[*] Drop MenuItem.IsEnabledPropertyName (#4659)
* [*] Drop MenuItem.IsEnabledPropertyName

While doing one of the big refactoring of 2006, we missed an
opportunity to use a propertyKey for IsEnabled, ending up in some
less-than-optimal  design choices, like IMenuController.IsEnabledPropertyName.

Properly using a public r-o BP removes the need for IsEnabledPropertyName.

* other plats

* use the key
2018-12-21 09:06:52 +01:00
Shane Neuville 7199cd099b [Android] set ClipBounds to use ViewCompat.SetClipBounds (#4819) 2018-12-20 09:27:01 +01:00
Shane Neuville e4325a0a69
[Android] Check if Drawable is null in Draw override (#4783)
- fixes #4782
2018-12-18 18:22:12 -07:00
Rui Marinho 3eaf1997bd Merge branch '3.5.0' 2018-12-18 14:19:27 +00:00
Samantha Houts ef77b19832 [Android] Avoid acting on a disposed reference (#4780) 2018-12-18 13:01:48 +00:00
Gerald Versluis 27f83582e9 [C, iOS, AND, UWP] Color for Picker.Title (#4701)
* Implemented Core, iOS and Android

* Implemented UWP

* Processed code review feedback

* More code review feedback
And implemented reset scenarios for all platforms

* Also apply color to popup dialog on Android

- fixes #4669
2018-12-18 13:12:30 +01:00
Samantha Houts f2948f1f0c Merge branch '3.5.0' 2018-12-14 11:00:28 -08:00
Samantha Houts 4908a29f48 Merge branch '3.4.0' into 3.5.0 2018-12-13 16:17:21 -08:00
Shane Neuville a391f69e26 update to preview9 and uncomment no longer broken interface (#4727) 2018-12-13 23:46:29 +00:00
Pavel Yakovlev aaff052e0a [Android] fixes pop-up dialog in Pickers when you call Focus() (#4725)
* [Android] fixes pop-up dialog in Pickers when you call Focus()

* [Android] Extract the popup-on-focus logic
 - the will be useful when other, non-EditText triggers are used
 - this can be extended later if more features are needed
 - no specific types in base types
2018-12-13 23:44:53 +00:00
E.Z. Hart 154c2d088a [Android] ItemContentView should use all available space (#4569) fixes #4406
* [Android] ItemContentView should use all available space; fixes #4406
Fix inconsistent/inaccurate class naming for cells/views.

* Update Xamarin.Forms.Platform.Android/CollectionView/SizedItemContentView.cs

Add missing space.

Co-Authored-By: hartez <hartez@users.noreply.github.com>

* Make ReuseId values match class names
2018-12-11 18:41:30 +00:00
Rui Marinho 4fd2d6b45b Merge branch '3.5.0' 2018-12-09 01:16:23 +00:00
Rui Marinho 97206c235c
Merge 3.4.0 to 3.5.0 2018-12-09 00:51:34 +00:00
jcmanke 03da76bdd6 Change SearchBar base class to InputView (#3248) fixes #2902
* Changed SearchView base class from View to InputView

* Minor code cleanup
2018-12-07 13:31:56 +00:00
Pavel Yakovlev a55ce0ff0f [Android] fixes crash when switching Bottom Navigation Tabs too fast or click on More menu (#4617) fixes #4382 2018-12-07 00:54:44 +00:00
Shane Neuville db0467a5eb [Android] Fix ImageSource being set to null and fix ImageCell so it loads images (#4601) fixes #4597 fixes #4584
* [Android] fix imageCell and null ImageSource

* [iOS] fixed ui tests for iOS

* [Android] fix FR UI Tests

* suggested formatting fixes
2018-12-05 00:55:00 +00:00
Pavel Yakovlev ab6147a6c1 [Android] fixes Picker list showing up incorrectly when focus is set on other controls (#4344) fixes #4318 fixes #4187 fixes #4494
* [Android] fixes Picker list shows up, when focus is set on other controls

* - fixes Picker outside the cell, when you tap on the adjacent EditBox
- address comments

* [Android] added automated UItest

* [Android] added automated test in the carousel

* correct namespace UITest

* fix uitest

* fix uitest #2

* [Controls] Add test for #4494

* minor formating
2018-12-05 00:54:00 +00:00
Paul Datsiuk 19ac6e7b1f [Android] Java.Lang.RuntimeException: Animators may only be run on Lo… (#4177)
* [Android] Java.Lang.RuntimeException: Animators may only be run on Looper threads on Battery Saver Mode

https://github.com/xamarin/Xamarin.Forms/issues/4176

* rewrite code to BeginInvokeOnMainThread
- fixes #4176
2018-12-04 12:49:07 -07:00
Matthew Richardson 1e116658a1 [Enhancement] Add drag started and completed events/commands to Slider (#4423) fixes #1450
* Implement DragStarted and DragCompleted events/commands in Slider.

* Add Tizen support.

* Use explicit interface implementation.

* Fix unit tests.

* Update Xamarin.Forms.Core/ISliderController.cs

Co-Authored-By: velocitysystems <matthew@velocitysystems.co.nz>

* Fix whitespace.

* Add missing namespace import
2018-12-04 19:08:13 +00:00
Stephane Delcroix 78385f9fc1 [Shell] The glorious Shell (#4522)
* [Shell] The glorious Shell

* set the flag for the test

* remove the FastRenderer flag

* [Android] If we were disposed earlier Element can be null and Control was disposed

* [Controls] Seems part of #2520 was solved so we don't need this

* [iOS] Fix NRE on the ScrollviewTracker

* add missing constructor for RenderWith

* [Core] propagate visual/flow through shell

* use interlock increment

* hide IDataTemplateController

* [Android] Fix TableViewModelRenderer dispose

* [Core] propagate visual/flow direction through shell hierarchy

* [Android-Gallery] removed some left in settings changes that effect UI Tests

* [iOS,Droid,Core] Code formatting

* [iOS,Core] Last minute style refactoring
2018-11-29 20:22:51 -08:00
Alexandre Caprais 369c2af2a5 Set ImageButton property of Android.ImageButtonRenderer public (#4534)
* Set ImageButton property public
Set ImageButton property public.
* Rename ImageButton to Element
the Element set property remains private.
2018-11-29 17:14:14 -07:00
Paul Datsiuk 4db654df07 [Android] total fix of issue #3575 (#4567)
* total fix of issue #3575

we need to check _childView with null also

* Update MasterDetailContainer.cs
2018-11-29 13:12:43 +00:00
E.Z. Hart e6af1a513c Modify Android and iOS adapters to handle null items sources (#4536) fixes #4366
* Modify Android and iOS adapters to handle null items sources; fixes #4366

* Correct behavior for EmptySource indexer on iOS
2018-11-29 13:03:21 +00:00
Shane Neuville 4975d0cb85 update support and sync up nuspecs (#4571) 2018-11-29 13:00:20 +00:00
Gerald Versluis 0d08fd8254 Implemented colored refresh indicator for ListView pull-to-refresh (#2961)
* Implemented colored spinner for ListView pull-to-refresh

* Added back default spinner color

* Renamed away from "spinner" and did some default value magic

Color.Default reinstated, but also added the default black color in the iOS `UpdateRefreshControlColor` method. Seeing this also happens for the seperator color this is something that is necessary. If not, the spinner is invisible.

* Implemented default color on iOS and right property name on Android

For iOS, when the new `RefreshControlColor` has the default color, the `TintColor` for iOS is set to null, causing the color to be the default one.

Forgot to refactor the new name in the Android renderer, whoops

* Reinstated coloring on listview gallry page

* Implemented colored spinner for ListView pull-to-refresh

* Added back default spinner color

* Renamed away from "spinner" and did some default value magic

Color.Default reinstated, but also added the default black color in the iOS `UpdateRefreshControlColor` method. Seeing this also happens for the seperator color this is something that is necessary. If not, the spinner is invisible.

* Implemented default color on iOS and right property name on Android

For iOS, when the new `RefreshControlColor` has the default color, the `TintColor` for iOS is set to null, causing the color to be the default one.

Forgot to refactor the new name in the Android renderer, whoops

* Reinstated coloring on listview gallry page

* Added documentation for new property

* Fixed merge boo-boos
2018-11-29 12:57:57 +00:00