Merge branch 'master' into feature/issue_534

CONTRIBUTORS.md

@@ -73,6 +73,8 @@
 - Satoshi Iguchi
 - Kimihiro Shirase
 - Tassana Thaveeteeratham (Thai Translation)
+- Kotaro Sakamoto
+- Koichi Yokota (Documentation)
 
 # Original Covid19Radar Beta Testers
 - Nagahata Kenji

COPYRIGHT_THIRD_PARTY_SOFTWARE_NOTICES.md

@@ -9,18 +9,9 @@ The original copyright notices and the licenses under which COVID-19Radar commun
 ---
 Copyright (C) 2020 COVID-19Radar Contributors
 
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
+This Source Code Form is subject to the terms of the Mozilla Public
+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/.
 
 ---
 ## Visual Studio App Center SDK for .NET
@@ -394,3 +385,49 @@ The above copyright notice and this permission notice shall be included in all c
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+---
+## (Font) Font Awesome Free
+---
+
+Font Awesome Free is free, open source, and GPL friendly. You can use it for commercial projects, open source projects, or really almost whatever you want.
+
+Icons — CC BY 4.0 License
+In the Font Awesome Free download, the CC BY 4.0 license applies to all icons packaged as .svg and .js files types.
+
+Fonts — SIL OFL 1.1 License
+In the Font Awesome Free download, the SIL OLF license applies to all icons packaged as web and desktop font files.
+
+Code — MIT License
+In the Font Awesome Free download, the MIT license applies to all non-font and non-icon files.
+
+Attribution is required by MIT, SIL OLF, and CC BY licenses. Downloaded Font Awesome Free files already contain embedded comments with sufficient attribution, so you shouldn't need to do anything additional when using these files normally.
+
+We've kept attribution comments terse, so we ask that you do not actively work to remove them from files, especially code. They're a great way for folks to learn about Font Awesome.
+
+---
+## (Font) Noto Sans CJK JP
+---
+
+This Font Software is licensed under the SIL Open Font License,
+Version 1.1.
+
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+---
+## (Font) Roboto
+---
+
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+---
+## (Font) Material Design Icons
+---
+
+Copyright (c) 2014, Austin Andrews (http://materialdesignicons.com/), with Reserved Font Name Material Design Icons.
+
+Copyright (c) 2014, Google (http://www.google.com/design/) uses the license at https://github.com/google/material-design-icons/blob/master/LICENSE
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1. This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL

Covid19Radar/Covid19Radar.Android/Covid19Radar.Android.csproj

@@ -49,7 +49,6 @@
  <BundleAssemblies>true</BundleAssemblies>
  <AndroidEnableMultiDex>true</AndroidEnableMultiDex>
  <AndroidDexTool>d8</AndroidDexTool>
- <AndroidLinkTool>r8</AndroidLinkTool>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
  <DebugSymbols>false</DebugSymbols>
@@ -97,6 +96,8 @@
  <MandroidI18n>CJK</MandroidI18n>
  <AndroidHttpClientHandlerType>
  </AndroidHttpClientHandlerType>
+ <AndroidDexTool>d8</AndroidDexTool>
+ <AndroidEnableMultiDex>true</AndroidEnableMultiDex>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_Mock|AnyCPU'">
  <DebugSymbols>true</DebugSymbols>
@@ -130,9 +131,6 @@
  <PackageReference Include="Newtonsoft.Json">
  <Version>12.0.3</Version>
  </PackageReference>
- <PackageReference Include="Plugin.LocalNotification">
- <Version>5.0.4</Version>
- </PackageReference>
  <PackageReference Include="Prism.Core">
  <Version>7.2.0.1422</Version>
  </PackageReference>

Covid19Radar/Covid19Radar.Android/MainActivity.cs

@@ -16,7 +16,7 @@
 using Xamarin.Forms;
 using Acr.UserDialogs;
 using Covid19Radar.Renderers;
-using Plugin.LocalNotification;
+//using Plugin.LocalNotification;
 
 namespace Covid19Radar.Droid
 {
@@ -41,9 +41,9 @@ protected override void OnCreate(Bundle savedInstanceState)
 
  UserDialogs.Init(this);
 
- NotificationCenter.CreateNotificationChannel();
+ //NotificationCenter.CreateNotificationChannel();
  LoadApplication(new App(new AndroidInitializer()));
- NotificationCenter.NotifyNotificationTapped(base.Intent);
+ //NotificationCenter.NotifyNotificationTapped(base.Intent);
  }
 
 
@@ -84,12 +84,12 @@ protected override void OnActivityResult(int requestCode, Result resultCode, Int
  Xamarin.ExposureNotifications.ExposureNotification.OnActivityResult(requestCode, resultCode, data);
  }
 
- protected override void OnNewIntent(Intent intent)
- {
- NotificationCenter.NotifyNotificationTapped(intent);
+ //protected override void OnNewIntent(Intent intent)
+ //{
+ // NotificationCenter.NotifyNotificationTapped(intent);
 
- base.OnNewIntent(intent);
- }
+ // base.OnNewIntent(intent);
+ //}
 
  }
 }

Covid19Radar/Covid19Radar.Android/Properties/AndroidManifest.xml

@@ -1,18 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="4" 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">
- <receiver android:name=".nearby.ExposureNotificationBroadcastReceiver" android:permission="com.google.android.gms.nearby.exposurenotification.EXPOSURE_CALLBACK" android:exported="true">
- <intent-filter>
- <action android:name="com.google.android.gms.exposurenotification.ACTION_EXPOSURE_STATE_UPDATED" />
- </intent-filter>
- </receiver>
- </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" />
- <uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
- <uses-permission android:name="android.permission.WAKE_LOCK" />
- <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="4" android:versionName="1.1.1" package="jp.go.mhlw.covid19radar" 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">
+ </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" />
+ <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+ <uses-permission android:name="android.permission.WAKE_LOCK" />
+ <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 </manifest>