diff --git a/CollectionViewChallenge/CollectionViewChallenge.Android/Assets/Fonts/Font Awesome 5 Free-Solid-900.otf b/CollectionViewChallenge/CollectionViewChallenge.Android/Assets/Fonts/Font Awesome 5 Free-Solid-900.otf new file mode 100644 index 0000000..6e94624 Binary files /dev/null and b/CollectionViewChallenge/CollectionViewChallenge.Android/Assets/Fonts/Font Awesome 5 Free-Solid-900.otf differ diff --git a/CollectionViewChallenge/CollectionViewChallenge.Android/CollectionViewChallenge.Android.csproj b/CollectionViewChallenge/CollectionViewChallenge.Android/CollectionViewChallenge.Android.csproj index d2c42fc..56df89e 100644 --- a/CollectionViewChallenge/CollectionViewChallenge.Android/CollectionViewChallenge.Android.csproj +++ b/CollectionViewChallenge/CollectionViewChallenge.Android/CollectionViewChallenge.Android.csproj @@ -15,7 +15,6 @@ Properties\AndroidManifest.xml Resources Assets - false v8.1 true Xamarin.Android.Net.AndroidClientHandler @@ -93,18 +92,38 @@ + + + + + + + + + + + + + + + + + - {BA39825E-3CF8-4A31-B120-782B2A651542} + {9A9DDEE5-8C48-4274-82D7-22EB79C97206} CollectionViewChallenge + + + \ No newline at end of file diff --git a/CollectionViewChallenge/CollectionViewChallenge.Android/Properties/AndroidManifest.xml b/CollectionViewChallenge/CollectionViewChallenge.Android/Properties/AndroidManifest.xml index 8a8223a..0a62e2d 100644 --- a/CollectionViewChallenge/CollectionViewChallenge.Android/Properties/AndroidManifest.xml +++ b/CollectionViewChallenge/CollectionViewChallenge.Android/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@ - + - - - + + + \ No newline at end of file diff --git a/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/daily_mix1.jpeg b/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/daily_mix1.jpeg new file mode 100644 index 0000000..ff24615 Binary files /dev/null and b/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/daily_mix1.jpeg differ diff --git a/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/daily_mix2.jpeg b/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/daily_mix2.jpeg new file mode 100644 index 0000000..937cfa4 Binary files /dev/null and b/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/daily_mix2.jpeg differ diff --git a/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/daily_mix3.jpeg b/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/daily_mix3.jpeg new file mode 100644 index 0000000..f6cea6d Binary files /dev/null and b/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/daily_mix3.jpeg differ diff --git a/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/daily_mix4.jpeg b/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/daily_mix4.jpeg new file mode 100644 index 0000000..7abd5d2 Binary files /dev/null and b/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/daily_mix4.jpeg differ diff --git a/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/home_icon.png b/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/home_icon.png new file mode 100644 index 0000000..4abe6b1 Binary files /dev/null and b/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/home_icon.png differ diff --git a/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/library_icon.png b/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/library_icon.png new file mode 100644 index 0000000..4897e3e Binary files /dev/null and b/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/library_icon.png differ diff --git a/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/main_cover.jpg b/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/main_cover.jpg new file mode 100644 index 0000000..0a50ffa Binary files /dev/null and b/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/main_cover.jpg differ diff --git a/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/recently_played1.jpeg b/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/recently_played1.jpeg new file mode 100644 index 0000000..c782109 Binary files /dev/null and b/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/recently_played1.jpeg differ diff --git a/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/recently_played2.jpeg b/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/recently_played2.jpeg new file mode 100644 index 0000000..602a46b Binary files /dev/null and b/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/recently_played2.jpeg differ diff --git a/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/recently_played3.jpeg b/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/recently_played3.jpeg new file mode 100644 index 0000000..6c899d9 Binary files /dev/null and b/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/recently_played3.jpeg differ diff --git a/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/recently_played4.jpeg b/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/recently_played4.jpeg new file mode 100644 index 0000000..20a07e0 Binary files /dev/null and b/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/recently_played4.jpeg differ diff --git a/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/search_icon.png b/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/search_icon.png new file mode 100644 index 0000000..c05eba9 Binary files /dev/null and b/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/search_icon.png differ diff --git a/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/sing_along1.jpeg b/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/sing_along1.jpeg new file mode 100644 index 0000000..e2b9aad Binary files /dev/null and b/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/sing_along1.jpeg differ diff --git a/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/sing_along2.jpeg b/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/sing_along2.jpeg new file mode 100644 index 0000000..af7d8fa Binary files /dev/null and b/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/sing_along2.jpeg differ diff --git a/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/sing_along3.jpeg b/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/sing_along3.jpeg new file mode 100644 index 0000000..05fbfb6 Binary files /dev/null and b/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/sing_along3.jpeg differ diff --git a/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/sing_along4.jpeg b/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/sing_along4.jpeg new file mode 100644 index 0000000..cbdcaff Binary files /dev/null and b/CollectionViewChallenge/CollectionViewChallenge.Android/Resources/drawable/sing_along4.jpeg differ diff --git a/CollectionViewChallenge/CollectionViewChallenge.iOS/CollectionViewChallenge.iOS.csproj b/CollectionViewChallenge/CollectionViewChallenge.iOS/CollectionViewChallenge.iOS.csproj index 49a7105..ecd05fa 100644 --- a/CollectionViewChallenge/CollectionViewChallenge.iOS/CollectionViewChallenge.iOS.csproj +++ b/CollectionViewChallenge/CollectionViewChallenge.iOS/CollectionViewChallenge.iOS.csproj @@ -123,6 +123,23 @@ + + + + + + + + + + + + + + + + + @@ -139,8 +156,11 @@ - {BA39825E-3CF8-4A31-B120-782B2A651542} + {9A9DDEE5-8C48-4274-82D7-22EB79C97206} CollectionViewChallenge + + + \ No newline at end of file diff --git a/CollectionViewChallenge/CollectionViewChallenge.iOS/Info.plist b/CollectionViewChallenge/CollectionViewChallenge.iOS/Info.plist index 82bd07d..7b33b76 100644 --- a/CollectionViewChallenge/CollectionViewChallenge.iOS/Info.plist +++ b/CollectionViewChallenge/CollectionViewChallenge.iOS/Info.plist @@ -2,37 +2,41 @@ - UIDeviceFamily - - 1 - 2 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - MinimumOSVersion - 8.0 - CFBundleDisplayName - CollectionViewChallenge - CFBundleIdentifier - com.companyname.CollectionViewChallenge - CFBundleVersion - 1.0 - UILaunchStoryboardName - LaunchScreen - CFBundleName - CollectionViewChallenge - XSAppIconAssets - Assets.xcassets/AppIcon.appiconset + UIDeviceFamily + + 1 + 2 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + MinimumOSVersion + 8.0 + CFBundleDisplayName + CollectionViewChallenge + CFBundleIdentifier + com.companyname.CollectionViewChallenge + CFBundleVersion + 1.0 + UILaunchStoryboardName + LaunchScreen + CFBundleName + CollectionViewChallenge + XSAppIconAssets + Assets.xcassets/AppIcon.appiconset + UIAppFonts + + Fonts/Font Awesome 5 Free-Solid-900.otf + diff --git a/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/Fonts/Font Awesome 5 Free-Solid-900.otf b/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/Fonts/Font Awesome 5 Free-Solid-900.otf new file mode 100644 index 0000000..6e94624 Binary files /dev/null and b/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/Fonts/Font Awesome 5 Free-Solid-900.otf differ diff --git a/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/daily_mix1.jpeg b/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/daily_mix1.jpeg new file mode 100644 index 0000000..ff24615 Binary files /dev/null and b/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/daily_mix1.jpeg differ diff --git a/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/daily_mix2.jpeg b/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/daily_mix2.jpeg new file mode 100644 index 0000000..937cfa4 Binary files /dev/null and b/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/daily_mix2.jpeg differ diff --git a/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/daily_mix3.jpeg b/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/daily_mix3.jpeg new file mode 100644 index 0000000..f6cea6d Binary files /dev/null and b/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/daily_mix3.jpeg differ diff --git a/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/daily_mix4.jpeg b/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/daily_mix4.jpeg new file mode 100644 index 0000000..7abd5d2 Binary files /dev/null and b/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/daily_mix4.jpeg differ diff --git a/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/home_icon.png b/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/home_icon.png new file mode 100644 index 0000000..4abe6b1 Binary files /dev/null and b/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/home_icon.png differ diff --git a/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/library_icon.png b/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/library_icon.png new file mode 100644 index 0000000..4897e3e Binary files /dev/null and b/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/library_icon.png differ diff --git a/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/main_cover.jpg b/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/main_cover.jpg new file mode 100644 index 0000000..0a50ffa Binary files /dev/null and b/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/main_cover.jpg differ diff --git a/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/recently_played1.jpeg b/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/recently_played1.jpeg new file mode 100644 index 0000000..c782109 Binary files /dev/null and b/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/recently_played1.jpeg differ diff --git a/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/recently_played2.jpeg b/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/recently_played2.jpeg new file mode 100644 index 0000000..602a46b Binary files /dev/null and b/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/recently_played2.jpeg differ diff --git a/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/recently_played3.jpeg b/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/recently_played3.jpeg new file mode 100644 index 0000000..6c899d9 Binary files /dev/null and b/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/recently_played3.jpeg differ diff --git a/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/recently_played4.jpeg b/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/recently_played4.jpeg new file mode 100644 index 0000000..20a07e0 Binary files /dev/null and b/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/recently_played4.jpeg differ diff --git a/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/search_icon.png b/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/search_icon.png new file mode 100644 index 0000000..c05eba9 Binary files /dev/null and b/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/search_icon.png differ diff --git a/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/sing_along1.jpeg b/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/sing_along1.jpeg new file mode 100644 index 0000000..e2b9aad Binary files /dev/null and b/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/sing_along1.jpeg differ diff --git a/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/sing_along2.jpeg b/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/sing_along2.jpeg new file mode 100644 index 0000000..af7d8fa Binary files /dev/null and b/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/sing_along2.jpeg differ diff --git a/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/sing_along3.jpeg b/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/sing_along3.jpeg new file mode 100644 index 0000000..05fbfb6 Binary files /dev/null and b/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/sing_along3.jpeg differ diff --git a/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/sing_along4.jpeg b/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/sing_along4.jpeg new file mode 100644 index 0000000..cbdcaff Binary files /dev/null and b/CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/sing_along4.jpeg differ diff --git a/CollectionViewChallenge/CollectionViewChallenge/App.xaml b/CollectionViewChallenge/CollectionViewChallenge/App.xaml index 5477c51..7cd3013 100644 --- a/CollectionViewChallenge/CollectionViewChallenge/App.xaml +++ b/CollectionViewChallenge/CollectionViewChallenge/App.xaml @@ -1,8 +1,99 @@ - + - + + #28A745 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/CollectionViewChallenge/CollectionViewChallenge/AppShell.xaml b/CollectionViewChallenge/CollectionViewChallenge/AppShell.xaml index 9364c60..eecc485 100644 --- a/CollectionViewChallenge/CollectionViewChallenge/AppShell.xaml +++ b/CollectionViewChallenge/CollectionViewChallenge/AppShell.xaml @@ -8,72 +8,43 @@ FlyoutBehavior="Disabled" Title="CollectionViewChallenge" x:Class="CollectionViewChallenge.AppShell"> - - - - - #2196F3 + + -