diff --git a/App3/App3.Android/App3.Android.csproj b/App3/App3.Android/App3.Android.csproj
index 6a60df5..7f75a00 100644
--- a/App3/App3.Android/App3.Android.csproj
+++ b/App3/App3.Android/App3.Android.csproj
@@ -158,5 +158,8 @@
+
+
+
\ No newline at end of file
diff --git a/App3/App3.Android/Resources/Resource.designer.cs b/App3/App3.Android/Resources/Resource.designer.cs
index 6ba2a6c..de6f34d 100644
--- a/App3/App3.Android/Resources/Resource.designer.cs
+++ b/App3/App3.Android/Resources/Resource.designer.cs
@@ -16517,175 +16517,178 @@ namespace App3.Droid
public const int btn_radio_on_to_off_mtrl_animation = 2131165278;
// aapt resource value: 0x7F07005F
- public const int design_fab_background = 2131165279;
+ public const int chuck_norris = 2131165279;
// aapt resource value: 0x7F070060
- public const int design_ic_visibility = 2131165280;
+ public const int design_fab_background = 2131165280;
// aapt resource value: 0x7F070061
- public const int design_ic_visibility_off = 2131165281;
+ public const int design_ic_visibility = 2131165281;
// aapt resource value: 0x7F070062
- public const int design_password_eye = 2131165282;
+ public const int design_ic_visibility_off = 2131165282;
// aapt resource value: 0x7F070063
- public const int design_snackbar_background = 2131165283;
+ public const int design_password_eye = 2131165283;
- // aapt resource value: 0x7F07006B
- public const int icon_about = 2131165291;
+ // aapt resource value: 0x7F070064
+ public const int design_snackbar_background = 2131165284;
// aapt resource value: 0x7F07006C
- public const int icon_feed = 2131165292;
+ public const int icon_about = 2131165292;
- // aapt resource value: 0x7F070064
- public const int ic_arrow_down_24dp = 2131165284;
+ // aapt resource value: 0x7F07006D
+ public const int icon_feed = 2131165293;
// aapt resource value: 0x7F070065
- public const int ic_clock_black_24dp = 2131165285;
+ public const int ic_arrow_down_24dp = 2131165285;
// aapt resource value: 0x7F070066
- public const int ic_keyboard_black_24dp = 2131165286;
+ public const int ic_clock_black_24dp = 2131165286;
// aapt resource value: 0x7F070067
- public const int ic_mtrl_checked_circle = 2131165287;
+ public const int ic_keyboard_black_24dp = 2131165287;
// aapt resource value: 0x7F070068
- public const int ic_mtrl_chip_checked_black = 2131165288;
+ public const int ic_mtrl_checked_circle = 2131165288;
// aapt resource value: 0x7F070069
- public const int ic_mtrl_chip_checked_circle = 2131165289;
+ public const int ic_mtrl_chip_checked_black = 2131165289;
// aapt resource value: 0x7F07006A
- public const int ic_mtrl_chip_close_circle = 2131165290;
+ public const int ic_mtrl_chip_checked_circle = 2131165290;
- // aapt resource value: 0x7F07006D
- public const int LaughFI_icon = 2131165293;
+ // aapt resource value: 0x7F07006B
+ public const int ic_mtrl_chip_close_circle = 2131165291;
// aapt resource value: 0x7F07006E
- public const int LaughLarge = 2131165294;
+ public const int LaughFI_icon = 2131165294;
// aapt resource value: 0x7F07006F
- public const int LaughSmall = 2131165295;
+ public const int LaughLarge = 2131165295;
// aapt resource value: 0x7F070070
- public const int Logout_icon = 2131165296;
+ public const int LaughSmall = 2131165296;
// aapt resource value: 0x7F070071
- public const int material_cursor_drawable = 2131165297;
+ public const int Logout_icon = 2131165297;
// aapt resource value: 0x7F070072
- public const int material_ic_calendar_black_24dp = 2131165298;
+ public const int material_cursor_drawable = 2131165298;
// aapt resource value: 0x7F070073
- public const int material_ic_clear_black_24dp = 2131165299;
+ public const int material_ic_calendar_black_24dp = 2131165299;
// aapt resource value: 0x7F070074
- public const int material_ic_edit_black_24dp = 2131165300;
+ public const int material_ic_clear_black_24dp = 2131165300;
// aapt resource value: 0x7F070075
- public const int material_ic_keyboard_arrow_left_black_24dp = 2131165301;
+ public const int material_ic_edit_black_24dp = 2131165301;
// aapt resource value: 0x7F070076
- public const int material_ic_keyboard_arrow_next_black_24dp = 2131165302;
+ public const int material_ic_keyboard_arrow_left_black_24dp = 2131165302;
// aapt resource value: 0x7F070077
- public const int material_ic_keyboard_arrow_previous_black_24dp = 2131165303;
+ public const int material_ic_keyboard_arrow_next_black_24dp = 2131165303;
// aapt resource value: 0x7F070078
- public const int material_ic_keyboard_arrow_right_black_24dp = 2131165304;
+ public const int material_ic_keyboard_arrow_previous_black_24dp = 2131165304;
// aapt resource value: 0x7F070079
- public const int material_ic_menu_arrow_down_black_24dp = 2131165305;
+ public const int material_ic_keyboard_arrow_right_black_24dp = 2131165305;
// aapt resource value: 0x7F07007A
- public const int material_ic_menu_arrow_up_black_24dp = 2131165306;
+ public const int material_ic_menu_arrow_down_black_24dp = 2131165306;
// aapt resource value: 0x7F07007B
- public const int mtrl_dialog_background = 2131165307;
+ public const int material_ic_menu_arrow_up_black_24dp = 2131165307;
// aapt resource value: 0x7F07007C
- public const int mtrl_dropdown_arrow = 2131165308;
+ public const int mtrl_dialog_background = 2131165308;
// aapt resource value: 0x7F07007D
- public const int mtrl_ic_arrow_drop_down = 2131165309;
+ public const int mtrl_dropdown_arrow = 2131165309;
// aapt resource value: 0x7F07007E
- public const int mtrl_ic_arrow_drop_up = 2131165310;
+ public const int mtrl_ic_arrow_drop_down = 2131165310;
// aapt resource value: 0x7F07007F
- public const int mtrl_ic_cancel = 2131165311;
+ public const int mtrl_ic_arrow_drop_up = 2131165311;
// aapt resource value: 0x7F070080
- public const int mtrl_ic_error = 2131165312;
+ public const int mtrl_ic_cancel = 2131165312;
// aapt resource value: 0x7F070081
- public const int mtrl_navigation_bar_item_background = 2131165313;
+ public const int mtrl_ic_error = 2131165313;
// aapt resource value: 0x7F070082
- public const int mtrl_popupmenu_background = 2131165314;
+ public const int mtrl_navigation_bar_item_background = 2131165314;
// aapt resource value: 0x7F070083
- public const int mtrl_popupmenu_background_dark = 2131165315;
+ public const int mtrl_popupmenu_background = 2131165315;
// aapt resource value: 0x7F070084
- public const int mtrl_tabs_default_indicator = 2131165316;
+ public const int mtrl_popupmenu_background_dark = 2131165316;
// aapt resource value: 0x7F070085
- public const int navigation_empty_icon = 2131165317;
+ public const int mtrl_tabs_default_indicator = 2131165317;
// aapt resource value: 0x7F070086
- public const int notification_action_background = 2131165318;
+ public const int navigation_empty_icon = 2131165318;
// aapt resource value: 0x7F070087
- public const int notification_bg = 2131165319;
+ public const int notification_action_background = 2131165319;
// aapt resource value: 0x7F070088
- public const int notification_bg_low = 2131165320;
+ public const int notification_bg = 2131165320;
// aapt resource value: 0x7F070089
- public const int notification_bg_low_normal = 2131165321;
+ public const int notification_bg_low = 2131165321;
// aapt resource value: 0x7F07008A
- public const int notification_bg_low_pressed = 2131165322;
+ public const int notification_bg_low_normal = 2131165322;
// aapt resource value: 0x7F07008B
- public const int notification_bg_normal = 2131165323;
+ public const int notification_bg_low_pressed = 2131165323;
// aapt resource value: 0x7F07008C
- public const int notification_bg_normal_pressed = 2131165324;
+ public const int notification_bg_normal = 2131165324;
// aapt resource value: 0x7F07008D
- public const int notification_icon_background = 2131165325;
+ public const int notification_bg_normal_pressed = 2131165325;
// aapt resource value: 0x7F07008E
- public const int notification_template_icon_bg = 2131165326;
+ public const int notification_icon_background = 2131165326;
// aapt resource value: 0x7F07008F
- public const int notification_template_icon_low_bg = 2131165327;
+ public const int notification_template_icon_bg = 2131165327;
// aapt resource value: 0x7F070090
- public const int notification_tile_bg = 2131165328;
+ public const int notification_template_icon_low_bg = 2131165328;
// aapt resource value: 0x7F070091
- public const int notify_panel_notification_icon_bg = 2131165329;
+ public const int notification_tile_bg = 2131165329;
// aapt resource value: 0x7F070092
- public const int preference_list_divider_material = 2131165330;
+ public const int notify_panel_notification_icon_bg = 2131165330;
// aapt resource value: 0x7F070093
- public const int Register_icon = 2131165331;
+ public const int preference_list_divider_material = 2131165331;
// aapt resource value: 0x7F070094
- public const int test_custom_background = 2131165332;
+ public const int Register_icon = 2131165332;
// aapt resource value: 0x7F070095
- public const int tooltip_frame_dark = 2131165333;
+ public const int test_custom_background = 2131165333;
// aapt resource value: 0x7F070096
- public const int tooltip_frame_light = 2131165334;
+ public const int tooltip_frame_dark = 2131165334;
// aapt resource value: 0x7F070097
- public const int xamarin_logo = 2131165335;
+ public const int tooltip_frame_light = 2131165335;
+
+ // aapt resource value: 0x7F070098
+ public const int xamarin_logo = 2131165336;
static Drawable()
{
diff --git a/App3/App3.Android/Resources/drawable/chuck_norris.png b/App3/App3.Android/Resources/drawable/chuck_norris.png
new file mode 100644
index 0000000..cbd1cd8
Binary files /dev/null and b/App3/App3.Android/Resources/drawable/chuck_norris.png differ
diff --git a/App3/App3/Services/DataService.cs b/App3/App3/Services/DataService.cs
index d057036..6509d1a 100644
--- a/App3/App3/Services/DataService.cs
+++ b/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();
+ }
}
}
diff --git a/App3/App3/Services/IDataService.cs b/App3/App3/Services/IDataService.cs
index 97a73c6..b8dd364 100644
--- a/App3/App3/Services/IDataService.cs
+++ b/App3/App3/Services/IDataService.cs
@@ -9,5 +9,7 @@ namespace App3.Services
Task AddUser(string Username, string Password);
Task> GetUser();
Task RemoveUser(int id);
+ Task AddUser(object username, object password);
+ Task AddUser(string username, object password);
}
}
\ No newline at end of file
diff --git a/App3/App3/ViewModels/LoginViewModel.cs b/App3/App3/ViewModels/LoginViewModel.cs
index 109265b..2f0ecfb 100644
--- a/App3/App3/ViewModels/LoginViewModel.cs
+++ b/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)
{
diff --git a/App3/App3/Views/AboutPage.xaml b/App3/App3/Views/AboutPage.xaml
index e0c361e..e27fddc 100644
--- a/App3/App3/Views/AboutPage.xaml
+++ b/App3/App3/Views/AboutPage.xaml
@@ -15,6 +15,8 @@
+
+
@@ -30,7 +32,7 @@
-
+
+
diff --git a/App3/App3/Views/AboutPage.xaml.cs b/App3/App3/Views/AboutPage.xaml.cs
index 3ec9fc9..a6f42ca 100644
--- a/App3/App3/Views/AboutPage.xaml.cs
+++ b/App3/App3/Views/AboutPage.xaml.cs
@@ -11,5 +11,10 @@ namespace App3.Views
{
InitializeComponent();
}
+
+ private void RefreshView_Refreshing(object sender, EventArgs e)
+ {
+
+ }
}
}
\ No newline at end of file
diff --git a/App3/App3/Views/JokesHome.xaml b/App3/App3/Views/JokesHome.xaml
index a0663cb..de6656c 100644
--- a/App3/App3/Views/JokesHome.xaml
+++ b/App3/App3/Views/JokesHome.xaml
@@ -22,31 +22,31 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-