From 37f4a4b298ba6ce884882b51f7257776311bc037 Mon Sep 17 00:00:00 2001 From: Takym Date: Sat, 10 Oct 2020 13:21:17 +0900 Subject: [PATCH 1/5] =?UTF-8?q?NewsPage=E3=80=81WebViewerPage=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0=EF=BC=86=E7=99=BB=E9=8C=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CONTRIBUTORS.md | 1 + Covid19Radar/Covid19Radar/App.xaml.cs | 4 + Covid19Radar/Covid19Radar/Covid19Radar.csproj | 6 ++ .../ViewModels/MenuPageViewModel.cs | 16 ++-- .../ViewModels/News/NewsPageViewModel.cs | 40 ++++++++++ .../ViewModels/News/WebViewerPageViewModel.cs | 15 ++++ .../Covid19Radar/Views/News/NewsPage.xaml | 80 +++++++++++++++++++ .../Covid19Radar/Views/News/NewsPage.xaml.cs | 24 ++++++ .../Views/News/WebViewerPage.xaml | 26 ++++++ .../Views/News/WebViewerPage.xaml.cs | 14 ++++ 10 files changed, 218 insertions(+), 8 deletions(-) create mode 100644 Covid19Radar/Covid19Radar/ViewModels/News/NewsPageViewModel.cs create mode 100644 Covid19Radar/Covid19Radar/ViewModels/News/WebViewerPageViewModel.cs create mode 100644 Covid19Radar/Covid19Radar/Views/News/NewsPage.xaml create mode 100644 Covid19Radar/Covid19Radar/Views/News/NewsPage.xaml.cs create mode 100644 Covid19Radar/Covid19Radar/Views/News/WebViewerPage.xaml create mode 100644 Covid19Radar/Covid19Radar/Views/News/WebViewerPage.xaml.cs diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 31480f37..5a3dd96d 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -81,6 +81,7 @@ - Yuto Takano - Jean-Noël Ribelles (French/English Translation) - Niccori 250k (Xamarin) +- Takym (News Page) # Original Covid19Radar Beta Testers - Nagahata Kenji diff --git a/Covid19Radar/Covid19Radar/App.xaml.cs b/Covid19Radar/Covid19Radar/App.xaml.cs index d984c396..0d65e8fa 100644 --- a/Covid19Radar/Covid19Radar/App.xaml.cs +++ b/Covid19Radar/Covid19Radar/App.xaml.cs @@ -146,6 +146,10 @@ protected override void RegisterTypes(IContainerRegistry containerRegistry) containerRegistry.RegisterForNavigation(); containerRegistry.RegisterForNavigation(); + // News + containerRegistry.RegisterForNavigation(); + containerRegistry.RegisterForNavigation(); + // Services containerRegistry.RegisterSingleton(); containerRegistry.RegisterSingleton(); diff --git a/Covid19Radar/Covid19Radar/Covid19Radar.csproj b/Covid19Radar/Covid19Radar/Covid19Radar.csproj index 55071960..08f287d1 100644 --- a/Covid19Radar/Covid19Radar/Covid19Radar.csproj +++ b/Covid19Radar/Covid19Radar/Covid19Radar.csproj @@ -187,6 +187,12 @@ MSBuild:UpdateDesignTimeXaml + + MSBuild:UpdateDesignTimeXaml + + + MSBuild:UpdateDesignTimeXaml + diff --git a/Covid19Radar/Covid19Radar/ViewModels/MenuPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/MenuPageViewModel.cs index 10d7a2de..622ff999 100644 --- a/Covid19Radar/Covid19Radar/ViewModels/MenuPageViewModel.cs +++ b/Covid19Radar/Covid19Radar/ViewModels/MenuPageViewModel.cs @@ -33,7 +33,13 @@ public MenuPageViewModel(INavigationService navigationService) : base(navigation IconColor = "#019AE8", TextColor = "#000" }); - + MenuItems.Add(new MainMenuModel() { + Icon = "\uf0c0", //"\ue85c", //"\ud83d\udcf0", + PageName = nameof(NewsPage), + Title = Resources.AppResources.NewsPageTitle, + IconColor = "#019AE8", + TextColor = "#000" + }); MenuItems.Add(new MainMenuModel() { Icon = "\uf013", @@ -42,7 +48,6 @@ public MenuPageViewModel(INavigationService navigationService) : base(navigation IconColor = "#019AE8", TextColor = "#000" }); - MenuItems.Add(new MainMenuModel() { Icon = "\uf0e0", @@ -75,7 +80,6 @@ public MenuPageViewModel(INavigationService navigationService) : base(navigation PageName = nameof(LicenseAgreementPage), Title = Resources.AppResources.TitleLicenseAgreement }); - MenuItems.Add(new MainMenuModel() { Icon = "\uf0c0", @@ -94,7 +98,6 @@ public MenuPageViewModel(INavigationService navigationService) : base(navigation PageName = nameof(ContactedNotifyPage), Title = nameof(ContactedNotifyPage) }); - MenuItems.Add(new MainMenuModel() { Icon = "\uf0c0", @@ -107,7 +110,6 @@ public MenuPageViewModel(INavigationService navigationService) : base(navigation PageName = nameof(PrivacyPolicyPage), Title = nameof(PrivacyPolicyPage) }); - MenuItems.Add(new MainMenuModel() { Icon = "\uf70e", @@ -180,14 +182,12 @@ public MenuPageViewModel(INavigationService navigationService) : base(navigation PageName = nameof(HelpPage4), Title = nameof(HelpPage4) }); - MenuItems.Add(new MainMenuModel() { Icon = "\uf0c0", PageName = nameof(ChatbotPage), Title = nameof(ChatbotPage) }); - MenuItems.Add(new MainMenuModel() { Icon = "\uf0c0", @@ -201,7 +201,7 @@ public MenuPageViewModel(INavigationService navigationService) : base(navigation Title = nameof(SubmitConsentPage) }); #endif - */ + //*/ NavigateCommand = new DelegateCommand(Navigate); } diff --git a/Covid19Radar/Covid19Radar/ViewModels/News/NewsPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/News/NewsPageViewModel.cs new file mode 100644 index 00000000..56eb30ba --- /dev/null +++ b/Covid19Radar/Covid19Radar/ViewModels/News/NewsPageViewModel.cs @@ -0,0 +1,40 @@ +using Covid19Radar.Resources; +using Covid19Radar.Views; +using Prism.Navigation; +using Xamarin.Forms; + +namespace Covid19Radar.ViewModels +{ + public class NewsPageViewModel : ViewModelBase + { + private readonly INavigationService _navigationService; + + public static string Url { get; set; } + public static bool GSearch { get; set; } + + public Command OnClick_ShowGoogle => new Command(() => { + if (GSearch) { + GSearch = false; + } else { + Url = AppResources.GoogleSearchUrl; + } + _navigationService.NavigateAsync(nameof(WebViewerPage)); + }); + + public Command OnClick_ShowCoronaGoJP => new Command(() => { + Url = AppResources.CoronaGoJPUrl; + _navigationService.NavigateAsync(nameof(WebViewerPage)); + }); + + public Command OnClick_ShowStopCOVID19JP => new Command(() => { + Url = AppResources.StopCOVID19JPUrl; + _navigationService.NavigateAsync(nameof(WebViewerPage)); + }); + + public NewsPageViewModel(INavigationService navigationService) : base(navigationService) + { + _navigationService = navigationService; + this.Title = AppResources.NewsPageTitle; + } + } +} diff --git a/Covid19Radar/Covid19Radar/ViewModels/News/WebViewerPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/News/WebViewerPageViewModel.cs new file mode 100644 index 00000000..3554d3b3 --- /dev/null +++ b/Covid19Radar/Covid19Radar/ViewModels/News/WebViewerPageViewModel.cs @@ -0,0 +1,15 @@ +using Covid19Radar.Resources; +using Prism.Navigation; + +namespace Covid19Radar.ViewModels +{ + public class WebViewerPageViewModel : ViewModelBase + { + public string Url => NewsPageViewModel.Url; + + public WebViewerPageViewModel(INavigationService navigationService) : base(navigationService) + { + this.Title = AppResources.NewsPageTitle; + } + } +} diff --git a/Covid19Radar/Covid19Radar/Views/News/NewsPage.xaml b/Covid19Radar/Covid19Radar/Views/News/NewsPage.xaml new file mode 100644 index 00000000..94a2c6a9 --- /dev/null +++ b/Covid19Radar/Covid19Radar/Views/News/NewsPage.xaml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + +