Merge pull request #3 from jsuarezruiz/uwp

Added UWP project
dotnet-ad · Oct 30, 2017 · e0306d7 · e0306d7
2 parents ad9e8ac + 1f69dfe
commit e0306d7
Show file tree

Hide file tree

Showing 30 changed files with 810 additions and 64 deletions.
diff --git a/Bikr/Bikr.sln b/Bikr/Bikr.sln
@@ -1,57 +1,133 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 15
+VisualStudioVersion = 15.0.26730.12
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bikr", "Bikr\Bikr.csproj", "{5B96A7C2-0D99-4342-A105-59155A0CE1D3}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bikr.iOS", "iOS\Bikr.iOS.csproj", "{E17A89C9-F802-4E98-B45E-DF39CE93A4D4}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bikr.Droid", "Droid\Bikr.Droid.csproj", "{7AEF866F-0029-475E-9B6B-D1E34C6DA3ED}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bikr.UWP", "UWP\Bikr.UWP.csproj", "{372B9936-E211-41D0-8220-7D4AE333B52C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
+		Debug|ARM = Debug|ARM
+		Debug|iPhone = Debug|iPhone
 		Debug|iPhoneSimulator = Debug|iPhoneSimulator
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|ARM = Release|ARM
 		Release|iPhone = Release|iPhone
 		Release|iPhoneSimulator = Release|iPhoneSimulator
-		Debug|iPhone = Debug|iPhone
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{5B96A7C2-0D99-4342-A105-59155A0CE1D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5B96A7C2-0D99-4342-A105-59155A0CE1D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5B96A7C2-0D99-4342-A105-59155A0CE1D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5B96A7C2-0D99-4342-A105-59155A0CE1D3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5B96A7C2-0D99-4342-A105-59155A0CE1D3}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{5B96A7C2-0D99-4342-A105-59155A0CE1D3}.Debug|ARM.Build.0 = Debug|Any CPU
+		{5B96A7C2-0D99-4342-A105-59155A0CE1D3}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{5B96A7C2-0D99-4342-A105-59155A0CE1D3}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{5B96A7C2-0D99-4342-A105-59155A0CE1D3}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{5B96A7C2-0D99-4342-A105-59155A0CE1D3}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{5B96A7C2-0D99-4342-A105-59155A0CE1D3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5B96A7C2-0D99-4342-A105-59155A0CE1D3}.Debug|x64.Build.0 = Debug|Any CPU
+		{5B96A7C2-0D99-4342-A105-59155A0CE1D3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5B96A7C2-0D99-4342-A105-59155A0CE1D3}.Debug|x86.Build.0 = Debug|Any CPU
+		{5B96A7C2-0D99-4342-A105-59155A0CE1D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5B96A7C2-0D99-4342-A105-59155A0CE1D3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5B96A7C2-0D99-4342-A105-59155A0CE1D3}.Release|ARM.ActiveCfg = Release|Any CPU
+		{5B96A7C2-0D99-4342-A105-59155A0CE1D3}.Release|ARM.Build.0 = Release|Any CPU
 		{5B96A7C2-0D99-4342-A105-59155A0CE1D3}.Release|iPhone.ActiveCfg = Release|Any CPU
 		{5B96A7C2-0D99-4342-A105-59155A0CE1D3}.Release|iPhone.Build.0 = Release|Any CPU
 		{5B96A7C2-0D99-4342-A105-59155A0CE1D3}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{5B96A7C2-0D99-4342-A105-59155A0CE1D3}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{5B96A7C2-0D99-4342-A105-59155A0CE1D3}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{5B96A7C2-0D99-4342-A105-59155A0CE1D3}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{5B96A7C2-0D99-4342-A105-59155A0CE1D3}.Release|x64.ActiveCfg = Release|Any CPU
+		{5B96A7C2-0D99-4342-A105-59155A0CE1D3}.Release|x64.Build.0 = Release|Any CPU
+		{5B96A7C2-0D99-4342-A105-59155A0CE1D3}.Release|x86.ActiveCfg = Release|Any CPU
+		{5B96A7C2-0D99-4342-A105-59155A0CE1D3}.Release|x86.Build.0 = Release|Any CPU
 		{E17A89C9-F802-4E98-B45E-DF39CE93A4D4}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
 		{E17A89C9-F802-4E98-B45E-DF39CE93A4D4}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
-		{E17A89C9-F802-4E98-B45E-DF39CE93A4D4}.Release|Any CPU.ActiveCfg = Release|iPhone
-		{E17A89C9-F802-4E98-B45E-DF39CE93A4D4}.Release|Any CPU.Build.0 = Release|iPhone
+		{E17A89C9-F802-4E98-B45E-DF39CE93A4D4}.Debug|ARM.ActiveCfg = Debug|iPhone
+		{E17A89C9-F802-4E98-B45E-DF39CE93A4D4}.Debug|iPhone.ActiveCfg = Debug|iPhone
+		{E17A89C9-F802-4E98-B45E-DF39CE93A4D4}.Debug|iPhone.Build.0 = Debug|iPhone
 		{E17A89C9-F802-4E98-B45E-DF39CE93A4D4}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
 		{E17A89C9-F802-4E98-B45E-DF39CE93A4D4}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
+		{E17A89C9-F802-4E98-B45E-DF39CE93A4D4}.Debug|x64.ActiveCfg = Debug|iPhone
+		{E17A89C9-F802-4E98-B45E-DF39CE93A4D4}.Debug|x86.ActiveCfg = Debug|iPhone
+		{E17A89C9-F802-4E98-B45E-DF39CE93A4D4}.Debug|x86.Build.0 = Debug|iPhone
+		{E17A89C9-F802-4E98-B45E-DF39CE93A4D4}.Release|Any CPU.ActiveCfg = Release|iPhone
+		{E17A89C9-F802-4E98-B45E-DF39CE93A4D4}.Release|Any CPU.Build.0 = Release|iPhone
+		{E17A89C9-F802-4E98-B45E-DF39CE93A4D4}.Release|ARM.ActiveCfg = Release|iPhoneSimulator
 		{E17A89C9-F802-4E98-B45E-DF39CE93A4D4}.Release|iPhone.ActiveCfg = Release|iPhone
 		{E17A89C9-F802-4E98-B45E-DF39CE93A4D4}.Release|iPhone.Build.0 = Release|iPhone
 		{E17A89C9-F802-4E98-B45E-DF39CE93A4D4}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
 		{E17A89C9-F802-4E98-B45E-DF39CE93A4D4}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{E17A89C9-F802-4E98-B45E-DF39CE93A4D4}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{E17A89C9-F802-4E98-B45E-DF39CE93A4D4}.Debug|iPhone.Build.0 = Debug|iPhone
+		{E17A89C9-F802-4E98-B45E-DF39CE93A4D4}.Release|x64.ActiveCfg = Release|iPhoneSimulator
+		{E17A89C9-F802-4E98-B45E-DF39CE93A4D4}.Release|x86.ActiveCfg = Release|iPhoneSimulator
 		{7AEF866F-0029-475E-9B6B-D1E34C6DA3ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7AEF866F-0029-475E-9B6B-D1E34C6DA3ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7AEF866F-0029-475E-9B6B-D1E34C6DA3ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7AEF866F-0029-475E-9B6B-D1E34C6DA3ED}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7AEF866F-0029-475E-9B6B-D1E34C6DA3ED}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{7AEF866F-0029-475E-9B6B-D1E34C6DA3ED}.Debug|ARM.Build.0 = Debug|Any CPU
+		{7AEF866F-0029-475E-9B6B-D1E34C6DA3ED}.Debug|ARM.Deploy.0 = Debug|Any CPU
+		{7AEF866F-0029-475E-9B6B-D1E34C6DA3ED}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{7AEF866F-0029-475E-9B6B-D1E34C6DA3ED}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{7AEF866F-0029-475E-9B6B-D1E34C6DA3ED}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{7AEF866F-0029-475E-9B6B-D1E34C6DA3ED}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{7AEF866F-0029-475E-9B6B-D1E34C6DA3ED}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7AEF866F-0029-475E-9B6B-D1E34C6DA3ED}.Debug|x64.Build.0 = Debug|Any CPU
+		{7AEF866F-0029-475E-9B6B-D1E34C6DA3ED}.Debug|x64.Deploy.0 = Debug|Any CPU
+		{7AEF866F-0029-475E-9B6B-D1E34C6DA3ED}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7AEF866F-0029-475E-9B6B-D1E34C6DA3ED}.Debug|x86.Build.0 = Debug|Any CPU
+		{7AEF866F-0029-475E-9B6B-D1E34C6DA3ED}.Debug|x86.Deploy.0 = Debug|Any CPU
+		{7AEF866F-0029-475E-9B6B-D1E34C6DA3ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7AEF866F-0029-475E-9B6B-D1E34C6DA3ED}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7AEF866F-0029-475E-9B6B-D1E34C6DA3ED}.Release|ARM.ActiveCfg = Release|Any CPU
+		{7AEF866F-0029-475E-9B6B-D1E34C6DA3ED}.Release|ARM.Build.0 = Release|Any CPU
+		{7AEF866F-0029-475E-9B6B-D1E34C6DA3ED}.Release|ARM.Deploy.0 = Release|Any CPU
 		{7AEF866F-0029-475E-9B6B-D1E34C6DA3ED}.Release|iPhone.ActiveCfg = Release|Any CPU
 		{7AEF866F-0029-475E-9B6B-D1E34C6DA3ED}.Release|iPhone.Build.0 = Release|Any CPU
 		{7AEF866F-0029-475E-9B6B-D1E34C6DA3ED}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{7AEF866F-0029-475E-9B6B-D1E34C6DA3ED}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{7AEF866F-0029-475E-9B6B-D1E34C6DA3ED}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{7AEF866F-0029-475E-9B6B-D1E34C6DA3ED}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{7AEF866F-0029-475E-9B6B-D1E34C6DA3ED}.Release|x64.ActiveCfg = Release|Any CPU
+		{7AEF866F-0029-475E-9B6B-D1E34C6DA3ED}.Release|x64.Build.0 = Release|Any CPU
+		{7AEF866F-0029-475E-9B6B-D1E34C6DA3ED}.Release|x64.Deploy.0 = Release|Any CPU
+		{7AEF866F-0029-475E-9B6B-D1E34C6DA3ED}.Release|x86.ActiveCfg = Release|Any CPU
+		{7AEF866F-0029-475E-9B6B-D1E34C6DA3ED}.Release|x86.Build.0 = Release|Any CPU
+		{7AEF866F-0029-475E-9B6B-D1E34C6DA3ED}.Release|x86.Deploy.0 = Release|Any CPU
+		{372B9936-E211-41D0-8220-7D4AE333B52C}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{372B9936-E211-41D0-8220-7D4AE333B52C}.Debug|ARM.ActiveCfg = Debug|ARM
+		{372B9936-E211-41D0-8220-7D4AE333B52C}.Debug|ARM.Build.0 = Debug|ARM
+		{372B9936-E211-41D0-8220-7D4AE333B52C}.Debug|ARM.Deploy.0 = Debug|ARM
+		{372B9936-E211-41D0-8220-7D4AE333B52C}.Debug|iPhone.ActiveCfg = Debug|x86
+		{372B9936-E211-41D0-8220-7D4AE333B52C}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
+		{372B9936-E211-41D0-8220-7D4AE333B52C}.Debug|x64.ActiveCfg = Debug|x64
+		{372B9936-E211-41D0-8220-7D4AE333B52C}.Debug|x64.Build.0 = Debug|x64
+		{372B9936-E211-41D0-8220-7D4AE333B52C}.Debug|x64.Deploy.0 = Debug|x64
+		{372B9936-E211-41D0-8220-7D4AE333B52C}.Debug|x86.ActiveCfg = Debug|x86
+		{372B9936-E211-41D0-8220-7D4AE333B52C}.Debug|x86.Build.0 = Debug|x86
+		{372B9936-E211-41D0-8220-7D4AE333B52C}.Debug|x86.Deploy.0 = Debug|x86
+		{372B9936-E211-41D0-8220-7D4AE333B52C}.Release|Any CPU.ActiveCfg = Release|x86
+		{372B9936-E211-41D0-8220-7D4AE333B52C}.Release|ARM.ActiveCfg = Release|ARM
+		{372B9936-E211-41D0-8220-7D4AE333B52C}.Release|ARM.Build.0 = Release|ARM
+		{372B9936-E211-41D0-8220-7D4AE333B52C}.Release|ARM.Deploy.0 = Release|ARM
+		{372B9936-E211-41D0-8220-7D4AE333B52C}.Release|iPhone.ActiveCfg = Release|x86
+		{372B9936-E211-41D0-8220-7D4AE333B52C}.Release|iPhoneSimulator.ActiveCfg = Release|x86
+		{372B9936-E211-41D0-8220-7D4AE333B52C}.Release|x64.ActiveCfg = Release|x64
+		{372B9936-E211-41D0-8220-7D4AE333B52C}.Release|x64.Build.0 = Release|x64
+		{372B9936-E211-41D0-8220-7D4AE333B52C}.Release|x64.Deploy.0 = Release|x64
+		{372B9936-E211-41D0-8220-7D4AE333B52C}.Release|x86.ActiveCfg = Release|x86
+		{372B9936-E211-41D0-8220-7D4AE333B52C}.Release|x86.Build.0 = Release|x86
+		{372B9936-E211-41D0-8220-7D4AE333B52C}.Release|x86.Deploy.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A131DA39-6526-4F24-8940-0E9C9C211717}
 	EndGlobalSection
 EndGlobal
diff --git a/Bikr/Bikr/Views/Pages/HomePage.xaml b/Bikr/Bikr/Views/Pages/HomePage.xaml
@@ -7,7 +7,13 @@
     x:Class="Bikr.HomePage"
     xmlns:microcharts="clr-namespace:Microcharts.Forms;assembly=Microcharts.Forms" >
 
-    <ListView SeparatorVisibility="None" RowHeight="90" ItemsSource="{Binding Rides}" ItemTapped="Handle_ItemTapped">
+    <ListView SeparatorVisibility="None" ItemsSource="{Binding Rides}" ItemTapped="Handle_ItemTapped">
+        <ListView.RowHeight>
+            <OnPlatform x:TypeArguments="x:Int32">
+                <On Platform="Android, iOS" Value="90" />
+                <On Platform="UWP" Value="120" />
+            </OnPlatform>
+        </ListView.RowHeight>
         <ListView.Header>
             <Grid HeightRequest="280" RowSpacing="10" ColumnSpacing="10" Padding="0" BackgroundColor="{StaticResource PrimaryDark}">
                 <Grid.RowDefinitions>
@@ -78,22 +84,64 @@
                         </Grid.ColumnDefinitions>
 
                         <Frame Grid.RowSpan="3" WidthRequest="20" HeightRequest="40" BackgroundColor="{StaticResource Primary}" CornerRadius="30" HasShadow="false" />
-                        <Image Grid.RowSpan="3" Source="ic_star_empty" VerticalOptions="Center" HorizontalOptions="Center" />
+                        <Image Grid.RowSpan="3" VerticalOptions="Center" HorizontalOptions="Center">
+                            <Image.Source>
+                                <OnPlatform x:TypeArguments="ImageSource">
+                                    <On Platform="Android, iOS" Value="ic_star_empty" />
+                                    <On Platform="UWP" Value="Assets/ic_star_empty.png" />
+                                </OnPlatform>
+                            </Image.Source>
+                        </Image>
 
 
                         <Label Grid.Column="1" Text="{Binding Title}" TextColor="Black" FontSize="18" FontAttributes="Bold" />
                         <StackLayout Grid.Column="1" Grid.Row="1" Orientation="Horizontal" HorizontalOptions="Start">
-                            <Image WidthRequest="12" Source="ic_location" />
+                            <Image WidthRequest="12">
+                                <Image.Source>
+                                    <OnPlatform x:TypeArguments="ImageSource">
+                                        <On Platform="Android, iOS" Value="ic_location" />
+                                        <On Platform="UWP" Value="Assets/ic_location.png" />
+                                    </OnPlatform>
+                                </Image.Source>
+                            </Image>
                             <Label Text="{Binding Location}" Style="{StaticResource ValueLabel}" />
-                            <Image WidthRequest="12" Source="ic_time" />
+                            <Image WidthRequest="12">
+                                <Image.Source>
+                                    <OnPlatform x:TypeArguments="ImageSource">
+                                        <On Platform="Android, iOS" Value="ic_time" />
+                                        <On Platform="UWP" Value="Assets/ic_time.png" />
+                                    </OnPlatform>
+                                </Image.Source>
+                            </Image>
                             <Label Text="{Binding TotalTime}" Style="{StaticResource ValueLabel}" />
-                            <Image WidthRequest="12" Source="ic_speed" />
+                            <Image WidthRequest="12">
+                                <Image.Source>
+                                    <OnPlatform x:TypeArguments="ImageSource">
+                                        <On Platform="Android, iOS" Value="ic_speed" />
+                                        <On Platform="UWP" Value="Assets/ic_speed.png" />
+                                    </OnPlatform>
+                                </Image.Source>
+                            </Image>
                             <Label Text="{Binding Speed}" Style="{StaticResource ValueLabel}" />
                         </StackLayout>
                          <StackLayout Grid.Column="1"  Grid.Row="2" Orientation="Horizontal" HorizontalOptions="Start">
-                            <Image WidthRequest="12" Source="ic_distance" />
+                            <Image WidthRequest="12">
+                                <Image.Source>
+                                    <OnPlatform x:TypeArguments="ImageSource">
+                                        <On Platform="Android, iOS" Value="ic_distance" />
+                                        <On Platform="UWP" Value="Assets/ic_distance.png" />
+                                    </OnPlatform>
+                                </Image.Source>
+                            </Image>
                             <Label Text="{Binding Distance}" Style="{StaticResource ValueLabel}" />
-                            <Image WidthRequest="12" Source="ic_calories" />
+                            <Image WidthRequest="12">
+                                <Image.Source>
+                                    <OnPlatform x:TypeArguments="ImageSource">
+                                        <On Platform="Android, iOS" Value="ic_calories" />
+                                        <On Platform="UWP" Value="Assets/ic_calories.png" />
+                                    </OnPlatform>
+                                </Image.Source>
+                            </Image>
                             <Label Text="{Binding Calories}" Style="{StaticResource ValueLabel}" />
                         </StackLayout>
                     </Grid>

diff --git a/Bikr/Bikr/Views/Pages/RidePage.xaml b/Bikr/Bikr/Views/Pages/RidePage.xaml
@@ -40,7 +40,14 @@
 
                         <Label Text="{Binding Title}" TextColor="Black" FontSize="18" FontAttributes="Bold" />
                          <StackLayout Grid.Row="2" Orientation="Horizontal" HorizontalOptions="Start">
-                            <Image WidthRequest="12" Source="ic_distance" />
+                            <Image WidthRequest="12">
+                                <Image.Source>
+                                    <OnPlatform x:TypeArguments="ImageSource">
+                                        <On Platform="Android, iOS" Value="ic_distance" />
+                                        <On Platform="UWP" Value="Assets/ic_distance.png" />
+                                    </OnPlatform>
+                                </Image.Source>
+                            </Image>
                             <Label Text="{Binding Distance}" Style="{StaticResource ValueLabel}" />
                         </StackLayout>
                     </Grid>

diff --git a/Bikr/Bikr/Views/Pages/WelcomePage.xaml b/Bikr/Bikr/Views/Pages/WelcomePage.xaml
@@ -8,12 +8,26 @@
             <RowDefinition Height="*" />
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
-
-        <Image Grid.RowSpan="1" Source="welcome" Aspect="AspectFill" />
+
+        <Image Grid.RowSpan="1" Aspect="AspectFill">
+            <Image.Source>
+                <OnPlatform x:TypeArguments="ImageSource">
+                    <On Platform="Android, iOS" Value="welcome" />
+                    <On Platform="UWP" Value="Assets/welcome.png" />
+                </OnPlatform>
+            </Image.Source>
+        </Image>
         <BoxView Grid.RowSpan="1" BackgroundColor="{StaticResource Primary}" Opacity="0.8" />
 
         <StackLayout VerticalOptions="Center" Spacing="0">
-            <Image Source="ic_bike" />
+            <Image HorizontalOptions="Center">
+                <Image.Source>
+                    <OnPlatform x:TypeArguments="ImageSource">
+                        <On Platform="Android, iOS" Value="ic_bike" />
+                        <On Platform="UWP" Value="Assets/ic_bike.png" />
+                    </OnPlatform>
+                </Image.Source>
+            </Image>
             <Label HorizontalTextAlignment="Center" FontSize="30" TextColor="White" Text="Bikr" FontAttributes="Bold" />
         </StackLayout>
 

diff --git a/Bikr/Droid/Bikr.Droid.csproj b/Bikr/Droid/Bikr.Droid.csproj
@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Bikr.Droid</RootNamespace>
     <AssemblyName>Bikr.Droid</AssemblyName>
-    <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
     <AndroidApplication>True</AndroidApplication>
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <AndroidResgenClass>Resource</AndroidResgenClass>