最新情報ページ追加 (#771 の修正版)

CONTRIBUTORS.md

@@ -81,6 +81,7 @@
 - Yuto Takano
 - Jean-Noël Ribelles (French/English Translation)
 - Niccori 250k (Xamarin)
+- Takym (News Page)
 - Strice ([Portuguese Translation](https://github.com/Covid-19Radar/Covid19Radar/commits?author=xx-thedoctor-xx))
 
 # Original Covid19Radar Beta Testers

Covid19Radar/Covid19Radar/App.xaml.cs

@@ -1,27 +1,15 @@
-using System;
 using Prism;
 using Prism.DryIoc;
 using Prism.Ioc;
 using Covid19Radar.ViewModels;
 using Covid19Radar.Views;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
-using Prism.Mvvm;
 using DryIoc;
-using ImTools;
-using Covid19Radar.Model;
 using System.Threading.Tasks;
 using Prism.Navigation;
 using Covid19Radar.Services;
-using Prism.Services;
 using Covid19Radar.Common;
-using System.Net.Http;
-using Prism.Logging;
-using System.Collections.Generic;
-using System.Text;
-using FFImageLoading.Helpers;
-using FFImageLoading;
-using Xamarin.ExposureNotifications;
 using Xamarin.Essentials;
 //using Plugin.LocalNotification;
 
@@ -146,6 +134,10 @@ protected override void RegisterTypes(IContainerRegistry containerRegistry)
             containerRegistry.RegisterForNavigation<SubmitConsentPage>();
             containerRegistry.RegisterForNavigation<ExposuresPage>();
 
+            // News
+            containerRegistry.RegisterForNavigation<NewsPage>();
+            containerRegistry.RegisterForNavigation<WebViewerPage>();
+
             // Services
             containerRegistry.RegisterSingleton<UserDataService>();
             containerRegistry.RegisterSingleton<ExposureNotificationService>();

Covid19Radar/Covid19Radar/Common/AppUtils.cs

@@ -1,4 +1,7 @@
-using Acr.UserDialogs;
+#if !DEBUG
+#define NDEBUG
+#endif
+using Acr.UserDialogs;
 using Covid19Radar.Resources;
 using Newtonsoft.Json.Linq;
 using System;
@@ -26,20 +29,21 @@ public static async void PopUpShare()
                 await Share.RequestAsync(new ShareTextRequest
                 {
                     Uri = AppSettings.Instance.AppStoreUrl,
-                    Title = Resources.AppResources.AppName
+                    Title = AppResources.AppName
                 });
             }
             else if (Device.RuntimePlatform == Device.Android)
             {
                 await Share.RequestAsync(new ShareTextRequest
                 {
                     Uri = AppSettings.Instance.GooglePlayUrl,
-                    Title = Resources.AppResources.AppName
+                    Title = AppResources.AppName
                 });
             }
 
         }
 
+        [Conditional("NDEBUG")]
         public static async void CheckVersion()
         {
             var uri = AppResources.UrlVersion;
@@ -49,11 +53,12 @@ public static async void CheckVersion()
                 {
                     var json = await client.GetStringAsync(uri);
                     var versionString = JObject.Parse(json).Value<string>("version");
-
                     if (versionString != AppInfo.VersionString)
                     {
-                        await UserDialogs.Instance.AlertAsync(AppResources.AppUtilsGetNewVersionDescription, AppResources.AppUtilsGetNewVersionTitle, Resources.AppResources.ButtonOk);
-
+                        await UserDialogs.Instance.AlertAsync(
+                            AppResources.AppUtilsGetNewVersionDescription,
+                            AppResources.AppUtilsGetNewVersionTitle,
+                            AppResources.ButtonOk);
                         if (Device.RuntimePlatform == Device.iOS)
                         {
                             await Browser.OpenAsync(AppSettings.Instance.AppStoreUrl, BrowserLaunchMode.External);
@@ -62,18 +67,13 @@ public static async void CheckVersion()
                         {
                             await Browser.OpenAsync(AppSettings.Instance.GooglePlayUrl, BrowserLaunchMode.External);
                         }
-
                     }
-
                 }
                 catch (Exception ex)
                 {
                     Debug.WriteLine(ex.ToString());
                 }
-                finally
-                {
-                }
             }
         }
     }
-}
+}

Covid19Radar/Covid19Radar/Common/SecondsTimer.cs

@@ -10,9 +10,7 @@ public class SecondsTimer
 
         public event TimeOutHandler TimeOutEvent;
 
-        private DateTime _startDateTime;
-
-        private bool _timerRunning;
+		private bool _timerRunning;
 
         private int _timeDiffernce;
 

Covid19Radar/Covid19Radar/Covid19Radar.csproj

@@ -187,6 +187,12 @@
     <EmbeddedResource Update="Views\HomePage\ExposuresPage.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
+    <EmbeddedResource Update="Views\News\NewsPage.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Update="Views\News\WebViewerPage.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Image\" />

Covid19Radar/Covid19Radar/MultilingualResources/Covid19Radar.en.xlf

@@ -913,6 +913,51 @@
           <target state="new">Count</target>
           <note from="MultilingualBuild" annotates="source" priority="2">件</note>
         </trans-unit>
+        <trans-unit id="NewsPageTitle" translate="yes" xml:space="preserve">
+          <source>News</source>
+          <target state="translated">News</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">最新情報ページ</note>
+        </trans-unit>
+        <trans-unit id="NewsPageLabel_Links" translate="yes" xml:space="preserve">
+          <source>Links</source>
+          <target state="translated">Links</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">リンク集</note>
+        </trans-unit>
+        <trans-unit id="NewsPageLabel_LinksDescription" translate="yes" xml:space="preserve">
+          <source>You can search information about new corona.</source>
+          <target state="translated">You can search information about new corona.</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">新型コロナに関する情報を調べる事ができます。</note>
+        </trans-unit>
+        <trans-unit id="NewsPageButton_ShowGoogle" translate="yes" xml:space="preserve">
+          <source>Search News on Google</source>
+          <target state="translated">Search News on Google</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">最新情報をGoogleで検索</note>
+        </trans-unit>
+        <trans-unit id="NewsPageButton_ShowCoronaGoJP" translate="yes" xml:space="preserve">
+          <source>Data by Cabinet Secretariat</source>
+          <target state="translated">Data by Cabinet Secretariat</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">内閣官房のデータ</note>
+        </trans-unit>
+        <trans-unit id="NewsPageButton_ShowStopCOVID19JP" translate="yes" xml:space="preserve">
+          <source>Anti-Coronavirus Dashboard</source>
+          <target state="translated">Anti-Coronavirus Dashboard</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">対策ダッシュボード</note>
+        </trans-unit>
+        <trans-unit id="GoogleSearchUrl" translate="yes" xml:space="preserve">
+          <source>https://www.google.us/search?hl=en&amp;q=Coronavirus+disease+2019</source>
+          <target state="translated">https://www.google.us/search?hl=en&amp;q=Coronavirus+disease+2019</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">https://www.google.co.jp/search?hl=ja&amp;q=2019年新型コロナウイルス感染症</note>
+        </trans-unit>
+        <trans-unit id="CoronaGoJPUrl" translate="yes" xml:space="preserve">
+          <source>https://corona.go.jp/en/</source>
+          <target state="translated">https://corona.go.jp/en/</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">https://corona.go.jp/dashboard/</note>
+        </trans-unit>
+        <trans-unit id="StopCOVID19JPUrl" translate="yes" xml:space="preserve">
+          <source>https://www.stopcovid19.jp/#en</source>
+          <target state="translated">https://www.stopcovid19.jp/#en</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">https://www.stopcovid19.jp/#ja</note>
+        </trans-unit>
       </group>
     </body>
   </file>

Covid19Radar/Covid19Radar/MultilingualResources/Covid19Radar.ja.xlf

@@ -912,6 +912,51 @@
           <target state="translated">件</target>
           <note from="MultilingualBuild" annotates="source" priority="2">件</note>
         </trans-unit>
+        <trans-unit id="NewsPageTitle" translate="yes" xml:space="preserve">
+          <source>News</source>
+          <target state="translated">最新情報ページ</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">最新情報ページ</note>
+        </trans-unit>
+        <trans-unit id="NewsPageLabel_Links" translate="yes" xml:space="preserve">
+          <source>Links</source>
+          <target state="translated">リンク集</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">リンク集</note>
+        </trans-unit>
+        <trans-unit id="NewsPageLabel_LinksDescription" translate="yes" xml:space="preserve">
+          <source>You can search information about new corona.</source>
+          <target state="translated">新型コロナに関する情報を調べる事ができます。</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">新型コロナに関する情報を調べる事ができます。</note>
+        </trans-unit>
+        <trans-unit id="NewsPageButton_ShowGoogle" translate="yes" xml:space="preserve">
+          <source>Search News on Google</source>
+          <target state="translated">最新情報をGoogleで検索</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">最新情報をGoogleで検索</note>
+        </trans-unit>
+        <trans-unit id="NewsPageButton_ShowCoronaGoJP" translate="yes" xml:space="preserve">
+          <source>Data by Cabinet Secretariat</source>
+          <target state="translated">内閣官房のデータ</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">内閣官房のデータ</note>
+        </trans-unit>
+        <trans-unit id="NewsPageButton_ShowStopCOVID19JP" translate="yes" xml:space="preserve">
+          <source>Anti-Coronavirus Dashboard</source>
+          <target state="translated">対策ダッシュボード</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">対策ダッシュボード</note>
+        </trans-unit>
+        <trans-unit id="GoogleSearchUrl" translate="yes" xml:space="preserve">
+          <source>https://www.google.us/search?hl=en&amp;q=Coronavirus+disease+2019</source>
+          <target state="translated">https://www.google.co.jp/search?hl=ja&amp;q=2019年新型コロナウイルス感染症</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">https://www.google.co.jp/search?hl=ja&amp;q=2019年新型コロナウイルス感染症</note>
+        </trans-unit>
+        <trans-unit id="CoronaGoJPUrl" translate="yes" xml:space="preserve">
+          <source>https://corona.go.jp/en/</source>
+          <target state="translated">https://corona.go.jp/dashboard/</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">https://corona.go.jp/dashboard/</note>
+        </trans-unit>
+        <trans-unit id="StopCOVID19JPUrl" translate="yes" xml:space="preserve">
+          <source>https://www.stopcovid19.jp/#en</source>
+          <target state="translated">https://www.stopcovid19.jp/#ja</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">https://www.stopcovid19.jp/#ja</note>
+        </trans-unit>
       </group>
     </body>
   </file>