Merge pull request #210 from cocoa-mhlw/release_1_2_4

Release v1.2.4

Covid19Radar/Covid19Radar.Android/Covid19Radar.Android.csproj

@@ -49,6 +49,7 @@
  <BundleAssemblies>true</BundleAssemblies>
  <AndroidEnableMultiDex>true</AndroidEnableMultiDex>
  <AndroidDexTool>d8</AndroidDexTool>
+ <LangVersion>default</LangVersion>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
  <DebugSymbols>false</DebugSymbols>
@@ -72,6 +73,8 @@
  <AndroidDexTool>d8</AndroidDexTool>
  <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
  <AndroidEnableMultiDex>true</AndroidEnableMultiDex>
+ <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
+ <LangVersion>default</LangVersion>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Local|AnyCPU'">
  <DebugSymbols>true</DebugSymbols>
@@ -80,7 +83,7 @@
  <DebugType>full</DebugType>
  <PlatformTarget>AnyCPU</PlatformTarget>
  <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
- <LangVersion>8.0</LangVersion>
+ <LangVersion>default</LangVersion>
  <ErrorReport>prompt</ErrorReport>
  <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
  <AndroidPackageFormat>apk</AndroidPackageFormat>
@@ -94,8 +97,7 @@
  <EnableLLVM>false</EnableLLVM>
  <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
  <MandroidI18n>CJK</MandroidI18n>
- <AndroidHttpClientHandlerType>
- </AndroidHttpClientHandlerType>
+ <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
  <AndroidDexTool>d8</AndroidDexTool>
  <AndroidEnableMultiDex>true</AndroidEnableMultiDex>
  </PropertyGroup>
@@ -106,7 +108,7 @@
  <DebugType>full</DebugType>
  <PlatformTarget>AnyCPU</PlatformTarget>
  <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
- <LangVersion>8.0</LangVersion>
+ <LangVersion>default</LangVersion>
  <ErrorReport>prompt</ErrorReport>
  <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
  <AndroidUseSharedRuntime>true</AndroidUseSharedRuntime>
@@ -115,6 +117,7 @@
  <AndroidPackageFormat>apk</AndroidPackageFormat>
  <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
  <MandroidI18n>CJK</MandroidI18n>
+ <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
  </PropertyGroup>
  <ItemGroup>
  <Reference Include="Mono.Android" />
@@ -176,7 +179,7 @@
  <Version>4.6.0.967</Version>
  </PackageReference>
  <PackageReference Include="Xamarin.GooglePlayServices.Nearby.ExposureNotification">
- <Version>18.0.2-eap.6</Version>
+ <Version>19.7.1-eap.1</Version>
  </PackageReference>
  <PackageReference Include="Xamarin.GooglePlayServices.SafetyNet">
  <Version>117.0.0-preview03</Version>

Covid19Radar/Covid19Radar.Android/Resources/xml/backup_settings.xml

@@ -5,4 +5,4 @@
 
 <full-backup-content>
  <exclude domain="file" path="logs" />
-</full-backup-content>
+</full-backup-content>

Covid19Radar/Covid19Radar.Android/appcenter-pre-build.sh

@@ -32,9 +32,3 @@ sed -i '' "s/LOG_STORAGE_ACCOUNT_NAME/$LOG_STORAGE_ACCOUNT_NAME/g" $APP_CONSTANT
 cat $APP_CONSTANT_FILE
 
 echo "Updated id!"
-
-# To avoid the following
-# https://github.com/xamarin/xamarin-android/issues/5499
-${ANDROID_HOME}/tools/bin/sdkmanager --uninstall "ndk-bundle"
-${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.3.6528147"
-ln -s ${ANDROID_HOME}/ndk/21.3.6528147 ${ANDROID_HOME}/ndk-bundle

Covid19Radar/Covid19Radar.iOS/AppDelegate.cs

@@ -2,18 +2,20 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+using Covid19Radar.Common;
 using Covid19Radar.iOS.Services;
 using Covid19Radar.iOS.Services.Logs;
 using Covid19Radar.Services;
 using Covid19Radar.Services.Logs;
 using DryIoc;
 using Foundation;
 using UIKit;
+using Xamarin.Forms;
 
 namespace Covid19Radar.iOS
 {
- // The UIApplicationDelegate for the application. This class is responsible for launching the 
- // User Interface of the application, as well as listening (and optionally responding) to 
+ // The UIApplicationDelegate for the application. This class is responsible for launching the
+ // User Interface of the application, as well as listening (and optionally responding) to
  // application events from iOS.
  [Register("AppDelegate")]
  public partial class AppDelegate : global::Xamarin.Forms.Platform.iOS.FormsApplicationDelegate
@@ -24,7 +26,7 @@ public AppDelegate()
  }
 
  //
- // This method is invoked when the application has loaded and is ready to run. In this 
+ // This method is invoked when the application has loaded and is ready to run. In this
  // method you should instantiate the window, load the UI into it and then make the window
  // visible.
  //
@@ -56,6 +58,12 @@ public override bool FinishedLaunching(UIApplication app, NSDictionary options)
  return base.FinishedLaunching(app, options);
  }
 
+ public override void OnActivated(UIApplication uiApplication)
+ {
+ base.OnActivated(uiApplication);
+ MessagingCenter.Send((object)this, AppConstants.IosOnActivatedMessage);
+ }
+
  //public override void WillEnterForeground(UIApplication uiApplication)
  //{
  // Plugin.LocalNotification.NotificationCenter.ResetApplicationIconBadgeNumber(uiApplication);

Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj

@@ -1175,8 +1175,6 @@
  <EmbeddedResource Include="fa-brands-400.otf" />
  <EmbeddedResource Include="fa-regular-400.otf" />
  <EmbeddedResource Include="fa-solid-900.otf" />
- <EmbeddedResource Include="NotoSansCJKjp-Medium.otf" />
- <EmbeddedResource Include="NotoSansCJKjp-Regular.otf" />
  <EmbeddedResource Include="Roboto-Regular.ttf" />
  </ItemGroup>
  <ItemGroup>

Covid19Radar/Covid19Radar/App.xaml

@@ -128,7 +128,6 @@
  </Style>
 
  <Style x:Key="DefaultEntry" TargetType="Entry">
- <Setter Property="FontFamily" Value="NotoSansRegularFontFamily" />
  <Setter Property="BackgroundColor" Value="Transparent" />
  <Setter Property="TextColor" Value="{StaticResource PrimaryText}" />
  <Setter Property="PlaceholderColor" Value="{StaticResource SecondaryText}" />
@@ -144,7 +143,6 @@
  </Style>
 
  <Style x:Key="DefaultDatePicker" TargetType="DatePicker">
- <Setter Property="FontFamily" Value="NotoSansRegularFontFamily" />
  <Setter Property="BackgroundColor" Value="Transparent" />
  <Setter Property="TextColor" Value="{StaticResource PrimaryText}" />
  <Setter Property="Opacity" Value="0.6" />
@@ -156,7 +154,6 @@
  <Setter Property="FontAttributes" Value="Bold" />
  <Setter Property="FontSize" Value="Title" />
  <Setter Property="HorizontalOptions" Value="FillAndExpand" />
- <Setter Property="FontFamily" Value="NotoSansMediumFontFamily" />
  </Style>
 
  <Style x:Key="DefaultTitleLabel" TargetType="Label">
@@ -165,55 +162,48 @@
  <Setter Property="FontAttributes" Value="Bold" />
  <Setter Property="FontSize" Value="Title" />
  <Setter Property="HorizontalOptions" Value="FillAndExpand" />
- <Setter Property="FontFamily" Value="NotoSansMediumFontFamily" />
  </Style>
 
  <Style x:Key="DefaultSubTitleLabelColor" TargetType="Label">
  <Setter Property="HorizontalTextAlignment" Value="Center" />
  <Setter Property="TextColor" Value="{StaticResource Primary}" />
  <Setter Property="FontSize" Value="Subtitle" />
  <Setter Property="HorizontalOptions" Value="FillAndExpand" />
- <Setter Property="FontFamily" Value="NotoSansMediumFontFamily" />
  </Style>
 
  <Style x:Key="DefaultSubTitleLabel" TargetType="Label">
  <Setter Property="HorizontalTextAlignment" Value="Center" />
  <Setter Property="TextColor" Value="{StaticResource PrimaryText}" />
  <Setter Property="FontSize" Value="{x:OnPlatform Android=18, iOS=20}" />
  <Setter Property="HorizontalOptions" Value="FillAndExpand" />
- <Setter Property="FontFamily" Value="NotoSansMediumFontFamily" />
  </Style>
 
  <Style x:Key="DefaultLabelLarge" TargetType="Label">
  <Setter Property="HorizontalTextAlignment" Value="Start" />
  <Setter Property="TextColor" Value="{StaticResource PrimaryText}" />
  <Setter Property="FontSize" Value="Large" />
  <Setter Property="HorizontalOptions" Value="FillAndExpand" />
- <Setter Property="FontFamily" Value="NotoSansRegularFontFamily" />
  </Style>
 
  <Style x:Key="DefaultLabelLargeColor" TargetType="Label">
  <Setter Property="HorizontalTextAlignment" Value="Start" />
  <Setter Property="TextColor" Value="{StaticResource Primary}" />
  <Setter Property="FontSize" Value="Large" />
  <Setter Property="HorizontalOptions" Value="FillAndExpand" />
- <Setter Property="FontFamily" Value="NotoSansRegularFontFamily" />
  </Style>
 
  <Style x:Key="DefaultLabelColor" TargetType="Label">
  <Setter Property="HorizontalTextAlignment" Value="Start" />
  <Setter Property="TextColor" Value="{StaticResource Primary}" />
  <Setter Property="FontSize" Value="Medium" />
  <Setter Property="HorizontalOptions" Value="FillAndExpand" />
- <Setter Property="FontFamily" Value="NotoSansRegularFontFamily" />
  </Style>
 
  <Style x:Key="DefaultLabel" TargetType="Label">
  <Setter Property="HorizontalTextAlignment" Value="Start" />
  <Setter Property="TextColor" Value="{StaticResource PrimaryText}" />
  <Setter Property="FontSize" Value="Medium" />
  <Setter Property="HorizontalOptions" Value="FillAndExpand" />
- <Setter Property="FontFamily" Value="NotoSansRegularFontFamily" />
  </Style>
 
 
@@ -222,7 +212,6 @@
  <Setter Property="TextColor" Value="{StaticResource Primary}" />
  <Setter Property="FontSize" Value="Small" />
  <Setter Property="HorizontalOptions" Value="FillAndExpand" />
- <Setter Property="FontFamily" Value="NotoSansRegularFontFamily" />
  </Style>
 
 
@@ -231,15 +220,13 @@
  <Setter Property="TextColor" Value="{StaticResource PrimaryText}" />
  <Setter Property="FontSize" Value="Small" />
  <Setter Property="HorizontalOptions" Value="FillAndExpand" />
- <Setter Property="FontFamily" Value="NotoSansRegularFontFamily" />
  </Style>
 
  <Style x:Key="DefaultLabelMicro" TargetType="Label">
  <Setter Property="HorizontalTextAlignment" Value="Start" />
  <Setter Property="TextColor" Value="{StaticResource PrimaryText}" />
  <Setter Property="FontSize" Value="Micro" />
  <Setter Property="HorizontalOptions" Value="FillAndExpand" />
- <Setter Property="FontFamily" Value="NotoSansRegularFontFamily" />
  </Style>
 
  <Style x:Key="DefaultActivityIndicator" TargetType="ActivityIndicator">
@@ -252,7 +239,6 @@
  <Setter Property="TextColor" Value="{StaticResource Primary}" />
  <Setter Property="FontSize" Value="Medium" />
  <Setter Property="HorizontalOptions" Value="FillAndExpand" />
- <Setter Property="FontFamily" Value="NotoSansRegularFontFamily" />
  </Style>
 
  <Style x:Key="DefaultNumberLabel" TargetType="Label">
@@ -284,7 +270,6 @@
  <Setter Property="HorizontalOptions" Value="FillAndExpand" />
  <Setter Property="VerticalTextAlignment" Value="Center" />
  <Setter Property="Margin" Value="0,0,0,0" />
- <Setter Property="FontFamily" Value="NotoSansRegularFontFamily" />
  </Style>
 
  <Style x:Key="DefaultWebView" TargetType="WebView">
@@ -305,7 +290,6 @@
 
  <Style x:Key="DefaultButton" TargetType="Button">
  <Setter Property="Visual" Value="Default" />
- <Setter Property="FontFamily" Value="NotoSansMediumFontFamily" />
  <Setter Property="FontAttributes" Value="Bold" />
  <Setter Property="BorderColor" Value="{StaticResource ButtonBorder}" />
  <Setter Property="BorderWidth" Value="4" />
@@ -329,7 +313,6 @@
 
  <Style x:Key="DefaultButtonGrayedOut" TargetType="Button">
  <Setter Property="Visual" Value="Default" />
- <Setter Property="FontFamily" Value="NotoSansMediumFontFamily" />
  <Setter Property="FontAttributes" Value="Bold" />
  <Setter Property="BorderColor" Value="{StaticResource ButtonGrayedOut}" />
  <Setter Property="BorderWidth" Value="2" />
@@ -349,7 +332,6 @@
  <Setter Property="TextColor" Value="{StaticResource PrimaryText}" />
  <Setter Property="FontSize" Value="Medium" />
  <Setter Property="HorizontalOptions" Value="FillAndExpand" />
- <Setter Property="FontFamily" Value="NotoSansRegularFontFamily" />
  <Setter Property="VerticalTextAlignment" Value="Center" />
  </Style>
 
@@ -359,15 +341,13 @@
  <Setter Property="HorizontalTextAlignment" Value="Start" />
  <Setter Property="TextColor" Value="{StaticResource Primary}" />
  <Setter Property="FontSize" Value="Small" />
- <Setter Property="FontFamily" Value="NotoSansRegularFontFamily" />
  </Style>
 
 
  <Style x:Key="CardLabelSmall" TargetType="Label">
  <Setter Property="HorizontalTextAlignment" Value="Start" />
  <Setter Property="TextColor" Value="{StaticResource PrimaryText}" />
  <Setter Property="FontSize" Value="Small" />
- <Setter Property="FontFamily" Value="NotoSansRegularFontFamily" />
  </Style>
 
  <Style x:Key="ImageLableStackLayout" TargetType="StackLayout">

Covid19Radar/Covid19Radar/App.xaml.cs

@@ -32,7 +32,7 @@ public partial class App : PrismApplication
  private ILoggerService LoggerService;
  private ILogFileService LogFileService;
 
- /* 
+ /*
  * The Xamarin Forms XAML Previewer in Visual Studio uses System.Activator.CreateInstance.
  * This imposes a limitation in which the App class must have a default constructor.
  * App(IPlatformInitializer initializer = null) cannot be handled by the Activator.
@@ -192,6 +192,7 @@ protected override void OnStart()
 
  protected override void OnResume()
  {
+ base.OnResume();
  LogFileService.Rotate();
  }
 
@@ -204,6 +205,7 @@ public async Task InitializeBackgroundTasks()
  */
  protected override void OnSleep()
  {
+ base.OnSleep();
  }
 
  private void LogUnobservedTaskExceptions()

Covid19Radar/Covid19Radar/AssemblyInfo.cs

@@ -7,6 +7,4 @@
 [assembly: ExportFont("fa-solid-900.otf", Alias = "FA-S")]
 [assembly: ExportFont("fa-brands-400.otf", Alias = "FA-B")]
 [assembly: ExportFont("materialdesignicons-webfont.ttf", Alias = "MaterialFontFamily")]
-[assembly: ExportFont("NotoSansCJKjp-Medium.otf", Alias = "NotoSansMediumFontFamily")]
-[assembly: ExportFont("NotoSansCJKjp-Regular.otf", Alias = "NotoSansRegularFontFamily")]
 [assembly: ExportFont("Roboto-Regular.ttf", Alias = "RobotoRegularFontFamily")]

Covid19Radar/Covid19Radar/Common/AppConstants.cs

@@ -30,5 +30,14 @@ public static class AppConstants
 
  public const string positiveRegex = @"\b[0-9]{8}\b";
 
+ /// <summary>
+ /// Number of days of exposure information to display
+ /// </summary>
+ public const int DaysOfExposureInformationToDisplay = -15;
+
+ /// <summary>
+ /// Message when `AppDelagate.OnActivated()` occurs on iOS.
+ /// </summary>
+ public const string IosOnActivatedMessage = "IosOnActivatedMessage";
  }
 }

Covid19Radar/Covid19Radar/Common/DateTimeUtility.cs

@@ -0,0 +1,18 @@
+using System;
+namespace Covid19Radar.Common
+{
+ public interface IDateTimeUtility
+ {
+ DateTime UtcNow { get; }
+ }
+ public class DateTimeUtility : IDateTimeUtility
+ {
+ public static IDateTimeUtility Instance = new DateTimeUtility();
+
+ public DateTimeUtility()
+ {
+ }
+
+ public DateTime UtcNow => DateTime.UtcNow;
+ }
+}

Covid19Radar/Covid19Radar/Covid19Radar.csproj

@@ -86,8 +86,6 @@
  <None Remove="Resources\Fonts\fa-regular-400.otf" />
  <None Remove="Resources\Fonts\fa-solid-900.otf" />
  <None Remove="Resources\Fonts\materialdesignicons-webfont.ttf" />
- <None Remove="Resources\Fonts\NotoSansCJKjp-Medium.otf" />
- <None Remove="Resources\Fonts\NotoSansCJKjp-Regular.otf" />
  <None Remove="Resources\Fonts\Roboto-Regular.ttf" />
  <None Remove="Services\ExposureNotificationHandler.cs.txt" />
  <None Remove="settings.json" />
@@ -99,8 +97,6 @@
  <EmbeddedResource Include="Resources\Fonts\fa-regular-400.otf" />
  <EmbeddedResource Include="Resources\Fonts\fa-solid-900.otf" />
  <EmbeddedResource Include="Resources\Fonts\materialdesignicons-webfont.ttf" />
- <EmbeddedResource Include="Resources\Fonts\NotoSansCJKjp-Medium.otf" />
- <EmbeddedResource Include="Resources\Fonts\NotoSansCJKjp-Regular.otf" />
  <EmbeddedResource Include="Resources\Fonts\Roboto-Regular.ttf" />
  </ItemGroup>
  <ItemGroup>

Covid19Radar/Covid19Radar/MultilingualResources/Covid19Radar.zh-Hans.xlf

@@ -93,8 +93,7 @@
  </trans-unit>
  <trans-unit id="SettingsPageTitle" translate="yes" xml:space="preserve">
  <source>Settings</source>
- <target state="needs-review-translation">设置</target>
- <note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
+ <target state="translated">设置</target>
  <note from="MultilingualBuild" annotates="source" priority="2">アプリの設定</note>
  </trans-unit>
  <trans-unit id="ButtonCancel" translate="yes" xml:space="preserve">