Final changes to app, ready for release

App3/App3.Android/App3.Android.csproj

@@ -158,5 +158,8 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\LaughLarge.png" />
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\chuck_norris.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>

App3/App3/Services/DataService.cs

@@ -55,5 +55,15 @@ namespace App3.Services
             return User;
 
         }
+
+        public Task AddUser(object username, object password)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task AddUser(string username, object password)
+        {
+            throw new NotImplementedException();
+        }
     }
 }

App3/App3/Services/IDataService.cs

@@ -9,5 +9,7 @@ namespace App3.Services
         Task AddUser(string Username, string Password);
         Task<IEnumerable<User>> GetUser();
         Task RemoveUser(int id);
+        Task AddUser(object username, object password);
+        Task AddUser(string username, object password);
     }
 }

App3/App3/ViewModels/LoginViewModel.cs

@@ -24,6 +24,7 @@ namespace App3.ViewModels
         {
             // Prefixing with `//` switches to a different navigation stack instead of pushing to the active one
             await Shell.Current.GoToAsync($"//{nameof(AboutPage)}");
+
         }
         private async void OnRegisterClicked(object obj)
         {

App3/App3/Views/AboutPage.xaml

@@ -15,6 +15,8 @@
         </ResourceDictionary>
     </ContentPage.Resources>
 
+
+
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
@@ -30,7 +32,7 @@
         <ScrollView Grid.Row="1">
             <StackLayout Orientation="Vertical" Padding="30,24,30,24" Spacing="10">
                 <Label Text="Hello, Welcome to LOL! App" FontSize="Title"/>
-                <Label Text="This App's main focus is to make you smile, chuckle or laugh to bring joy to your day whenever you need it. This App ulitizes an Web API that specifically tells Quirky Chuck Norris Jokes. This App was made by Tyler Mullings-Clarke who is a 3rd year Computer Science Student Studying at Coventry University, and was built for a module he is studying at University. Hope you enjoy!" FontSize="16" Padding="0,0,0,0"/>
+                <Label Text="This App's main focus is to make you smile, chuckle or laugh to bring joy to your day whenever you need it. This App ulitizes a Web API that specifically tells quirky Chuck Norris Jokes. This App was made by Tyler Mullings-Clarke who is a 3rd year Computer Science Student Studying at Coventry University, and was built for a module he is studying at University. Hope you enjoy!" FontSize="16" Padding="0,0,0,0"/>
                 <Label FontSize="16" Padding="0,24,0,0">
                     <Label.FormattedText>
                         <FormattedString>
@@ -48,5 +50,6 @@
             </StackLayout>
         </ScrollView>
     </Grid>
+
 
 </ContentPage>

App3/App3/Views/AboutPage.xaml.cs

@@ -11,5 +11,10 @@ namespace App3.Views
         {
             InitializeComponent();
         }
+
+        private void RefreshView_Refreshing(object sender, EventArgs e)
+        {
+
+        }
     }
 }

App3/App3/Views/JokesHome.xaml

@@ -22,31 +22,31 @@
         </Grid.RowDefinitions>
         <ScrollView Grid.Row="1">
             <StackLayout Orientation="Vertical" Padding="30,16,30,16" Spacing="4">
-                <Label HorizontalOptions="Center">
-                    <Label.FormattedText >
-                        <FormattedString>
-                            <Span Text="This is a Joke 1 " FontSize="Title"/>
-                            <Span Text="{Binding ShowIcon_url}" FontSize="Title" />
-                        </FormattedString>
-                    </Label.FormattedText>
-                </Label>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
+                    </Grid.RowDefinitions>
+                    <StackLayout VerticalOptions="FillAndExpand" HorizontalOptions="Fill">
+                        <StackLayout Orientation="Horizontal" HorizontalOptions="Center" VerticalOptions="Center">
+                            <ContentView Padding="0,40,0,40" VerticalOptions="FillAndExpand">
+                                <Image Source="chuck_norris.png" VerticalOptions="FillAndExpand" HeightRequest="64" />
+                            </ContentView>
+                        </StackLayout>
+                    </StackLayout>
+                    <ScrollView Grid.Row="1">
+                        <StackLayout Orientation="Vertical" Padding="30,24,30,24" Spacing="10">
+                            <Label Text="Wanna hear a joke?" FontSize="Title"/>
+                            <Label Text="Do you know the man the myth the legend himself Chuck Norris? If you dont, ask yourself why!" FontSize="16" Padding="0,0,0,0"/>
+                            <Label FontSize="16" Padding="0,24,0,0">
+
+                            </Label>
+                        </StackLayout>
+                    </ScrollView>
+                </Grid>
+
+
 
-                <Label>
-                    <Label.FormattedText>
-                        <FormattedString>
-                            <Span Text="This is a joke 2 "/>
-                            <Span Text="{Binding ShowId}"/>
-                        </FormattedString>
-                    </Label.FormattedText>
-                </Label>
-                <Label>
-                    <Label.FormattedText>
-                        <FormattedString>
-                            <Span Text="This is a joke 3 "/>
-                            <Span Text="{Binding ShowUrl}"/>
-                        </FormattedString>
-                    </Label.FormattedText>
-                </Label>
                 <Label>
                     <Label.FormattedText>
                         <FormattedString>

App3/App3/Views/RegistrationPage.xaml

@@ -2,7 +2,8 @@
 <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="App3.Views.RegistrationPage"
-             Shell.NavBarIsVisible="False">
+             Shell.FlyoutBehavior="Flyout"
+             Shell.NavBarIsVisible="True">
     <ContentPage.Content>
         <StackLayout>
             <Label Text="Lets Register"