diff --git a/CarouselViewChallenge/CarouselViewChallenge.Android/CarouselViewChallenge.Android.csproj b/CarouselViewChallenge/CarouselViewChallenge.Android/CarouselViewChallenge.Android.csproj index 1e33499..6be9938 100644 --- a/CarouselViewChallenge/CarouselViewChallenge.Android/CarouselViewChallenge.Android.csproj +++ b/CarouselViewChallenge/CarouselViewChallenge.Android/CarouselViewChallenge.Android.csproj @@ -54,8 +54,8 @@ - - + + @@ -100,5 +100,65 @@ CarouselViewChallenge + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/BradProfile.jpg b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/BradProfile.jpg new file mode 100644 index 0000000..e3f089d Binary files /dev/null and b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/BradProfile.jpg differ diff --git a/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/BradStory.jpg b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/BradStory.jpg new file mode 100644 index 0000000..09bf9c6 Binary files /dev/null and b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/BradStory.jpg differ diff --git a/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/KeanuProfile.jpg b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/KeanuProfile.jpg new file mode 100644 index 0000000..82cc12f Binary files /dev/null and b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/KeanuProfile.jpg differ diff --git a/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/KeanuStory.jpg b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/KeanuStory.jpg new file mode 100644 index 0000000..e8df595 Binary files /dev/null and b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/KeanuStory.jpg differ diff --git a/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/LebronProfile.jpg b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/LebronProfile.jpg new file mode 100644 index 0000000..62ce458 Binary files /dev/null and b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/LebronProfile.jpg differ diff --git a/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/LebronStory.jpg b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/LebronStory.jpg new file mode 100644 index 0000000..8a6d510 Binary files /dev/null and b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/LebronStory.jpg differ diff --git a/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/LeonardoProfile.jpg b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/LeonardoProfile.jpg new file mode 100644 index 0000000..6a6cb9e Binary files /dev/null and b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/LeonardoProfile.jpg differ diff --git a/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/LeonardoStory.jpg b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/LeonardoStory.jpg new file mode 100644 index 0000000..48bf43d Binary files /dev/null and b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/LeonardoStory.jpg differ diff --git a/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/LucianoHulkProfile.jpg b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/LucianoHulkProfile.jpg new file mode 100644 index 0000000..5599e4b Binary files /dev/null and b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/LucianoHulkProfile.jpg differ diff --git a/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/LucianoHulkStory.jpg b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/LucianoHulkStory.jpg new file mode 100644 index 0000000..bbba5ae Binary files /dev/null and b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/LucianoHulkStory.jpg differ diff --git a/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/MackProfile.jpg b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/MackProfile.jpg new file mode 100644 index 0000000..9717a61 Binary files /dev/null and b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/MackProfile.jpg differ diff --git a/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/MackStory.jpg b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/MackStory.jpg new file mode 100644 index 0000000..6a2e2c6 Binary files /dev/null and b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/MackStory.jpg differ diff --git a/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/NeymarProfile.jpg b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/NeymarProfile.jpg new file mode 100644 index 0000000..a320441 Binary files /dev/null and b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/NeymarProfile.jpg differ diff --git a/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/NeymarStory.jpg b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/NeymarStory.jpg new file mode 100644 index 0000000..b784b3f Binary files /dev/null and b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/NeymarStory.jpg differ diff --git a/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/TimelineHeader.png b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/TimelineHeader.png new file mode 100644 index 0000000..12822e2 Binary files /dev/null and b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/TimelineHeader.png differ diff --git a/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/TimelinePosts.png b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/TimelinePosts.png new file mode 100644 index 0000000..907a942 Binary files /dev/null and b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/TimelinePosts.png differ diff --git a/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/TomProfile.jpg b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/TomProfile.jpg new file mode 100644 index 0000000..31bc982 Binary files /dev/null and b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/TomProfile.jpg differ diff --git a/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/TomStory.jpg b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/TomStory.jpg new file mode 100644 index 0000000..11dd1de Binary files /dev/null and b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/TomStory.jpg differ diff --git a/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/User.jpg b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/User.jpg new file mode 100644 index 0000000..c727ced Binary files /dev/null and b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/User.jpg differ diff --git a/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/UserProfile.jpg b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/UserProfile.jpg new file mode 100644 index 0000000..c727ced Binary files /dev/null and b/CarouselViewChallenge/CarouselViewChallenge.Android/Resources/drawable/UserProfile.jpg differ diff --git a/CarouselViewChallenge/CarouselViewChallenge.UWP/CarouselViewChallenge.UWP.csproj b/CarouselViewChallenge/CarouselViewChallenge.UWP/CarouselViewChallenge.UWP.csproj index 4b6b2c9..55db78b 100644 --- a/CarouselViewChallenge/CarouselViewChallenge.UWP/CarouselViewChallenge.UWP.csproj +++ b/CarouselViewChallenge/CarouselViewChallenge.UWP/CarouselViewChallenge.UWP.csproj @@ -146,8 +146,8 @@ - - + + @@ -159,4 +159,4 @@ 14.0 - + \ No newline at end of file diff --git a/CarouselViewChallenge/CarouselViewChallenge.iOS/CarouselViewChallenge.iOS.csproj b/CarouselViewChallenge/CarouselViewChallenge.iOS/CarouselViewChallenge.iOS.csproj index 6241d2c..f5738b9 100644 --- a/CarouselViewChallenge/CarouselViewChallenge.iOS/CarouselViewChallenge.iOS.csproj +++ b/CarouselViewChallenge/CarouselViewChallenge.iOS/CarouselViewChallenge.iOS.csproj @@ -130,7 +130,7 @@ - + @@ -139,4 +139,4 @@ CarouselViewChallenge - + \ No newline at end of file diff --git a/CarouselViewChallenge/CarouselViewChallenge/CarouselViewChallenge.csproj b/CarouselViewChallenge/CarouselViewChallenge/CarouselViewChallenge.csproj index a58ec88..e6724ce 100644 --- a/CarouselViewChallenge/CarouselViewChallenge/CarouselViewChallenge.csproj +++ b/CarouselViewChallenge/CarouselViewChallenge/CarouselViewChallenge.csproj @@ -7,11 +7,7 @@ - - - - - + diff --git a/CarouselViewChallenge/CarouselViewChallenge/Models/StoryCard.cs b/CarouselViewChallenge/CarouselViewChallenge/Models/StoryCard.cs new file mode 100644 index 0000000..273d25e --- /dev/null +++ b/CarouselViewChallenge/CarouselViewChallenge/Models/StoryCard.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace CarouselViewChallenge.Models +{ + public class StoryCard + { + public string ProfileImage { get; set; } + public string Name { get; set; } + public string StoryImage { get; set; } + public bool IsUserStory { get; set; } + } +} diff --git a/CarouselViewChallenge/CarouselViewChallenge/ViewModels/CarouselViewChallengePageViewModel.cs b/CarouselViewChallenge/CarouselViewChallenge/ViewModels/CarouselViewChallengePageViewModel.cs new file mode 100644 index 0000000..8dab098 --- /dev/null +++ b/CarouselViewChallenge/CarouselViewChallenge/ViewModels/CarouselViewChallengePageViewModel.cs @@ -0,0 +1,36 @@ +using CarouselViewChallenge.Models; +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel; +using System.Text; + +namespace CarouselViewChallenge.ViewModels +{ + class CarouselViewChallengePageViewModel : INotifyPropertyChanged + { + public event PropertyChangedEventHandler PropertyChanged; + + private ObservableCollection _storyCards; + public ObservableCollection StoryCards + { + get + { + return _storyCards; + } + set + { + if (_storyCards != value) + { + _storyCards = value; + OnPropertyChanged(new PropertyChangedEventArgs("StoryCards")); + } + } + } + + private void OnPropertyChanged(PropertyChangedEventArgs eventArgs) + { + PropertyChanged?.Invoke(this, eventArgs); + } + } +} diff --git a/CarouselViewChallenge/CarouselViewChallenge/Views/CarouselViewChallengePage.xaml b/CarouselViewChallenge/CarouselViewChallenge/Views/CarouselViewChallengePage.xaml index 1a7cc0d..8c8d1e3 100644 --- a/CarouselViewChallenge/CarouselViewChallenge/Views/CarouselViewChallengePage.xaml +++ b/CarouselViewChallenge/CarouselViewChallenge/Views/CarouselViewChallengePage.xaml @@ -6,8 +6,78 @@ mc:Ignorable="d" x:Class="CarouselViewChallenge.Views.CarouselViewChallengePage"> - - \ No newline at end of file diff --git a/CarouselViewChallenge/CarouselViewChallenge/Views/CarouselViewChallengePage.xaml.cs b/CarouselViewChallenge/CarouselViewChallenge/Views/CarouselViewChallengePage.xaml.cs index 38f2e9f..050e831 100644 --- a/CarouselViewChallenge/CarouselViewChallenge/Views/CarouselViewChallengePage.xaml.cs +++ b/CarouselViewChallenge/CarouselViewChallenge/Views/CarouselViewChallengePage.xaml.cs @@ -1,5 +1,8 @@ -using System; +using CarouselViewChallenge.Models; +using CarouselViewChallenge.ViewModels; +using System; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -15,6 +18,22 @@ public partial class CarouselViewChallengePage : ContentPage public CarouselViewChallengePage() { InitializeComponent(); + + var vm = new CarouselViewChallengePageViewModel(); + vm.StoryCards = new ObservableCollection + { + new StoryCard{Name = "Adicionar ao story", IsUserStory = true, StoryImage="User.jpg"}, + new StoryCard{Name = "Luciano Hulk", IsUserStory = false, ProfileImage = "LucianoHulkProfile.jpg", StoryImage = "LucianoHulkStory.jpg"}, + new StoryCard{Name = "Neymar Junior", IsUserStory = false, ProfileImage = "NeymarProfile.jpg", StoryImage = "NeymarStory.jpg" }, + new StoryCard{Name = "Keanu Reeves", IsUserStory = false, ProfileImage = "KeanuProfile.jpg", StoryImage = "KeanuStory.jpg" }, + new StoryCard{Name = "Leonardo DiCaprio", IsUserStory = false, ProfileImage = "LeonardoProfile.jpg", StoryImage = "LeonardoStory.jpg" }, + new StoryCard{Name = "Brad Pitt", IsUserStory = false, ProfileImage = "BradProfile.jpg", StoryImage = "BradStory.jpg" }, + new StoryCard{Name = "Tom Brady", IsUserStory = false, ProfileImage = "TomProfile.jpg", StoryImage = "TomStory.jpg" }, + new StoryCard{Name = "Lebron James", IsUserStory = false, ProfileImage = "LebronProfile.jpg", StoryImage = "LebronStory.jpg" }, + new StoryCard{Name = "Khalil Mack", IsUserStory = false, ProfileImage = "MackProfile.jpg", StoryImage = "MackStory.jpg" }, + }; + + BindingContext = vm; } } } \ No newline at end of file