Fixed terms of use url and privacy policy url

Covid19Radar/Covid19Radar.Android/Covid19Radar.Android.csproj

@@ -192,6 +192,7 @@
  <Compile Include="Services\Logs\LogFileServiceAndroid.cs" />
  <Compile Include="Services\Logs\LogPathServiceAndroid.cs" />
  <Compile Include="Services\Logs\LogPeriodicDeleteServiceAndroid.cs" />
+ <Compile Include="Renderers\CustomDatePickerRenderer.cs" />
  </ItemGroup>
  <ItemGroup>
  <None Include="appcenter-pre-build.sh" />
@@ -242,6 +243,30 @@
  <SubType></SubType>
  <Generator></Generator>
  </AndroidResource>
+ <AndroidResource Include="Resources\drawable-en-xxhdpi\arrow_icon.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable-en-xhdpi\arrow_icon.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable-ja-xhdpi\arrow_icon.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable-ja-xxhdpi\arrow_icon.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable-xhdpi\arrow_icon.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable-xxhdpi\arrow_icon.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
  </ItemGroup>
  <ItemGroup>
  <None Include="Properties\AndroidManifest.xml" />

Covid19Radar/Covid19Radar.Android/MainActivity.cs

@@ -32,6 +32,7 @@ protected override void OnCreate(Bundle savedInstanceState)
  base.SetTheme(Resource.Style.MainTheme);
  base.OnCreate(savedInstanceState);
 
+ Xamarin.Forms.Forms.SetFlags("RadioButton_Experimental");
  Xamarin.Essentials.Platform.Init(this, savedInstanceState);
  Xamarin.Forms.Forms.Init(this, savedInstanceState);
  Xamarin.Forms.FormsMaterial.Init(this, savedInstanceState);

Covid19Radar/Covid19Radar.Android/Properties/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="5" android:versionName="APP_VERSION" package="APP_PACKAGE_NAME" android:installLocation="auto">
  <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="29" />
- <application android:debuggable="true" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:fullBackupContent="@xml/backup_settings"></application>
+ <application android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:fullBackupContent="@xml/backup_settings"></application>
  <uses-feature android:name="android.hardware.bluetooth_le" android:required="true" />
  <uses-feature android:name="android.hardware.bluetooth" />
  <uses-permission android:name="android.permission.BLUETOOTH" />

Covid19Radar/Covid19Radar.Android/Renderers/CustomDatePickerRenderer.cs

@@ -0,0 +1,15 @@
+using Android.Content;
+using Covid19Radar.Droid.Renderers;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Android;
+
+[assembly: ExportRenderer(typeof(DatePicker), typeof(CustomDatePickerRendererAndroid))]
+namespace Covid19Radar.Droid.Renderers
+{
+ public class CustomDatePickerRendererAndroid : DatePickerRenderer
+ {
+ public CustomDatePickerRendererAndroid(Context context) : base(context)
+ {
+ }
+ }
+}

Covid19Radar/Covid19Radar.iOS/AppDelegate.cs

@@ -29,6 +29,8 @@ public override bool FinishedLaunching(UIApplication app, NSDictionary options)
  {
  NSUrlCache.SharedCache.RemoveAllCachedResponses();
 
+ Xamarin.Forms.Forms.SetFlags("RadioButton_Experimental");
+
  global::Xamarin.Forms.Forms.Init();
  global::Xamarin.Forms.FormsMaterial.Init();
 

Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj

@@ -277,6 +277,7 @@
  <Compile Include="Services\Logs\LogFileServiceIos.cs" />
  <Compile Include="Services\Logs\LogPathServiceIos.cs" />
  <Compile Include="Services\Logs\LogPeriodicDeleteServiceIos.cs" />
+ <Compile Include="Renderers\CustomDatePickerRenderer.cs" />
  </ItemGroup>
  <ItemGroup>
  <ImageAsset Include="Assets.xcassets\Contents.json">
@@ -478,6 +479,21 @@
  <BundleResource Include="Resources\zh.lproj\privacypolicy_img01%403x.png" />
  <BundleResource Include="Resources\zh.lproj\privacypolicy_img01%402x.png" />
  <BundleResource Include="Resources\zh.lproj\privacypolicy_img01.png" />
+ <BundleResource Include="Resources\arrow_icon%403x.png" />
+ <BundleResource Include="Resources\arrow_icon%402x.png" />
+ <BundleResource Include="Resources\arrow_icon.png" />
+ <BundleResource Include="Resources\Base.lproj\arrow_icon%403x.png" />
+ <BundleResource Include="Resources\Base.lproj\arrow_icon%402x.png" />
+ <BundleResource Include="Resources\Base.lproj\arrow_icon.png" />
+ <BundleResource Include="Resources\en.lproj\arrow_icon%403x.png" />
+ <BundleResource Include="Resources\en.lproj\arrow_icon%402x.png" />
+ <BundleResource Include="Resources\en.lproj\arrow_icon.png" />
+ <BundleResource Include="Resources\ja.lproj\arrow_icon%403x.png" />
+ <BundleResource Include="Resources\ja.lproj\arrow_icon%402x.png" />
+ <BundleResource Include="Resources\ja.lproj\arrow_icon.png" />
+ <BundleResource Include="Resources\zh.lproj\arrow_icon%403x.png" />
+ <BundleResource Include="Resources\zh.lproj\arrow_icon%402x.png" />
+ <BundleResource Include="Resources\zh.lproj\arrow_icon.png" />
  </ItemGroup>
  <ItemGroup>
  <Reference Include="System" />
@@ -1331,6 +1347,7 @@
  </ItemGroup>
  <ItemGroup>
  <Folder Include="Services\Logs\" />
+ <Folder Include="Renderers\" />
  </ItemGroup>
  <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
  <ProjectExtensions>

Covid19Radar/Covid19Radar.iOS/Renderers/CustomDatePickerRenderer.cs

@@ -0,0 +1,22 @@
+using Covid19Radar.Controls;
+using Covid19Radar.iOS.Renderers;
+using UIKit;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.iOS;
+
+[assembly: ExportRenderer(typeof(CustomDatePicker), typeof(CustomDatePickerRendererIos))]
+namespace Covid19Radar.iOS.Renderers
+{
+ public class CustomDatePickerRendererIos : DatePickerRenderer
+ {
+ protected override void OnElementChanged(ElementChangedEventArgs<DatePicker> e)
+ {
+ base.OnElementChanged(e);
+ if (e.NewElement != null && Control != null)
+ {
+ var datePicker = Control.InputView as UIDatePicker;
+ datePicker.PreferredDatePickerStyle = UIDatePickerStyle.Wheels;
+ }
+ }
+ }
+}

Covid19Radar/Covid19Radar/App.xaml.cs

@@ -56,7 +56,7 @@ protected override async void OnInitialized()
 
  INavigationResult result;
  // Check user data and skip tutorial
- UserDataService userDataService = Container.Resolve<UserDataService>();
+ IUserDataService userDataService = Container.Resolve<IUserDataService>();
 
  if (userDataService.IsExistUserData)
  {
@@ -155,10 +155,11 @@ protected override void RegisterTypes(IContainerRegistry containerRegistry)
  containerRegistry.RegisterSingleton<ILogPeriodicDeleteService, LogPeriodicDeleteService>();
  containerRegistry.RegisterSingleton<ILogUploadService, LogUploadService>();
  containerRegistry.RegisterSingleton<IEssentialsService, EssentialsService>();
- containerRegistry.RegisterSingleton<UserDataService>();
+ containerRegistry.RegisterSingleton<IUserDataService, UserDataService>();
  containerRegistry.RegisterSingleton<ExposureNotificationService>();
  containerRegistry.RegisterSingleton<ITermsUpdateService, TermsUpdateService>();
  containerRegistry.RegisterSingleton<IApplicationPropertyService, ApplicationPropertyService>();
+ containerRegistry.RegisterSingleton<IHttpClientService, HttpClientService>();
 #if USE_MOCK
  containerRegistry.RegisterSingleton<IHttpDataService, HttpDataServiceMock>();
  containerRegistry.RegisterSingleton<IStorageService, StorageServiceMock>();

Covid19Radar/Covid19Radar/Common/AppConstants.cs

@@ -4,9 +4,9 @@ public static class AppConstants
  {
  public static readonly int NumberOfGroup = 86400;
  /// <summary>
- /// Number of days not processed or deleted
+ /// Number of days covered from the date of diagnosis or onset
  /// </summary>
- public const int OutOfDateDays = -14;
+ public const int DaysToSendTek = -3;
  /// <summary>
  /// Cache Timeout
  /// </summary>

Covid19Radar/Covid19Radar/Controls/CustomDatePicker.cs

@@ -0,0 +1,11 @@
+using Xamarin.Forms;
+
+namespace Covid19Radar.Controls
+{
+ public class CustomDatePicker : DatePicker
+ {
+ public CustomDatePicker()
+ {
+ }
+ }
+}

Covid19Radar/Covid19Radar/Covid19Radar.csproj

@@ -117,6 +117,9 @@
  <PackageReference Include="Xamarin.Forms.Visual.Material" Version="4.6.0.967" />
  <PackageReference Include="Azure.Storage.Blobs" Version="12.6.0" />
  </ItemGroup>
+ <ItemGroup>
+ <Compile Include="Controls\CustomDatePicker.cs" />
+ </ItemGroup>
  <ItemGroup>
  <Compile Update="Templates\BeaconItemTemplate .xaml.cs">
  <DependentUpon>BeaconItemTemplate .xaml</DependentUpon>
@@ -191,6 +194,7 @@
  <Folder Include="MultilingualResources\" />
  <Folder Include="Image\" />
  <Folder Include="Services\Logs\" />
+ <Folder Include="Controls\" />
  </ItemGroup>
  <ItemGroup>
  <ProjectReference Include="..\Xamarin.ExposureNotification\Xamarin.ExposureNotification.csproj" />