Skip to content
This repository has been archived by the owner on May 1, 2024. It is now read-only.

Merged ResourceDictionary #97

Merged
merged 5 commits into from Apr 17, 2016
Merged

Merged ResourceDictionary #97

merged 5 commits into from Apr 17, 2016

Conversation

StephaneDelcroix
Copy link
Member

@StephaneDelcroix StephaneDelcroix commented Apr 15, 2016 •
edited by samhouts

Description of Change

It supports this syntax

    <ContentPage.Resources>
        <ResourceDictionary MergedWith="local:SharedResourceDictionary">
        </ResourceDictionary>

Bugs Fixed

None

API Changes

Added:

  • ResourceDictionary.MergedWith property

Behavioral Changes

PR Checklist

  • [OH YEAH ] Has tests (if omitted, state reason in description)
  • [ LEMME CHECK] Rebased on top of master at time of PR
  • [ I THINK SO] Changes adhere to coding standard
  • [ OBVIOUSLY] Consolidate commits as makes sense

@samhouts
Copy link
Member

samhouts commented Apr 15, 2016 •
edited

👎 Unit test fail: StaticResource not found for key sharedfoo

EDIT: Fixed! 👍

samhouts
samhouts reviewed Apr 15, 2016
View reviewed changes
Xamarin.Forms.Core/ResourceDictionary.cs
return;
var ms = _mergedWith.GetTypeInfo ().BaseType.GetTypeInfo().DeclaredMethods;
foreach (var me in ms)
System.Diagnostics.Debug.WriteLine (me.Name);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we leaving this in here?

@samhouts
Copy link
Member

Not a blocker, but probably needs to be formatted with our new styles.

@samhouts
Copy link
Member

samhouts commented Apr 15, 2016 •
edited

👍Unit test has been fixed. Just needs docs updated & UI test lanes to finish & pass!

@jassmith jassmith merged commit cdd6d4d into master Apr 17, 2016
@kingces95 kingces95 deleted the MergedRD branch April 25, 2016 16:12
jsuarezruiz added a commit to PlainConcepts/Xamarin.Forms that referenced this pull request Sep 7, 2017
@jsuarezruiz
Merge pull request xamarin#97 from jsuarezruiz/gtk-carousel-overflow-fix
86ed99d 
Fixed StackOverflowException on CarouselPage
@samhouts samhouts added this to the 2.3.0 milestone Jun 27, 2018
mattleibow pushed a commit that referenced this pull request Jan 28, 2021
@jamesmontemagno
GH-22: Initial Support for Data Transfer aka Share (#97)
2990784 
* Initial Support for Data Transfer aka Share

* Add samples for Data Transfer

* Add Tests for DataTransfer

* Add documentation

* Rename to RequestAsync, Cleanup UWP, and update docs

* Update to use AppInfo

* Cleanup event handler in UWP
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
2.3.0
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@StephaneDelcroix @samhouts @jassmith