diff --git a/CarouselViewChallenge/CarouselViewChallenge.Android/CarouselViewChallenge.Android.csproj b/CarouselViewChallenge/CarouselViewChallenge.Android/CarouselViewChallenge.Android.csproj index 1e33499..5491fea 100644 --- a/CarouselViewChallenge/CarouselViewChallenge.Android/CarouselViewChallenge.Android.csproj +++ b/CarouselViewChallenge/CarouselViewChallenge.Android/CarouselViewChallenge.Android.csproj @@ -15,7 +15,6 @@ Properties\AndroidManifest.xml Resources Assets - false v9.0 true true @@ -96,7 +95,7 @@ - {1AD32EAF-CE1F-497F-8598-87F19CDA3D10} + {A9F8B9B3-719F-4F40-9044-924E7B921409} CarouselViewChallenge diff --git a/CarouselViewChallenge/CarouselViewChallenge.Android/Properties/AndroidManifest.xml b/CarouselViewChallenge/CarouselViewChallenge.Android/Properties/AndroidManifest.xml index f37a67c..06d3722 100644 --- a/CarouselViewChallenge/CarouselViewChallenge.Android/Properties/AndroidManifest.xml +++ b/CarouselViewChallenge/CarouselViewChallenge.Android/Properties/AndroidManifest.xml @@ -1,6 +1,6 @@ - + - - - - + + + + \ No newline at end of file diff --git a/CarouselViewChallenge/CarouselViewChallenge.iOS/CarouselViewChallenge.iOS.csproj b/CarouselViewChallenge/CarouselViewChallenge.iOS/CarouselViewChallenge.iOS.csproj index 6241d2c..06a0833 100644 --- a/CarouselViewChallenge/CarouselViewChallenge.iOS/CarouselViewChallenge.iOS.csproj +++ b/CarouselViewChallenge/CarouselViewChallenge.iOS/CarouselViewChallenge.iOS.csproj @@ -135,7 +135,7 @@ - {1AD32EAF-CE1F-497F-8598-87F19CDA3D10} + {A9F8B9B3-719F-4F40-9044-924E7B921409} CarouselViewChallenge diff --git a/CarouselViewChallenge/CarouselViewChallenge/CarouselViewChallenge.csproj b/CarouselViewChallenge/CarouselViewChallenge/CarouselViewChallenge.csproj index a58ec88..df0b930 100644 --- a/CarouselViewChallenge/CarouselViewChallenge/CarouselViewChallenge.csproj +++ b/CarouselViewChallenge/CarouselViewChallenge/CarouselViewChallenge.csproj @@ -12,6 +12,7 @@ + @@ -20,9 +21,20 @@ + + + + + MSBuild:UpdateDesignTimeXaml + + + + + + diff --git a/CarouselViewChallenge/CarouselViewChallenge/Models/Plant.cs b/CarouselViewChallenge/CarouselViewChallenge/Models/Plant.cs new file mode 100644 index 0000000..43b0c0c --- /dev/null +++ b/CarouselViewChallenge/CarouselViewChallenge/Models/Plant.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using Xamarin.Forms; + +namespace CarouselViewChallenge.Models +{ + public class Plant + { + public string Name { get; set; } + public string Type { get; set; } + public string FlowerDate { get; set; } + public string FruitDate { get; set; } + public string HardinessZone { get; set; } + public string Description { get; set; } + public List Images { get; set; } + } +} diff --git a/CarouselViewChallenge/CarouselViewChallenge/Resources/sample-rose-florentina.jpg b/CarouselViewChallenge/CarouselViewChallenge/Resources/sample-rose-florentina.jpg new file mode 100644 index 0000000..196631f Binary files /dev/null and b/CarouselViewChallenge/CarouselViewChallenge/Resources/sample-rose-florentina.jpg differ diff --git a/CarouselViewChallenge/CarouselViewChallenge/Resources/sample-rose-honeycaramel.jpg b/CarouselViewChallenge/CarouselViewChallenge/Resources/sample-rose-honeycaramel.jpg new file mode 100644 index 0000000..cecc4c3 Binary files /dev/null and b/CarouselViewChallenge/CarouselViewChallenge/Resources/sample-rose-honeycaramel.jpg differ diff --git a/CarouselViewChallenge/CarouselViewChallenge/Resources/sample-rose-hotchocolate.jpg b/CarouselViewChallenge/CarouselViewChallenge/Resources/sample-rose-hotchocolate.jpg new file mode 100644 index 0000000..962a480 Binary files /dev/null and b/CarouselViewChallenge/CarouselViewChallenge/Resources/sample-rose-hotchocolate.jpg differ diff --git a/CarouselViewChallenge/CarouselViewChallenge/Screenshots/after.gif b/CarouselViewChallenge/CarouselViewChallenge/Screenshots/after.gif new file mode 100644 index 0000000..68f5721 Binary files /dev/null and b/CarouselViewChallenge/CarouselViewChallenge/Screenshots/after.gif differ diff --git a/CarouselViewChallenge/CarouselViewChallenge/Screenshots/after.png b/CarouselViewChallenge/CarouselViewChallenge/Screenshots/after.png new file mode 100644 index 0000000..93a4ed2 Binary files /dev/null and b/CarouselViewChallenge/CarouselViewChallenge/Screenshots/after.png differ diff --git a/CarouselViewChallenge/CarouselViewChallenge/Screenshots/before.jpg b/CarouselViewChallenge/CarouselViewChallenge/Screenshots/before.jpg new file mode 100644 index 0000000..4f40c53 Binary files /dev/null and b/CarouselViewChallenge/CarouselViewChallenge/Screenshots/before.jpg differ diff --git a/CarouselViewChallenge/CarouselViewChallenge/ViewModels/CarouselViewChallengePageViewModel.cs b/CarouselViewChallenge/CarouselViewChallenge/ViewModels/CarouselViewChallengePageViewModel.cs new file mode 100644 index 0000000..5cfc1e7 --- /dev/null +++ b/CarouselViewChallenge/CarouselViewChallenge/ViewModels/CarouselViewChallengePageViewModel.cs @@ -0,0 +1,10 @@ +using System; +using CarouselViewChallenge.Models; + +namespace CarouselViewChallenge.ViewModels +{ + public class CarouselViewChallengePageViewModel + { + public Plant Plant { get; set; } + } +} diff --git a/CarouselViewChallenge/CarouselViewChallenge/Views/CarouselViewChallengePage.xaml b/CarouselViewChallenge/CarouselViewChallenge/Views/CarouselViewChallengePage.xaml index 1a7cc0d..9830253 100644 --- a/CarouselViewChallenge/CarouselViewChallenge/Views/CarouselViewChallengePage.xaml +++ b/CarouselViewChallenge/CarouselViewChallenge/Views/CarouselViewChallengePage.xaml @@ -5,9 +5,59 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 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..a0d0f5f 100644 --- a/CarouselViewChallenge/CarouselViewChallenge/Views/CarouselViewChallengePage.xaml.cs +++ b/CarouselViewChallenge/CarouselViewChallenge/Views/CarouselViewChallengePage.xaml.cs @@ -3,7 +3,8 @@ using System.Linq; using System.Text; using System.Threading.Tasks; - +using CarouselViewChallenge.Models; +using CarouselViewChallenge.ViewModels; using Xamarin.Forms; using Xamarin.Forms.Xaml; @@ -12,9 +13,69 @@ namespace CarouselViewChallenge.Views [XamlCompilation(XamlCompilationOptions.Compile)] public partial class CarouselViewChallengePage : ContentPage { + public CarouselViewChallengePageViewModel VM { get; set; } + public CarouselViewChallengePage() { InitializeComponent(); + + VM = new CarouselViewChallengePageViewModel(); + VM.Plant = new Plant + { + Name = "Florentina", + Type = "Climbing Rose", + FlowerDate = "3,4,5", + FruitDate = "6,7,8", + HardinessZone = "Zone 4-9", + Description = "佛罗伦蒂娜(佛罗伦萨、Florentina),德国, 2002,红色花,黄色花蕊。大花复瓣(26-40),杯型过渡至平坦花,多季开放。约两米,宽度约一米,耐寒。", + Images = new List + { + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-florentina.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-honeycaramel.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-hotchocolate.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-florentina.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-honeycaramel.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-hotchocolate.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-florentina.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-honeycaramel.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-hotchocolate.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-florentina.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-honeycaramel.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-hotchocolate.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-florentina.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-honeycaramel.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-hotchocolate.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-florentina.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-honeycaramel.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-hotchocolate.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-florentina.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-honeycaramel.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-hotchocolate.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-florentina.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-honeycaramel.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-hotchocolate.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-florentina.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-honeycaramel.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-hotchocolate.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-florentina.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-honeycaramel.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-hotchocolate.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-florentina.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-honeycaramel.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-hotchocolate.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-florentina.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-honeycaramel.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-hotchocolate.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-florentina.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-honeycaramel.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-hotchocolate.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-florentina.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-honeycaramel.jpg"), + ImageSource.FromResource("CarouselViewChallenge.Resources.sample-rose-hotchocolate.jpg"), + } + }; + + BindingContext = VM; } } } \ No newline at end of file