Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions PhotoGallery/AlbumCollectionPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
x:Class="PhotoGallery.AlbumCollectionPage"
Title="{Binding AlbumName}">
<Grid>
<listView:SfListView x:Name="listView" ItemsSource="{Binding Photos}" ItemSize="200" ItemSpacing="10"
ItemTapped="OnPhotosItemTapped">
<listView:SfListView x:Name="listView" ItemsSource="{Binding Photos}" SelectionMode="None"
ItemSize="90" ItemSpacing="5" ItemTapped="OnPhotosItemTapped">
<listView:SfListView.ItemsLayout>
<listView:GridLayout SpanCount="3" />
<listView:GridLayout SpanCount="4" />
</listView:SfListView.ItemsLayout>
<listView:SfListView.ItemTemplate>
<DataTemplate>
<Image Source="{Binding Image}" Aspect="AspectFill"/>
<Image Source="{Binding Image}" Aspect="AspectFill" HeightRequest="88" WidthRequest="88"/>
</DataTemplate>
</listView:SfListView.ItemTemplate>
</listView:SfListView>
Expand Down
8 changes: 6 additions & 2 deletions PhotoGallery/AlbumCollectionPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,17 @@ public AlbumCollectionPage(GalleryViewModel viewModel)
{
return "Today";
}
else if (item.DateTime.Date == DateTime.Now.Date.AddDays(-1))
{
return "Yesterday";
}
else if (item.DateTime.Year == DateTime.Now.Year)
{
return item.DateTime.ToString("MMM dd", CultureInfo.InvariantCulture);
return item.DateTime.ToString("ddd, dd MMM", CultureInfo.InvariantCulture);
}
else
{
return item.DateTime.ToString("MMM dd yyyy", CultureInfo.InvariantCulture);
return item.DateTime.ToString("ddd, dd MMM, yyyy", CultureInfo.InvariantCulture);
}
}
else
Expand Down
26 changes: 13 additions & 13 deletions PhotoGallery/ImagePage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@

<Grid RowDefinitions="*,60">
<Image Source="{Binding Image}" Aspect="AspectFit"/>
<HorizontalStackLayout VerticalOptions="End" Spacing="10" HorizontalOptions="Center">
<HorizontalStackLayout VerticalOptions="End" Spacing="20" HorizontalOptions="Center">

<Border StrokeThickness="0" HeightRequest="60" WidthRequest="60">
<Border.StrokeShape>
<RoundRectangle CornerRadius="25"/>
<RoundRectangle CornerRadius="30"/>
</Border.StrokeShape>
<effects:SfEffectsView TouchDownEffects="Highlight">
<effects:SfEffectsView.GestureRecognizers>
Expand All @@ -33,46 +33,46 @@

<Border StrokeThickness="0" HeightRequest="60" WidthRequest="60">
<Border.StrokeShape>
<RoundRectangle CornerRadius="25"/>
<RoundRectangle CornerRadius="30"/>
</Border.StrokeShape>
<effects:SfEffectsView TouchDownEffects="Highlight">
<effects:SfEffectsView.GestureRecognizers>
<TapGestureRecognizer Tapped="OnFavoriteTapped"/>
<TapGestureRecognizer Tapped="OnEditTapped"/>
</effects:SfEffectsView.GestureRecognizers>
<VerticalStackLayout HorizontalOptions="Center" VerticalOptions="Center">
<Label Text="{Binding IsFavorite, Converter={StaticResource FavoriteToIconConverter}}"
FontFamily="PhotoGallery" FontSize="24" HorizontalOptions="Center"/>
<Label Text="Favorite" />
<Label Text="&#xE701;" FontFamily="PhotoGallery" FontSize="24" HorizontalOptions="Center"/>
<Label Text="Edit" />
</VerticalStackLayout>
</effects:SfEffectsView>
</Border>

<Border StrokeThickness="0" HeightRequest="60" WidthRequest="60">
<Border.StrokeShape>
<RoundRectangle CornerRadius="25"/>
<RoundRectangle CornerRadius="30"/>
</Border.StrokeShape>
<effects:SfEffectsView TouchDownEffects="Highlight">
<effects:SfEffectsView.GestureRecognizers>
<TapGestureRecognizer Tapped="OnEditTapped"/>
<TapGestureRecognizer Tapped="OnFavoriteTapped"/>
</effects:SfEffectsView.GestureRecognizers>
<VerticalStackLayout HorizontalOptions="Center" VerticalOptions="Center">
<Label Text="&#xE701;" FontFamily="PhotoGallery" FontSize="24" HorizontalOptions="Center"/>
<Label Text="Edit" />
<Label Text="{Binding IsFavorite, Converter={StaticResource FavoriteToIconConverter}}"
FontFamily="PhotoGallery" FontSize="24" HorizontalOptions="Center"/>
<Label Text="Favorite" />
</VerticalStackLayout>
</effects:SfEffectsView>
</Border>

<Border StrokeThickness="0" HeightRequest="60" WidthRequest="60">
<Border.StrokeShape>
<RoundRectangle CornerRadius="25"/>
<RoundRectangle CornerRadius="30"/>
</Border.StrokeShape>
<effects:SfEffectsView TouchDownEffects="Highlight">
<effects:SfEffectsView.GestureRecognizers>
<TapGestureRecognizer Tapped="OnDeleteTapped"/>
</effects:SfEffectsView.GestureRecognizers>
<VerticalStackLayout HorizontalOptions="Center" VerticalOptions="Center">
<Label Text="&#xE700;" FontFamily="PhotoGallery" FontSize="24" HorizontalOptions="Center"/>
<Label Text="Delete" />
<Label Text="Bin" />
</VerticalStackLayout>
</effects:SfEffectsView>
</Border>
Expand Down
32 changes: 15 additions & 17 deletions PhotoGallery/MainPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@
Color="{Binding Source={x:Reference photosTab},Path=TextColor}"
FontFamily="PhotoGallery"/>
</tabView:SfTabItem.ImageSource>
<listView:SfListView x:Name="listViewPhotos" ItemsSource="{Binding Photos}" ItemSize="200" ItemSpacing="10"
ItemTapped="OnPhotosItemTapped">
<listView:SfListView x:Name="listViewPhotos" ItemsSource="{Binding Photos}" SelectionMode="None"
ItemSize="90" ItemSpacing="5" ItemTapped="OnPhotosItemTapped">

<listView:SfListView.ItemsLayout>
<listView:GridLayout SpanCount="3" />
<listView:GridLayout SpanCount="4" />
</listView:SfListView.ItemsLayout>
<listView:SfListView.ItemTemplate>
<DataTemplate>
<Image Source="{Binding Image}" Aspect="AspectFill"/>
<Image Source="{Binding Image}" Aspect="AspectFill" HeightRequest="88" WidthRequest="88"/>
</DataTemplate>
</listView:SfListView.ItemTemplate>
</listView:SfListView>
Expand All @@ -60,17 +60,17 @@
FontFamily="PhotoGallery"/>
</tabView:SfTabItem.ImageSource>

<listView:SfListView ItemsSource="{Binding Albums}" ItemSize="200" ItemSpacing="10"
ItemTapped="OnAlbumsItemTapped">
<listView:SfListView ItemsSource="{Binding Albums}" ItemSize="230"
ItemTapped="OnAlbumsItemTapped" SelectionMode="None">
<listView:SfListView.ItemsLayout>
<listView:GridLayout SpanCount="3" />
<listView:GridLayout SpanCount="2" />
</listView:SfListView.ItemsLayout>
<listView:SfListView.ItemTemplate>
<DataTemplate>
<Grid RowDefinitions="*,20,20">
<Image Source="{Binding CoverImage}" Aspect="AspectFill" />
<Label Text="{Binding AlbumName}" FontSize="15" Grid.Row="1"/>
<Label Text="{Binding Count}" FontSize="12" Grid.Row="2" />
<Image Source="{Binding CoverImage}" Aspect="Fill" HeightRequest="180" WidthRequest="180"/>
<Label Text="{Binding AlbumName}" FontSize="15" Margin="10,0,0,0" Grid.Row="1"/>
<Label Text="{Binding Count, StringFormat='{0} items'}" Margin="10,0,0,0" FontSize="12" Grid.Row="2" />
</Grid>
</DataTemplate>
</listView:SfListView.ItemTemplate>
Expand All @@ -83,15 +83,13 @@
Color="{Binding Source={x:Reference favoritesTab},Path=TextColor}"
FontFamily="PhotoGallery"/>
</tabView:SfTabItem.ImageSource>
<listView:SfListView ItemsSource="{Binding Favorites, Mode=TwoWay}" ItemSize="300" ItemSpacing="10"
ItemTapped="OnPhotosItemTapped">
<listView:SfListView.ItemsLayout>
<listView:GridLayout SpanCount="2" />
</listView:SfListView.ItemsLayout>
<listView:SfListView x:Name="listViewFavorites" ItemsSource="{Binding Favorites, Mode=TwoWay}" ItemSpacing="10"
SelectionMode="None" AutoFitMode="Height" ItemTapped="OnPhotosItemTapped">
<listView:SfListView.ItemTemplate>
<DataTemplate>
<Grid RowDefinitions="20,*">
<Label Text="{Binding DateTime, StringFormat='{0:ddd, dd MMM, yyyy}'}" />
<Grid RowDefinitions="30,*">
<Label Text="{Binding DateTime, StringFormat='{0:ddd, dd MMM, yyyy}'}"
FontAttributes="Bold" FontSize="15" />
<Image Source="{Binding Image}" Aspect="AspectFill" Grid.Row="1"/>
</Grid>
</DataTemplate>
Expand Down
8 changes: 6 additions & 2 deletions PhotoGallery/MainPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,17 @@ public MainPage()
{
return "Today";
}
else if (item.DateTime.Date == DateTime.Now.Date.AddDays(-1))
{
return "Yesterday";
}
else if (item.DateTime.Year == DateTime.Now.Year)
{
return item.DateTime.ToString("MMM dd", CultureInfo.InvariantCulture);
return item.DateTime.ToString("ddd, dd MMM", CultureInfo.InvariantCulture);
}
else
{
return item.DateTime.ToString("MMM dd yyyy", CultureInfo.InvariantCulture);
return item.DateTime.ToString("ddd, dd MMM, yyyy", CultureInfo.InvariantCulture);
}
}
else
Expand Down
13 changes: 11 additions & 2 deletions PhotoGallery/ViewModel/ViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,17 @@ private void GeneratePhotos()
new ImageInfo() { ImageName = "place_8", Image= "place_8.jpg",Size= "2MB",DateTime= dateTime.AddDays(-40).AddHours(14)},
new ImageInfo() { ImageName = "monitors", Image= "monitors.png",Size= "2MB",DateTime= dateTime.AddDays(-45).AddHours(14)},
new ImageInfo() { ImageName = "place_9", Image= "place_9.jpg",Size= "2MB",DateTime= dateTime.AddDays(-50).AddHours(13)},
new ImageInfo() { ImageName = "bird10", Image= "bird10.jpg",Size= "2MB",DateTime= dateTime.AddMonths(-2).AddHours(16)},
new ImageInfo() { ImageName = "place_10", Image= "place_10.jpg",Size= "2MB",DateTime= dateTime.AddYears(-1).AddHours(16)},
new ImageInfo() { ImageName = "bird10", Image= "bird10.png",Size= "2MB",DateTime= dateTime.AddMonths(-2).AddHours(16)},
new ImageInfo() { ImageName = "place_10", Image= "place_10.jpg",Size= "2MB",DateTime= dateTime.AddMonths(-3).AddHours(6)},
new ImageInfo() { ImageName = "place_11", Image= "place_11.jpg",Size= "2MB",DateTime= dateTime.AddMonths(-4).AddHours(12)},
new ImageInfo() { ImageName = "bird11", Image= "bird11.png",Size= "2MB",DateTime= dateTime.AddMonths(-2).AddDays(1).AddHours(16)},
new ImageInfo() { ImageName = "bird12", Image= "bird12.png",Size= "2MB",DateTime= dateTime.AddMonths(-2).AddHours(13)},
new ImageInfo() { ImageName = "place_12", Image= "place_12.jpg",Size= "2MB",DateTime= dateTime.AddMonths(-3).AddHours(14)},
new ImageInfo() { ImageName = "place_13", Image= "place_13.jpg",Size= "2MB",DateTime= dateTime.AddMonths(-3).AddDays(1).AddHours(12)},
new ImageInfo() { ImageName = "bird13", Image= "bird13.png",Size= "2MB",DateTime= dateTime.AddMonths(-6).AddHours(16)},
new ImageInfo() { ImageName = "bird14", Image= "bird14.png",Size= "2MB",DateTime= dateTime.AddMonths(-6).AddDays(1).AddHours(10)},
new ImageInfo() { ImageName = "place_14", Image= "place_14.jpg",Size= "2MB",DateTime= dateTime.AddMonths(-7).AddHours(16)},
new ImageInfo() { ImageName = "place_15", Image= "place_15.jpg",Size= "2MB",DateTime= dateTime.AddYears(-1).AddHours(13)},
};

Countries = new ObservableCollection<ImageInfo>()
Expand Down