diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 9ab0e80e2..ce53cb576 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -62,7 +62,7 @@ - Daniel Kastl (German Translation) - Iyotetsuya (Traditional Chinese Translation) - Anharu (Xamarin) -- Soichi Ikebe (Documentation) +- Soichi Ikebe (Xamarin / Documentation) - Elisa Sakamoto (Italian Translation) - Leo Ando (Client Android) - Prastyo ([Indonesian Translation](https://github.com/Covid-19Radar/Covid19Radar/commits?author=jiprastyo)) diff --git a/COPYRIGHT_THIRD_PARTY_SOFTWARE_NOTICES.md b/COPYRIGHT_THIRD_PARTY_SOFTWARE_NOTICES.md index 39dde674a..f81390980 100644 --- a/COPYRIGHT_THIRD_PARTY_SOFTWARE_NOTICES.md +++ b/COPYRIGHT_THIRD_PARTY_SOFTWARE_NOTICES.md @@ -284,12 +284,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE --- -## Current Activity Plugin for Xamarin.Android +## Xamarin.Android bindings for AndroidX - core --- The MIT License (MIT) -Copyright (c) 2016 James Montemagno +Copyright (c) .NET Foundation Contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -309,8 +309,10 @@ 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. +20160427 + --- -## AndroidX for Xamarin.Android +## Xamarin.Android bindings for AndroidX - recyclerview --- The MIT License (MIT) @@ -335,24 +337,7 @@ 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. ---- -## AndroidAltBeaconLibrary ---- - -Copyright 2014 - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express -or implied. See the License for the specific language governing -permissions and limitations under the License. - +20160427 --- ## CommonServiceLocator @@ -389,6 +374,43 @@ A "contributor" is any person that distributes its contribution under this licen (E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement. +--- +## Google.Protobuf +--- + +Copyright 2008 Google Inc. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + +* Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. +* Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Code generated by the Protocol Buffer compiler is owned by the owner +of the input file used when generating it. This code is not +standalone and requires a support library to be linked with it. This +support library is itself covered by the above license. + --- ## (Sample Code) Exposure Notifications API: Android Reference Design --- @@ -413,7 +435,7 @@ permissions and limitations under the License. Swift Protobuf is licensed under Apache 2.0., see ACKNOWLEDGEMENTS.txt for more information. -Copyright © 2020 Apple Inc. +Copyright (c) 2020 Apple Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: @@ -427,13 +449,13 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI 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 +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 +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 +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. @@ -441,29 +463,114 @@ Attribution is required by MIT, SIL OLF, and CC BY licenses. Downloaded Font Awe 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 +## (Font) Roboto --- +Copyright (c) 2011 Google Inc. -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 +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at ---- -## (Font) Roboto ---- + http://www.apache.org/licenses/LICENSE-2.0 -Apache License -Version 2.0, January 2004 -http://www.apache.org/licenses/ +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. --- ## (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 -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 + ----------------------------------------------------------- + SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 + ----------------------------------------------------------- + + PREAMBLE + The goals of the Open Font License (OFL) are to stimulate worldwide + development of collaborative font projects, to support the font creation + efforts of academic and linguistic communities, and to provide a free and + open framework in which fonts may be shared and improved in partnership + with others. + + The OFL allows the licensed fonts to be used, studied, modified and + redistributed freely as long as they are not sold by themselves. The + fonts, including any derivative works, can be bundled, embedded, + redistributed and/or sold with any software provided that any reserved + names are not used by derivative works. The fonts and derivatives, + however, cannot be released under any other type of license. The + requirement for fonts to remain under this license does not apply + to any document created using the fonts or their derivatives. + + DEFINITIONS + "Font Software" refers to the set of files released by the Copyright + Holder(s) under this license and clearly marked as such. This may + include source files, build scripts and documentation. + + "Reserved Font Name" refers to any names specified as such after the + copyright statement(s). + + "Original Version" refers to the collection of Font Software components as + distributed by the Copyright Holder(s). + + "Modified Version" refers to any derivative made by adding to, deleting, + or substituting -- in part or in whole -- any of the components of the + Original Version, by changing formats or by porting the Font Software to a + new environment. + + "Author" refers to any designer, engineer, programmer, technical + writer or other person who contributed to the Font Software. + + PERMISSION & CONDITIONS + Permission is hereby granted, free of charge, to any person obtaining + a copy of the Font Software, to use, study, copy, merge, embed, modify, + redistribute, and sell modified and unmodified copies of the Font + Software, subject to the following conditions: + + 1) Neither the Font Software nor any of its individual components, + in Original or Modified Versions, may be sold by itself. + + 2) Original or Modified Versions of the Font Software may be bundled, + redistributed and/or sold with any software, provided that each copy + contains the above copyright notice and this license. These can be + included either as stand-alone text files, human-readable headers or + in the appropriate machine-readable metadata fields within text or + binary files as long as those fields can be easily viewed by the user. + + 3) No Modified Version of the Font Software may use the Reserved Font + Name(s) unless explicit written permission is granted by the corresponding + Copyright Holder. This restriction only applies to the primary font name as + presented to the users. + + 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font + Software shall not be used to promote, endorse or advertise any + Modified Version, except to acknowledge the contribution(s) of the + Copyright Holder(s) and the Author(s) or with their explicit written + permission. + + 5) The Font Software, modified or unmodified, in part or in whole, + must be distributed entirely under this license, and must not be + distributed under any other license. The requirement for fonts to + remain under this license does not apply to any document created + using the Font Software. + + TERMINATION + This license becomes null and void if any of the above conditions are + not met. + + DISCLAIMER + THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT + OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE + COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL + DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM + OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/Covid19Radar/Covid19Radar.Android/Assets/license.html b/Covid19Radar/Covid19Radar.Android/Assets/license.html new file mode 100644 index 000000000..55821a359 --- /dev/null +++ b/Covid19Radar/Covid19Radar.Android/Assets/license.html @@ -0,0 +1,1461 @@ +COPYRIGHT_THIRD_PARTY_SOFTWARE_NOTICES

+LICENSE Copyright / THIRD PARTY SOFTWARE NOTICES

+

Do Not Translate or Localize. +This file incorporates components from the projects listed below. +COVID-19Radar community licenses these components to you under COVID-19Radar community's software licensing terms, except that components licensed under open source licenses requiring that such components remain under their original license are being made available to you by COVID-19Radar community under their original licensing terms. +The original copyright notices and the licenses under which COVID-19Radar community received such components are set forth below for informational purposes.

+
+

+COVID-19Radar

+
+

Copyright (C) 2020 COVID-19Radar Contributors

+

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

+
+

Copyright (c) Microsoft Corporation

+

The MIT License (MIT)

+

Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions:

+

The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software.

+

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.

+
+

+Acr.UserDialogs

+
+

The MIT License (MIT)

+

Copyright (c) 2016 Allan Ritchie

+

Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions:

+

The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software.

+

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.

+
+

+.NET Standard

+
+

The MIT License (MIT)

+

Copyright (c) .NET Foundation and Contributors

+

All rights reserved.

+

Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions:

+

The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software.

+

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.

+
+

+Json.NET

+
+

The MIT License (MIT)

+

Copyright (c) 2007 James Newton-King

+

Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions:

+

The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software.

+

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.

+
+

+Prism

+
+

The MIT License (MIT)

+

Copyright (c) .NET Foundation

+

All rights reserved.

+

Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions:

+

The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software.

+

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.

+
+

+SQLite-net

+
+

The MIT License (MIT)

+

Copyright (c) Krueger Systems, Inc.

+

All rights reserved.

+

Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions:

+

The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software.

+

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.

+
+

+Xamarin SDK

+
+

The MIT License (MIT)

+

Copyright (c) .NET Foundation Contributors

+

All rights reserved.

+

Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions:

+

The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software.

+

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.

+
+

+Xamarin.Essentials

+
+

The MIT License (MIT)

+

Copyright (c) Microsoft Corporation

+

All rights reserved.

+

Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions:

+

The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software.

+

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.

+
+

+Xamarin Exposure Notification

+
+

MIT License

+

Copyright (c) Microsoft Corporation.

+

Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions:

+

The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software.

+

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

+
+

+FFImageLoading

+
+

The MIT License (MIT)

+

Copyright (c) 2015 Daniel Luberda & Fabien Molinet

+

Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions:

+

The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software.

+

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

+
+

+Xamarin.Android bindings for AndroidX - core

+
+

The MIT License (MIT)

+

Copyright (c) .NET Foundation Contributors

+

Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions:

+

The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software.

+

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.

+

20160427

+
+

+Xamarin.Android bindings for AndroidX - recyclerview

+
+

The MIT License (MIT)

+

Copyright (c) .NET Foundation Contributors

+

Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions:

+

The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software.

+

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.

+

20160427

+
+

+CommonServiceLocator

+
+

Microsoft Public License (MS-PL) +This license governs use of the accompanying software. If you use the software, you accept this license. If you do not accept the license, do not use the software.

+
    +
  1. Definitions +The terms "reproduce," "reproduction," "derivative works," and "distribution" have the +same meaning here as under U.S. copyright law.
  2. +
+

A "contribution" is the original software, or any additions or changes to the software.

+

A "contributor" is any person that distributes its contribution under this license.

+

"Licensed patents" are a contributor's patent claims that read directly on its contribution.

+
    +
  1. Grant of Rights
  2. +
+

(A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create.

+

(B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software.

+
    +
  1. Conditions and Limitations
  2. +
+

(A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks.

+

(B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically.

+

(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software.

+

(D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license.

+

(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement.

+
+

+Google.Protobuf

+
+

Copyright 2008 Google Inc. All rights reserved.

+

Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met:

+ +

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+

Code generated by the Protocol Buffer compiler is owned by the owner +of the input file used when generating it. This code is not +standalone and requires a support library to be linked with it. This +support library is itself covered by the above license.

+
+

+(Sample Code) Exposure Notifications API: Android Reference Design

+
+

Copyright 2020

+

Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at

+

http://www.apache.org/licenses/LICENSE-2.0

+

Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express +or implied. See the License for the specific language governing +permissions and limitations under the License.

+
+

+(Sample Code) Building an App to Notify Users of COVID-19 Exposure

+
+

Swift Protobuf is licensed under Apache 2.0., see ACKNOWLEDGEMENTS.txt for more information.

+

Copyright (c) 2020 Apple Inc.

+

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

+

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

+

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) Roboto

+
+

Copyright (c) 2011 Google Inc.

+

Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at

+
http://www.apache.org/licenses/LICENSE-2.0
+
+

Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License.

+
+

+(Font) Material Design Icons

+
+

Copyright (c) 2014, Austin Andrews (http://materialdesignicons.com/), with Reserved Font Name Material Design Icons.

+

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

+
-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
+
+
\ No newline at end of file diff --git a/Covid19Radar/Covid19Radar.Android/BackgroundService/BackgroundService.cs b/Covid19Radar/Covid19Radar.Android/BackgroundService/BackgroundService.cs deleted file mode 100644 index 263ae88cf..000000000 --- a/Covid19Radar/Covid19Radar.Android/BackgroundService/BackgroundService.cs +++ /dev/null @@ -1,91 +0,0 @@ -/* 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/. */ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Android.App; -using Android.Content; -using Android.OS; -using Android.Runtime; -using Android.Support.V4.App; -using Android.Views; -using Android.Widget; - -namespace Covid19Radar.Droid.BackgroundService -{ - [Service(Name = "net.Kzmx.Covid19Radar.BackgroundService", Process = ":BleProcess")] - public class BackgroundService : Service - { - public override IBinder OnBind(Intent intent) - { - return null; - } - - public override StartCommandResult OnStartCommand(Android.Content.Intent intent, StartCommandFlags flags, int startId) - { - if (Build.VERSION.SdkInt >= BuildVersionCodes.O) - { - //Android 8 Oreo - this.RegisterForegroundService(); - } - - Task task = new Task(() => - { - // Do Back Ground Task - while (true) - { - System.Threading.Thread.Sleep(10000); - System.Diagnostics.Debug.WriteLine("Do Background"); - } - }); - task.Start(); - - return StartCommandResult.Sticky; - } - public void StartBackgroundService() - { - Intent serviceIntent = new Intent(this, typeof(BackgroundService)); - serviceIntent.AddFlags(ActivityFlags.NewTask); - serviceIntent.SetPackage(this.PackageManager.GetPackageInfo(this.PackageName, 0).PackageName); - base.StartService(serviceIntent); - } - public override void OnDestroy() - { - base.OnDestroy(); - System.Diagnostics.Debug.WriteLine("OnDestroy"); - this.StartBackgroundService(); - } - - void RegisterForegroundService() - { - NotificationManager manager = (NotificationManager)GetSystemService(NotificationService); - - //Andorid8.0 Oreo 以降の通知で必要なChannel - string channelId = "Covid19RadarNotification"; - if (Build.VERSION.SdkInt >= BuildVersionCodes.O) - { - string channelNm = "Covid19Radar"; - NotificationChannel channel = new NotificationChannel(channelId, channelNm, NotificationImportance.Default) - { - Description = "任意の説明" - }; - manager.CreateNotificationChannel(channel); - } - var notification = new Notification.Builder(this) - .SetContentTitle(Resources.GetString(Resource.String.app_name)) - .SetContentText("Started ForegroundService.") - .SetSmallIcon(Resource.Drawable.notification_icon_background) //Android 7 - .SetColor(ActivityCompat.GetColor(Android.App.Application.Context, Resource.Color.notification_material_background_media_default_color)) //Android7.0対応 - .SetOngoing(true) - .SetChannelId(channelId) // Android8 - .Build(); - - // Enlist this instance of the service as a foreground service - this.StartForeground(2451, notification); - } - } -} \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar.Android/BackgroundService/BootReceiver.cs b/Covid19Radar/Covid19Radar.Android/BackgroundService/BootReceiver.cs deleted file mode 100644 index 63c6f6559..000000000 --- a/Covid19Radar/Covid19Radar.Android/BackgroundService/BootReceiver.cs +++ /dev/null @@ -1,68 +0,0 @@ -/* 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/. */ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -using Android.App; -using Android.Content; -using Android.OS; -using Android.Runtime; -using Android.Views; -using Android.Widget; - -namespace Covid19Radar.Droid.BackgroundService -{ - [BroadcastReceiver] - [IntentFilter(new[] { Intent.ActionBootCompleted, - "android.intent.action.QUICKBOOT_POWERON", - "com.htc.intent.action.QUICKBOOT_POWERON", - "android.intent.action.PACKAGE_INSTALL", - "android.intent.action.PACKAGE_ADDED", - Intent.ActionMyPackageReplaced - })] - public class BootReceiver : BroadcastReceiver - { - public BootReceiver() : base() - { - } - public override void OnReceive(Context context, Intent intent) - { - //アプリを起動する場合はこちら - //Intent activityIntent = new Intent(context, typeof(MainActivity)); - //activityIntent.AddFlags(ActivityFlags.NewTask); - //context.StartActivity(activityIntent); - - //サービスを起動する - Intent serviceIntent = new Intent(context, typeof(BackgroundService)); - - if (Build.VERSION.SdkInt >= BuildVersionCodes.Lollipop && - Build.VERSION.SdkInt <= BuildVersionCodes.LollipopMr1) - { - // Android5 Lollipop - string packageName = context.PackageManager.GetPackageInfo(context.PackageName, 0).PackageName; - serviceIntent.SetPackage(packageName); - serviceIntent.SetClassName(context, packageName + ".BackgroundService"); - } - else - { - serviceIntent.AddFlags(ActivityFlags.NewTask); - } - - serviceIntent.SetPackage(context.PackageManager.GetPackageInfo(context.PackageName, 0).PackageName); - // Android 8 Oreo - if (Build.VERSION.SdkInt >= BuildVersionCodes.O) - { - context.StartForegroundService(serviceIntent); - } - else - { - context.StartService(serviceIntent); - } - - } - } -} \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar.Android/Covid19Radar.Android.csproj b/Covid19Radar/Covid19Radar.Android/Covid19Radar.Android.csproj index a86fb7f59..cfa68f865 100644 --- a/Covid19Radar/Covid19Radar.Android/Covid19Radar.Android.csproj +++ b/Covid19Radar/Covid19Radar.Android/Covid19Radar.Android.csproj @@ -1,4 +1,4 @@ - + Debug @@ -144,18 +144,6 @@ 7.2.0.1422 - - 7.2.0.1114 - - - 1.1.0.1 - - - 1.1.0.1 - - - 1.1.0.1 - 2.5.0.1 @@ -169,12 +157,6 @@ 2.4.11.982 - - - - - - 4.6.0.967 @@ -187,6 +169,12 @@ 2.0.6 + + 1.6.0 + + + 1.2.1 + @@ -202,28 +190,19 @@ + + + - - - - - - - - - - - - @@ -260,6 +239,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -303,9 +334,6 @@ - - - @@ -318,9 +346,6 @@ - - - @@ -351,9 +376,6 @@ - - - @@ -405,9 +427,6 @@ - - - @@ -433,6 +452,8 @@ + + diff --git a/Covid19Radar/Covid19Radar.Android/MainActivity.cs b/Covid19Radar/Covid19Radar.Android/MainActivity.cs index c2af8f583..b90e1e1d8 100644 --- a/Covid19Radar/Covid19Radar.Android/MainActivity.cs +++ b/Covid19Radar/Covid19Radar.Android/MainActivity.cs @@ -8,15 +8,18 @@ using Android.Runtime; using Android.Content; using Acr.UserDialogs; -using Xamarin.ExposureNotifications; -using System; -using AndroidX.Work; namespace Covid19Radar.Droid { [Activity(Label = "@string/app_name", Icon = "@mipmap/ic_launcher", Theme = "@style/MainTheme.Splash", MainLauncher = true, LaunchMode = LaunchMode.SingleTop, ScreenOrientation = ScreenOrientation.Portrait, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)] public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity { + internal static Intent NewIntent(Context context) + { + Intent intent = new Intent(context, typeof(MainActivity)); + return intent; + } + public static object dataLock = new object(); protected override void OnCreate(Bundle savedInstanceState) @@ -26,16 +29,6 @@ protected override void OnCreate(Bundle savedInstanceState) base.SetTheme(Resource.Style.MainTheme); base.OnCreate(savedInstanceState); - // Override WorkRequest configuration - // Must be run before being scheduled with `ExposureNotification.Init()` in `App.OnInitialized()` - var repeatInterval = TimeSpan.FromHours(6); - Action requestBuilder = b => - b.SetConstraints(new Constraints.Builder() - .SetRequiresBatteryNotLow(true) - .SetRequiredNetworkType(NetworkType.Connected) - .Build()); - ExposureNotification.ConfigureBackgroundWorkRequest(repeatInterval, requestBuilder); - Xamarin.Forms.Forms.SetFlags("RadioButton_Experimental"); Xamarin.Essentials.Platform.Init(this, savedInstanceState); Xamarin.Forms.Forms.Init(this, savedInstanceState); diff --git a/Covid19Radar/Covid19Radar.Android/MainApplication.cs b/Covid19Radar/Covid19Radar.Android/MainApplication.cs index ed54799d8..c737a40f9 100644 --- a/Covid19Radar/Covid19Radar.Android/MainApplication.cs +++ b/Covid19Radar/Covid19Radar.Android/MainApplication.cs @@ -10,6 +10,9 @@ using Covid19Radar.Droid.Services.Logs; using Covid19Radar.Services; using Covid19Radar.Droid.Services; +using AndroidX.Work; +using Xamarin.ExposureNotifications; +using Java.Util.Concurrent; namespace Covid19Radar.Droid { @@ -20,6 +23,9 @@ namespace Covid19Radar.Droid #endif public class MainApplication : Application { + private const int WORKER_REPEATED_INTERVAL_HOURS = 6; + private const int WORKER_BACKOFF_DELAY_HOURS = 1; + public MainApplication(IntPtr handle, JniHandleOwnership transfer) : base(handle, transfer) { } @@ -29,7 +35,23 @@ public override void OnCreate() base.OnCreate(); App.InitializeServiceLocator(RegisterPlatformTypes); - App.UseMockExposureNotificationImplementationIfNeeded(); + + // Override WorkRequest configuration + // Must be run before being scheduled with `ExposureNotification.Init()` in `App.OnInitialized()` + var repeatInterval = TimeSpan.FromHours(WORKER_REPEATED_INTERVAL_HOURS); + static void requestBuilder(PeriodicWorkRequest.Builder b) => + b.SetConstraints(new Constraints.Builder() + .SetRequiresBatteryNotLow(true) + .SetRequiredNetworkType(NetworkType.Connected) + .Build()) + .SetBackoffCriteria( + BackoffPolicy.Linear, + WORKER_BACKOFF_DELAY_HOURS, + TimeUnit.Hours + ); + ExposureNotification.ConfigureBackgroundWorkRequest(repeatInterval, requestBuilder); + + App.InitExposureNotification(); } private void RegisterPlatformTypes(IContainer container) @@ -39,7 +61,8 @@ private void RegisterPlatformTypes(IContainer container) container.Register(Reuse.Singleton); container.Register(Reuse.Singleton); container.Register(Reuse.Singleton); - + container.Register(Reuse.Singleton); + container.Register(Reuse.Singleton); #if USE_MOCK container.Register(Reuse.Singleton); #else diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xhdpi/HelpPage20.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xhdpi/HelpPage20.png index f50730087..dd17f08f3 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xhdpi/HelpPage20.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xhdpi/HelpPage20.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xhdpi/HelpPage21.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xhdpi/HelpPage21.png index 573e504be..e11cdf7bf 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xhdpi/HelpPage21.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xhdpi/HelpPage21.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xhdpi/HelpPage22.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xhdpi/HelpPage22.png index 38f690f7e..f32fdcaa7 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xhdpi/HelpPage22.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xhdpi/HelpPage22.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xhdpi/HelpPage31.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xhdpi/HelpPage31.png index f6f8c47a2..bb9e1c2f6 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xhdpi/HelpPage31.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xhdpi/HelpPage31.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xhdpi/HelpPage32.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xhdpi/HelpPage32.png index e48bfc95b..c0d37f83d 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xhdpi/HelpPage32.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xhdpi/HelpPage32.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xhdpi/HelpPage50.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xhdpi/HelpPage50.png deleted file mode 100644 index 3e8321dd8..000000000 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xhdpi/HelpPage50.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xhdpi/Nocontact10.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xhdpi/Nocontact10.png index b9cfb80c3..8bec876b1 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xhdpi/Nocontact10.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xhdpi/Nocontact10.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xxhdpi/HelpPage20.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xxhdpi/HelpPage20.png index 072c7fdb6..9325f5916 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xxhdpi/HelpPage20.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xxhdpi/HelpPage20.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xxhdpi/HelpPage21.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xxhdpi/HelpPage21.png index aa536a00b..d998da7e0 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xxhdpi/HelpPage21.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xxhdpi/HelpPage21.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xxhdpi/HelpPage22.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xxhdpi/HelpPage22.png index fac64a1e9..dc4d894dd 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xxhdpi/HelpPage22.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xxhdpi/HelpPage22.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xxhdpi/HelpPage31.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xxhdpi/HelpPage31.png index 29f1fc059..c15170f60 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xxhdpi/HelpPage31.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xxhdpi/HelpPage31.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xxhdpi/HelpPage32.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xxhdpi/HelpPage32.png index bb4010d5c..af4fa9d85 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xxhdpi/HelpPage32.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xxhdpi/HelpPage32.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xxhdpi/HelpPage50.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xxhdpi/HelpPage50.png deleted file mode 100644 index 39114759d..000000000 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xxhdpi/HelpPage50.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xxhdpi/Nocontact10.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xxhdpi/Nocontact10.png index 894522f97..38728abac 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xxhdpi/Nocontact10.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xxhdpi/Nocontact10.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HOMEPage10.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HOMEPage10.png index afe8a830d..1bd20702a 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HOMEPage10.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HOMEPage10.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HOMEPage11.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HOMEPage11.png index b1c55d76c..5f09566ea 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HOMEPage11.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HOMEPage11.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HeaderLogo.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HeaderLogo.png index b14b5e491..7b06d420f 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HeaderLogo.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HeaderLogo.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage20.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage20.png index ae23a22af..90f50ce46 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage20.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage20.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage21.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage21.png index eb667cbd8..4dabd4d73 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage21.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage21.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage22.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage22.png index 23273fce4..8a53ee4a6 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage22.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage22.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage30.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage30.png index 09855693d..a03288541 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage30.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage30.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage31.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage31.png index af7306a20..abac51064 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage31.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage31.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage32.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage32.png index de13e5855..4250bf0c0 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage32.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage32.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage40.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage40.png index 1f72f0603..988cd27e9 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage40.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage40.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage41.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage41.png index 94b6798d1..2fad02bac 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage41.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage41.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage42.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage42.png index 87efa46f6..a31ca7489 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage42.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage42.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage44.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage44.png index 730a65816..d37147795 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage44.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage44.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage45.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage45.png index 500bee125..088bf6226 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage45.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage45.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage50.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage50.png deleted file mode 100644 index 72ee764b9..000000000 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/HelpPage50.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/InfoMark.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/InfoMark.png index 5b35f9c85..4cda941b7 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/InfoMark.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/InfoMark.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/Logo.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/Logo.png deleted file mode 100644 index 1d288ec98..000000000 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/Logo.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/Nocontact10.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/Nocontact10.png index 3c1926c60..ae37493bc 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/Nocontact10.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/Nocontact10.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/SplashImg.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/SplashImg.png index 3d514d649..a91369ee4 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/SplashImg.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/SplashImg.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/TutorialPage10.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/TutorialPage10.png index 2ebc72e0d..8446ec36b 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/TutorialPage10.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/TutorialPage10.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/TutorialPage11.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/TutorialPage11.png index 5809edd36..329217428 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/TutorialPage11.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/TutorialPage11.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/TutorialPage12.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/TutorialPage12.png index 716217317..056e94a72 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/TutorialPage12.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/TutorialPage12.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/TutorialPage20.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/TutorialPage20.png index 9510bc823..eece7d0d8 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/TutorialPage20.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/TutorialPage20.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/TutorialPage40.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/TutorialPage40.png index 47e7e7802..241e86b79 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/TutorialPage40.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/TutorialPage40.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/TutorialPage50.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/TutorialPage50.png index d5fefa724..be77ad710 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/TutorialPage50.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/TutorialPage50.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/arrow_icon.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/arrow_icon.png index dbf4e01f3..fc1123cdc 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/arrow_icon.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/arrow_icon.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/privacypolicy_img01.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/privacypolicy_img01.png index 54c5777f2..d989794b0 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/privacypolicy_img01.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/privacypolicy_img01.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HOMEPage10.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HOMEPage10.png index eefdd344a..98b2c756d 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HOMEPage10.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HOMEPage10.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HOMEPage11.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HOMEPage11.png index 9fc1b7221..0689ca0c8 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HOMEPage11.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HOMEPage11.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage20.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage20.png index fc4310845..fc9aab674 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage20.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage20.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage21.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage21.png index bd29b1fce..a7d3320df 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage21.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage21.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage22.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage22.png index 7d0e7b575..418572431 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage22.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage22.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage30.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage30.png index 29ae42476..84a9f4294 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage30.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage30.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage31.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage31.png index 0f039f7e6..da46c720d 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage31.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage31.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage32.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage32.png index e525c4f4d..a094ed42b 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage32.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage32.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage40.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage40.png index 053b7efc5..1673ee840 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage40.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage40.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage42.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage42.png index 5d84e7ca7..58107d5a2 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage42.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage42.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage44.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage44.png index a25f35745..bd4846a5d 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage44.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage44.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage45.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage45.png index 394513b69..1ac8237c9 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage45.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage45.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage50.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage50.png deleted file mode 100644 index 999387cf0..000000000 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/HelpPage50.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/InfoMark.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/InfoMark.png index 4560a9665..879823e27 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/InfoMark.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/InfoMark.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/Logo.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/Logo.png deleted file mode 100644 index 3adbd7d05..000000000 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/Logo.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/Nocontact10.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/Nocontact10.png index 41fe737bc..5da9d986d 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/Nocontact10.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/Nocontact10.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/SplashImg.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/SplashImg.png index d860df813..6266791cc 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/SplashImg.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/SplashImg.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/TutorialPage10.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/TutorialPage10.png index 43793aba3..6834e7932 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/TutorialPage10.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/TutorialPage10.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/TutorialPage11.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/TutorialPage11.png index 813921e52..146d98fc9 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/TutorialPage11.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/TutorialPage11.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/TutorialPage12.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/TutorialPage12.png index b452f83f7..6c6401483 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/TutorialPage12.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/TutorialPage12.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/TutorialPage20.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/TutorialPage20.png index 507dae2c2..542c70880 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/TutorialPage20.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/TutorialPage20.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/TutorialPage40.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/TutorialPage40.png index bb25ce27d..f755d381b 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/TutorialPage40.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/TutorialPage40.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/TutorialPage50.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/TutorialPage50.png index 175abdc23..a3e781529 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/TutorialPage50.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/TutorialPage50.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/arrow_icon.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/arrow_icon.png index bc60f1723..819182c23 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/arrow_icon.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/arrow_icon.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/privacypolicy_img01.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/privacypolicy_img01.png index 72a3da25e..8d2f2aa47 100644 Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/privacypolicy_img01.png and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/privacypolicy_img01.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xhdpi/HelpPage20.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xhdpi/HelpPage20.png new file mode 100644 index 000000000..dd17f08f3 Binary files /dev/null and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xhdpi/HelpPage20.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xhdpi/HelpPage21.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xhdpi/HelpPage21.png new file mode 100644 index 000000000..7e206016d Binary files /dev/null and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xhdpi/HelpPage21.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xhdpi/HelpPage22.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xhdpi/HelpPage22.png new file mode 100644 index 000000000..f3fb2e56c Binary files /dev/null and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xhdpi/HelpPage22.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xhdpi/HelpPage31.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xhdpi/HelpPage31.png new file mode 100644 index 000000000..f5a5914e3 Binary files /dev/null and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xhdpi/HelpPage31.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xhdpi/HelpPage32.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xhdpi/HelpPage32.png new file mode 100644 index 000000000..b047273a8 Binary files /dev/null and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xhdpi/HelpPage32.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xhdpi/Nocontact10.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xhdpi/Nocontact10.png new file mode 100644 index 000000000..2b49dd4e8 Binary files /dev/null and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xhdpi/Nocontact10.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xxhdpi/HelpPage20.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xxhdpi/HelpPage20.png new file mode 100644 index 000000000..9325f5916 Binary files /dev/null and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xxhdpi/HelpPage20.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xxhdpi/HelpPage21.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xxhdpi/HelpPage21.png new file mode 100644 index 000000000..83793d7d8 Binary files /dev/null and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xxhdpi/HelpPage21.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xxhdpi/HelpPage22.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xxhdpi/HelpPage22.png new file mode 100644 index 000000000..c48fd5323 Binary files /dev/null and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xxhdpi/HelpPage22.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xxhdpi/HelpPage31.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xxhdpi/HelpPage31.png new file mode 100644 index 000000000..f45603f03 Binary files /dev/null and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xxhdpi/HelpPage31.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xxhdpi/HelpPage32.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xxhdpi/HelpPage32.png new file mode 100644 index 000000000..93640102c Binary files /dev/null and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xxhdpi/HelpPage32.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xxhdpi/Nocontact10.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xxhdpi/Nocontact10.png new file mode 100644 index 000000000..cf73bae5a Binary files /dev/null and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xxhdpi/Nocontact10.png differ diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable/ic_notification.xml b/Covid19Radar/Covid19Radar.Android/Resources/drawable/ic_notification.xml new file mode 100644 index 000000000..3676d8af0 --- /dev/null +++ b/Covid19Radar/Covid19Radar.Android/Resources/drawable/ic_notification.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/Covid19Radar/Covid19Radar.Android/Services/DeviceCheckService.cs b/Covid19Radar/Covid19Radar.Android/Services/DeviceCheckService.cs index 4f63a960a..9cb0bb7c5 100644 --- a/Covid19Radar/Covid19Radar.Android/Services/DeviceCheckService.cs +++ b/Covid19Radar/Covid19Radar.Android/Services/DeviceCheckService.cs @@ -1,20 +1,25 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public +/* 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/. */ +using System.Collections.Generic; +using System.Linq; +using System.Security.Cryptography; +using System.Text; using System.Threading.Tasks; -using Covid19Radar.Services; -using Covid19Radar.Model; using Android.Gms.SafetyNet; +using Covid19Radar.Droid.Services; +using Covid19Radar.Model; +using Covid19Radar.Services; +using Xamarin.Forms; namespace Covid19Radar.Droid.Services { public class DeviceCheckService : IDeviceVerifier { - public Task VerifyAsync(DiagnosisSubmissionParameter submission) { - var nonce = submission.GetAndroidNonce(); + var nonce = GetNonce(submission); return GetSafetyNetAttestationAsync(nonce); } @@ -22,11 +27,37 @@ public Task VerifyAsync(DiagnosisSubmissionParameter submission) /// Verification device information required for positive submissions /// /// Device Verification Payload - async Task GetSafetyNetAttestationAsync(byte[] nonce) + private static async Task GetSafetyNetAttestationAsync(byte[] nonce) { using var client = SafetyNetClass.GetClient(Android.App.Application.Context); using var response = await client.AttestAsync(nonce, AppSettings.Instance.AndroidSafetyNetApiKey); return response.JwsResult; } + + private static byte[] GetNonce(DiagnosisSubmissionParameter submission) + { + var cleartext = GetNonceClearText(submission); + var nonce = GetSha256(cleartext); + return nonce; + + static string GetNonceClearText(DiagnosisSubmissionParameter submission) => + string.Join("|", submission.AppPackageName, GetKeyString(submission.Keys), GetRegionString(submission.Regions), submission.VerificationPayload); + + static string GetKeyString(IEnumerable keys) => + string.Join(",", keys.OrderBy(k => k.KeyData).Select(k => GetKeyStringCore(k))); + + static string GetKeyStringCore(DiagnosisSubmissionParameter.Key k) => + string.Join(".", k.KeyData, k.RollingStartNumber, k.RollingPeriod); + + static string GetRegionString(IEnumerable regions) => + string.Join(",", regions.Select(r => r.ToUpperInvariant()).OrderBy(r => r)); + + static byte[] GetSha256(string text) + { + using var sha = SHA256.Create(); + var textBytes = Encoding.UTF8.GetBytes(text); + return sha.ComputeHash(textBytes); + } + } } -} \ No newline at end of file +} diff --git a/Covid19Radar/Covid19Radar.Android/Services/LocalContentService.cs b/Covid19Radar/Covid19Radar.Android/Services/LocalContentService.cs new file mode 100644 index 000000000..6eb95c145 --- /dev/null +++ b/Covid19Radar/Covid19Radar.Android/Services/LocalContentService.cs @@ -0,0 +1,16 @@ +/* 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/. */ + +using System.IO; +using Covid19Radar.Services; + +namespace Covid19Radar.Droid.Services +{ + public class LocalContentService : ILocalContentService + { + private const string ASSET_PATH = "file:///android_asset"; + + public string LicenseUrl => Path.Combine(ASSET_PATH, ILocalContentService.LICENSE_FILENAME); + } +} diff --git a/Covid19Radar/Covid19Radar.Android/Services/LocalNotificationService.cs b/Covid19Radar/Covid19Radar.Android/Services/LocalNotificationService.cs new file mode 100644 index 000000000..1f7f80080 --- /dev/null +++ b/Covid19Radar/Covid19Radar.Android/Services/LocalNotificationService.cs @@ -0,0 +1,91 @@ +/* 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/. */ + +using System.Threading.Tasks; +using Android.App; +using Android.Content; +using Android.OS; +using AndroidX.Core.App; +using Covid19Radar.Resources; +using Covid19Radar.Services; +using Covid19Radar.Services.Logs; +using Xamarin.Essentials; + +namespace Covid19Radar.Droid.Services +{ + public class LocalNotificationService : ILocalNotificationService + { + private const string NOTIFICATION_CHANNEL_ID = "notification_channel_cocoa_202107"; + + private const int REQUEST_CODE = 0x01; + + private const int NOTIFICATION_ID_EXPOSURE = 0x1234; + + private readonly ILoggerService _loggerService; + + public LocalNotificationService(ILoggerService loggerService) + { + _loggerService = loggerService; + } + +#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously + public async Task PrepareAsync() + { + _loggerService.StartMethod(); + + if (Build.VERSION.SdkInt < BuildVersionCodes.O) + { + _loggerService.Info($"Platform version {Build.VERSION.SdkInt} is not supported NotificationChannel."); + _loggerService.EndMethod(); + return; + } + + NotificationChannelCompat notificationChannel = new NotificationChannelCompat + .Builder(NOTIFICATION_CHANNEL_ID, NotificationManagerCompat.ImportanceDefault) + .SetName(AppResources.AndroidNotificationChannelName) + .SetShowBadge(false) + .Build(); + + var nm = NotificationManagerCompat.From(Platform.AppContext); + nm.CreateNotificationChannel(notificationChannel); + + _loggerService.Info($"NotificationChannel created."); + _loggerService.EndMethod(); + } +#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously + +#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously + public async Task ShowExposureNotificationAsync() + { + _loggerService.StartMethod(); + + Intent intent = MainActivity.NewIntent(Platform.AppContext); + PendingIntent pendingIntent = PendingIntent.GetActivity( + Platform.AppContext, + REQUEST_CODE, + intent, + PendingIntentFlags.UpdateCurrent + ); + + var notification = new NotificationCompat + .Builder(Platform.AppContext, NOTIFICATION_CHANNEL_ID) + .SetStyle(new NotificationCompat.BigTextStyle()) + .SetSmallIcon(Resource.Drawable.ic_notification) + .SetContentTitle(AppResources.LocalExposureNotificationTitle) + .SetContentText(AppResources.LocalExposureNotificationContent) + .SetVisibility(NotificationCompat.VisibilitySecret) + .SetContentIntent(pendingIntent) + .SetLocalOnly(true) + .SetAutoCancel(true) + .Build(); + + var nm = NotificationManagerCompat.From(Platform.AppContext); + nm.Notify(NOTIFICATION_ID_EXPOSURE, notification); + + _loggerService.Info("Local exposure notification shown."); + _loggerService.EndMethod(); + } +#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously + } +} diff --git a/Covid19Radar/Covid19Radar.Android/Services/UnUsed/BeaconService.cs b/Covid19Radar/Covid19Radar.Android/Services/UnUsed/BeaconService.cs deleted file mode 100644 index 5d92cdc88..000000000 --- a/Covid19Radar/Covid19Radar.Android/Services/UnUsed/BeaconService.cs +++ /dev/null @@ -1,112 +0,0 @@ -/* 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/. */ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using AltBeaconOrg.BoundBeacon; -using AltBeaconOrg.BoundBeacon.Startup; -using Android.App; -using Android.Content; -using Android.Content.PM; -using Android.OS; -using Android.Runtime; -using Android.Views; -using Android.Widget; -using Covid19Radar.Common; -using Covid19Radar.Droid.Services; -using Covid19Radar.Model; -using Covid19Radar.Services; -using Java.Util; -using Plugin.CurrentActivity; -using SQLite; -using Xamarin.Forms; - -namespace Covid19Radar.Droid.Services -{ - public class BeaconService : IBeaconService, IDisposable - { - private HttpDataService _httpDataService; - private MinutesTimer _uploadTimer; - private UserDataModel _userData; - private SQLiteConnection _connection; - - public BeaconService(HttpDataService httpDataService, ISQLiteConnectionProvider sqliteConnectionProvider) - { - _httpDataService = httpDataService; - _connection = sqliteConnectionProvider.GetConnection(); - _connection.CreateTable(); - } - - protected MainActivity MainActivity - { - get { return (MainActivity)CrossCurrentActivity.Current.Activity; } - } - - public List GetBeaconData() - { - return MainActivity.GetBeaconData(); - } - - public void StartRagingBeacons(UserDataModel userData) - { - _userData = userData; - MainActivity.StartRagingBeacons(); - _uploadTimer = new MinutesTimer(_userData.GetJumpHashTimeDifference()); - _uploadTimer.Start(); - _uploadTimer.TimeOutEvent += TimerUploadAsync; - } - - public void StopRagingBeacons() - { - MainActivity.StopRagingBeacons(); - } - - public void StartAdvertisingBeacons(UserDataModel userData) - { - MainActivity.StartAdvertisingBeacons(userData); - } - - public void StopAdvertisingBeacons() - { - MainActivity.StopAdvertisingBeacons(); - } - - private async void TimerUploadAsync(EventArgs e) - { - System.Diagnostics.Debug.WriteLine(DateTime.Now.ToString()); - - List beacons = _connection.Table().ToList(); - foreach (var beacon in beacons) - { - if (beacon.IsSentToServer) continue; - if (!await _httpDataService.PostBeaconDataAsync(_userData, beacon)) continue; - - var key = beacon.Id; - lock (MainActivity.dataLock) - { - var b = _connection.Table().SingleOrDefault(x => x.Id == key); - b.IsSentToServer = true; - _connection.Update(b); - } - } - } - - public void OnSleep() - { - } - - public void OnResume() - { - } - - public void Dispose() - { - _uploadTimer.Stop(); - } - } -} - diff --git a/Covid19Radar/Covid19Radar.Android/Services/UnUsed/BeaconSimulator.cs b/Covid19Radar/Covid19Radar.Android/Services/UnUsed/BeaconSimulator.cs deleted file mode 100644 index f87826da3..000000000 --- a/Covid19Radar/Covid19Radar.Android/Services/UnUsed/BeaconSimulator.cs +++ /dev/null @@ -1,59 +0,0 @@ -/* 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/. */ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using AltBeaconOrg.BoundBeacon; -using AltBeaconOrg.BoundBeacon.Simulator; -using Android.App; -using Android.Content; -using Android.OS; -using Android.Runtime; -using Android.Views; -using Android.Widget; -using Covid19Radar.Common; - -namespace Covid19Radar.Droid.Services -{ - public class BeaconSimulator : Java.Lang.Object, IBeaconSimulator - { - public bool UseSimulatedBeacons = true; - - private readonly List _beacons; - - public BeaconSimulator() - { - _beacons = new List(); - } - - public IList Beacons - { - get - { - return _beacons; - } - } - - public void CreateBasicSimulatedBeacons() - { - if (!UseSimulatedBeacons) return; - - var beacon1 = new AltBeacon.Builder().SetId1(AppConstants.iBeaconAppUuid) - .SetId2("111").SetId3("111").SetRssi(-55).SetTxPower(-55).Build(); - - var beacon2 = new AltBeacon.Builder().SetId1(AppConstants.iBeaconAppUuid) - .SetId2("2").SetId3("32768").SetRssi(-55).SetTxPower(-55).Build(); - - var beacon3 = new AltBeacon.Builder().SetId1(AppConstants.iBeaconAppUuid) - .SetId2("32768").SetId3("1").SetRssi(-55).SetTxPower(-55).Build(); - - var beacon4 = new AltBeacon.Builder().SetId1(AppConstants.iBeaconAppUuid) - .SetId2("65535").SetId3("65535").SetRssi(-55).SetTxPower(-55).Build(); - - _beacons.AddRange(new[] { beacon1, beacon2, beacon3, beacon4 }); - } - } -} diff --git a/Covid19Radar/Covid19Radar.Android/Services/UnUsed/MonitorEventArgs.cs b/Covid19Radar/Covid19Radar.Android/Services/UnUsed/MonitorEventArgs.cs deleted file mode 100644 index ad31c4d58..000000000 --- a/Covid19Radar/Covid19Radar.Android/Services/UnUsed/MonitorEventArgs.cs +++ /dev/null @@ -1,18 +0,0 @@ -/* 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/. */ - -using AltBeaconOrg.BoundBeacon; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Covid19Radar.Droid.Services -{ - public class MonitorEventArgs : EventArgs - { - public Region Region { get; set; } - public int State { get; set; } - } -} \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar.Android/Services/UnUsed/MonitorNotifier.cs b/Covid19Radar/Covid19Radar.Android/Services/UnUsed/MonitorNotifier.cs deleted file mode 100644 index 4ee8afaf4..000000000 --- a/Covid19Radar/Covid19Radar.Android/Services/UnUsed/MonitorNotifier.cs +++ /dev/null @@ -1,52 +0,0 @@ -/* 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/. */ - -using AltBeaconOrg.BoundBeacon; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - - -namespace Covid19Radar.Droid.Services -{ - public class MonitorNotifier : Java.Lang.Object, IMonitorNotifier - { - public event EventHandler DetermineStateForRegionComplete; - public event EventHandler EnterRegionComplete; - public event EventHandler ExitRegionComplete; - - public void DidDetermineStateForRegion(int state, Region region) - { - OnDetermineStateForRegionComplete(state, region); - } - - public void DidEnterRegion(Region region) - { - OnEnterRegionComplete(region); - } - - public void DidExitRegion(Region region) - { - OnExitRegionComplete(region); - } - - private void OnDetermineStateForRegionComplete(int state, Region region) - { - DetermineStateForRegionComplete?.Invoke(this, new MonitorEventArgs { State = state, Region = region }); - } - - private void OnEnterRegionComplete(Region region) - { - EnterRegionComplete?.Invoke(this, new MonitorEventArgs { Region = region }); - } - - private void OnExitRegionComplete(Region region) - { - ExitRegionComplete?.Invoke(this, new MonitorEventArgs { Region = region }); - } - - } - -} \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar.Android/Services/UnUsed/RangeEventArgs.cs b/Covid19Radar/Covid19Radar.Android/Services/UnUsed/RangeEventArgs.cs deleted file mode 100644 index 09f4205fb..000000000 --- a/Covid19Radar/Covid19Radar.Android/Services/UnUsed/RangeEventArgs.cs +++ /dev/null @@ -1,19 +0,0 @@ -/* 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/. */ - -using AltBeaconOrg.BoundBeacon; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - - -namespace Covid19Radar.Droid.Services -{ - public class RangeEventArgs : EventArgs - { - public Region Region { get; set; } - public ICollection Beacons { get; set; } - } -} \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar.Android/Services/UnUsed/RangeNotifier.cs b/Covid19Radar/Covid19Radar.Android/Services/UnUsed/RangeNotifier.cs deleted file mode 100644 index cc0366207..000000000 --- a/Covid19Radar/Covid19Radar.Android/Services/UnUsed/RangeNotifier.cs +++ /dev/null @@ -1,28 +0,0 @@ -/* 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/. */ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using AltBeaconOrg.BoundBeacon; -using Android.App; -using Android.Content; -using Android.OS; -using Android.Runtime; -using Android.Views; -using Android.Widget; - -namespace Covid19Radar.Droid.Services -{ - public class RangeNotifier : Java.Lang.Object, IRangeNotifier - { - public event EventHandler> DidRangeBeaconsInRegionComplete; - - public void DidRangeBeaconsInRegion(ICollection beacons, AltBeaconOrg.BoundBeacon.Region region) - { - DidRangeBeaconsInRegionComplete?.Invoke(this, beacons); - } - } -} \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar.Android/Services/UnUsed/SQLiteConnectionProvider.cs b/Covid19Radar/Covid19Radar.Android/Services/UnUsed/SQLiteConnectionProvider.cs deleted file mode 100644 index c98640d68..000000000 --- a/Covid19Radar/Covid19Radar.Android/Services/UnUsed/SQLiteConnectionProvider.cs +++ /dev/null @@ -1,30 +0,0 @@ -/* 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/. */ - -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using Covid19Radar.Common; -using Covid19Radar.Model; -using SQLite; -using Xamarin.Forms; - -namespace Covid19Radar.Droid.Services -{ - public class SQLiteConnectionProvider : ISQLiteConnectionProvider - { - private SQLiteConnection Connection { get; set; } - - public SQLiteConnection GetConnection() - { - if (this.Connection != null) { return this.Connection; } - - var path = System.Environment.GetFolderPath(System.Environment.SpecialFolder.Personal); - path = Path.Combine(path, AppConstants.SqliteFilename); - return this.Connection = new SQLiteConnection(path); - } - } -} \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar.iOS/AppDelegate.cs b/Covid19Radar/Covid19Radar.iOS/AppDelegate.cs index 96e452eff..f3dfe5bc9 100644 --- a/Covid19Radar/Covid19Radar.iOS/AppDelegate.cs +++ b/Covid19Radar/Covid19Radar.iOS/AppDelegate.cs @@ -10,6 +10,7 @@ using DryIoc; using Foundation; using UIKit; +using UserNotifications; using Xamarin.Forms; namespace Covid19Radar.iOS @@ -37,7 +38,8 @@ public override bool FinishedLaunching(UIApplication app, NSDictionary options) NSUrlCache.SharedCache.RemoveAllCachedResponses(); App.InitializeServiceLocator(RegisterPlatformTypes); - App.UseMockExposureNotificationImplementationIfNeeded(); + + App.InitExposureNotification(); Xamarin.Forms.Forms.SetFlags("RadioButton_Experimental"); @@ -45,12 +47,9 @@ public override bool FinishedLaunching(UIApplication app, NSDictionary options) global::Xamarin.Forms.FormsMaterial.Init(); FFImageLoading.Forms.Platform.CachedImageRenderer.Init(); - global::FFImageLoading.ImageService.Instance.Initialize(new FFImageLoading.Config.Configuration() - { - Logger = new Covid19Radar.Services.DebugLogger() - }); + global::FFImageLoading.ImageService.Instance.Initialize(new FFImageLoading.Config.Configuration()); - //Plugin.LocalNotification.NotificationCenter.AskPermission(); + UNUserNotificationCenter.Current.Delegate = new UserNotificationCenterDelegate(); LoadApplication(new App()); @@ -64,11 +63,6 @@ public override void OnActivated(UIApplication uiApplication) MessagingCenter.Send((object)this, AppConstants.IosOnActivatedMessage); } - //public override void WillEnterForeground(UIApplication uiApplication) - //{ - // Plugin.LocalNotification.NotificationCenter.ResetApplicationIconBadgeNumber(uiApplication); - //} - private void RegisterPlatformTypes(IContainer container) { // Services @@ -76,7 +70,8 @@ private void RegisterPlatformTypes(IContainer container) container.Register(Reuse.Singleton); container.Register(Reuse.Singleton); container.Register(Reuse.Singleton); - + container.Register(Reuse.Singleton); + container.Register(Reuse.Singleton); #if USE_MOCK container.Register(Reuse.Singleton); #else @@ -85,3 +80,19 @@ private void RegisterPlatformTypes(IContainer container) } } } + +public class UserNotificationCenterDelegate : UNUserNotificationCenterDelegate +{ + public override void WillPresentNotification(UNUserNotificationCenter center, UNNotification notification, System.Action completionHandler) + { + if (UIDevice.CurrentDevice.CheckSystemVersion(14, 0)) + { + completionHandler(UNNotificationPresentationOptions.Banner | UNNotificationPresentationOptions.List); + } + else + { + completionHandler(UNNotificationPresentationOptions.Alert); + } + + } +} diff --git a/Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj b/Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj index 9556b77e7..0083f5e7a 100644 --- a/Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj +++ b/Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj @@ -46,6 +46,7 @@ Apple Development: Kazumi Hirose (WG99EL99X6) VS: net.kzmx.Covid19Radar Development latest + true true @@ -106,6 +107,7 @@ false true true + true none @@ -163,6 +165,7 @@ true cjk DEBUG;__IOS__;__MOBILE__;__UNIFIED__; + true @@ -198,6 +201,7 @@ prompt MinimumRecommendedRules.ruleset ARM64 + true @@ -280,6 +284,8 @@ + + @@ -288,182 +294,43 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -524,657 +391,150 @@ Xamarin.ExposureNotification - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1184,6 +544,7 @@ + diff --git a/Covid19Radar/Covid19Radar.iOS/Info.plist b/Covid19Radar/Covid19Radar.iOS/Info.plist index 9419dab38..5db52269d 100644 --- a/Covid19Radar/Covid19Radar.iOS/Info.plist +++ b/Covid19Radar/Covid19Radar.iOS/Info.plist @@ -61,8 +61,6 @@ fa-brands-400.otf fa-regular-400.otf fa-solid-900.otf - NotoSansCJKjp-Medium.otf - NotoSansCJKjp-Regular.otf Roboto-Regular.ttf UILaunchStoryboardName diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HOMEPage10@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HOMEPage10@1x.png deleted file mode 100644 index fb9b180d0..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HOMEPage10@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HOMEPage10@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HOMEPage10@2x.png index 88ae4546e..2b88af405 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HOMEPage10@2x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HOMEPage10@2x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HOMEPage10@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HOMEPage10@3x.png index 882135932..b6eba6374 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HOMEPage10@3x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HOMEPage10@3x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HOMEPage11@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HOMEPage11@1x.png deleted file mode 100644 index 7e159d655..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HOMEPage11@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HOMEPage11@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HOMEPage11@2x.png index 6c0e86f49..48cf55a32 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HOMEPage11@2x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HOMEPage11@2x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HOMEPage11@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HOMEPage11@3x.png index 4f7e3439a..fa46a178d 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HOMEPage11@3x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HOMEPage11@3x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HeaderLogo@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HeaderLogo@1x.png deleted file mode 100644 index e8c51485e..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HeaderLogo@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage20@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage20@1x.png deleted file mode 100644 index cd796f1ee..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage20@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage20@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage20@2x.png index f81b99256..90f50ce46 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage20@2x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage20@2x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage20@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage20@3x.png index 97fdc316f..fc9aab674 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage20@3x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage20@3x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage21@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage21@1x.png deleted file mode 100644 index 995861bc0..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage21@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage21@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage21@2x.png index 97b111821..9a575fa28 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage21@2x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage21@2x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage21@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage21@3x.png index 353939834..914a72af4 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage21@3x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage21@3x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage22@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage22@1x.png deleted file mode 100644 index b7bc97702..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage22@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage22@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage22@2x.png index a3c395fd5..8a53ee4a6 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage22@2x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage22@2x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage22@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage22@3x.png index 017328288..418572431 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage22@3x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage22@3x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage30@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage30@1x.png deleted file mode 100644 index c5e3da380..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage30@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage30@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage30@2x.png index 857817b1f..8978df16d 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage30@2x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage30@2x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage30@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage30@3x.png index f9c1e813b..c10e48f98 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage30@3x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage30@3x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage31@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage31@1x.png deleted file mode 100644 index 6a9b5cedf..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage31@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage31@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage31@2x.png index 0939ffbcf..06ad6ff99 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage31@2x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage31@2x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage31@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage31@3x.png index 65c1098ec..094985d95 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage31@3x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage31@3x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage32@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage32@1x.png deleted file mode 100644 index db847f84a..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage32@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage32@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage32@2x.png index 41ab28714..4250bf0c0 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage32@2x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage32@2x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage32@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage32@3x.png index 6e578319f..a094ed42b 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage32@3x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage32@3x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage40@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage40@1x.png deleted file mode 100644 index 9b9f0afb5..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage40@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage40@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage40@2x.png index b10b65601..b5328dc03 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage40@2x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage40@2x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage40@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage40@3x.png index 661741f17..3ce41fd56 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage40@3x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage40@3x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage41@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage41@1x.png deleted file mode 100644 index ee082a50a..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage41@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage41@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage41@2x.png index 6277ec412..b8e5c6633 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage41@2x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage41@2x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage41@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage41@3x.png index 25c2a380c..67fd9c5fb 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage41@3x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage41@3x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage42@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage42@1x.png deleted file mode 100644 index e48d5c0cd..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage42@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage42@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage42@2x.png index f57caf873..a50123623 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage42@2x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage42@2x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage42@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage42@3x.png index 95ee3f0e3..aedeff679 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage42@3x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage42@3x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage44@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage44@1x.png deleted file mode 100644 index b9d240c64..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage44@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage44@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage44@2x.png index ce92f503f..45eaa3fc5 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage44@2x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage44@2x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage44@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage44@3x.png index ab941ec69..9f97a45d0 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage44@3x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage44@3x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage45@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage45@1x.png deleted file mode 100644 index 0bf54a8a0..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage45@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage45@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage45@2x.png index 742fd2823..657d771e7 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage45@2x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage45@2x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage45@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage45@3x.png index d3938ae48..3087dff97 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage45@3x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage45@3x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage50@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage50@1x.png deleted file mode 100644 index 1a9a91aec..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage50@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage50@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage50@2x.png deleted file mode 100644 index 9df54534d..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage50@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage50@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage50@3x.png deleted file mode 100644 index f5dd32786..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/HelpPage50@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/IconHamburger@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/IconHamburger@1x.png deleted file mode 100644 index be38e4344..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/IconHamburger@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/InfoMark@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/InfoMark@1x.png deleted file mode 100644 index 55997eed1..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/InfoMark@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/Logo.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/Logo.png deleted file mode 100644 index 0d1efcc3f..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/Logo.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/Logo@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/Logo@1x.png deleted file mode 100644 index 0d1efcc3f..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/Logo@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/Logo@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/Logo@2x.png deleted file mode 100644 index 5d205a43b..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/Logo@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/Logo@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/Logo@3x.png deleted file mode 100644 index 0b8d0f969..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/Logo@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/Nocontact10@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/Nocontact10@1x.png deleted file mode 100644 index 1e50dfdf2..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/Nocontact10@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/Nocontact10@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/Nocontact10@2x.png index a57525173..e8e560fa6 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/Nocontact10@2x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/Nocontact10@2x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/Nocontact10@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/Nocontact10@3x.png index 6cb772c72..5da9d986d 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/Nocontact10@3x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/Nocontact10@3x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/SplashImg.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/SplashImg.png deleted file mode 100644 index 9ca1b4e18..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/SplashImg.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/SplashImg@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/SplashImg@2x.png index 64b7c7dd3..1b1fa4d81 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/SplashImg@2x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/SplashImg@2x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/SplashImg@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/SplashImg@3x.png index cc1936cc0..a40c8d0d2 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/SplashImg@3x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/SplashImg@3x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage10@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage10@1x.png deleted file mode 100644 index 2b6163644..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage10@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage10@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage10@2x.png index 0c82cc754..f8ecf67f1 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage10@2x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage10@2x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage10@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage10@3x.png index 69c9b6c95..eb5d715ef 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage10@3x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage10@3x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage11@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage11@1x.png deleted file mode 100644 index f2b814d7a..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage11@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage11@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage11@2x.png index 9d68d6437..f59ea3556 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage11@2x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage11@2x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage11@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage11@3x.png index 0e2d1182f..c08d467b4 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage11@3x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage11@3x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage12@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage12@1x.png deleted file mode 100644 index a65e214ea..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage12@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage12@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage12@2x.png index f796ad4eb..914a7e7b2 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage12@2x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage12@2x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage12@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage12@3x.png index f8a9680f3..d7126ac03 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage12@3x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage12@3x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage20@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage20@1x.png deleted file mode 100644 index 2fd27ffce..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage20@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage20@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage20@2x.png index f9b65d44d..1030b32a8 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage20@2x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage20@2x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage20@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage20@3x.png index 925ff3028..35be5a1d8 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage20@3x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage20@3x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage40@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage40@1x.png deleted file mode 100644 index f408e0a3a..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage40@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage40@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage40@2x.png index 4366204b4..3087c367b 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage40@2x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage40@2x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage40@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage40@3x.png index 7565046b7..24d785c6c 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage40@3x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage40@3x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage50@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage50@1x.png deleted file mode 100644 index 197544fb0..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage50@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage50@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage50@2x.png index f6929558a..06983ec89 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage50@2x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage50@2x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage50@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage50@3x.png index d247b993a..862ebacf5 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage50@3x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage50@3x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage60@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage60@1x.png deleted file mode 100644 index 99b0490c1..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/TutorialPage60@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/arrow_icon.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/arrow_icon.png deleted file mode 100644 index 92f5d408e..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/arrow_icon.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/arrow_icon@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/arrow_icon@2x.png index dbf4e01f3..fc1123cdc 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/arrow_icon@2x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/arrow_icon@2x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/arrow_icon@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/arrow_icon@3x.png index bc60f1723..819182c23 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/arrow_icon@3x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/arrow_icon@3x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/notify_img01@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/notify_img01@2x.png similarity index 100% rename from Covid19Radar/Covid19Radar.iOS/Resources/notify_img01@2x.png rename to Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/notify_img01@2x.png diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/notify_img01@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/notify_img01@3x.png similarity index 100% rename from Covid19Radar/Covid19Radar.iOS/Resources/notify_img01@3x.png rename to Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/notify_img01@3x.png diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/notify_img02@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/notify_img02@2x.png similarity index 100% rename from Covid19Radar/Covid19Radar.iOS/Resources/notify_img02@2x.png rename to Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/notify_img02@2x.png diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/notify_img02@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/notify_img02@3x.png similarity index 100% rename from Covid19Radar/Covid19Radar.iOS/Resources/notify_img02@3x.png rename to Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/notify_img02@3x.png diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/privacypolicy_img01.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/privacypolicy_img01.png deleted file mode 100644 index b1622da33..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/privacypolicy_img01.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/privacypolicy_img01@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/privacypolicy_img01@2x.png index 54c5777f2..d989794b0 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/privacypolicy_img01@2x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/privacypolicy_img01@2x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/privacypolicy_img01@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/privacypolicy_img01@3x.png index 72a3da25e..8d2f2aa47 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/privacypolicy_img01@3x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/privacypolicy_img01@3x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HOMEPage10.png b/Covid19Radar/Covid19Radar.iOS/Resources/HOMEPage10.png deleted file mode 100644 index fb9b180d0..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HOMEPage10.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HOMEPage10@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/HOMEPage10@2x.png deleted file mode 100644 index 88ae4546e..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HOMEPage10@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HOMEPage10@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/HOMEPage10@3x.png deleted file mode 100644 index 882135932..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HOMEPage10@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HOMEPage11.png b/Covid19Radar/Covid19Radar.iOS/Resources/HOMEPage11.png deleted file mode 100644 index 7e159d655..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HOMEPage11.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HOMEPage11@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/HOMEPage11@2x.png deleted file mode 100644 index 6c0e86f49..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HOMEPage11@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HOMEPage11@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/HOMEPage11@3x.png deleted file mode 100644 index 4f7e3439a..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HOMEPage11@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage20.png b/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage20.png deleted file mode 100644 index cd796f1ee..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage20.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage20@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage20@2x.png deleted file mode 100644 index f81b99256..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage20@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage20@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage20@3x.png deleted file mode 100644 index 97fdc316f..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage20@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage21.png b/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage21.png deleted file mode 100644 index 995861bc0..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage21.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage21@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage21@2x.png deleted file mode 100644 index 97b111821..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage21@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage21@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage21@3x.png deleted file mode 100644 index 353939834..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage21@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage22.png b/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage22.png deleted file mode 100644 index b7bc97702..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage22.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage22@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage22@2x.png deleted file mode 100644 index a3c395fd5..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage22@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage22@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage22@3x.png deleted file mode 100644 index 017328288..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage22@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage30.png b/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage30.png deleted file mode 100644 index c5e3da380..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage30.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage30@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage30@2x.png deleted file mode 100644 index 857817b1f..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage30@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage30@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage30@3x.png deleted file mode 100644 index f9c1e813b..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage30@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage31.png b/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage31.png deleted file mode 100644 index 6a9b5cedf..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage31.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage31@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage31@2x.png deleted file mode 100644 index 0939ffbcf..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage31@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage31@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage31@3x.png deleted file mode 100644 index 65c1098ec..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage31@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage32.png b/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage32.png deleted file mode 100644 index 96ccdb6ad..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage32.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage32@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage32@2x.png deleted file mode 100644 index e48bfc95b..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage32@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage32@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage32@3x.png deleted file mode 100644 index bb4010d5c..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage32@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage40.png b/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage40.png deleted file mode 100644 index 9b9f0afb5..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage40.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage40@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage40@2x.png deleted file mode 100644 index b10b65601..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage40@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage40@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage40@3x.png deleted file mode 100644 index 661741f17..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage40@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage41.png b/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage41.png deleted file mode 100644 index ee082a50a..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage41.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage41@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage41@2x.png deleted file mode 100644 index 6277ec412..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage41@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage41@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage41@3x.png deleted file mode 100644 index 25c2a380c..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage41@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage42.png b/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage42.png deleted file mode 100644 index e48d5c0cd..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage42.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage42@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage42@2x.png deleted file mode 100644 index f57caf873..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage42@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage42@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage42@3x.png deleted file mode 100644 index 95ee3f0e3..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage42@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage44.png b/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage44.png deleted file mode 100644 index b9d240c64..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage44.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage44@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage44@2x.png deleted file mode 100644 index ce92f503f..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage44@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage44@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage44@3x.png deleted file mode 100644 index ab941ec69..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage44@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage45.png b/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage45.png deleted file mode 100644 index 0bf54a8a0..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage45.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage45@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage45@2x.png deleted file mode 100644 index 742fd2823..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage45@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage45@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage45@3x.png deleted file mode 100644 index d3938ae48..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage45@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage50.png b/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage50.png deleted file mode 100644 index 1a9a91aec..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage50.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage50@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage50@2x.png deleted file mode 100644 index 9df54534d..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage50@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage50@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage50@3x.png deleted file mode 100644 index f5dd32786..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/HelpPage50@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/IconHamburger.png b/Covid19Radar/Covid19Radar.iOS/Resources/IconHamburger.png deleted file mode 100644 index be38e4344..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/IconHamburger.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/IconHamburger@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/IconHamburger@2x.png deleted file mode 100644 index 4b2026052..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/IconHamburger@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/IconHamburger@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/IconHamburger@3x.png deleted file mode 100644 index 35a34ff76..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/IconHamburger@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/InfoMark.png b/Covid19Radar/Covid19Radar.iOS/Resources/InfoMark.png deleted file mode 100644 index 55997eed1..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/InfoMark.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/InfoMark@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/InfoMark@2x.png deleted file mode 100644 index 7fdf104dd..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/InfoMark@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/InfoMark@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/InfoMark@3x.png deleted file mode 100644 index 6afe382ab..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/InfoMark@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Logo.png b/Covid19Radar/Covid19Radar.iOS/Resources/Logo.png deleted file mode 100644 index 0d1efcc3f..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Logo.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Logo@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Logo@1x.png deleted file mode 100644 index 0d1efcc3f..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Logo@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Logo@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Logo@2x.png deleted file mode 100644 index 5d205a43b..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Logo@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Logo@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Logo@3x.png deleted file mode 100644 index 0b8d0f969..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Logo@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Nocontact10.png b/Covid19Radar/Covid19Radar.iOS/Resources/Nocontact10.png deleted file mode 100644 index 1e50dfdf2..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Nocontact10.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Nocontact10@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Nocontact10@2x.png deleted file mode 100644 index a57525173..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Nocontact10@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Nocontact10@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Nocontact10@3x.png deleted file mode 100644 index 6cb772c72..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Nocontact10@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage10.png b/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage10.png deleted file mode 100644 index 2b6163644..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage10.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage10@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage10@2x.png deleted file mode 100644 index 0c82cc754..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage10@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage10@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage10@3x.png deleted file mode 100644 index 69c9b6c95..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage10@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage11.png b/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage11.png deleted file mode 100644 index f2b814d7a..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage11.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage11@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage11@2x.png deleted file mode 100644 index 9d68d6437..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage11@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage11@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage11@3x.png deleted file mode 100644 index 0e2d1182f..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage11@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage12.png b/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage12.png deleted file mode 100644 index a65e214ea..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage12.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage12@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage12@2x.png deleted file mode 100644 index f796ad4eb..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage12@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage12@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage12@3x.png deleted file mode 100644 index f8a9680f3..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage12@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage20.png b/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage20.png deleted file mode 100644 index 2fd27ffce..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage20.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage20@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage20@2x.png deleted file mode 100644 index f9b65d44d..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage20@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage20@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage20@3x.png deleted file mode 100644 index 925ff3028..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage20@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage40.png b/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage40.png deleted file mode 100644 index f408e0a3a..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage40.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage40@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage40@2x.png deleted file mode 100644 index 4366204b4..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage40@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage40@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage40@3x.png deleted file mode 100644 index 7565046b7..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage40@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage50.png b/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage50.png deleted file mode 100644 index 197544fb0..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage50.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage50@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage50@2x.png deleted file mode 100644 index f6929558a..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage50@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage50@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage50@3x.png deleted file mode 100644 index d247b993a..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/TutorialPage50@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/arrow_icon.png b/Covid19Radar/Covid19Radar.iOS/Resources/arrow_icon.png deleted file mode 100644 index 92f5d408e..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/arrow_icon.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/arrow_icon@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/arrow_icon@2x.png deleted file mode 100644 index dbf4e01f3..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/arrow_icon@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/arrow_icon@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/arrow_icon@3x.png deleted file mode 100644 index bc60f1723..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/arrow_icon@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HOMEPage10@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HOMEPage10@1x.png deleted file mode 100644 index fb9b180d0..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HOMEPage10@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HOMEPage10@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HOMEPage10@2x.png deleted file mode 100644 index 88ae4546e..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HOMEPage10@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HOMEPage10@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HOMEPage10@3x.png deleted file mode 100644 index 882135932..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HOMEPage10@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HOMEPage11@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HOMEPage11@1x.png deleted file mode 100644 index 7e159d655..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HOMEPage11@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HOMEPage11@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HOMEPage11@2x.png deleted file mode 100644 index 6c0e86f49..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HOMEPage11@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HOMEPage11@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HOMEPage11@3x.png deleted file mode 100644 index 4f7e3439a..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HOMEPage11@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage20@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage20@1x.png deleted file mode 100644 index 1ec2e4737..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage20@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage20@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage20@2x.png deleted file mode 100644 index ae23a22af..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage20@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage20@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage20@3x.png deleted file mode 100644 index fc4310845..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage20@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage21@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage21@1x.png deleted file mode 100644 index 3f211a630..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage21@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage21@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage21@2x.png deleted file mode 100644 index eb667cbd8..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage21@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage21@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage21@3x.png deleted file mode 100644 index bd29b1fce..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage21@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage22@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage22@1x.png deleted file mode 100644 index f0c334b70..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage22@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage22@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage22@2x.png deleted file mode 100644 index 23273fce4..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage22@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage22@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage22@3x.png deleted file mode 100644 index 7d0e7b575..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage22@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage30@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage30@1x.png deleted file mode 100644 index c5e3da380..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage30@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage30@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage30@2x.png deleted file mode 100644 index 857817b1f..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage30@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage30@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage30@3x.png deleted file mode 100644 index f9c1e813b..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage30@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage31@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage31@1x.png deleted file mode 100644 index c120cf37b..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage31@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage31@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage31@2x.png deleted file mode 100644 index af7306a20..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage31@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage31@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage31@3x.png deleted file mode 100644 index 0f039f7e6..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage31@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage32@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage32@1x.png deleted file mode 100644 index 5daaf3e14..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage32@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage32@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage32@2x.png deleted file mode 100644 index de13e5855..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage32@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage32@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage32@3x.png deleted file mode 100644 index e525c4f4d..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage32@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage40@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage40@1x.png deleted file mode 100644 index 9b9f0afb5..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage40@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage40@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage40@2x.png deleted file mode 100644 index b10b65601..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage40@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage40@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage40@3x.png deleted file mode 100644 index 661741f17..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage40@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage41@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage41@1x.png deleted file mode 100644 index ee082a50a..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage41@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage41@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage41@2x.png deleted file mode 100644 index 6277ec412..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage41@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage41@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage41@3x.png deleted file mode 100644 index 25c2a380c..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage41@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage42@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage42@1x.png deleted file mode 100644 index e48d5c0cd..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage42@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage42@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage42@2x.png deleted file mode 100644 index f57caf873..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage42@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage42@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage42@3x.png deleted file mode 100644 index 95ee3f0e3..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage42@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage44@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage44@1x.png deleted file mode 100644 index b9d240c64..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage44@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage44@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage44@2x.png deleted file mode 100644 index ce92f503f..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage44@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage44@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage44@3x.png deleted file mode 100644 index ab941ec69..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage44@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage45@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage45@1x.png deleted file mode 100644 index 0bf54a8a0..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage45@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage45@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage45@2x.png deleted file mode 100644 index 742fd2823..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage45@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage45@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage45@3x.png deleted file mode 100644 index d3938ae48..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage45@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage50@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage50@1x.png deleted file mode 100644 index 6c1985ef3..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage50@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage50@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage50@2x.png deleted file mode 100644 index 72ee764b9..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage50@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage50@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage50@3x.png deleted file mode 100644 index 999387cf0..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/HelpPage50@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/IconHamburger@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/IconHamburger@1x.png deleted file mode 100644 index be38e4344..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/IconHamburger@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/IconHamburger@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/IconHamburger@2x.png deleted file mode 100644 index 4b2026052..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/IconHamburger@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/IconHamburger@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/IconHamburger@3x.png deleted file mode 100644 index 35a34ff76..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/IconHamburger@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/InfoMark@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/InfoMark@1x.png deleted file mode 100644 index 55997eed1..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/InfoMark@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/InfoMark@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/InfoMark@2x.png deleted file mode 100644 index 7fdf104dd..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/InfoMark@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/InfoMark@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/InfoMark@3x.png deleted file mode 100644 index 6afe382ab..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/InfoMark@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/Logo@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/Logo@1x.png deleted file mode 100644 index 0d1efcc3f..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/Logo@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/Logo@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/Logo@2x.png deleted file mode 100644 index 5d205a43b..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/Logo@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/Logo@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/Logo@3x.png deleted file mode 100644 index 0b8d0f969..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/Logo@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/Nocontact10@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/Nocontact10@1x.png deleted file mode 100644 index b71f4ec3e..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/Nocontact10@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/Nocontact10@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/Nocontact10@2x.png deleted file mode 100644 index 3c1926c60..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/Nocontact10@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/Nocontact10@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/Nocontact10@3x.png deleted file mode 100644 index 41fe737bc..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/Nocontact10@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage10@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage10@1x.png deleted file mode 100644 index 2b6163644..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage10@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage10@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage10@2x.png deleted file mode 100644 index 0c82cc754..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage10@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage10@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage10@3x.png deleted file mode 100644 index 69c9b6c95..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage10@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage11@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage11@1x.png deleted file mode 100644 index f2b814d7a..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage11@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage11@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage11@2x.png deleted file mode 100644 index 9d68d6437..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage11@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage11@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage11@3x.png deleted file mode 100644 index 0e2d1182f..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage11@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage12@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage12@1x.png deleted file mode 100644 index a65e214ea..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage12@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage12@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage12@2x.png deleted file mode 100644 index f796ad4eb..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage12@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage12@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage12@3x.png deleted file mode 100644 index f8a9680f3..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage12@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage20@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage20@1x.png deleted file mode 100644 index 2fd27ffce..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage20@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage20@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage20@2x.png deleted file mode 100644 index f9b65d44d..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage20@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage20@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage20@3x.png deleted file mode 100644 index 925ff3028..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage20@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage40@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage40@1x.png deleted file mode 100644 index f408e0a3a..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage40@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage40@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage40@2x.png deleted file mode 100644 index 4366204b4..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage40@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage40@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage40@3x.png deleted file mode 100644 index 7565046b7..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage40@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage50@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage50@1x.png deleted file mode 100644 index 197544fb0..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage50@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage50@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage50@2x.png deleted file mode 100644 index f6929558a..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage50@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage50@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage50@3x.png deleted file mode 100644 index d247b993a..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/TutorialPage50@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/arrow_icon.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/arrow_icon.png deleted file mode 100644 index 92f5d408e..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/arrow_icon.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/arrow_icon@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/arrow_icon@2x.png deleted file mode 100644 index dbf4e01f3..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/arrow_icon@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/arrow_icon@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/arrow_icon@3x.png deleted file mode 100644 index bc60f1723..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/arrow_icon@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/privacypolicy_img01.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/privacypolicy_img01.png deleted file mode 100644 index b1622da33..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/privacypolicy_img01.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/privacypolicy_img01@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/privacypolicy_img01@2x.png deleted file mode 100644 index 54c5777f2..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/privacypolicy_img01@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/privacypolicy_img01@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/privacypolicy_img01@3x.png deleted file mode 100644 index 72a3da25e..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/en.lproj/privacypolicy_img01@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HOMEPage10@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HOMEPage10@1x.png deleted file mode 100644 index fb9b180d0..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HOMEPage10@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HOMEPage10@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HOMEPage10@2x.png deleted file mode 100644 index 88ae4546e..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HOMEPage10@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HOMEPage10@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HOMEPage10@3x.png deleted file mode 100644 index 882135932..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HOMEPage10@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HOMEPage11@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HOMEPage11@1x.png deleted file mode 100644 index 7e159d655..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HOMEPage11@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HOMEPage11@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HOMEPage11@2x.png deleted file mode 100644 index 6c0e86f49..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HOMEPage11@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HOMEPage11@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HOMEPage11@3x.png deleted file mode 100644 index 4f7e3439a..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HOMEPage11@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage20@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage20@1x.png deleted file mode 100644 index cd796f1ee..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage20@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage20@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage20@2x.png index f81b99256..0f629cc50 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage20@2x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage20@2x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage20@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage20@3x.png index 97fdc316f..9624a9523 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage20@3x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage20@3x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage21@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage21@1x.png deleted file mode 100644 index 995861bc0..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage21@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage21@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage21@2x.png index 97b111821..60edebcd4 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage21@2x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage21@2x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage21@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage21@3x.png index 353939834..217015913 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage21@3x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage21@3x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage22@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage22@1x.png deleted file mode 100644 index b7bc97702..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage22@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage22@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage22@2x.png index a3c395fd5..fd7e3206d 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage22@2x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage22@2x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage22@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage22@3x.png index 017328288..c7a1be00e 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage22@3x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage22@3x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage30@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage30@1x.png deleted file mode 100644 index c5e3da380..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage30@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage30@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage30@2x.png deleted file mode 100644 index 857817b1f..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage30@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage30@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage30@3x.png deleted file mode 100644 index f9c1e813b..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage30@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage31@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage31@1x.png deleted file mode 100644 index 6a9b5cedf..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage31@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage31@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage31@2x.png index 0939ffbcf..37a21ae93 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage31@2x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage31@2x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage31@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage31@3x.png index 65c1098ec..327524c3b 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage31@3x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage31@3x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage32@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage32@1x.png deleted file mode 100644 index 96ccdb6ad..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage32@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage32@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage32@2x.png index e48bfc95b..c0d37f83d 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage32@2x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage32@2x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage32@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage32@3x.png index bb4010d5c..af4fa9d85 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage32@3x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage32@3x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage40@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage40@1x.png deleted file mode 100644 index 9b9f0afb5..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage40@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage40@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage40@2x.png deleted file mode 100644 index b10b65601..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage40@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage40@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage40@3x.png deleted file mode 100644 index 661741f17..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage40@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage41@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage41@1x.png deleted file mode 100644 index ee082a50a..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage41@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage41@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage41@2x.png deleted file mode 100644 index 6277ec412..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage41@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage41@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage41@3x.png deleted file mode 100644 index 25c2a380c..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage41@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage42@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage42@1x.png deleted file mode 100644 index e48d5c0cd..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage42@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage42@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage42@2x.png deleted file mode 100644 index f57caf873..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage42@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage42@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage42@3x.png deleted file mode 100644 index 95ee3f0e3..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage42@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage44@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage44@1x.png deleted file mode 100644 index b9d240c64..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage44@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage44@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage44@2x.png deleted file mode 100644 index ce92f503f..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage44@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage44@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage44@3x.png deleted file mode 100644 index ab941ec69..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage44@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage45@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage45@1x.png deleted file mode 100644 index 0bf54a8a0..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage45@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage45@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage45@2x.png deleted file mode 100644 index 742fd2823..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage45@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage45@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage45@3x.png deleted file mode 100644 index d3938ae48..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage45@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage50@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage50@1x.png deleted file mode 100644 index 1a9a91aec..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage50@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage50@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage50@2x.png deleted file mode 100644 index 9df54534d..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage50@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage50@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage50@3x.png deleted file mode 100644 index f5dd32786..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/HelpPage50@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/IconHamburger@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/IconHamburger@1x.png deleted file mode 100644 index be38e4344..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/IconHamburger@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/IconHamburger@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/IconHamburger@2x.png deleted file mode 100644 index 4b2026052..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/IconHamburger@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/IconHamburger@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/IconHamburger@3x.png deleted file mode 100644 index 35a34ff76..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/IconHamburger@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/InfoMark@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/InfoMark@1x.png deleted file mode 100644 index 55997eed1..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/InfoMark@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/InfoMark@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/InfoMark@2x.png deleted file mode 100644 index 7fdf104dd..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/InfoMark@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/InfoMark@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/InfoMark@3x.png deleted file mode 100644 index 6afe382ab..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/InfoMark@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/Logo.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/Logo.png deleted file mode 100644 index 0d1efcc3f..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/Logo.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/Logo@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/Logo@1x.png deleted file mode 100644 index 0d1efcc3f..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/Logo@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/Logo@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/Logo@2x.png deleted file mode 100644 index 5d205a43b..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/Logo@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/Logo@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/Logo@3x.png deleted file mode 100644 index 0b8d0f969..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/Logo@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/Nocontact10@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/Nocontact10@1x.png deleted file mode 100644 index 1e50dfdf2..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/Nocontact10@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/Nocontact10@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/Nocontact10@2x.png index a57525173..f2e69fd5f 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/Nocontact10@2x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/Nocontact10@2x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/Nocontact10@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/Nocontact10@3x.png index 6cb772c72..c1538ddda 100644 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/Nocontact10@3x.png and b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/Nocontact10@3x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage10@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage10@1x.png deleted file mode 100644 index 2b6163644..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage10@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage10@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage10@2x.png deleted file mode 100644 index 0c82cc754..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage10@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage10@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage10@3x.png deleted file mode 100644 index 69c9b6c95..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage10@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage11@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage11@1x.png deleted file mode 100644 index f2b814d7a..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage11@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage11@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage11@2x.png deleted file mode 100644 index 9d68d6437..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage11@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage11@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage11@3x.png deleted file mode 100644 index 0e2d1182f..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage11@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage12@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage12@1x.png deleted file mode 100644 index a65e214ea..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage12@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage12@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage12@2x.png deleted file mode 100644 index f796ad4eb..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage12@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage12@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage12@3x.png deleted file mode 100644 index f8a9680f3..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage12@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage20@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage20@1x.png deleted file mode 100644 index 2fd27ffce..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage20@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage20@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage20@2x.png deleted file mode 100644 index f9b65d44d..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage20@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage20@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage20@3x.png deleted file mode 100644 index 925ff3028..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage20@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage40@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage40@1x.png deleted file mode 100644 index f408e0a3a..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage40@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage40@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage40@2x.png deleted file mode 100644 index 4366204b4..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage40@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage40@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage40@3x.png deleted file mode 100644 index 7565046b7..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage40@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage50@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage50@1x.png deleted file mode 100644 index 197544fb0..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage50@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage50@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage50@2x.png deleted file mode 100644 index f6929558a..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage50@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage50@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage50@3x.png deleted file mode 100644 index d247b993a..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/TutorialPage50@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/arrow_icon.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/arrow_icon.png deleted file mode 100644 index 92f5d408e..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/arrow_icon.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/arrow_icon@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/arrow_icon@2x.png deleted file mode 100644 index dbf4e01f3..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/arrow_icon@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/arrow_icon@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/arrow_icon@3x.png deleted file mode 100644 index bc60f1723..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/arrow_icon@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/privacypolicy_img01.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/privacypolicy_img01.png deleted file mode 100644 index b1622da33..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/privacypolicy_img01.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/privacypolicy_img01@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/privacypolicy_img01@2x.png deleted file mode 100644 index 54c5777f2..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/privacypolicy_img01@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/privacypolicy_img01@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/privacypolicy_img01@3x.png deleted file mode 100644 index 72a3da25e..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/privacypolicy_img01@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/license.html b/Covid19Radar/Covid19Radar.iOS/Resources/license.html new file mode 100644 index 000000000..55821a359 --- /dev/null +++ b/Covid19Radar/Covid19Radar.iOS/Resources/license.html @@ -0,0 +1,1461 @@ +COPYRIGHT_THIRD_PARTY_SOFTWARE_NOTICES

+LICENSE Copyright / THIRD PARTY SOFTWARE NOTICES

+

Do Not Translate or Localize. +This file incorporates components from the projects listed below. +COVID-19Radar community licenses these components to you under COVID-19Radar community's software licensing terms, except that components licensed under open source licenses requiring that such components remain under their original license are being made available to you by COVID-19Radar community under their original licensing terms. +The original copyright notices and the licenses under which COVID-19Radar community received such components are set forth below for informational purposes.

+
+

+COVID-19Radar

+
+

Copyright (C) 2020 COVID-19Radar Contributors

+

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

+
+

Copyright (c) Microsoft Corporation

+

The MIT License (MIT)

+

Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions:

+

The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software.

+

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.

+
+

+Acr.UserDialogs

+
+

The MIT License (MIT)

+

Copyright (c) 2016 Allan Ritchie

+

Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions:

+

The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software.

+

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.

+
+

+.NET Standard

+
+

The MIT License (MIT)

+

Copyright (c) .NET Foundation and Contributors

+

All rights reserved.

+

Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions:

+

The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software.

+

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.

+
+

+Json.NET

+
+

The MIT License (MIT)

+

Copyright (c) 2007 James Newton-King

+

Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions:

+

The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software.

+

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.

+
+

+Prism

+
+

The MIT License (MIT)

+

Copyright (c) .NET Foundation

+

All rights reserved.

+

Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions:

+

The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software.

+

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.

+
+

+SQLite-net

+
+

The MIT License (MIT)

+

Copyright (c) Krueger Systems, Inc.

+

All rights reserved.

+

Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions:

+

The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software.

+

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.

+
+

+Xamarin SDK

+
+

The MIT License (MIT)

+

Copyright (c) .NET Foundation Contributors

+

All rights reserved.

+

Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions:

+

The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software.

+

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.

+
+

+Xamarin.Essentials

+
+

The MIT License (MIT)

+

Copyright (c) Microsoft Corporation

+

All rights reserved.

+

Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions:

+

The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software.

+

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.

+
+

+Xamarin Exposure Notification

+
+

MIT License

+

Copyright (c) Microsoft Corporation.

+

Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions:

+

The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software.

+

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

+
+

+FFImageLoading

+
+

The MIT License (MIT)

+

Copyright (c) 2015 Daniel Luberda & Fabien Molinet

+

Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions:

+

The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software.

+

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

+
+

+Xamarin.Android bindings for AndroidX - core

+
+

The MIT License (MIT)

+

Copyright (c) .NET Foundation Contributors

+

Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions:

+

The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software.

+

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.

+

20160427

+
+

+Xamarin.Android bindings for AndroidX - recyclerview

+
+

The MIT License (MIT)

+

Copyright (c) .NET Foundation Contributors

+

Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions:

+

The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software.

+

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.

+

20160427

+
+

+CommonServiceLocator

+
+

Microsoft Public License (MS-PL) +This license governs use of the accompanying software. If you use the software, you accept this license. If you do not accept the license, do not use the software.

+
    +
  1. Definitions +The terms "reproduce," "reproduction," "derivative works," and "distribution" have the +same meaning here as under U.S. copyright law.
  2. +
+

A "contribution" is the original software, or any additions or changes to the software.

+

A "contributor" is any person that distributes its contribution under this license.

+

"Licensed patents" are a contributor's patent claims that read directly on its contribution.

+
    +
  1. Grant of Rights
  2. +
+

(A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create.

+

(B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software.

+
    +
  1. Conditions and Limitations
  2. +
+

(A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks.

+

(B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically.

+

(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software.

+

(D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license.

+

(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement.

+
+

+Google.Protobuf

+
+

Copyright 2008 Google Inc. All rights reserved.

+

Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met:

+
    +
  • Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer.
  • +
  • Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution.
  • +
  • Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission.
  • +
+

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+

Code generated by the Protocol Buffer compiler is owned by the owner +of the input file used when generating it. This code is not +standalone and requires a support library to be linked with it. This +support library is itself covered by the above license.

+
+

+(Sample Code) Exposure Notifications API: Android Reference Design

+
+

Copyright 2020

+

Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at

+

http://www.apache.org/licenses/LICENSE-2.0

+

Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express +or implied. See the License for the specific language governing +permissions and limitations under the License.

+
+

+(Sample Code) Building an App to Notify Users of COVID-19 Exposure

+
+

Swift Protobuf is licensed under Apache 2.0., see ACKNOWLEDGEMENTS.txt for more information.

+

Copyright (c) 2020 Apple Inc.

+

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

+

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

+

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) Roboto

+
+

Copyright (c) 2011 Google Inc.

+

Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at

+
http://www.apache.org/licenses/LICENSE-2.0
+
+

Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License.

+
+

+(Font) Material Design Icons

+
+

Copyright (c) 2014, Austin Andrews (http://materialdesignicons.com/), with Reserved Font Name Material Design Icons.

+

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

+
-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
+
+
\ No newline at end of file diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/privacypolicy_img01.png b/Covid19Radar/Covid19Radar.iOS/Resources/privacypolicy_img01.png deleted file mode 100644 index b1622da33..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/privacypolicy_img01.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/privacypolicy_img01@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/privacypolicy_img01@2x.png deleted file mode 100644 index 54c5777f2..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/privacypolicy_img01@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/privacypolicy_img01@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/privacypolicy_img01@3x.png deleted file mode 100644 index 72a3da25e..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/privacypolicy_img01@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/HelpPage20@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/HelpPage20@2x.png new file mode 100644 index 000000000..0f629cc50 Binary files /dev/null and b/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/HelpPage20@2x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/HelpPage20@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/HelpPage20@3x.png new file mode 100644 index 000000000..9624a9523 Binary files /dev/null and b/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/HelpPage20@3x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/HelpPage21@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/HelpPage21@2x.png new file mode 100644 index 000000000..38ec5e5c0 Binary files /dev/null and b/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/HelpPage21@2x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/HelpPage21@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/HelpPage21@3x.png new file mode 100644 index 000000000..5269967c3 Binary files /dev/null and b/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/HelpPage21@3x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/HelpPage22@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/HelpPage22@2x.png new file mode 100644 index 000000000..5ae8511bb Binary files /dev/null and b/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/HelpPage22@2x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/HelpPage22@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/HelpPage22@3x.png new file mode 100644 index 000000000..f746b12e5 Binary files /dev/null and b/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/HelpPage22@3x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/HelpPage31@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/HelpPage31@2x.png new file mode 100644 index 000000000..48f69a6d1 Binary files /dev/null and b/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/HelpPage31@2x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/HelpPage31@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/HelpPage31@3x.png new file mode 100644 index 000000000..7b5145411 Binary files /dev/null and b/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/HelpPage31@3x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/HelpPage32@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/HelpPage32@2x.png new file mode 100644 index 000000000..b047273a8 Binary files /dev/null and b/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/HelpPage32@2x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/HelpPage32@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/HelpPage32@3x.png new file mode 100644 index 000000000..93640102c Binary files /dev/null and b/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/HelpPage32@3x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/InfoPlist.strings b/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/InfoPlist.strings similarity index 100% rename from Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/InfoPlist.strings rename to Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/InfoPlist.strings diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/Nocontact10@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/Nocontact10@2x.png new file mode 100644 index 000000000..71e8b8301 Binary files /dev/null and b/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/Nocontact10@2x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/Nocontact10@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/Nocontact10@3x.png new file mode 100644 index 000000000..62755aa09 Binary files /dev/null and b/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/Nocontact10@3x.png differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HOMEPage10@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HOMEPage10@1x.png deleted file mode 100644 index fb9b180d0..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HOMEPage10@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HOMEPage10@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HOMEPage10@2x.png deleted file mode 100644 index 88ae4546e..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HOMEPage10@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HOMEPage10@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HOMEPage10@3x.png deleted file mode 100644 index 882135932..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HOMEPage10@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HOMEPage11@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HOMEPage11@1x.png deleted file mode 100644 index 7e159d655..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HOMEPage11@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HOMEPage11@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HOMEPage11@2x.png deleted file mode 100644 index 6c0e86f49..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HOMEPage11@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HOMEPage11@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HOMEPage11@3x.png deleted file mode 100644 index 4f7e3439a..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HOMEPage11@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage20@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage20@1x.png deleted file mode 100644 index cd796f1ee..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage20@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage20@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage20@2x.png deleted file mode 100644 index f81b99256..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage20@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage20@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage20@3x.png deleted file mode 100644 index 97fdc316f..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage20@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage21@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage21@1x.png deleted file mode 100644 index 995861bc0..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage21@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage21@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage21@2x.png deleted file mode 100644 index 97b111821..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage21@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage21@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage21@3x.png deleted file mode 100644 index 353939834..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage21@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage22@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage22@1x.png deleted file mode 100644 index b7bc97702..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage22@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage22@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage22@2x.png deleted file mode 100644 index a3c395fd5..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage22@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage22@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage22@3x.png deleted file mode 100644 index 017328288..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage22@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage30@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage30@1x.png deleted file mode 100644 index c5e3da380..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage30@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage30@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage30@2x.png deleted file mode 100644 index 857817b1f..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage30@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage30@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage30@3x.png deleted file mode 100644 index f9c1e813b..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage30@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage31@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage31@1x.png deleted file mode 100644 index 6a9b5cedf..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage31@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage31@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage31@2x.png deleted file mode 100644 index 0939ffbcf..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage31@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage31@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage31@3x.png deleted file mode 100644 index 65c1098ec..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage31@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage32@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage32@1x.png deleted file mode 100644 index db847f84a..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage32@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage32@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage32@2x.png deleted file mode 100644 index 41ab28714..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage32@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage32@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage32@3x.png deleted file mode 100644 index 6e578319f..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage32@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage40@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage40@1x.png deleted file mode 100644 index 9b9f0afb5..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage40@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage40@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage40@2x.png deleted file mode 100644 index b10b65601..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage40@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage40@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage40@3x.png deleted file mode 100644 index 661741f17..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage40@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage41@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage41@1x.png deleted file mode 100644 index ee082a50a..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage41@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage41@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage41@2x.png deleted file mode 100644 index 6277ec412..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage41@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage41@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage41@3x.png deleted file mode 100644 index 25c2a380c..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage41@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage42@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage42@1x.png deleted file mode 100644 index e48d5c0cd..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage42@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage42@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage42@2x.png deleted file mode 100644 index f57caf873..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage42@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage42@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage42@3x.png deleted file mode 100644 index 95ee3f0e3..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage42@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage44@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage44@1x.png deleted file mode 100644 index b9d240c64..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage44@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage44@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage44@2x.png deleted file mode 100644 index ce92f503f..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage44@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage44@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage44@3x.png deleted file mode 100644 index ab941ec69..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage44@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage45@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage45@1x.png deleted file mode 100644 index 0bf54a8a0..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage45@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage45@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage45@2x.png deleted file mode 100644 index 742fd2823..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage45@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage45@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage45@3x.png deleted file mode 100644 index d3938ae48..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage45@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage50@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage50@1x.png deleted file mode 100644 index 1a9a91aec..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage50@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage50@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage50@2x.png deleted file mode 100644 index 9df54534d..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage50@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage50@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage50@3x.png deleted file mode 100644 index f5dd32786..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/HelpPage50@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/IconHamburger@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/IconHamburger@1x.png deleted file mode 100644 index be38e4344..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/IconHamburger@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/IconHamburger@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/IconHamburger@2x.png deleted file mode 100644 index 4b2026052..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/IconHamburger@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/IconHamburger@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/IconHamburger@3x.png deleted file mode 100644 index 35a34ff76..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/IconHamburger@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/InfoMark@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/InfoMark@1x.png deleted file mode 100644 index 55997eed1..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/InfoMark@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/InfoMark@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/InfoMark@2x.png deleted file mode 100644 index 7fdf104dd..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/InfoMark@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/InfoMark@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/InfoMark@3x.png deleted file mode 100644 index 6afe382ab..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/InfoMark@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/Logo@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/Logo@1x.png deleted file mode 100644 index 0d1efcc3f..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/Logo@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/Logo@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/Logo@2x.png deleted file mode 100644 index 5d205a43b..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/Logo@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/Logo@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/Logo@3x.png deleted file mode 100644 index 0b8d0f969..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/Logo@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/Nocontact10@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/Nocontact10@1x.png deleted file mode 100644 index 1e50dfdf2..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/Nocontact10@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/Nocontact10@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/Nocontact10@2x.png deleted file mode 100644 index a57525173..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/Nocontact10@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/Nocontact10@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/Nocontact10@3x.png deleted file mode 100644 index 6cb772c72..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/Nocontact10@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage10@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage10@1x.png deleted file mode 100644 index 2b6163644..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage10@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage10@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage10@2x.png deleted file mode 100644 index 0c82cc754..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage10@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage10@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage10@3x.png deleted file mode 100644 index 69c9b6c95..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage10@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage11@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage11@1x.png deleted file mode 100644 index f2b814d7a..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage11@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage11@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage11@2x.png deleted file mode 100644 index 9d68d6437..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage11@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage11@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage11@3x.png deleted file mode 100644 index 0e2d1182f..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage11@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage12@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage12@1x.png deleted file mode 100644 index a65e214ea..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage12@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage12@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage12@2x.png deleted file mode 100644 index f796ad4eb..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage12@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage12@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage12@3x.png deleted file mode 100644 index f8a9680f3..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage12@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage20@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage20@1x.png deleted file mode 100644 index 2fd27ffce..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage20@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage20@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage20@2x.png deleted file mode 100644 index f9b65d44d..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage20@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage20@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage20@3x.png deleted file mode 100644 index 925ff3028..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage20@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage40@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage40@1x.png deleted file mode 100644 index f408e0a3a..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage40@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage40@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage40@2x.png deleted file mode 100644 index 4366204b4..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage40@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage40@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage40@3x.png deleted file mode 100644 index 7565046b7..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage40@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage50@1x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage50@1x.png deleted file mode 100644 index 197544fb0..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage50@1x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage50@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage50@2x.png deleted file mode 100644 index f6929558a..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage50@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage50@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage50@3x.png deleted file mode 100644 index d247b993a..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/TutorialPage50@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/arrow_icon.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/arrow_icon.png deleted file mode 100644 index 92f5d408e..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/arrow_icon.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/arrow_icon@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/arrow_icon@2x.png deleted file mode 100644 index dbf4e01f3..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/arrow_icon@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/arrow_icon@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/arrow_icon@3x.png deleted file mode 100644 index bc60f1723..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/arrow_icon@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/privacypolicy_img01.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/privacypolicy_img01.png deleted file mode 100644 index b1622da33..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/privacypolicy_img01.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/privacypolicy_img01@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/privacypolicy_img01@2x.png deleted file mode 100644 index 54c5777f2..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/privacypolicy_img01@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/privacypolicy_img01@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/privacypolicy_img01@3x.png deleted file mode 100644 index 72a3da25e..000000000 Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh.lproj/privacypolicy_img01@3x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar.iOS/Services/LocalContentService.cs b/Covid19Radar/Covid19Radar.iOS/Services/LocalContentService.cs new file mode 100644 index 000000000..5ef287e9b --- /dev/null +++ b/Covid19Radar/Covid19Radar.iOS/Services/LocalContentService.cs @@ -0,0 +1,15 @@ +/* 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/. */ + +using System.IO; +using Covid19Radar.Services; +using Foundation; + +namespace Covid19Radar.iOS.Services +{ + public class LocalContentService : ILocalContentService + { + public string LicenseUrl => Path.Combine(NSBundle.MainBundle.BundleUrl.AbsoluteString, ILocalContentService.LICENSE_FILENAME); + } +} diff --git a/Covid19Radar/Covid19Radar.iOS/Services/LocalNotificationService.cs b/Covid19Radar/Covid19Radar.iOS/Services/LocalNotificationService.cs new file mode 100644 index 000000000..e21305317 --- /dev/null +++ b/Covid19Radar/Covid19Radar.iOS/Services/LocalNotificationService.cs @@ -0,0 +1,86 @@ +/* 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/. */ + +using System; +using System.Threading.Tasks; +using Covid19Radar.Resources; +using Covid19Radar.Services; +using Covid19Radar.Services.Logs; +using UserNotifications; + +namespace Covid19Radar.iOS.Services +{ + public class LocalNotificationService : ILocalNotificationService + { + private const string NOTIFICATION_ID = "notification_id_cocoa"; + + private readonly ILoggerService _loggerService; + + public LocalNotificationService(ILoggerService loggerService) + { + _loggerService = loggerService; + } + +#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously + public async Task PrepareAsync() + { + _loggerService.StartMethod(); + + AskPermissionForUserNotification(); + + _loggerService.EndMethod(); + } +#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously + + public async Task ShowExposureNotificationAsync() + { + _loggerService.StartMethod(); + + await ScheduleLocalNotificationAsync(); + + _loggerService.EndMethod(); + } + + private void AskPermissionForUserNotification() + { + _loggerService.StartMethod(); + + UNUserNotificationCenter.Current.RequestAuthorization(UNAuthorizationOptions.Alert, (granted, error) => + { + _loggerService.Info($"Ask permission for user notification: {granted}"); + }); + + _loggerService.EndMethod(); + } + + private async Task ScheduleLocalNotificationAsync() + { + _loggerService.StartMethod(); + + try + { + var settings = await UNUserNotificationCenter.Current.GetNotificationSettingsAsync(); + if (settings.AuthorizationStatus != UNAuthorizationStatus.Authorized) + { + throw new Exception($"UserNotification is not authorized: {settings.AuthorizationStatus}"); + } + + var content = new UNMutableNotificationContent(); + + content.Title = AppResources.LocalExposureNotificationTitle; + content.Body = AppResources.LocalExposureNotificationContent; + + var request = UNNotificationRequest.FromIdentifier(NOTIFICATION_ID, content, null); + var notificationCenter = UNUserNotificationCenter.Current; + await notificationCenter.AddNotificationRequestAsync(request); + } + catch (Exception e) + { + _loggerService.Exception("Exception occurred", e); + } + + _loggerService.EndMethod(); + } + } +} diff --git a/Covid19Radar/Covid19Radar.iOS/Services/UnUsed/BeaconService.cs b/Covid19Radar/Covid19Radar.iOS/Services/UnUsed/BeaconService.cs deleted file mode 100644 index 677d11555..000000000 --- a/Covid19Radar/Covid19Radar.iOS/Services/UnUsed/BeaconService.cs +++ /dev/null @@ -1,219 +0,0 @@ -/* 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/. */ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using CoreLocation; -using Covid19Radar.Common; -using Covid19Radar.Model; -using Covid19Radar.Services; -using Foundation; -using CoreBluetooth; -using UIKit; -using Xamarin.Forms; -using SQLite; -using Xamarin.Forms.Internals; - -namespace Covid19Radar.iOS.Services -{ - public class BeaconService : CLLocationManagerDelegate, IBeaconService - { - private static object dataLock = new object(); - private UserDataModel _userData; - private bool _transmitterFlg = false; - private CBPeripheralManager _beaconTransmitter = new CBPeripheralManager(); - private CLBeaconRegion _fieldRegion; - private readonly CLLocationManager _locationManager; - private List _listOfCLBeaconRegion; - private readonly SQLiteConnection _connection; - - public BeaconService(ISQLiteConnectionProvider sqliteConnectionProvider) - { - _connection = sqliteConnectionProvider.GetConnection(); - _connection.CreateTable(); - - _beaconTransmitter = new CBPeripheralManager(); - _beaconTransmitter.StateUpdated += DidStateUpdated; - - _listOfCLBeaconRegion = new List(); - _fieldRegion = new CLBeaconRegion(new NSUuid(AppConstants.iBeaconAppUuid), ""); - _fieldRegion.NotifyEntryStateOnDisplay = true; - _fieldRegion.NotifyOnEntry = true; - _fieldRegion.NotifyOnExit = true; - - // Monitoring - _locationManager = new CLLocationManager(); - if (CLLocationManager.LocationServicesEnabled) - { - _locationManager.Delegate = this; - _locationManager.PausesLocationUpdatesAutomatically = false; - _locationManager.ShowsBackgroundLocationIndicator = true; - _locationManager.DistanceFilter = 1.0; - _locationManager.AllowsBackgroundLocationUpdates = true; - _locationManager.DidRangeBeacons += DidRangeBeconsInRegionComplete; - _locationManager.AuthorizationChanged += HandleAuthorizationChanged; - _locationManager.RequestAlwaysAuthorization(); - } - - } - - public List GetBeaconData() - { - return _connection.Table().ToList(); - } - - public void OnSleep() - { - _locationManager.StartMonitoringSignificantLocationChanges(); - } - - public void OnResume() - { - _locationManager.StopMonitoringSignificantLocationChanges(); - } - - private void DidStateUpdated(object sender, EventArgs e) - { - System.Diagnostics.Debug.WriteLine("DidStateUpdated"); - //CBPeripheralManager trasmitter = sender as CBPeripheralManager; - } - - private void DidRangeBeconsInRegionComplete(object sender, CLRegionBeaconsRangedEventArgs e) - { - System.Diagnostics.Debug.WriteLine("HandleDidDetermineState"); - var now = DateTime.UtcNow; - var keyTime = now.ToString("yyyyMMddHH"); - - foreach (var beacon in e.Beacons) - { - if (beacon.Proximity == CLProximity.Unknown) - { - return; - } - string key; - try - { - key = $"{beacon.Uuid}{beacon.Major}{beacon.Minor}.{keyTime}"; - } - catch { continue; } - lock (dataLock) - { - var result = _connection.Table().SingleOrDefault(x => x.Id == key); - if (result == null) - { - BeaconDataModel data = new BeaconDataModel(); - data.Id = key; - data.Count = 0; - data.UserBeaconUuid = AppConstants.iBeaconAppUuid; - data.BeaconUuid = beacon.Uuid.ToString(); - data.Major = beacon.Major.ToString(); - data.Minor = beacon.Minor.ToString(); - data.Distance = beacon.Accuracy; - data.MinDistance = beacon.Accuracy; - data.MaxDistance = beacon.Accuracy; - data.Rssi = (short)beacon.Rssi; - // data.TXPower = beacon.tr; - data.ElaspedTime = new TimeSpan(); - data.LastDetectTime = now; - data.FirstDetectTime = now; - data.KeyTime = keyTime; - data.IsSentToServer = false; - _connection.Insert(data); - } - else - { - BeaconDataModel data = result; - data.Id = key; - data.Count++; - data.UserBeaconUuid = AppConstants.iBeaconAppUuid; - data.BeaconUuid = beacon.Uuid.ToString(); - data.Major = beacon.Major.ToString(); - data.Minor = beacon.Minor.ToString(); - data.Distance += (beacon.Accuracy - data.Distance) / data.Count; - data.MinDistance = (beacon.Accuracy < data.MinDistance ? beacon.Accuracy : data.MinDistance); - data.MaxDistance = (beacon.Accuracy > data.MaxDistance ? beacon.Accuracy : data.MaxDistance); - data.Rssi = (short)beacon.Rssi; - // data.TXPower = beacon.tr; - data.ElaspedTime += now - data.LastDetectTime; - data.LastDetectTime = now; - data.KeyTime = keyTime; - data.IsSentToServer = false; - _connection.Update(data); - System.Diagnostics.Debug.WriteLine(Utils.SerializeToJson(data)); - } - } - - } - - } - - #region Auth - - private void HandleAuthorizationChanged(object sender, CLAuthorizationChangedEventArgs e) - { - System.Diagnostics.Debug.WriteLine("HandleAuthorizationChanged"); - // Do That Stop beacons - if (e.Status == CLAuthorizationStatus.NotDetermined) - { - if (UIDevice.CurrentDevice.CheckSystemVersion(8, 0)) - { - if (UIDevice.CurrentDevice.CheckSystemVersion(13, 4)) - { - _locationManager.RequestWhenInUseAuthorization(); - } - else - { - _locationManager.RequestAlwaysAuthorization(); - } - } - - } - else if (e.Status == CLAuthorizationStatus.AuthorizedWhenInUse) - { - _locationManager.RequestAlwaysAuthorization(); - } - } - - public void StartRagingBeacons(UserDataModel userData) - { - System.Diagnostics.Debug.WriteLine("StartBeacon"); - - _listOfCLBeaconRegion.Add(_fieldRegion); - _locationManager.StartRangingBeacons(_fieldRegion); - } - - public void StopRagingBeacons() - { - System.Diagnostics.Debug.WriteLine("StopBeacon"); - _locationManager.StopRangingBeacons(_fieldRegion); - - } - - public void StartAdvertisingBeacons(UserDataModel userData) - { - _userData = userData; - - if (_beaconTransmitter.State < CBPeripheralManagerState.PoweredOn) - { - System.Diagnostics.Debug.WriteLine("Bluetooth must be enabled"); - // new UIAlertView("Bluetooth must be enabled", "To configure your device as a beacon", null, "OK", null).Show(); - return; - } - - CLBeaconRegion region = new CLBeaconRegion(new NSUuid(AppConstants.iBeaconAppUuid), ushort.Parse(_userData.Major), ushort.Parse(_userData.Minor), _userData.UserUuid); - NSNumber txPower = new NSNumber(-59); - _beaconTransmitter.StartAdvertising(region.GetPeripheralData(txPower)); - - } - - public void StopAdvertisingBeacons() - { - _beaconTransmitter.StopAdvertising(); - } - - #endregion - } -} diff --git a/Covid19Radar/Covid19Radar.iOS/Services/UnUsed/SQLiteConnectionProvider.cs b/Covid19Radar/Covid19Radar.iOS/Services/UnUsed/SQLiteConnectionProvider.cs deleted file mode 100644 index 9fa9508a5..000000000 --- a/Covid19Radar/Covid19Radar.iOS/Services/UnUsed/SQLiteConnectionProvider.cs +++ /dev/null @@ -1,31 +0,0 @@ -/* 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/. */ - -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using Covid19Radar.Common; -using Covid19Radar.Model; -using Foundation; -using SQLite; -using UIKit; -using Xamarin.Forms; - -namespace Covid19Radar.iOS.Services -{ - public class SQLiteConnectionProvider : ISQLiteConnectionProvider - { - private SQLiteConnection Connection { get; set; } - public SQLiteConnection GetConnection() - { - if (this.Connection != null) { return this.Connection; } - - var path = Environment.GetFolderPath(Environment.SpecialFolder.Personal); - path = Path.Combine(path, "..", "Library", AppConstants.SqliteFilename); - return this.Connection = new SQLiteConnection(path); - } - } -} \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar.iOS/appcenter-pre-build.sh b/Covid19Radar/Covid19Radar.iOS/appcenter-pre-build.sh index 33d625f5b..15cb001e6 100644 --- a/Covid19Radar/Covid19Radar.iOS/appcenter-pre-build.sh +++ b/Covid19Radar/Covid19Radar.iOS/appcenter-pre-build.sh @@ -35,11 +35,3 @@ sed -i '' "s/LOG_STORAGE_ACCOUNT_NAME/$LOG_STORAGE_ACCOUNT_NAME/g" $APP_CONSTANT # Print out file for reference cat $APP_CONSTANT_FILE echo "Updated id!" - -# Download Runtime -curl -L -O https://bosstoragemirror.blob.core.windows.net/wrench/jenkins/d16-6/29c4ea73109b377a71866c53a6d43033d5c5e90b/49/package/notarized/xamarin.ios-13.18.2.1.pkg -curl -L -O https://bosstoragemirror.blob.core.windows.net/wrench/jenkins/d16-6/29c4ea73109b377a71866c53a6d43033d5c5e90b/49/package/notarized/xamarin.mac-6.18.2.1.pkg - -# Install Runtime -sudo installer -store -pkg "xamarin.ios-13.18.2.1.pkg" -target / -sudo installer -store -pkg "xamarin.mac-6.18.2.1.pkg" -target / diff --git a/Covid19Radar/Covid19Radar/App.xaml.cs b/Covid19Radar/Covid19Radar/App.xaml.cs index f0150945a..7af840fdb 100644 --- a/Covid19Radar/Covid19Radar/App.xaml.cs +++ b/Covid19Radar/Covid19Radar/App.xaml.cs @@ -17,6 +17,7 @@ using System; using CommonServiceLocator; using Covid19Radar.Common; +using Xamarin.ExposureNotifications; /* * Our mission...is @@ -50,8 +51,6 @@ protected override async void OnInitialized() LogFileService = Container.Resolve(); LogFileService.AddSkipBackupAttribute(); - Xamarin.ExposureNotifications.ExposureNotification.Init(); - // Local Notification tap event listener //NotificationCenter.Current.NotificationTapped += OnNotificationTapped; LogUnobservedTaskExceptions(); @@ -75,12 +74,19 @@ protected override async void OnInitialized() LoggerService.EndMethod(); } - public static void UseMockExposureNotificationImplementationIfNeeded() + public static void InitExposureNotification() + { + UseMockExposureNotificationImplementationIfNeeded(); + + ExposureNotification.Init(); + } + + private static void UseMockExposureNotificationImplementationIfNeeded() { #if USE_MOCK // For debug mode, set the mock api provider to interact // with some fake data - Xamarin.ExposureNotifications.ExposureNotification.OverrideNativeImplementation(new Services.TestNativeImplementation()); + ExposureNotification.OverrideNativeImplementation(new Services.TestNativeImplementation()); #endif } @@ -157,6 +163,7 @@ protected override void RegisterTypes(IContainerRegistry containerRegistry) containerRegistry.RegisterForNavigation(); containerRegistry.RegisterForNavigation(); containerRegistry.RegisterForNavigation(); + containerRegistry.RegisterForNavigation(); } private static void RegisterCommonTypes(IContainer container) diff --git a/Covid19Radar/Covid19Radar/AppSettings.cs b/Covid19Radar/Covid19Radar/AppSettings.cs index 881475908..615712479 100644 --- a/Covid19Radar/Covid19Radar/AppSettings.cs +++ b/Covid19Radar/Covid19Radar/AppSettings.cs @@ -27,7 +27,6 @@ public AppSettings() var j = JObject.Parse(json); AppVersion = j.Value("appVersion"); - LicenseUrl = j.Value("licenseUrl"); AppStoreUrl = j.Value("appStoreUrl"); GooglePlayUrl = j.Value("googlePlayUrl"); ApiUrlBase = j.Value("apiUrlBase"); @@ -45,7 +44,6 @@ public AppSettings() public string SupportEmail { get; } public string AppVersion { get; } - public string LicenseUrl { get; } public string ApiUrlBase { get; } public string ApiSecret { get; } public string ApiKey { get; } diff --git a/Covid19Radar/Covid19Radar/Behaviors/UnUsed/MaskedBehavior.cs b/Covid19Radar/Covid19Radar/Behaviors/UnUsed/MaskedBehavior.cs deleted file mode 100644 index a438d8864..000000000 --- a/Covid19Radar/Covid19Radar/Behaviors/UnUsed/MaskedBehavior.cs +++ /dev/null @@ -1,80 +0,0 @@ -/* 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/. */ - -using System.Collections.Generic; -using Xamarin.Forms; - -namespace Covid19Radar.Behaviors -{ - public class MaskedBehavior : Behavior - { - private string _mask = ""; - public string Mask - { - get => _mask; - set - { - _mask = value; - SetPositions(); - } - } - - protected override void OnAttachedTo(Entry entry) - { - entry.TextChanged += OnEntryTextChanged; - base.OnAttachedTo(entry); - } - - protected override void OnDetachingFrom(Entry entry) - { - entry.TextChanged -= OnEntryTextChanged; - base.OnDetachingFrom(entry); - } - - IDictionary _positions; - - void SetPositions() - { - if (string.IsNullOrEmpty(Mask)) - { - _positions = null; - return; - } - - var list = new Dictionary(); - for (var i = 0; i < Mask.Length; i++) - if (Mask[i] != 'X') - list.Add(i, Mask[i]); - - _positions = list; - } - - private void OnEntryTextChanged(object sender, TextChangedEventArgs args) - { - var entry = sender as Entry; - - var text = entry.Text; - - if (string.IsNullOrWhiteSpace(text) || _positions == null) - return; - - if (text.Length > _mask.Length) - { - entry.Text = text.Remove(text.Length - 1); - return; - } - - foreach (var position in _positions) - if (text.Length >= position.Key + 1) - { - var value = position.Value.ToString(); - if (text.Substring(position.Key, 1) != value) - text = text.Insert(position.Key, value); - } - - if (entry.Text != text) - entry.Text = text; - } - } -} diff --git a/Covid19Radar/Covid19Radar/Common/AppConstants.cs b/Covid19Radar/Covid19Radar/Common/AppConstants.cs index 04c78ec2f..8cd07347a 100644 --- a/Covid19Radar/Covid19Radar/Common/AppConstants.cs +++ b/Covid19Radar/Covid19Radar/Common/AppConstants.cs @@ -1,4 +1,4 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public +/* 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/. */ @@ -6,23 +6,16 @@ namespace Covid19Radar.Common { public static class AppConstants { - public static readonly int NumberOfGroup = 86400; /// /// Number of days covered from the date of diagnosis or onset /// public const int DaysToSendTek = -3; - /// - /// Cache Timeout - /// - public const int CacheTimeout = 60; - /// - /// Active Rolling Period - /// - public const uint ActiveRollingPeriod = 144; + /// /// Max Error Count /// public const int MaxErrorCount = 3; + /// /// Max diagnosis UID Count /// diff --git a/Covid19Radar/Covid19Radar/Common/AppUtils.cs b/Covid19Radar/Covid19Radar/Common/AppUtils.cs index fae777306..c1aef1f2c 100644 --- a/Covid19Radar/Covid19Radar/Common/AppUtils.cs +++ b/Covid19Radar/Covid19Radar/Common/AppUtils.cs @@ -16,14 +16,6 @@ namespace Covid19Radar.Common { static class AppUtils { - public static async void CheckPermission() - { - var status = await Permissions.CheckStatusAsync(); - if (status != PermissionStatus.Granted) - { - status = await Permissions.RequestAsync(); - } - } public static async void PopUpShare() { if (Device.RuntimePlatform == Device.iOS) @@ -85,4 +77,4 @@ public static async void CheckVersion(ILoggerService loggerService) } } } -} \ No newline at end of file +} diff --git a/Covid19Radar/Covid19Radar/Common/HoursTimer.cs b/Covid19Radar/Covid19Radar/Common/HoursTimer.cs deleted file mode 100644 index 0609f6268..000000000 --- a/Covid19Radar/Covid19Radar/Common/HoursTimer.cs +++ /dev/null @@ -1,66 +0,0 @@ -/* 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/. */ - -using System; -using Xamarin.Forms; - -namespace Covid19Radar.Common -{ - - public class HoursTimer - { - public delegate void TimeOutHandler(EventArgs e); - - public event TimeOutHandler TimeOutEvent; - - private DateTime _startDateTime; - - private bool _timerRunning; - - private int _timeDiffernce; - - public HoursTimer(int timeDiffernce) - { - _timeDiffernce = timeDiffernce; - this._timerRunning = false; - } - public void Start() - { - if (this._timerRunning == true) - return; - RegisterTimer(this.HandleFunc); - } - - public void Stop() - { - this._timerRunning = false; - } - - private bool HandleFunc() - { - if (this._timerRunning == true) - { - - if (this.TimeOutEvent != null) - { - Device.BeginInvokeOnMainThread(() => - { - this.TimeOutEvent(new EventArgs()); - }); - } - RegisterTimer(this.HandleFunc); - } - return false; - } - - private void RegisterTimer(Func callback) - { - this._startDateTime = new DateTime(DateTime.UtcNow.Year, DateTime.UtcNow.Month, DateTime.UtcNow.Day, DateTime.UtcNow.Hour, DateTime.UtcNow.Minute, 0); - double spanMinutes = 60 - this._startDateTime.Minute + _timeDiffernce; - - this._timerRunning = true; - Device.StartTimer(TimeSpan.FromMinutes(spanMinutes), callback); - } - } -} diff --git a/Covid19Radar/Covid19Radar/Common/JumpHash.cs b/Covid19Radar/Covid19Radar/Common/JumpHash.cs deleted file mode 100644 index d6ca87f24..000000000 --- a/Covid19Radar/Covid19Radar/Common/JumpHash.cs +++ /dev/null @@ -1,33 +0,0 @@ -/* 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/. */ - -namespace Covid19Radar.Common -{ - public static class JumpHash - { - private const ulong constant = 2862933555777941757L; - private const long constant2 = 1L << 31; - - public static int JumpConsistentHash(object key, int buckets) - { - return JumpConsistentHash((ulong)key.GetHashCode(), buckets); - } - public static int JumpConsistentHash(ulong key, int buckets) - { - - long b = -1, j = 0; - while (j < buckets) - { - b = j; - - key = key * constant + 1; - ulong keyShift = key >> 33 + 1; - - j = (long)((b + 1) * ((double)constant2 / (double)keyShift)); - } - - return (int)b; - } - } -} diff --git a/Covid19Radar/Covid19Radar/Common/SecondsTimer.cs b/Covid19Radar/Covid19Radar/Common/SecondsTimer.cs deleted file mode 100644 index ccbeb846b..000000000 --- a/Covid19Radar/Covid19Radar/Common/SecondsTimer.cs +++ /dev/null @@ -1,66 +0,0 @@ -/* 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/. */ - -using System; -using Xamarin.Forms; - -namespace Covid19Radar.Common -{ - - public class SecondsTimer - { - public delegate void TimeOutHandler(EventArgs e); - - public event TimeOutHandler TimeOutEvent; - - private DateTime _startDateTime; - - private bool _timerRunning; - - private int _timeDiffernce; - - public SecondsTimer(int timeDiffernce) - { - _timeDiffernce = timeDiffernce; - this._timerRunning = false; - } - public void Start() - { - if (this._timerRunning == true) - return; - RegisterTimer(this.HandleFunc); - } - - public void Stop() - { - this._timerRunning = false; - } - - private bool HandleFunc() - { - if (this._timerRunning == true) - { - - if (this.TimeOutEvent != null) - { - Device.BeginInvokeOnMainThread(() => - { - this.TimeOutEvent(new EventArgs()); - }); - } - RegisterTimer(this.HandleFunc); - } - return false; - } - - private void RegisterTimer(Func callback) - { - //this._startDateTime = DateTime.Now; - //double spanSecond = 60 - this._startDateTime.Second+_timeDiffernce; - - this._timerRunning = true; - Device.StartTimer(TimeSpan.FromSeconds(_timeDiffernce), callback); - } - } -} diff --git a/Covid19Radar/Covid19Radar/Common/Utils.cs b/Covid19Radar/Covid19Radar/Common/Utils.cs index a0c829344..c8cc51e0c 100644 --- a/Covid19Radar/Covid19Radar/Common/Utils.cs +++ b/Covid19Radar/Covid19Radar/Common/Utils.cs @@ -11,10 +11,6 @@ public static class Utils { #region Other Public Methods - public static string SerializeToJson(object obj) => JsonConvert.SerializeObject(obj); - - public static T DeserializeFromJson(string jsonObj) => JsonConvert.DeserializeObject(jsonObj); - public static DateTime JstNow() { return TimeZoneInfo.ConvertTime(DateTime.Now, JstTimeZoneInfo()); diff --git a/Covid19Radar/Covid19Radar/Converters/UnUsed/IntEnumConverter.cs b/Covid19Radar/Covid19Radar/Converters/UnUsed/IntEnumConverter.cs deleted file mode 100644 index 041e8c584..000000000 --- a/Covid19Radar/Covid19Radar/Converters/UnUsed/IntEnumConverter.cs +++ /dev/null @@ -1,33 +0,0 @@ -/* 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/. */ - -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Text; -using Xamarin.Forms; - -namespace Covid19Radar.Converters -{ - public class IntEnumConverter : IValueConverter - { - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - if (value is Enum) - { - return (int)value; - } - return 0; - } - - public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) - { - if (value is int) - { - return Enum.ToObject(targetType, value); - } - return 0; - } - } -} diff --git a/Covid19Radar/Covid19Radar/Covid19Radar.csproj b/Covid19Radar/Covid19Radar/Covid19Radar.csproj index af4d5a74e..d2536f2ef 100644 --- a/Covid19Radar/Covid19Radar/Covid19Radar.csproj +++ b/Covid19Radar/Covid19Radar/Covid19Radar.csproj @@ -20,42 +20,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -93,7 +60,6 @@ - @@ -164,9 +130,12 @@ True - ResXFileCodeGenerator + PublicResXFileCodeGenerator AppResources.Designer.cs + + WebAccessibilityPolicyPage.xaml + diff --git a/Covid19Radar/Covid19Radar/Resources/html/en/privacypolicy.html b/Covid19Radar/Covid19Radar/Documents/html/en/privacypolicy.html similarity index 100% rename from Covid19Radar/Covid19Radar/Resources/html/en/privacypolicy.html rename to Covid19Radar/Covid19Radar/Documents/html/en/privacypolicy.html diff --git a/Covid19Radar/Covid19Radar/Resources/html/en/privacypolicy.md b/Covid19Radar/Covid19Radar/Documents/html/en/privacypolicy.md similarity index 100% rename from Covid19Radar/Covid19Radar/Resources/html/en/privacypolicy.md rename to Covid19Radar/Covid19Radar/Documents/html/en/privacypolicy.md diff --git a/Covid19Radar/Covid19Radar/Resources/html/en/termofuse.html b/Covid19Radar/Covid19Radar/Documents/html/en/termofuse.html similarity index 100% rename from Covid19Radar/Covid19Radar/Resources/html/en/termofuse.html rename to Covid19Radar/Covid19Radar/Documents/html/en/termofuse.html diff --git a/Covid19Radar/Covid19Radar/Resources/html/en/termofuse.md b/Covid19Radar/Covid19Radar/Documents/html/en/termofuse.md similarity index 100% rename from Covid19Radar/Covid19Radar/Resources/html/en/termofuse.md rename to Covid19Radar/Covid19Radar/Documents/html/en/termofuse.md diff --git a/Covid19Radar/Covid19Radar/Resources/html/index.html b/Covid19Radar/Covid19Radar/Documents/html/index.html similarity index 100% rename from Covid19Radar/Covid19Radar/Resources/html/index.html rename to Covid19Radar/Covid19Radar/Documents/html/index.html diff --git a/Covid19Radar/Covid19Radar/Resources/html/ja/privacypolicy.html b/Covid19Radar/Covid19Radar/Documents/html/ja/privacypolicy.html similarity index 100% rename from Covid19Radar/Covid19Radar/Resources/html/ja/privacypolicy.html rename to Covid19Radar/Covid19Radar/Documents/html/ja/privacypolicy.html diff --git a/Covid19Radar/Covid19Radar/Resources/html/ja/privacypolicy.md b/Covid19Radar/Covid19Radar/Documents/html/ja/privacypolicy.md similarity index 100% rename from Covid19Radar/Covid19Radar/Resources/html/ja/privacypolicy.md rename to Covid19Radar/Covid19Radar/Documents/html/ja/privacypolicy.md diff --git a/Covid19Radar/Covid19Radar/Resources/html/ja/termofuse.html b/Covid19Radar/Covid19Radar/Documents/html/ja/termofuse.html similarity index 100% rename from Covid19Radar/Covid19Radar/Resources/html/ja/termofuse.html rename to Covid19Radar/Covid19Radar/Documents/html/ja/termofuse.html diff --git a/Covid19Radar/Covid19Radar/Resources/html/ja/termofuse.md b/Covid19Radar/Covid19Radar/Documents/html/ja/termofuse.md similarity index 100% rename from Covid19Radar/Covid19Radar/Resources/html/ja/termofuse.md rename to Covid19Radar/Covid19Radar/Documents/html/ja/termofuse.md diff --git a/Covid19Radar/Covid19Radar/Resources/html/zh-hans/privacypolicy.html b/Covid19Radar/Covid19Radar/Documents/html/zh-hans/privacypolicy.html similarity index 100% rename from Covid19Radar/Covid19Radar/Resources/html/zh-hans/privacypolicy.html rename to Covid19Radar/Covid19Radar/Documents/html/zh-hans/privacypolicy.html diff --git a/Covid19Radar/Covid19Radar/Resources/html/zh-hans/privacypolicy.md b/Covid19Radar/Covid19Radar/Documents/html/zh-hans/privacypolicy.md similarity index 100% rename from Covid19Radar/Covid19Radar/Resources/html/zh-hans/privacypolicy.md rename to Covid19Radar/Covid19Radar/Documents/html/zh-hans/privacypolicy.md diff --git a/Covid19Radar/Covid19Radar/Resources/html/zh-hans/termofuse.html b/Covid19Radar/Covid19Radar/Documents/html/zh-hans/termofuse.html similarity index 100% rename from Covid19Radar/Covid19Radar/Resources/html/zh-hans/termofuse.html rename to Covid19Radar/Covid19Radar/Documents/html/zh-hans/termofuse.html diff --git a/Covid19Radar/Covid19Radar/Resources/html/zh-hans/termofuse.md b/Covid19Radar/Covid19Radar/Documents/html/zh-hans/termofuse.md similarity index 100% rename from Covid19Radar/Covid19Radar/Resources/html/zh-hans/termofuse.md rename to Covid19Radar/Covid19Radar/Documents/html/zh-hans/termofuse.md diff --git a/Covid19Radar/Covid19Radar/Model/AndroidExtensions.cs b/Covid19Radar/Covid19Radar/Model/AndroidExtensions.cs deleted file mode 100644 index f38025dc2..000000000 --- a/Covid19Radar/Covid19Radar/Model/AndroidExtensions.cs +++ /dev/null @@ -1,40 +0,0 @@ -/* 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/. */ - -using System.Collections.Generic; -using System.Linq; -using System.Security.Cryptography; -using System.Text; - -namespace Covid19Radar.Model -{ - public static class AndroidExtensions - { - public static byte[] GetAndroidNonce(this DiagnosisSubmissionParameter submission) - { - var cleartext = GetAndroidNonceClearText(submission); - var nonce = GetSha256(cleartext); - return nonce; - } - - static string GetAndroidNonceClearText(this DiagnosisSubmissionParameter submission) => - string.Join("|", submission.AppPackageName, GetKeyString(submission.Keys), GetRegionString(submission.Regions), submission.VerificationPayload); - - static string GetKeyString(IEnumerable keys) => - string.Join(",", keys.OrderBy(k => k.KeyData).Select(k => GetKeyString(k))); - - static string GetKeyString(DiagnosisSubmissionParameter.Key k) => - string.Join(".", k.KeyData, k.RollingStartNumber, k.RollingPeriod); - - static string GetRegionString(IEnumerable regions) => - string.Join(",", regions.Select(r => r.ToUpperInvariant()).OrderBy(r => r)); - - static byte[] GetSha256(string text) - { - using var sha = SHA256.Create(); - var textBytes = Encoding.UTF8.GetBytes(text); - return sha.ComputeHash(textBytes); - } - } -} diff --git a/Covid19Radar/Covid19Radar/Model/PositiveDiagnosisState.cs b/Covid19Radar/Covid19Radar/Model/PositiveDiagnosisState.cs deleted file mode 100644 index 53ef32dbd..000000000 --- a/Covid19Radar/Covid19Radar/Model/PositiveDiagnosisState.cs +++ /dev/null @@ -1,16 +0,0 @@ -/* 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/. */ - -using System; - -namespace Covid19Radar.Model -{ - public class PositiveDiagnosisState - { - public string DiagnosisUid { get; set; } - - public DateTimeOffset DiagnosisDate { get; set; } - - } -} diff --git a/Covid19Radar/Covid19Radar/Model/TemporaryExposureKeysResult.cs b/Covid19Radar/Covid19Radar/Model/TemporaryExposureKeysResult.cs deleted file mode 100644 index 1a63c7d6c..000000000 --- a/Covid19Radar/Covid19Radar/Model/TemporaryExposureKeysResult.cs +++ /dev/null @@ -1,23 +0,0 @@ -/* 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/. */ - -using Newtonsoft.Json; -using System.Collections.Generic; - -namespace Covid19Radar.Model -{ - public class TemporaryExposureKeysResult - { - [JsonProperty("timestamp")] - public long Timestamp { get; set; } - - [JsonProperty("keys")] - public IEnumerable Keys { get; set; } - - public class Key - { - public string Url; - } - } -} diff --git a/Covid19Radar/Covid19Radar/Model/UnUsed/ContributorModel.cs b/Covid19Radar/Covid19Radar/Model/UnUsed/ContributorModel.cs deleted file mode 100644 index 50f13e8e1..000000000 --- a/Covid19Radar/Covid19Radar/Model/UnUsed/ContributorModel.cs +++ /dev/null @@ -1,13 +0,0 @@ -/* 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/. */ - -namespace Covid19Radar.Model -{ - public class ContributorModel - { - public string Fullname { get; set; } - - public string Role { get; set; } - } -} diff --git a/Covid19Radar/Covid19Radar/Model/UnUsed/Language.cs b/Covid19Radar/Covid19Radar/Model/UnUsed/Language.cs deleted file mode 100644 index 52ddd9bfc..000000000 --- a/Covid19Radar/Covid19Radar/Model/UnUsed/Language.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* 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/. */ - -using System; -using System.Collections.Generic; -using System.Text; - -namespace Covid19Radar.Model -{ - public class Language - { - public string DisplayName - { - get; - set; - } - public string ShortName - { - get; - set; - } - } -} diff --git a/Covid19Radar/Covid19Radar/Model/UnUsed/LanguageModel.cs b/Covid19Radar/Covid19Radar/Model/UnUsed/LanguageModel.cs deleted file mode 100644 index 77bacf496..000000000 --- a/Covid19Radar/Covid19Radar/Model/UnUsed/LanguageModel.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* 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/. */ - -using System; -using System.Collections.Generic; -using System.Text; - -namespace Covid19Radar.Model -{ - public class LanguageModel - { - public string DisplayName - { - get; - set; - } - public string ShortName - { - get; - set; - } - } -} diff --git a/Covid19Radar/Covid19Radar/Model/UnUsed/NotificationMessageModel.cs b/Covid19Radar/Covid19Radar/Model/UnUsed/NotificationMessageModel.cs deleted file mode 100644 index da8515387..000000000 --- a/Covid19Radar/Covid19Radar/Model/UnUsed/NotificationMessageModel.cs +++ /dev/null @@ -1,37 +0,0 @@ -/* 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/. */ - -using SQLite; -using System; -using System.Collections.Generic; -using System.Text; - -namespace Covid19Radar.Model -{ - /// - /// Notification message model - /// - [Table("NotificationMessage")] - public class NotificationMessageModel - { - /// - /// for Cosmos DB - /// - [PrimaryKey] - public string id { get; set; } - - /// - /// Title - /// - public string Title { get; set; } - /// - /// Message - /// - public string Message { get; set; } - /// - /// Created DateTime - /// - public DateTime Created { get; set; } - } -} diff --git a/Covid19Radar/Covid19Radar/Model/UnUsed/NotificationPullResult.cs b/Covid19Radar/Covid19Radar/Model/UnUsed/NotificationPullResult.cs deleted file mode 100644 index da02b786e..000000000 --- a/Covid19Radar/Covid19Radar/Model/UnUsed/NotificationPullResult.cs +++ /dev/null @@ -1,26 +0,0 @@ -/* 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/. */ - -using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.Text; - -namespace Covid19Radar.Model -{ - public class NotificationPullResult - { - /// - /// Last notification date and time - /// - [JsonProperty("lastNotificationTime")] - public DateTime LastNotificationTime { get; set; } - /// - /// Notification Messages - /// - [JsonProperty("messages")] - public NotificationMessageModel[] Messages { get; set; } - } - -} diff --git a/Covid19Radar/Covid19Radar/Model/UnUsed/StepModel.cs b/Covid19Radar/Covid19Radar/Model/UnUsed/StepModel.cs deleted file mode 100644 index e50fe75df..000000000 --- a/Covid19Radar/Covid19Radar/Model/UnUsed/StepModel.cs +++ /dev/null @@ -1,21 +0,0 @@ -/* 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/. */ - -using Xamarin.Forms; - -namespace Covid19Radar.Model -{ - public class StepModel - { - public string Description { get; set; } - public string Description2 { get; set; } - public bool HasStepNumber => StepNumber != null; - public bool HasImage2 => Image2 != null; - public bool HasDescription2 => Description2 != null; - public string Image { get; set; } - public string Image2 { get; set; } - public int? StepNumber { get; set; } - public string Title { get; set; } - } -} diff --git a/Covid19Radar/Covid19Radar/Model/UnUsed/TermsOfServiceModel.cs b/Covid19Radar/Covid19Radar/Model/UnUsed/TermsOfServiceModel.cs deleted file mode 100644 index ab71528b5..000000000 --- a/Covid19Radar/Covid19Radar/Model/UnUsed/TermsOfServiceModel.cs +++ /dev/null @@ -1,12 +0,0 @@ -/* 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/. */ - -namespace Covid19Radar.Model -{ - public class TermsOfServiceModel - { - public string Title { get; set; } - public string Description { get; set; } - } -} diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.Designer.cs b/Covid19Radar/Covid19Radar/Resources/AppResources.Designer.cs index 8b4515a9b..18c8cfa18 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.Designer.cs +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.Designer.cs @@ -16,7 +16,7 @@ namespace Covid19Radar.Resources { [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [System.Diagnostics.DebuggerNonUserCodeAttribute()] [System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class AppResources { + public class AppResources { private static System.Resources.ResourceManager resourceMan; @@ -27,7 +27,7 @@ internal AppResources() { } [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] - internal static System.Resources.ResourceManager ResourceManager { + public static System.Resources.ResourceManager ResourceManager { get { if (object.Equals(null, resourceMan)) { System.Resources.ResourceManager temp = new System.Resources.ResourceManager("Covid19Radar.Resources.AppResources", typeof(AppResources).Assembly); @@ -38,7 +38,7 @@ internal static System.Resources.ResourceManager ResourceManager { } [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] - internal static System.Globalization.CultureInfo Culture { + public static System.Globalization.CultureInfo Culture { get { return resourceCulture; } @@ -47,1444 +47,1492 @@ internal static System.Globalization.CultureInfo Culture { } } - internal static string ButtonAgree { + public static string ButtonAgree { get { return ResourceManager.GetString("ButtonAgree", resourceCulture); } } - internal static string HomePageTitle { + public static string HomePageTitle { get { return ResourceManager.GetString("HomePageTitle", resourceCulture); } } - internal static string AppName { + public static string AppName { get { return ResourceManager.GetString("AppName", resourceCulture); } } - internal static string SettingsPageTitle { + public static string SettingsPageTitle { get { return ResourceManager.GetString("SettingsPageTitle", resourceCulture); } } - internal static string SettingsPageButton1 { + public static string SettingsPageButton1 { get { return ResourceManager.GetString("SettingsPageButton1", resourceCulture); } } - internal static string TitleLicenseAgreement { + public static string TitleLicenseAgreement { get { return ResourceManager.GetString("TitleLicenseAgreement", resourceCulture); } } - internal static string TitileUserStatusSettings { + public static string TitileUserStatusSettings { get { return ResourceManager.GetString("TitileUserStatusSettings", resourceCulture); } } - internal static string ButtonOk { + public static string ButtonOk { get { return ResourceManager.GetString("ButtonOk", resourceCulture); } } - internal static string DialogNetworkConnectionError { + public static string DialogNetworkConnectionError { get { return ResourceManager.GetString("DialogNetworkConnectionError", resourceCulture); } } - internal static string ButtonNotNow { + public static string ButtonNotNow { get { return ResourceManager.GetString("ButtonNotNow", resourceCulture); } } - internal static string MainExposures { + public static string MainExposures { get { return ResourceManager.GetString("MainExposures", resourceCulture); } } - internal static string NotifyOthersLearnMoreUrl { + public static string NotifyOthersLearnMoreUrl { get { return ResourceManager.GetString("NotifyOthersLearnMoreUrl", resourceCulture); } } - internal static string MainTutorial { + public static string MainTutorial { get { return ResourceManager.GetString("MainTutorial", resourceCulture); } } - internal static string ExposuresPageNoExposures { + public static string ExposuresPageNoExposures { get { return ResourceManager.GetString("ExposuresPageNoExposures", resourceCulture); } } - internal static string ExposuresPageNoExposuresInfo { + public static string ExposuresPageNoExposuresInfo { get { return ResourceManager.GetString("ExposuresPageNoExposuresInfo", resourceCulture); } } - internal static string NotifyOtherPageDialogExceptionText { + public static string NotifyOtherPageDialogExceptionText { get { return ResourceManager.GetString("NotifyOtherPageDialogExceptionText", resourceCulture); } } - internal static string ButtonFailed { + public static string NotifyOtherPageDialogExceptionTitle { get { - return ResourceManager.GetString("ButtonFailed", resourceCulture); + return ResourceManager.GetString("NotifyOtherPageDialogExceptionTitle", resourceCulture); } } - internal static string NotifyOtherPageDialogSubmittedText { + public static string NotifyOtherPageDialogSubmittedTitle { get { - return ResourceManager.GetString("NotifyOtherPageDialogSubmittedText", resourceCulture); + return ResourceManager.GetString("NotifyOtherPageDialogSubmittedTitle", resourceCulture); } } - internal static string ButtonComplete { + public static string LoadingTextSubmittingDiagnosis { get { - return ResourceManager.GetString("ButtonComplete", resourceCulture); + return ResourceManager.GetString("LoadingTextSubmittingDiagnosis", resourceCulture); } } - internal static string LoadingTextSubmittingDiagnosis { + public static string ButtonCancel { get { - return ResourceManager.GetString("LoadingTextSubmittingDiagnosis", resourceCulture); + return ResourceManager.GetString("ButtonCancel", resourceCulture); } } - internal static string ButtonCancel { + public static string ButtonReset { get { - return ResourceManager.GetString("ButtonCancel", resourceCulture); + return ResourceManager.GetString("ButtonReset", resourceCulture); } } - internal static string ButtonReset { + public static string ButtonRegister { get { - return ResourceManager.GetString("ButtonReset", resourceCulture); + return ResourceManager.GetString("ButtonRegister", resourceCulture); } } - internal static string LoadingTextDeleting { + public static string LoadingTextDeleting { get { return ResourceManager.GetString("LoadingTextDeleting", resourceCulture); } } - internal static string HomePageHeader2Description { + public static string HomePageHeader2Description { get { return ResourceManager.GetString("HomePageHeader2Description", resourceCulture); } } - internal static string HomePageHeader3Title { + public static string HomePageHeader3Title { get { return ResourceManager.GetString("HomePageHeader3Title", resourceCulture); } } - internal static string HomePageHeader3Description { + public static string HomePageHeader3Description { get { return ResourceManager.GetString("HomePageHeader3Description", resourceCulture); } } - internal static string ButtonShare { + public static string ButtonShare { get { return ResourceManager.GetString("ButtonShare", resourceCulture); } } - internal static string ButtonNotifyOtherPage { + public static string ButtonNotifyOtherPage { get { return ResourceManager.GetString("ButtonNotifyOtherPage", resourceCulture); } } - internal static string PrivacyPolicyPageTitle { + public static string PrivacyPolicyPageTitle { get { return ResourceManager.GetString("PrivacyPolicyPageTitle", resourceCulture); } } - internal static string LoadingTextRegistering { + public static string LoadingTextRegistering { get { return ResourceManager.GetString("LoadingTextRegistering", resourceCulture); } } - internal static string SettingsPageDialogResetText { + public static string SettingsPageDialogResetText { get { return ResourceManager.GetString("SettingsPageDialogResetText", resourceCulture); } } - internal static string SettingsPageDialogResetTitle { + public static string SettingsPageDialogResetTitle { get { return ResourceManager.GetString("SettingsPageDialogResetTitle", resourceCulture); } } - internal static string SettingsPageDialogResetCompletedText { + public static string SettingsPageDialogResetCompletedTitle { + get { + return ResourceManager.GetString("SettingsPageDialogResetCompletedTitle", resourceCulture); + } + } + + public static string SettingsPageDialogResetCompletedText { get { return ResourceManager.GetString("SettingsPageDialogResetCompletedText", resourceCulture); } } - internal static string VersionText { + public static string VersionText { get { return ResourceManager.GetString("VersionText", resourceCulture); } } - internal static string SettingsPageLabel1 { + public static string SettingsPageLabel1 { get { return ResourceManager.GetString("SettingsPageLabel1", resourceCulture); } } - internal static string SettingsPageDescription1 { + public static string SettingsPageDescription1 { get { return ResourceManager.GetString("SettingsPageDescription1", resourceCulture); } } - internal static string SettingsPageLabel2 { + public static string SettingsPageLabel2 { get { return ResourceManager.GetString("SettingsPageLabel2", resourceCulture); } } - internal static string SettingsPageDescription2 { + public static string SettingsPageDescription2 { get { return ResourceManager.GetString("SettingsPageDescription2", resourceCulture); } } - internal static string SettingsPageLabel3 { + public static string SettingsPageLabel3 { get { return ResourceManager.GetString("SettingsPageLabel3", resourceCulture); } } - internal static string SettingsPageDescription3 { + public static string SettingsPageDescription3 { get { return ResourceManager.GetString("SettingsPageDescription3", resourceCulture); } } - internal static string ButtonReturnToRegistration { + public static string ButtonReturnToRegistration { get { return ResourceManager.GetString("ButtonReturnToRegistration", resourceCulture); } } - internal static string PositiveRegistrationText { + public static string PositiveRegistrationText { get { return ResourceManager.GetString("PositiveRegistrationText", resourceCulture); } } - internal static string PositiveRegistrationConfirmText { + public static string PositiveRegistrationConfirmText { get { return ResourceManager.GetString("PositiveRegistrationConfirmText", resourceCulture); } } - internal static string HelpMenuPageTitle { + public static string HelpMenuPageTitle { get { return ResourceManager.GetString("HelpMenuPageTitle", resourceCulture); } } - internal static string HelpMenuPageLabel1 { + public static string HelpMenuPageLabel1 { get { return ResourceManager.GetString("HelpMenuPageLabel1", resourceCulture); } } - internal static string HelpMenuPageLabel2 { + public static string HelpMenuPageLabel2 { get { return ResourceManager.GetString("HelpMenuPageLabel2", resourceCulture); } } - internal static string HelpMenuPageLabel3 { + public static string HelpMenuPageLabel3 { get { return ResourceManager.GetString("HelpMenuPageLabel3", resourceCulture); } } - internal static string HelpMenuPageLabel4 { + public static string HelpMenuPageLabel4 { get { return ResourceManager.GetString("HelpMenuPageLabel4", resourceCulture); } } - internal static string HelpPage1Title { + public static string HelpPage1Title { get { return ResourceManager.GetString("HelpPage1Title", resourceCulture); } } - internal static string HelpPage2Title { + public static string HelpPage2Title { get { return ResourceManager.GetString("HelpPage2Title", resourceCulture); } } - internal static string HelpPage3Title { + public static string HelpPage3Title { get { return ResourceManager.GetString("HelpPage3Title", resourceCulture); } } - internal static string HelpPage4Title { + public static string HelpPage4Title { get { return ResourceManager.GetString("HelpPage4Title", resourceCulture); } } - internal static string HelpPage1Description1Text { + public static string HelpPage1Description1Text { get { return ResourceManager.GetString("HelpPage1Description1Text", resourceCulture); } } - internal static string HelpPage1Description2Title { + public static string HelpPage1Description2Title { get { return ResourceManager.GetString("HelpPage1Description2Title", resourceCulture); } } - internal static string HelpPage1Description2Text { + public static string HelpPage1Description2Text { get { return ResourceManager.GetString("HelpPage1Description2Text", resourceCulture); } } - internal static string HelpPage1Description3Title { + public static string HelpPage1Description3Title { get { return ResourceManager.GetString("HelpPage1Description3Title", resourceCulture); } } - internal static string HelpPage1Description3Text { + public static string HelpPage1Description3Text { get { return ResourceManager.GetString("HelpPage1Description3Text", resourceCulture); } } - internal static string HelpPage2Description1 { + public static string HelpPage2Description1 { get { return ResourceManager.GetString("HelpPage2Description1", resourceCulture); } } - internal static string HelpPage2Description2 { + public static string HelpPage2Description2 { get { return ResourceManager.GetString("HelpPage2Description2", resourceCulture); } } - internal static string HelpPage2Description3 { + public static string HelpPage2Description3 { get { return ResourceManager.GetString("HelpPage2Description3", resourceCulture); } } - internal static string HelpPage2Label1 { + public static string HelpPage2Label1 { get { return ResourceManager.GetString("HelpPage2Label1", resourceCulture); } } - internal static string HelpPage2Label2 { + public static string HelpPage2Label2 { get { return ResourceManager.GetString("HelpPage2Label2", resourceCulture); } } - internal static string HelpPage2Label3 { + public static string HelpPage2Label3 { get { return ResourceManager.GetString("HelpPage2Label3", resourceCulture); } } - internal static string HelpPage4ButtonText { + public static string HelpPage4ButtonText { get { return ResourceManager.GetString("HelpPage4ButtonText", resourceCulture); } } - internal static string HelpPage4Description { + public static string HelpPage4Description { get { return ResourceManager.GetString("HelpPage4Description", resourceCulture); } } - internal static string HelpPage3Description1 { + public static string HelpPage3Description1 { get { return ResourceManager.GetString("HelpPage3Description1", resourceCulture); } } - internal static string HelpPage3Description2 { + public static string HelpPage3Description2 { get { return ResourceManager.GetString("HelpPage3Description2", resourceCulture); } } - internal static string HelpPage3Description3 { + public static string HelpPage3Description3 { get { return ResourceManager.GetString("HelpPage3Description3", resourceCulture); } } - internal static string NotContactPageTitle { + public static string NotContactPageTitle { get { return ResourceManager.GetString("NotContactPageTitle", resourceCulture); } } - internal static string NotContactPageLabel1 { + public static string NotContactPageLabel1 { get { return ResourceManager.GetString("NotContactPageLabel1", resourceCulture); } } - internal static string NotContactPageDescription1 { + public static string NotContactPageDescription1 { get { return ResourceManager.GetString("NotContactPageDescription1", resourceCulture); } } - internal static string NotContactPageButtonText { + public static string NotContactPageButtonText { get { return ResourceManager.GetString("NotContactPageButtonText", resourceCulture); } } - internal static string ThankYouNotifyOtherPageLabel1 { + public static string ThankYouNotifyOtherPageLabel1 { get { return ResourceManager.GetString("ThankYouNotifyOtherPageLabel1", resourceCulture); } } - internal static string ThankYouNotifyOtherPageDescription1 { + public static string ThankYouNotifyOtherPageDescription1 { get { return ResourceManager.GetString("ThankYouNotifyOtherPageDescription1", resourceCulture); } } - internal static string TutorialPage3Title { + public static string TutorialPage3Title { get { return ResourceManager.GetString("TutorialPage3Title", resourceCulture); } } - internal static string TutorialPage3ButtonText { + public static string TutorialPage3ButtonText { get { return ResourceManager.GetString("TutorialPage3ButtonText", resourceCulture); } } - internal static string TutorialPage6Label1 { + public static string TutorialPage6Label1 { get { return ResourceManager.GetString("TutorialPage6Label1", resourceCulture); } } - internal static string TutorialPage6ButtonText1 { + public static string TutorialPage6ButtonText1 { get { return ResourceManager.GetString("TutorialPage6ButtonText1", resourceCulture); } } - internal static string TutorialPage6ButtonText2 { + public static string TutorialPage6ButtonText2 { get { return ResourceManager.GetString("TutorialPage6ButtonText2", resourceCulture); } } - internal static string HelpPage1MainTitle { + public static string HelpPage1MainTitle { get { return ResourceManager.GetString("HelpPage1MainTitle", resourceCulture); } } - internal static string ContactedNotifyPageButton1 { + public static string ContactedNotifyPageButton1 { get { return ResourceManager.GetString("ContactedNotifyPageButton1", resourceCulture); } } - internal static string ContactedNotifyPageCountText { + public static string ContactedNotifyPageCountText { get { return ResourceManager.GetString("ContactedNotifyPageCountText", resourceCulture); } } - internal static string ContactedNotifyPageMainText { + public static string ContactedNotifyPageMainText { get { return ResourceManager.GetString("ContactedNotifyPageMainText", resourceCulture); } } - internal static string ContactedNotifyPageTitle { + public static string ContactedNotifyPageTitle { get { return ResourceManager.GetString("ContactedNotifyPageTitle", resourceCulture); } } - internal static string InqueryPageTitle { + public static string InqueryPageTitle { get { return ResourceManager.GetString("InqueryPageTitle", resourceCulture); } } - internal static string InqueryPageTitle_Menu { + public static string InqueryPageTitle_Menu { get { return ResourceManager.GetString("InqueryPageTitle_Menu", resourceCulture); } } - internal static string HomePageDescription1 { + public static string HomePageDescription1 { get { return ResourceManager.GetString("HomePageDescription1", resourceCulture); } } - internal static string HomePageDescription2 { + public static string HomePageDescription2 { get { return ResourceManager.GetString("HomePageDescription2", resourceCulture); } } - internal static string HomePageDescription3 { + public static string HomePageDescription3 { get { return ResourceManager.GetString("HomePageDescription3", resourceCulture); } } - internal static string HomePageDescription4 { + public static string HomePageDescription4 { get { return ResourceManager.GetString("HomePageDescription4", resourceCulture); } } - internal static string HomePageDescription5 { + public static string HomePageDescription5 { get { return ResourceManager.GetString("HomePageDescription5", resourceCulture); } } - internal static string HomePageTitle1 { + public static string HomePageTitle1 { get { return ResourceManager.GetString("HomePageTitle1", resourceCulture); } } - internal static string TermsofservicePageTitle { + public static string TermsofservicePageTitle { get { return ResourceManager.GetString("TermsofservicePageTitle", resourceCulture); } } - internal static string TutorialPage2Description1 { + public static string TutorialPage2Description1 { get { return ResourceManager.GetString("TutorialPage2Description1", resourceCulture); } } - internal static string TutorialPage2Description2 { + public static string TutorialPage2Description2 { get { return ResourceManager.GetString("TutorialPage2Description2", resourceCulture); } } - internal static string TutorialPage2Description3 { + public static string TutorialPage2Description3 { get { return ResourceManager.GetString("TutorialPage2Description3", resourceCulture); } } - internal static string TutorialPage2Description4 { + public static string TutorialPage2Description4 { get { return ResourceManager.GetString("TutorialPage2Description4", resourceCulture); } } - internal static string TutorialPage2Description5 { + public static string TutorialPage2Description5 { get { return ResourceManager.GetString("TutorialPage2Description5", resourceCulture); } } - internal static string TutorialPage2Title { + public static string TutorialPage2Title { get { return ResourceManager.GetString("TutorialPage2Title", resourceCulture); } } - internal static string TutorialPage5Description1 { + public static string TutorialPage5Description1 { get { return ResourceManager.GetString("TutorialPage5Description1", resourceCulture); } } - internal static string TutorialPage5Description2 { + public static string TutorialPage5Description2 { get { return ResourceManager.GetString("TutorialPage5Description2", resourceCulture); } } - internal static string TutorialPage5Description3 { + public static string TutorialPage5Description3 { get { return ResourceManager.GetString("TutorialPage5Description3", resourceCulture); } } - internal static string TutorialPage5Description4 { + public static string TutorialPage5Description4 { get { return ResourceManager.GetString("TutorialPage5Description4", resourceCulture); } } - internal static string TutorialPage5Title { + public static string TutorialPage5Title { get { return ResourceManager.GetString("TutorialPage5Title", resourceCulture); } } - internal static string MenuPageTitle { + public static string MenuPageTitle { get { return ResourceManager.GetString("MenuPageTitle", resourceCulture); } } - internal static string NotifyOtherPageButton { + public static string NotifyOtherPageButton { get { return ResourceManager.GetString("NotifyOtherPageButton", resourceCulture); } } - internal static string NotifyOtherPageDescription3 { + public static string NotifyOtherPageDescription3 { get { return ResourceManager.GetString("NotifyOtherPageDescription3", resourceCulture); } } - internal static string NotifyOtherPageDescription5 { + public static string NotifyOtherPageDescription5 { get { return ResourceManager.GetString("NotifyOtherPageDescription5", resourceCulture); } } - internal static string NotifyOtherPageLabel { + public static string NotifyOtherPageLabel { get { return ResourceManager.GetString("NotifyOtherPageLabel", resourceCulture); } } - internal static string NotifyOtherPageTitle { + public static string NotifyOtherPageTitle { get { return ResourceManager.GetString("NotifyOtherPageTitle", resourceCulture); } } - internal static string TutorialPage1Button { + public static string TutorialPage1Button { get { return ResourceManager.GetString("TutorialPage1Button", resourceCulture); } } - internal static string TutorialPage1Description1 { + public static string TutorialPage1Description1 { get { return ResourceManager.GetString("TutorialPage1Description1", resourceCulture); } } - internal static string TutorialPage1Description2 { + public static string TutorialPage1Description2 { get { return ResourceManager.GetString("TutorialPage1Description2", resourceCulture); } } - internal static string TutorialPage1Description3 { + public static string TutorialPage1Description3 { get { return ResourceManager.GetString("TutorialPage1Description3", resourceCulture); } } - internal static string TutorialPage1Title1 { + public static string TutorialPage1Title1 { get { return ResourceManager.GetString("TutorialPage1Title1", resourceCulture); } } - internal static string TutorialPage1Title2 { + public static string TutorialPage1Title2 { get { return ResourceManager.GetString("TutorialPage1Title2", resourceCulture); } } - internal static string TutorialPage4Button1 { + public static string TutorialPage4Button1 { get { return ResourceManager.GetString("TutorialPage4Button1", resourceCulture); } } - internal static string TutorialPage4Button2 { + public static string TutorialPage4Button2 { get { return ResourceManager.GetString("TutorialPage4Button2", resourceCulture); } } - internal static string TutorialPage4Description { + public static string TutorialPage4Description { get { return ResourceManager.GetString("TutorialPage4Description", resourceCulture); } } - internal static string TutorialPage4Label { + public static string TutorialPage4Label { get { return ResourceManager.GetString("TutorialPage4Label", resourceCulture); } } - internal static string TutorialPage4Title1 { + public static string TutorialPage4Title1 { get { return ResourceManager.GetString("TutorialPage4Title1", resourceCulture); } } - internal static string TutorialPage4Title2 { + public static string TutorialPage4Title2 { get { return ResourceManager.GetString("TutorialPage4Title2", resourceCulture); } } - internal static string HomePageDescription0 { + public static string HomePageDescription0 { get { return ResourceManager.GetString("HomePageDescription0", resourceCulture); } } - internal static string NotifyOtherPageLabel2 { + public static string NotifyOtherPageLabel2 { get { return ResourceManager.GetString("NotifyOtherPageLabel2", resourceCulture); } } - internal static string SubmitConsentPageButton { + public static string SubmitConsentPageButton { get { return ResourceManager.GetString("SubmitConsentPageButton", resourceCulture); } } - internal static string SubmitConsentPageTitle1 { + public static string SubmitConsentPageTitle1 { get { return ResourceManager.GetString("SubmitConsentPageTitle1", resourceCulture); } } - internal static string SubmitConsentPageTitle2 { + public static string SubmitConsentPageTitle2 { get { return ResourceManager.GetString("SubmitConsentPageTitle2", resourceCulture); } } - internal static string ExposureNotificationServiceMessage4 { + public static string ExposureNotificationServiceMessage4 { get { return ResourceManager.GetString("ExposureNotificationServiceMessage4", resourceCulture); } } - internal static string ExposuresPageTitle { + public static string ExposuresPageTitle { get { return ResourceManager.GetString("ExposuresPageTitle", resourceCulture); } } - internal static string ExposuresPageLabel1 { + public static string ExposuresPageLabel1 { get { return ResourceManager.GetString("ExposuresPageLabel1", resourceCulture); } } - internal static string UrlContactedPhone { + public static string UrlContactedPhone { get { return ResourceManager.GetString("UrlContactedPhone", resourceCulture); } } - internal static string LocalNotificationDescription { + public static string LocalNotificationDescription { get { return ResourceManager.GetString("LocalNotificationDescription", resourceCulture); } } - internal static string LocalNotificationTitle { + public static string LocalNotificationTitle { get { return ResourceManager.GetString("LocalNotificationTitle", resourceCulture); } } - internal static string LocalNotificationPermittedDescription { + public static string LocalNotificationPermittedDescription { get { return ResourceManager.GetString("LocalNotificationPermittedDescription", resourceCulture); } } - internal static string LocalNotificationPermittedTitle { + public static string LocalNotificationPermittedTitle { get { return ResourceManager.GetString("LocalNotificationPermittedTitle", resourceCulture); } } - internal static string InqueryPageDescription3 { + public static string InqueryPageDescription3 { get { return ResourceManager.GetString("InqueryPageDescription3", resourceCulture); } } - internal static string HomePagePastDays { + public static string HomePagePastDays { get { return ResourceManager.GetString("HomePagePastDays", resourceCulture); } } - internal static string ExposureNotificationStatusMessageActive { + public static string ExposureNotificationStatusMessageActive { get { return ResourceManager.GetString("ExposureNotificationStatusMessageActive", resourceCulture); } } - internal static string ExposureNotificationStatusMessageBluetoothOff { + public static string ExposureNotificationStatusMessageBluetoothOff { get { return ResourceManager.GetString("ExposureNotificationStatusMessageBluetoothOff", resourceCulture); } } - internal static string ExposureNotificationStatusMessageDisabled { + public static string ExposureNotificationStatusMessageDisabled { get { return ResourceManager.GetString("ExposureNotificationStatusMessageDisabled", resourceCulture); } } - internal static string ExposureNotificationStatusMessageIsOptined { + public static string ExposureNotificationStatusMessageIsOptined { get { return ResourceManager.GetString("ExposureNotificationStatusMessageIsOptined", resourceCulture); } } - internal static string ExposureNotificationStatusMessageRestricted { + public static string ExposureNotificationRestrictedTitle { + get { + return ResourceManager.GetString("ExposureNotificationRestrictedTitle", resourceCulture); + } + } + + public static string ExposureNotificationStatusMessageRestricted { get { return ResourceManager.GetString("ExposureNotificationStatusMessageRestricted", resourceCulture); } } - internal static string ExposureNotificationStatusMessageUnknown { + public static string ExposureNotificationStatusMessageUnknown { get { return ResourceManager.GetString("ExposureNotificationStatusMessageUnknown", resourceCulture); } } - internal static string DialogNetworkConnectionErrorTitle { + public static string DialogNetworkConnectionErrorTitle { get { return ResourceManager.GetString("DialogNetworkConnectionErrorTitle", resourceCulture); } } - internal static string DialogExposureNotificationStartupErrorTitle { + public static string DialogExposureNotificationStartupErrorTitle { get { return ResourceManager.GetString("DialogExposureNotificationStartupErrorTitle", resourceCulture); } } - internal static string DialogExposureNotificationStartupError { + public static string DialogExposureNotificationStartupError { get { return ResourceManager.GetString("DialogExposureNotificationStartupError", resourceCulture); } } - internal static string ExposureNotificationHandler1ErrorMessage { + public static string ExposureNotificationHandler1ErrorMessage { get { return ResourceManager.GetString("ExposureNotificationHandler1ErrorMessage", resourceCulture); } } - internal static string ExposureNotificationHandler2ErrorMessage { + public static string ExposureNotificationHandler2ErrorMessage { get { return ResourceManager.GetString("ExposureNotificationHandler2ErrorMessage", resourceCulture); } } - internal static string NotifyOtherPageDiag1Message { + public static string NotifyOtherPageDiag1Message { get { return ResourceManager.GetString("NotifyOtherPageDiag1Message", resourceCulture); } } - internal static string NotifyOtherPageDiag1Title { + public static string NotifyOtherPageDiag1Title { get { return ResourceManager.GetString("NotifyOtherPageDiag1Title", resourceCulture); } } - internal static string NotifyOtherPageDiag2Message { + public static string NotifyOtherPageDiag2Title { get { - return ResourceManager.GetString("NotifyOtherPageDiag2Message", resourceCulture); + return ResourceManager.GetString("NotifyOtherPageDiag2Title", resourceCulture); } } - internal static string NotifyOtherPageDiag3Message { + public static string NotifyOtherPageDiag3Message { get { return ResourceManager.GetString("NotifyOtherPageDiag3Message", resourceCulture); } } - internal static string NotifyOtherPageDiag3Title { + public static string NotifyOtherPageDiag3Title { get { return ResourceManager.GetString("NotifyOtherPageDiag3Title", resourceCulture); } } - internal static string NotifyOtherPageDiag4Message { + public static string NotifyOtherPageDiag4Message { get { return ResourceManager.GetString("NotifyOtherPageDiag4Message", resourceCulture); } } - internal static string NotifyOtherPageDiag5Message { + public static string NotifyOtherPageDiag5Message { get { return ResourceManager.GetString("NotifyOtherPageDiag5Message", resourceCulture); } } - internal static string NotifyOtherPageDiag6Message { + public static string NotifyOtherPageDiag6Message { get { return ResourceManager.GetString("NotifyOtherPageDiag6Message", resourceCulture); } } - internal static string NotifyOtherPageDiag6Title { + public static string NotifyOtherPageDiag6Title { get { return ResourceManager.GetString("NotifyOtherPageDiag6Title", resourceCulture); } } - internal static string NotifyOtherPageDiagAppClose { + public static string NotifyOtherPageDiagAppCloseTitle { + get { + return ResourceManager.GetString("NotifyOtherPageDiagAppCloseTitle", resourceCulture); + } + } + + public static string NotifyOtherPageDiagAppClose { get { return ResourceManager.GetString("NotifyOtherPageDiagAppClose", resourceCulture); } } - internal static string NotifyOtherPageDiagErrorTitle { + public static string ProcessingNumberErrorDiagTitle { get { - return ResourceManager.GetString("NotifyOtherPageDiagErrorTitle", resourceCulture); + return ResourceManager.GetString("ProcessingNumberErrorDiagTitle", resourceCulture); } } - internal static string NotifyOtherPageDialogExceptionTargetDiagKeyNotFound { + public static string NotifyOtherPageDialogExceptionTargetDiagKeyNotFound { get { return ResourceManager.GetString("NotifyOtherPageDialogExceptionTargetDiagKeyNotFound", resourceCulture); } } - internal static string NotifyOtherPageDialogExceptionTargetDiagKeyNotFoundTitle { + public static string NotifyOtherPageDialogExceptionTargetDiagKeyNotFoundTitle { get { return ResourceManager.GetString("NotifyOtherPageDialogExceptionTargetDiagKeyNotFoundTitle", resourceCulture); } } - internal static string AppUtilsGetNewVersionDescription { + public static string AppUtilsGetNewVersionDescription { get { return ResourceManager.GetString("AppUtilsGetNewVersionDescription", resourceCulture); } } - internal static string AppUtilsGetNewVersionTitle { + public static string AppUtilsGetNewVersionTitle { get { return ResourceManager.GetString("AppUtilsGetNewVersionTitle", resourceCulture); } } - internal static string UrlVersion { + public static string UrlVersion { get { return ResourceManager.GetString("UrlVersion", resourceCulture); } } - internal static string ExposureNotificationHandler3ErrorMessage { + public static string ExposureNotificationHandler3ErrorMessage { get { return ResourceManager.GetString("ExposureNotificationHandler3ErrorMessage", resourceCulture); } } - internal static string ContactedNotifyPageButton2 { + public static string ContactedNotifyPageButton2 { get { return ResourceManager.GetString("ContactedNotifyPageButton2", resourceCulture); } } - internal static string ContactedNotifyPageDescription1 { + public static string ContactedNotifyPageDescription1 { get { return ResourceManager.GetString("ContactedNotifyPageDescription1", resourceCulture); } } - internal static string ReAgreeCheckButton { + public static string ReAgreeCheckButton { get { return ResourceManager.GetString("ReAgreeCheckButton", resourceCulture); } } - internal static string ReAgreePrivacyPolicyPageTitle { + public static string ReAgreePrivacyPolicyPageTitle { get { return ResourceManager.GetString("ReAgreePrivacyPolicyPageTitle", resourceCulture); } } - internal static string ReAgreePrivacyPolicyTextLink { + public static string ReAgreePrivacyPolicyTextLink { get { return ResourceManager.GetString("ReAgreePrivacyPolicyTextLink", resourceCulture); } } - internal static string ReAgreeTermsOfServiceTextLink { + public static string ReAgreeTermsOfServiceTextLink { get { return ResourceManager.GetString("ReAgreeTermsOfServiceTextLink", resourceCulture); } } - internal static string ReAgreeTermsOfServiceTitle { + public static string ReAgreeTermsOfServiceTitle { get { return ResourceManager.GetString("ReAgreeTermsOfServiceTitle", resourceCulture); } } - internal static string UrlTermsUpdate { + public static string UrlTermsUpdate { get { return ResourceManager.GetString("UrlTermsUpdate", resourceCulture); } } - internal static string InqueryPageDescription2 { + public static string InqueryPageDescription2 { get { return ResourceManager.GetString("InqueryPageDescription2", resourceCulture); } } - internal static string InqueryPageButton1 { + public static string InqueryPageButton1 { get { return ResourceManager.GetString("InqueryPageButton1", resourceCulture); } } - internal static string InqueryPageButton2 { + public static string InqueryPageButton2 { get { return ResourceManager.GetString("InqueryPageButton2", resourceCulture); } } - internal static string InqueryPageButton3 { + public static string InqueryPageButton3 { get { return ResourceManager.GetString("InqueryPageButton3", resourceCulture); } } - internal static string InqueryPageDescription1 { + public static string InqueryPageDescription1 { get { return ResourceManager.GetString("InqueryPageDescription1", resourceCulture); } } - internal static string SendLogConfirmationPageButton1 { + public static string SendLogConfirmationPageButton1 { get { return ResourceManager.GetString("SendLogConfirmationPageButton1", resourceCulture); } } - internal static string SendLogConfirmationPageDescription1 { + public static string SendLogConfirmationPageDescription1 { get { return ResourceManager.GetString("SendLogConfirmationPageDescription1", resourceCulture); } } - internal static string SendLogConfirmationPageDescription2 { + public static string SendLogConfirmationPageDescription2 { get { return ResourceManager.GetString("SendLogConfirmationPageDescription2", resourceCulture); } } - internal static string SendLogConfirmationPageDescription3 { + public static string SendLogConfirmationPageDescription3 { get { return ResourceManager.GetString("SendLogConfirmationPageDescription3", resourceCulture); } } - internal static string SendLogConfirmationPageDescription4 { + public static string SendLogConfirmationPageDescription4 { get { return ResourceManager.GetString("SendLogConfirmationPageDescription4", resourceCulture); } } - internal static string SendLogConfirmationPageDescription5 { + public static string SendLogConfirmationPageDescription5 { get { return ResourceManager.GetString("SendLogConfirmationPageDescription5", resourceCulture); } } - internal static string SendLogConfirmationPageDescription6 { + public static string SendLogConfirmationPageDescription6 { get { return ResourceManager.GetString("SendLogConfirmationPageDescription6", resourceCulture); } } - internal static string SendLogConfirmationPageDescription7 { + public static string SendLogConfirmationPageDescription7 { get { return ResourceManager.GetString("SendLogConfirmationPageDescription7", resourceCulture); } } - internal static string SendLogConfirmationPageDescription8 { + public static string SendLogConfirmationPageDescription8 { get { return ResourceManager.GetString("SendLogConfirmationPageDescription8", resourceCulture); } } - internal static string SendLogConfirmationPageTextLink1 { + public static string SendLogConfirmationPageTextLink1 { get { return ResourceManager.GetString("SendLogConfirmationPageTextLink1", resourceCulture); } } - internal static string SendLogConfirmationPageTitle { + public static string SendLogConfirmationPageTitle { get { return ResourceManager.GetString("SendLogConfirmationPageTitle", resourceCulture); } } - internal static string SendLogCompletePageButton1 { + public static string SendLogCompletePageButton1 { get { return ResourceManager.GetString("SendLogCompletePageButton1", resourceCulture); } } - internal static string SendLogCompletePageButton2 { + public static string SendLogCompletePageButton2 { get { return ResourceManager.GetString("SendLogCompletePageButton2", resourceCulture); } } - internal static string SendLogCompletePageDescription1 { + public static string SendLogCompletePageDescription1 { get { return ResourceManager.GetString("SendLogCompletePageDescription1", resourceCulture); } } - internal static string SendLogCompletePageDescription2 { + public static string SendLogCompletePageDescription2 { get { return ResourceManager.GetString("SendLogCompletePageDescription2", resourceCulture); } } - internal static string Error { + public static string Error { get { return ResourceManager.GetString("Error", resourceCulture); } } - internal static string FailedMessageToGetOperatingInformation { + public static string FailedMessageToGetOperatingInformation { get { return ResourceManager.GetString("FailedMessageToGetOperatingInformation", resourceCulture); } } - internal static string FailedMessageToSaveOperatingInformation { + public static string FailedMessageToSaveOperatingInformation { get { return ResourceManager.GetString("FailedMessageToSaveOperatingInformation", resourceCulture); } } - internal static string FailedMessageToSendOperatingInformation { + public static string FailedMessageToSendOperatingInformation { get { return ResourceManager.GetString("FailedMessageToSendOperatingInformation", resourceCulture); } } - internal static string InquiryMailBody { + public static string InquiryMailBody { get { return ResourceManager.GetString("InquiryMailBody", resourceCulture); } } - internal static string InquiryMailSubject { + public static string InquiryMailSubject { get { return ResourceManager.GetString("InquiryMailSubject", resourceCulture); } } - internal static string Processing { + public static string Processing { get { return ResourceManager.GetString("Processing", resourceCulture); } } - internal static string SaveCompleted { + public static string SaveCompleted { get { return ResourceManager.GetString("SaveCompleted", resourceCulture); } } - internal static string Saving { + public static string Saving { get { return ResourceManager.GetString("Saving", resourceCulture); } } - internal static string SendIdMailBody1 { + public static string SendIdMailBody1 { get { return ResourceManager.GetString("SendIdMailBody1", resourceCulture); } } - internal static string SendIdMailBody2 { + public static string SendIdMailBody2 { get { return ResourceManager.GetString("SendIdMailBody2", resourceCulture); } } - internal static string SendIdMailSubject { + public static string SendIdMailSubject { get { return ResourceManager.GetString("SendIdMailSubject", resourceCulture); } } - internal static string Sending { + public static string Sending { get { return ResourceManager.GetString("Sending", resourceCulture); } } - internal static string SendingError { + public static string SendingError { get { return ResourceManager.GetString("SendingError", resourceCulture); } } - internal static string SuccessMessageToSaveOperatingInformationForAndroid { + public static string SuccessMessageToSaveOperatingInformationForAndroid { get { return ResourceManager.GetString("SuccessMessageToSaveOperatingInformationForAndroid", resourceCulture); } } - internal static string SuccessMessageToSaveOperatingInformationForIOS { + public static string SuccessMessageToSaveOperatingInformationForIOS { get { return ResourceManager.GetString("SuccessMessageToSaveOperatingInformationForIOS", resourceCulture); } } - internal static string UrlContactedForm { + public static string UrlContactedForm { get { return ResourceManager.GetString("UrlContactedForm", resourceCulture); } } - internal static string SuccessMessageToSaveOperatingInformationForAndroid2 { + public static string SuccessMessageToSaveOperatingInformationForAndroid2 { get { return ResourceManager.GetString("SuccessMessageToSaveOperatingInformationForAndroid2", resourceCulture); } } - internal static string NotifyOtherPageDescription1 { + public static string NotifyOtherPageDescription1 { get { return ResourceManager.GetString("NotifyOtherPageDescription1", resourceCulture); } } - internal static string NotifyOtherPageDescription2 { + public static string NotifyOtherPageDescription2 { get { return ResourceManager.GetString("NotifyOtherPageDescription2", resourceCulture); } } - internal static string NotifyOtherPageDescription4 { + public static string NotifyOtherPageDescription4 { get { return ResourceManager.GetString("NotifyOtherPageDescription4", resourceCulture); } } - internal static string NotifyOtherPageDescription6 { + public static string NotifyOtherPageDescription6 { get { return ResourceManager.GetString("NotifyOtherPageDescription6", resourceCulture); } } - internal static string NotifyOtherPageNoSymptomsDescription1 { + public static string NotifyOtherPageNoSymptomsDescription1 { get { return ResourceManager.GetString("NotifyOtherPageNoSymptomsDescription1", resourceCulture); } } - internal static string NotifyOtherPageRadioButtonNo { + public static string NotifyOtherPageRadioButtonNo { get { return ResourceManager.GetString("NotifyOtherPageRadioButtonNo", resourceCulture); } } - internal static string NotifyOtherPageRadioButtonYes { + public static string NotifyOtherPageRadioButtonYes { get { return ResourceManager.GetString("NotifyOtherPageRadioButtonYes", resourceCulture); } } - internal static string NotifyOtherPageWithSymptomsDescription1 { + public static string NotifyOtherPageWithSymptomsDescription1 { get { return ResourceManager.GetString("NotifyOtherPageWithSymptomsDescription1", resourceCulture); } } - internal static string HelpPage3Description4 { + public static string HelpPage3Description4 { get { return ResourceManager.GetString("HelpPage3Description4", resourceCulture); } } - internal static string HelpPage3Description5 { + public static string HelpPage3Description5 { get { return ResourceManager.GetString("HelpPage3Description5", resourceCulture); } } - internal static string SubmitConsentPageDescription1 { + public static string SubmitConsentPageDescription1 { get { return ResourceManager.GetString("SubmitConsentPageDescription1", resourceCulture); } } - internal static string SubmitConsentPageDescription10 { + public static string SubmitConsentPageDescription10 { get { return ResourceManager.GetString("SubmitConsentPageDescription10", resourceCulture); } } - internal static string SubmitConsentPageDescription2 { + public static string SubmitConsentPageDescription2 { get { return ResourceManager.GetString("SubmitConsentPageDescription2", resourceCulture); } } - internal static string SubmitConsentPageDescription3 { + public static string SubmitConsentPageDescription3 { get { return ResourceManager.GetString("SubmitConsentPageDescription3", resourceCulture); } } - internal static string SubmitConsentPageDescription4 { + public static string SubmitConsentPageDescription4 { get { return ResourceManager.GetString("SubmitConsentPageDescription4", resourceCulture); } } - internal static string SubmitConsentPageDescription5 { + public static string SubmitConsentPageDescription5 { get { return ResourceManager.GetString("SubmitConsentPageDescription5", resourceCulture); } } - internal static string SubmitConsentPageDescription6 { + public static string SubmitConsentPageDescription6 { get { return ResourceManager.GetString("SubmitConsentPageDescription6", resourceCulture); } } - internal static string SubmitConsentPageDescription7 { + public static string SubmitConsentPageDescription7 { get { return ResourceManager.GetString("SubmitConsentPageDescription7", resourceCulture); } } - internal static string SubmitConsentPageDescription8 { + public static string SubmitConsentPageDescription8 { get { return ResourceManager.GetString("SubmitConsentPageDescription8", resourceCulture); } } - internal static string SubmitConsentPageDescription9 { + public static string SubmitConsentPageDescription9 { get { return ResourceManager.GetString("SubmitConsentPageDescription9", resourceCulture); } } - internal static string HelpPage3Description6 { + public static string HelpPage3Description6 { get { return ResourceManager.GetString("HelpPage3Description6", resourceCulture); } } - internal static string UrlPrivacyPolicy { + public static string UrlPrivacyPolicy { get { return ResourceManager.GetString("UrlPrivacyPolicy", resourceCulture); } } - internal static string UrlTermOfUse { + public static string UrlTermOfUse { get { return ResourceManager.GetString("UrlTermOfUse", resourceCulture); } } - internal static string HowToReceiveProcessingNumberPageTitle { + public static string HowToReceiveProcessingNumberPageTitle { get { return ResourceManager.GetString("HowToReceiveProcessingNumberPageTitle", resourceCulture); } } - internal static string HowToReceiveProcessingNumberPageDescription1 { + public static string HowToReceiveProcessingNumberPageDescription1 { get { return ResourceManager.GetString("HowToReceiveProcessingNumberPageDescription1", resourceCulture); } } - internal static string HowToReceiveProcessingNumberPageDescription2 { + public static string HowToReceiveProcessingNumberPageDescription2 { get { return ResourceManager.GetString("HowToReceiveProcessingNumberPageDescription2", resourceCulture); } } - internal static string HowToReceiveProcessingNumberPageDescription3 { + public static string HowToReceiveProcessingNumberPageDescription3 { get { return ResourceManager.GetString("HowToReceiveProcessingNumberPageDescription3", resourceCulture); } } - internal static string HowToReceiveProcessingNumberPageDescription4 { + public static string HowToReceiveProcessingNumberPageDescription4 { get { return ResourceManager.GetString("HowToReceiveProcessingNumberPageDescription4", resourceCulture); } } - internal static string NoteSymbol { + public static string AndroidNotificationChannelName { + get { + return ResourceManager.GetString("AndroidNotificationChannelName", resourceCulture); + } + } + + public static string LocalExposureNotificationTitle { + get { + return ResourceManager.GetString("LocalExposureNotificationTitle", resourceCulture); + } + } + + public static string LocalExposureNotificationContent { + get { + return ResourceManager.GetString("LocalExposureNotificationContent", resourceCulture); + } + } + + public static string NoteSymbol { get { return ResourceManager.GetString("NoteSymbol", resourceCulture); } } + + public static string WebAccessibilityPolicyPageTitle { + get { + return ResourceManager.GetString("WebAccessibilityPolicyPageTitle", resourceCulture); + } + } + + public static string UrlWebAccessibilityPolicy { + get { + return ResourceManager.GetString("UrlWebAccessibilityPolicy", resourceCulture); + } + } } } diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.af.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.af.resx index 7d04df5c8..f6aa96006 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.af.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.af.resx @@ -67,18 +67,6 @@ Jy sal in kennis gestel word as jy blootgestel was aan iemand wat 'n positiewe COVID-19 resultaat berig. exposures comment - - Probeer asseblief weer later. - - - Het misluk - - - Diagnose Ingedien - - - Voltooi - Diagnose word ingedien... @@ -544,10 +532,6 @@ Jy moet saamstem met die gebruiksvoorwaardes. 利用規約に同意する必要があります。 - - Blootstellingskennisgewing is beperk. Asseblief aktief. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - Blootstellingskennisgewing word nie ondersteun nie. Werk asseblief die OS by die nuutste weergawe. As jy nog probleme het, kontak ons asseblief by appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Registreer 登録 - - Gekanselleer - キャンセルしました - Wag asseblief vir 'n rukkie tot registrasie begin 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ Die aantal registrasies het die boonste limiet bereik. Verlaat toepassing 登録回数上限になりました。アプリケーションを終了します - - Registrasie fout - 登録エラー - Die kontadrekord wat by die voorlegging ooreenstem, kon nie bevestig word nie. Nie nodig om in te dien. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.am.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.am.resx index 0989cfb4d..b9e288b58 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.am.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.am.resx @@ -51,15 +51,6 @@ https://microsoft.com Health care jurisdiction page - - እባክዎን ቆይተው እንደገና ይሞክሩ። - - - አልተሳካም - - - አጠናቅ - ሰርዝ @@ -168,8 +159,4 @@ ይመዝገቡ 登録 - - ተሰርዟል - キャンセルしました - diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.ar.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.ar.resx index 4067d21b7..943b3b185 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.ar.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.ar.resx @@ -67,18 +67,6 @@ سيتم إعلامك إذا كنت قد تعرضت لشخص أبلغ عن إصابتة بفيروس كورونا المستجد. exposures comment - - يرجى إعادة المحاولة لاحقًا. - - - فشل - - - التشخيصات المقدمة - - - مكتمل - تقديم التشخيص... @@ -544,10 +532,6 @@ يجب أن توافق على شروط الاستخدام. 利用規約に同意する必要があります。 - - يتم تقييد إعلام التعرض. الرجاء نشط. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - لا يتم دعم إعلام التعرض. الرجاء تحديث نظام التشغيل إلى أحدث إصدار. إذا كنت لا تزال تواجه مشاكل، يرجى الاتصال بنا في appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ تسجيل 登録 - - تم الإلغاء - キャンセルしました - يرجى الانتظار لفترة حتى يبدأ التسجيل 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ وصل عدد التسجيلات إلى الحد الأعلى. إنهاء التطبيق 登録回数上限になりました。アプリケーションを終了します - - خطأ في التسجيل - 登録エラー - ولم يتسن تأكيد سجل الاتصال المقابل للإحالة. لا حاجة لتقديم. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.be.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.be.resx index 56b983fc7..e1dd20128 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.be.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.be.resx @@ -47,15 +47,6 @@ Не зараз - - Паўтарыце спробу пазней. - - - Памылка - - - Завершана - Скасаваць @@ -164,8 +155,4 @@ Рэгістрацыя 登録 - - Скасавана - キャンセルしました - diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.bg.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.bg.resx index c2fac6bf8..20a258905 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.bg.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.bg.resx @@ -67,18 +67,6 @@ Ще бъдете уведомени, ако сте били изложени на някой, който е съобщил за положителен резултат от COVID-19. exposures comment - - Опитайте отново по-късно. - - - Неуспешно - - - Диагноза, представена - - - Завършено - Подаване на диагноза... @@ -544,10 +532,6 @@ Трябва да приемете условията за ползване. 利用規約に同意する必要があります。 - - Уведомяването за експозиция е ограничено. Моля, активирайте се. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - Не се поддържа уведомяване за експозиция. Моля, актуализирайте операционната система до най-новата версия. Ако все още имате проблеми, моля, свържете се с нас на appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Регистриране 登録 - - Отменено - キャンセルしました - Моля, изчакайте известно време, докато започне регистрацията 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ Броят на регистрации е достигнал горната граница. Изход от приложението 登録回数上限になりました。アプリケーションを終了します - - Грешка при регистрацията - 登録エラー - Записът на контакта, съответстващ на подаването, не можа да бъде потвърден. Няма нужда да се подава. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.bn.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.bn.resx index 7a7db444b..139368851 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.bn.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.bn.resx @@ -67,18 +67,6 @@ আপনি যদি কেউ ইতিবাচক COVID-19 ফলাফল রিপোর্ট প্রকাশ করা হয়েছে আপনি অবহিত করা হবে. exposures comment - - অনুগ্রহ করে পরে আবার চেষ্টা করুন। - - - ব্যর্থ হয়েছে - - - নিদান জমা - - - সম্পন্ন হয়েছে - নির্ণয়ের জমা দেওয়া হচ্ছে... @@ -544,10 +532,6 @@ আপনাকে অবশ্যই ব্যবহারের শর্তাবলীর সাথে একমত হতে হবে। 利用規約に同意する必要があります。 - - এক্সপোজার প্রজ্ঞাপন সীমাবদ্ধ। অনুগ্রহ করে সক্রিয় করুন। - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - এক্সপোজার প্রজ্ঞাপন সমর্থিত নয়। অনুগ্রহ করে সর্বশেষ সংস্করণে OS হালনাগাদ করুন। আপনার যদি এখনও কোন সমস্যা থাকে, অনুগ্রহ করে appsupport@cov19.mhlw.go.jp আমাদের সাথে যোগাযোগ করুন। Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ নিবন্ধন করুন 登録 - - বাতিল করা হয়েছে - キャンセルしました - নিবন্ধন শুরু না হওয়া পর্যন্ত অনুগ্রহ করে কিছু সময়ের জন্য অপেক্ষা করুন 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ রেজিস্ট্রেশনের সংখ্যা সর্বোচ্চ সীমায় পৌঁছেছে। প্রয়োগণ প্রস্থান করুন 登録回数上限になりました。アプリケーションを終了します - - নিবন্ধন ত্রুটি - 登録エラー - জমা দেওয়ার সাথে সামঞ্জস্যপূর্ণ যোগাযোগ রেকর্ড নিশ্চিত করা যায়নি। জমা দেওয়ার দরকার নেই। 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.ca.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.ca.resx index dc2fd26d5..c1cf77f18 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.ca.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.ca.resx @@ -67,18 +67,6 @@ Se l'avisarà si ha estat exposat a algú que comunicava un resultat de COVID-19 positiu. exposures comment - - Torneu-ho a provar més tard. - - - Ha fallat - - - Diagnòstic presentat - - - complet - La presentació del diagnòstic... @@ -544,10 +532,6 @@ Vostè ha d'acceptar les condicions d'ús. 利用規約に同意する必要があります。 - - La notificació d'exposició està restringida. Si us plau actiu. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - No es permet la notificació d'exposició. Si us plau actualitzi l'OS a la versió més recent. Si encara teniu problemes, poseu-vos en contacte amb nosaltres a appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Registra 登録 - - Cancel·lat - キャンセルしました - Espereu-vos una estona fins que comenci el registre 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ El nombre de registres ha assolit el límit superior. Sol·licitud de sortida 登録回数上限になりました。アプリケーションを終了します - - Error de registre - 登録エラー - No s'ha pogut confirmar el registre de contacte corresponent a la tramesa. No hi ha necessitat de presentar. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.cs.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.cs.resx index ad34a402b..bd516f29a 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.cs.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.cs.resx @@ -67,18 +67,6 @@ Budete upozorněni, pokud jste byli vystaveni někomu, kdo hlásil pozitivní výsledek COVID-19. exposures comment - - Zkuste to prosím znovu později. - - - Chyba - - - Diagnóza odeslána - - - Dokončeno - Předkládání diagnózy... @@ -544,10 +532,6 @@ Musíte souhlasit s podmínkami použití. 利用規約に同意する必要があります。 - - Oznámení o expozici je omezeno. Prosím, aktivní. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - Oznámení o expozici není podporováno. Aktualizujte operační systém na nejnovější verzi. Pokud máte stále problémy, kontaktujte nás na appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Registrovat 登録 - - Stornováno - キャンセルしました - Počkejte chvíli, než začne registrace. 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ Počet registrací dosáhl horní hranice. Ukončit aplikaci 登録回数上限になりました。アプリケーションを終了します - - Chyba registrace - 登録エラー - Záznam kontaktu odpovídající podání nemohl být potvrzen. Není třeba se podrobovat. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.cy.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.cy.resx index 535458af3..27bee0aed 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.cy.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.cy.resx @@ -67,18 +67,6 @@ Byddwch yn cael eich hysbysu os ydych wedi dod i gysylltiad â rhywun a gofnododd ganlyniad COVID-19 cadarnhaol. exposures comment - - Rhowch gynnig arall arni rywbryd eto. - - - Wedi methu - - - Diagnosis a gyflwynwyd - - - Wedi gorffen - Wrthi'n cyflwyno diagnosis ... @@ -544,10 +532,6 @@ Rhaid i chi gytuno i'r telerau defnyddio. 利用規約に同意する必要があります。 - - Mae hysbysu am amlygiad yn gyfyngedig. Os gwelwch yn dda actif. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - Ni chynhelir hysbysiad am amlygiad. Diweddarwch yr AO at y fersiwn ddiweddaraf. Os oes gennych broblemau o hyd, cysylltwch â ni ar appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Cofrestru 登録 - - Canslwyd - キャンセルしました - Arhoswch am ychydig hyd nes y bydd y cofrestriad yn dechrau 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ Mae nifer y cofrestriadau wedi cyrraedd y terfyn uchaf. Gadael y rhaglen 登録回数上限になりました。アプリケーションを終了します - - Gwall cofrestru - 登録エラー - Doedd dim modd cadarnhau'r Cofnod Cyswllt a oedd yn cyfateb i'r cyflwyniad. Dim angen cyflwyno. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.da.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.da.resx index 115f4a30b..dbe311bbd 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.da.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.da.resx @@ -67,18 +67,6 @@ Du får besked, hvis du har været udsat for en person, der har rapporteret et positivt COVID-19 resultat. exposures comment - - Prøv igen senere. - - - Mislykkedes - - - Diagnose indsendt - - - Fuldført - Sender diagnose... @@ -544,10 +532,6 @@ Du skal acceptere vilkårene for brug. 利用規約に同意する必要があります。 - - Eksponeringsmeddelelsen er begrænset. Vær aktiv. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - Eksponeringsmeddelelse understøttes ikke. Opdater operativsystemet til den nyeste version. Hvis du stadig har problemer, bedes du kontakte os på appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Registrer 登録 - - Annulleret - キャンセルしました - Vent et stykke tid, indtil registreringen starter 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ Antallet af registreringer har nået den øvre grænse. Afslut program 登録回数上限になりました。アプリケーションを終了します - - Registreringsfejl - 登録エラー - Den kontaktpersonpost, der svarer til indsendelsen, kunne ikke bekræftes. Ingen grund til at indsende. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.de.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.de.resx index fb77e038d..f8c6f9cd3 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.de.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.de.resx @@ -67,18 +67,6 @@ Sie werden benachrichtigt, wenn Sie mit jemandem in Kontakt gekommen sind, der ein positives COVID-19-Ergebnis gemeldet hat. exposures comment - - Versuchen Sie es später erneut. - - - Fehler - - - Diagnose eingereicht - - - Abschließen - Diagnose wird gestellt... @@ -544,10 +532,6 @@ Sie müssen den Nutzungsbedingungen zustimmen. 利用規約に同意する必要があります。 - - Die Belichtungsbenachrichtigung ist eingeschränkt. Bitte aktiv. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - Die Belichtungsbenachrichtigung wird nicht unterstützt. Bitte aktualisieren Sie das Betriebssystem auf die neueste Version. Wenn Sie immer noch Probleme haben, kontaktieren Sie uns bitte unter appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Registrieren 登録 - - Abgebrochen - キャンセルしました - Bitte warten Sie eine Weile, bis die Registrierung beginnt 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ Die Anzahl der Anmeldungen hat die Obergrenze erreicht. Exit-Anwendung 登録回数上限になりました。アプリケーションを終了します - - Registrierungsfehler - 登録エラー - Der der Einreichung entsprechende Kontaktdatensatz konnte nicht bestätigt werden. Keine Notwendigkeit zu übermitteln. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.el.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.el.resx index fb92c30df..ac76dc1b6 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.el.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.el.resx @@ -67,18 +67,6 @@ Θα ειδοποιηθείτε εάν έχετε εκτεθεί σε κάποιον που ανέφερε θετικό αποτέλεσμα COVID-19. exposures comment - - Δοκιμάστε ξανά αργότερα. - - - Απέτυχε - - - Διάγνωση που υποβλήθηκε - - - Ολοκληρώθηκε - Υποβολή διάγνωσης... @@ -544,10 +532,6 @@ Πρέπει να συμφωνήσετε με τους όρους χρήσης. 利用規約に同意する必要があります。 - - Η ειδοποίηση έκθεσης είναι περιορισμένη. Παρακαλώ ενεργή. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - Η ειδοποίηση έκθεσης δεν υποστηρίζεται. Ενημερώστε το λειτουργικό σύστημα στην πιο πρόσφατη έκδοση. Αν εξακολουθείτε να αντιμετωπίζετε προβλήματα, παρακαλούμε επικοινωνήστε μαζί μας στο appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Καταχώρηση 登録 - - Ακυρωμένο - キャンセルしました - Περιμένετε λίγο μέχρι να ξεκινήσει η εγγραφή 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ Ο αριθμός των εγγραφών έχει φτάσει στο ανώτατο όριο. Έξοδος από την εφαρμογή 登録回数上限になりました。アプリケーションを終了します - - Σφάλμα εγγραφής - 登録エラー - Δεν ήταν δυνατή η επιβεβαίωση της καρτέλας επαφής που αντιστοιχεί στην υποβολή. Δεν χρειάζεται να υποταχθείς. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.en.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.en.resx index df412af7f..92b807297 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.en.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.en.resx @@ -65,16 +65,16 @@ exposures comment - Please try again later. + Please enter the processing number again. + 処理番号を再度入力してください。 - - Failed + + Could not register positive test result's information + 陽性情報を登録できませんでした - - Diagnosis Submitted - - - Complete + + Registration is complete + 登録が完了しました Submitting Diagnosis... @@ -85,6 +85,10 @@ Cancel + + + Register + 登録 Deleting @@ -111,13 +115,20 @@ Waiting for register - Do you really want to reset all the data? + Do you really want to delete all the data and stop the usage of the app? + すべてのデータを削除して、アプリの使用を中止します。よろしいですか? - Delete all data + Stop app usage + アプリの使用を中止します + + + Data have been deleted + データを削除しました - All settings and data have been deleted. Please restart the application. + Close the app + アプリを終了します。 Return to registration @@ -417,7 +428,7 @@ 登録する - How to receive a process code + How to receive a processing number 処理番号の取得方法 @@ -545,9 +556,13 @@ You must agree to the terms of use. 利用規約に同意する必要があります。 - - Exposure Notification is restricted. Please active. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 + + The close contact notification function is disabled + 接触通知機能が停止しています + + + Please reinstall the app or enable the notification from the OS settings. + アプリを再インストールするか、 OSの設定から接触通知を有効にしてください。 Exposure Notification is not supported. Please update the OS to the latest version. If you still have problems, please contact us at appsupport@cov19.mhlw.go.jp. @@ -566,40 +581,40 @@ Exposure Notificationを起動できませんでした。端末の設定を開いて、Exposure NotificationをONにするとともに、BluetoothをONにしてください。 - Process number incorrect - アプリで入力された処理番号が違います + Please input a valid processing number. + 正しい処理番号を入力してください。 Cannot connect to registration center センターに接続できません - Do you want to register positive information? - 陽性情報を登録しますか? + Do you want to register it? + よろしいですか? - Register - 登録 + Register positive test result + 陽性情報の登録をします - - Canceled - キャンセルしました + + Registration was canceled + 登録をキャンセルしました - Please wait for a while until registration starts - 登録開始までしばらくそのままでお待ちください + Please wait. + しばらくそのままでお待ちください。 - Awaiting registration - 登録待ち + Processing the registration + 登録を開始します No processing number entered 処理番号が入力されていません - Processing number format does not match - 処理番号のフォーマットが一致していません + Please enter a processing number in half-width numbers. + 処理番号は半角数字で入力してください。 In order to register positive records, it is necessary to enable COVID-19 contact log recording, please enable it from the application or OS settings. @@ -608,22 +623,26 @@ Enable COVID-19 contact logging COVID-19接触のログ記録を有効にしてください + + + Reached the maximum number of registrations + 登録回数の上限に達しました - The number of registrations has reached the upper limit. Exit application - 登録回数上限になりました。アプリケーションを終了します + Close the app + アプリを終了します。 - - Registration error - 登録エラー + + Incorrect processing number + 処理番号が違います - The contact record corresponding to the submission could not be confirmed. No need to submit. - 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 + Registration is not necessary. + 登録する必要はありません。 - No applicable contact - 該当接触なし + No close contact record present + 接触記録がありません https://covid19radarjpnprod.z11.web.core.windows.net/version.json @@ -830,7 +849,7 @@ Storage : ※「/Android」より前の部分は、お使いの環境によって「内部ストレージ」など表記が異なります - Please enter below the process code that you have received by SMS or email + Please enter below the processing number that you have received by SMS or email SMSまたはメールで届いた処理番号を入力してください。 @@ -846,7 +865,7 @@ Storage : 発熱、咳、呼吸困難、全身倦怠感、咽頭痛、鼻汁・鼻閉、頭痛、関節・筋肉痛、下痢、嘔気・嘔吐など - After you register the process code + After you register the processing number 登録すると @@ -954,9 +973,29 @@ Storage : If you have received a usage guide for My HER-SYS from the health center, please apply to use the Contact Confirmation Application from there. 保健所からMy HER-SYSの利用案内を受けている場合は、そちらから接触確認アプリの利用を申し出てください。 + + + Exposure notification + 接触を通知 + + + Important Notice + 重要なお知らせ + + + It is possible you have been in close proximity to a user who tested positive for COVID-19. Tap for more details. + 新型コロナウイルス感染症の陽性登録者と接触した可能性があります。タップして詳細を確認してください。 * + + Web accessibility policy + ウェブアクセシビリティ方針 + + + https://www.mhlw.go.jp/cocoa/webaccessibility_english.html + ウェブアクセシビリティ方針URL + \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.es.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.es.resx index 118638688..9d7c90a4a 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.es.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.es.resx @@ -67,18 +67,6 @@ Se le notificará si ha estado expuesto a alguien que reportó un resultado positivo de COVID-19. exposures comment - - Inténtelo de nuevo más tarde. - - - Error - - - Diagnóstico enviado - - - Completado - Enviando el Diagnóstico... @@ -544,10 +532,6 @@ Debe aceptar las condiciones de uso. 利用規約に同意する必要があります。 - - La notificación de exposición está restringida. Por favor, active. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - No se admite la notificación de exposición. Actualice el sistema operativo a la versión más reciente. Si sigues teniendo problemas, ponte en contacto con nosotros en appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Registrar 登録 - - Cancelado - キャンセルしました - Espere un momento hasta que comience el registro 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ El número de registros ha alcanzado el límite superior. Aplicación de salida 登録回数上限になりました。アプリケーションを終了します - - Error de registro - 登録エラー - No se pudo confirmar el registro de contacto correspondiente al envío. No hay necesidad de someterse. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.et.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.et.resx index 5fdcdba04..2b43a6a9f 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.et.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.et.resx @@ -67,18 +67,6 @@ Teid teavitatakse, kui olete kokku puutunud kellegagi, kes teatas positiivsest COVID-19 tulemusest. exposures comment - - Proovi hiljem uuesti. - - - Nurjus - - - Diagnoos esitatud - - - Valmis - Diagnoosi esitamine... @@ -544,10 +532,6 @@ Te peate nõustuma kasutustingimustega. 利用規約に同意する必要があります。 - - Kokkupuutest teatamine on piiratud. Palun aktiivne. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - Särituse teatist ei toetata. Värskendage operatsioonisüsteemi uusimale versioonile. Kui teil on veel probleeme, võtke meiega ühendust aadressil appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Registreeri 登録 - - Tühistatud - キャンセルしました - Palun oodake mõnda aega, kuni registreerimine algab 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ Registreerimiste arv on jõudnud ülempiirini. Välju rakendusest 登録回数上限になりました。アプリケーションを終了します - - Registreerimise viga - 登録エラー - Edastusele vastavat kontaktikirjet ei saanud kinnitada. Ei ole vaja esitada. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.eu.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.eu.resx index 698b41922..c57a32b2b 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.eu.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.eu.resx @@ -47,15 +47,6 @@ Orain ez - - Saiatu berriro geroago. - - - Huts egin du - - - Osatuta - Utzi @@ -172,8 +163,4 @@ Erregistratu 登録 - - Bertan behera utzita - キャンセルしました - diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.fa.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.fa.resx index ddcfd52cb..123e8212a 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.fa.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.fa.resx @@ -67,18 +67,6 @@ شما مطلع خواهید شد اگر شما در معرض کسی است که نتیجه مثبت COVID-19 گزارش شده است. exposures comment - - لطفاً بعداً دوباره تلاش کنید. - - - ناموفق - - - تشخیص ارائه شده - - - کامل - ارسال تشخیص... @@ -544,10 +532,6 @@ شما باید با شرایط استفاده موافقت کنید. 利用規約に同意する必要があります。 - - اعلان نوردهی محدود است. لطفا فعال. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - اعلان نوردهی پشتیبانی نمی شود. لطفا سیستم عامل را به آخرین نسخه به روز کنید. اگر شما هنوز هم مشکل دارید ، لطفا با ما تماس بگیرید در appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ ثبت کردن 登録 - - لغو شد - キャンセルしました - لطفا منتظر بمانید تا زمانی که ثبت نام شروع می شود 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ تعداد ثبت نام به حد بالایی رسیده است. خروج از برنامه 登録回数上限になりました。アプリケーションを終了します - - خطای ثبت نام - 登録エラー - ثبت مخاطب مربوط به ثبت تایید را نمی توان تأیید کرد. بدون نیاز به ارسال. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.fi.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.fi.resx index e34d12dd0..702a489e5 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.fi.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.fi.resx @@ -67,18 +67,6 @@ Saat ilmoituksen, jos olet altistunut jollekulle, joka ilmoitti positiivisesta COVID-19tuloksesta. exposures comment - - Yritä myöhemmin uudelleen. - - - Epäonnistui - - - Diagnoosi Lähetetty - - - Valmis - Lähetetään diagnoosia... @@ -544,10 +532,6 @@ Sinun on hyväksyttävä käyttöehdot. 利用規約に同意する必要があります。 - - Altistumisilmoitus on rajoitettu. Ole hyvä ja aktiivinen. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - Altistumisilmoitusta ei tueta. Päivitä käyttöjärjestelmä uusimpaan versioon. Jos sinulla on edelleen ongelmia, ota meihin yhteyttä appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Rekisteröi 登録 - - Peruutettu - キャンセルしました - Odota hetki, kunnes rekisteröinti alkaa 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ Rekisteröintien määrä on saavuttanut ylärajan. Lopeta sovellus 登録回数上限になりました。アプリケーションを終了します - - Rekisteröintivirhe - 登録エラー - Lähetystä vastaavaa yhteyshenkilötietuetta ei voitu vahvistaa. Ei tarvitse esittää. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.fil.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.fil.resx index f29380457..3f2a6999e 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.fil.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.fil.resx @@ -67,18 +67,6 @@ Ikaw ay aabisuhan kung ikaw ay napakita sa isang tao na iniulat ng isang positibong COVID na resulta. exposures comment - - Pakisubukang muli sa ibang pagkakataon. - - - Nabigo - - - Diyagnosis isinumite - - - Kumpleto - Nagsusumite ng pagsusuri ... @@ -544,10 +532,6 @@ Kailangan mong sumang-ayon sa mga tuntunin ng paggamit. 利用規約に同意する必要があります。 - - Ang pagkakalantad na notipikasyon ay limitado. Mangyaring aktibo. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - Hindi suportado ang pagkakalantad na paunawa. Mangyaring i-update ang OS sa pinakabagong bersyon. Kung mayroon ka pa ring problema, mangyaring makipag-ugnay sa amin sa appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Irehistro 登録 - - Kinansela - キャンセルしました - Mangyaring maghintay para sa isang habang hanggang sa magparehistro ay nagsisimula 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ Ang bilang ng mga o sariling pantatak ay naabot na ang itaas na limitasyon. Lumabas ng aplikasyon 登録回数上限になりました。アプリケーションを終了します - - Mali sa pagrerehistro - 登録エラー - Ang contact record na katumbas ng isinumite ay hindi makumpirma. Hindi na kailangang isumite. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.fr.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.fr.resx index f8aebbc4b..403c0e129 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.fr.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.fr.resx @@ -67,18 +67,6 @@ Vous serez notifié si vous avez été exposé à une personne ayant été déclarée positive au COVID-19. exposures comment - - Veuillez réessayer ultérieurement. - - - Échec - - - Diagnostic soumis - - - Terminé - Soumission du diagnostic... @@ -544,10 +532,6 @@ Vous devez accepter les conditions d’utilisation. 利用規約に同意する必要があります。 - - La fonction Notification d’exposition au COVID-19 n’est pas approuvée. Veuillez l’approuver via les paramètres du système d’exploitation, ou en réinstallant cette application. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - La Notification d’exposition n’est pas prise en charge. Veuillez mettre à jour le système d’exploitation vers la dernière version. Si vous avez encore des problèmes, veuillez nous contacter à appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ S’enregistrer 登録 - - Annulé - キャンセルしました - Veuillez attendre un certain temps jusqu’à ce que l’inscription commence 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ Le nombre d’enregistrements a atteint la limite maximale. Sortie de l’application. 登録回数上限になりました。アプリケーションを終了します - - Erreur d’inscription - 登録エラー - Le dossier de contact correspondant à la soumission n’a pas pu être confirmé. Pas besoin de soumettre. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.ga.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.ga.resx index 48c3091ad..3792cddc4 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.ga.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.ga.resx @@ -67,18 +67,6 @@ Cuirfear in iúl duit má bhí tú faoi lé duine a thuairiscigh toradh dearfach COVID-19. exposures comment - - Bain triail eile as ar ball. - - - Theip air - - - Diagnóis curtha isteach - - - Críochnaigh - Diagnóis a chur isteach... @@ -544,10 +532,6 @@ Ní mór duit aontú leis na téarmaí úsáide. 利用規約に同意する必要があります。 - - Tá srian ar Fhógra Nochta. Gníomhach, le do thoil. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - Ní thacaítear le Fógra Nochta. Nuashonraigh an OS go dtí an leagan is déanaí. Má tá fadhbanna agat fós, téigh i dteagmháil linn ag appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Cláraigh 登録 - - Cealaithe - キャンセルしました - Fan ar feadh tamaill go dtí go dtosaíonn an clárú 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ Tá an uasteorainn bainte amach ag líon na gclárúchán. Feidhmchlár scoir 登録回数上限になりました。アプリケーションを終了します - - Earráid chlárúcháin - 登録エラー - Níorbh fhéidir an taifead teagmhála a fhreagraíonn don aighneacht a dheimhniú. Ní gá a chur isteach. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.gd.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.gd.resx index 7730f979c..0aa8ccd32 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.gd.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.gd.resx @@ -43,15 +43,6 @@ Chan ann an-dràsta - - Feuch ris a-rithist an ceann greis. - - - Air fàilligeadh - - - Coileanta - Sguir dheth @@ -140,8 +131,4 @@ Clàraich 登録 - - Sguireadh dheth - キャンセルしました - diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.gl.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.gl.resx index a71e3d486..3d27a4e34 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.gl.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.gl.resx @@ -47,15 +47,6 @@ Agora non - - Téntao de novo máis tarde. - - - Erro - - - Completo - Cancelar @@ -172,8 +163,4 @@ Rexistrar 登録 - - Cancelado - キャンセルしました - diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.gu.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.gu.resx index 23eea82ed..ad2aa2d6c 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.gu.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.gu.resx @@ -67,18 +67,6 @@ જો તમને કોઈ એવા વ્યક્તિ સાથે સંપર્ક થયો હોય કે જેણે હકારાત્મક COVID-19 પરિણામ ની જાણ કરી હોય તો તમને સૂચિત કરવામાં આવશે. exposures comment - - પછીથી ફરી પ્રયાસ કરો. - - - નિષ્ફળ - - - નિદાન રજૂ થયેલ છે - - - પૂર્ણ - નિદાન રજૂ કરી રહ્યા છીએ... @@ -544,10 +532,6 @@ તમારે ઉપયોગની શરતો સાથે સંમત થવું જોઈએ. 利用規約に同意する必要があります。 - - એક્સપોઝર નોટિફિકેશન મર્યાદિત છે. કૃપા કરીને સક્રિય રહો. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - એક્સપોઝર સૂચના આધારભૂત નથી. કૃપા કરીને ઓએસને નવીનતમ આવૃત્તિમાં અપડેટ કરો. જો તમને હજુ પણ સમસ્યા હોય તો કૃપા કરીને appsupport@cov19.mhlw.go.jp પર અમારો સંપર્ક કરો. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ રજિસ્ટર કરો 登録 - - રદ કર્યું - キャンセルしました - મહેરબાની કરીને રજીસ્ટ્રેશન શરૂ થાય ત્યાં સુધી થોડી રાહ જુઓ 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ નોંધણીની સંખ્યા ઉપરની મર્યાદા સુધી પહોંચી ગઈ છે. કાર્યક્રમમાંથી બહાર નીકળો 登録回数上限になりました。アプリケーションを終了します - - નોંધણી ભૂલ - 登録エラー - રજૂઆતને અનુરૂપ સંપર્ક રેકોર્ડની પુષ્ટિ થઈ શકી નથી. સબમિટ કરવાની જરૂર નથી. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.he.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.he.resx index 315e2fa05..15d943bc2 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.he.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.he.resx @@ -67,18 +67,6 @@ תקבל הודעה אם נחשפת למישהו שדיווח על תוצאת COVID-19 חיובית. exposures comment - - נסה שוב מאוחר יותר. - - - נכשל - - - האבחנה הוגשה - - - השלם - הגשת אבחון... @@ -544,10 +532,6 @@ עליך להסכים לתנאי השימוש. 利用規約に同意する必要があります。 - - הודעת חשיפה מוגבלת. . בבקשה, פעילה - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - אין תמיכה בהודעת חשיפה. נא לעדכן את מערכת ההפעלה לגירסה העדכנית. אם עדיין יש לך בעיות, אנא צרו איתנו קשר ב-appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ הירשם 登録 - - בוטל - キャンセルしました - אנא המתן זמן עד שרישום יתחיל 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ מספר הרישומים הגיע למגבלה העליונה. צא מהיישום 登録回数上限になりました。アプリケーションを終了します - - שגיאת הרשמה - 登録エラー - לא היתה אפשרות לאשר את רשומת איש הקשר התואמת לשליחה. . אין צורך להיכנע 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.hi.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.hi.resx index 7cfc3b165..881315140 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.hi.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.hi.resx @@ -67,18 +67,6 @@ यदि आप किसी ऐसे व्यक्ति के संपर्क में आए हैं जिसने सकारात्मक COVID-19 परिणाम की सूचना दी है तो आपको सूचित किया जाएगा। exposures comment - - कृपया बाद में पुन: प्रयास करें. - - - विफल - - - निदान प्रस्तुत - - - पूर्ण करें - निदान प्रस्तुत कर रहा है ... @@ -544,10 +532,6 @@ आपको उपयोग की शर्तों से सहमत होना चाहिए। 利用規約に同意する必要があります。 - - एक्सपोजर नोटिफिकेशन प्रतिबंधित है। कृपया सक्रिय करें। - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - एक्सपोजर अधिसूचना का समर्थन नहीं किया जाता है। ओएस को नवीनतम संस्करण में अपडेट करें। यदि आपको अभी भी समस्या है, तो कृपया हमसे appsupport@cov19.mhlw.go.jp पर संपर्क करें। Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ पंजीकृत करें 登録 - - रद्द किया गया - キャンセルしました - पंजीकरण शुरू होने तक थोड़ी देर के लिए प्रतीक्षा करें 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ रजिस्ट्रेशन की संख्या ऊपरी सीमा तक पहुंच गई है। बाहर निकलें आवेदन 登録回数上限になりました。アプリケーションを終了します - - पंजीकरण त्रुटि - 登録エラー - प्रस्तुत करने के अनुरूप संपर्क रिकॉर्ड की पुष्टि नहीं की जा सकी । सबमिट करने की जरूरत नहीं है। 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.hr.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.hr.resx index 695b5f12c..e6970bbc8 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.hr.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.hr.resx @@ -67,18 +67,6 @@ Bit ćete obaviješteni ako ste bili izloženi nekome tko je prijavio pozitivan rezultat COVID-19. exposures comment - - Pokušajte ponovno poslije. - - - Nije uspjelo - - - Dijagnoza poslana - - - Dovršeno - Slanje dijagnoze... @@ -544,10 +532,6 @@ Morate se složiti s uvjetima korištenja. 利用規約に同意する必要があります。 - - Obavijest o izloženosti je ograničena. Molim vas, aktivne. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - Obavijest o izloženosti nije podržana. Ažurirajte OPERACIJSKI SUSTAV na najnoviju verziju. Ako i dalje imate problema, obratite nam se na appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Registracija 登録 - - Otkazano - キャンセルしました - Pričekajte neko vrijeme dok se registracija ne pokrene 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ Broj registracija dosegao je gornju granicu. Izlazna aplikacija 登録回数上限になりました。アプリケーションを終了します - - Pogreška pri registraciji - 登録エラー - Zapis kontakta koji odgovara podnesku nije moguće potvrditi. Nema potrebe da se podvrgnete. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.hu.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.hu.resx index 64989f08a..dbf2f9313 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.hu.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.hu.resx @@ -67,18 +67,6 @@ Értesítést kap, ha olyan személynek volt kitéve, aki pozitív COVID-19 eredményt jelentett. exposures comment - - Próbálkozzon később. - - - Sikertelen - - - Benyújtott diagnosztika - - - Kész - A diagnózis benyújtása... @@ -544,10 +532,6 @@ El kell fogadnia a felhasználási feltételeket. 利用規約に同意する必要があります。 - - Az expozíciós értesítés korlátozott. Kérjük, aktív. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - Az expozíciós értesítés nem támogatott. Frissítse az operációs rendszert a legújabb verzióra. Ha továbbra is problémái vannak, kérjük, lépjen kapcsolatba velünk appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Regisztrálás 登録 - - Megszakítva - キャンセルしました - Várjon egy kicsit, amíg a regisztráció meg kezdődik 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ A regisztrációk száma elérte a felső határt. Kilépés alkalmazásból 登録回数上限になりました。アプリケーションを終了します - - Regisztrálási hiba - 登録エラー - A beküldésnek megfelelő kapcsolattartói rekordot nem lehetett megerősíteni. Nem kell behódolni. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.hy.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.hy.resx index 91d8a1c91..e58d31c53 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.hy.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.hy.resx @@ -43,15 +43,6 @@ Ոչ հիմա - - Փորձեք նորից ավելի ուշ - - - Ձախողված - - - Ավարտել - Չեղարկել @@ -140,8 +131,4 @@ Գրանցվել 登録 - - Չեղարկված - キャンセルしました - diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.id.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.id.resx index 7f3bb8a0c..5bbd2253b 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.id.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.id.resx @@ -67,18 +67,6 @@ Anda akan diberitahu jika anda telah terpapar dengan seseorang yang telah melaporkan hasil tes positif COVID-19. exposures comment - - Coba lagi nanti. - - - Gagal - - - Diagnosis terkirim - - - Selesai - Mengirimkan diagnosis ... @@ -546,10 +534,6 @@ Anda harus menyetujui persyaratan penggunaan. 利用規約に同意する必要があります。 - - Fungsi notifikasi kontak jarak dekat dari aplikasi Paparan COVID-19 tak diizinkan pengguna. Mohon perbolehkan fungsi tersebut dari menu pengaturan perangkat, atau beri izin ulang setelah instal ulang aplikasi. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - Notifikasi Paparan tidak didukung. Perbarui sistem operasi perangkat anda ke versi terbaru. Jika masalah masih terjadi, silakan hubungi kami di appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -583,11 +567,6 @@ 登録 - - Dibatalkan - - キャンセルしました - Mohon tunggu sebentar sampai pendaftaran dimulai 登録開始までしばらくそのままでお待ちください @@ -616,10 +595,6 @@ Jumlah pendaftaran telah mencapai batas maksimal yang diperbolehkan. Keluar dari aplikasi. 登録回数上限になりました。アプリケーションを終了します - - Error saat pendaftaran - 登録エラー - Catatan kontak yang sesuai dengan pengajuan tidak dapat dikonfirmasi. Tidak perlu menyerahkan. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.ig.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.ig.resx index 16ef8fc52..d10a7d2c5 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.ig.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.ig.resx @@ -40,15 +40,6 @@ DỊ MMA - - Biko nwaa ọzọ ma emechaa. - - - A gaghị n'ihụ - - - Mmecha - Kagbuo @@ -137,8 +128,4 @@ Debanye 登録 - - Akagburu - キャンセルしました - diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.is.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.is.resx index 6ca3d7142..2ca4dcb09 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.is.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.is.resx @@ -67,18 +67,6 @@ Bićete obaviješteni ako ste bili izloženi nekome ko je prijavio pozitivan rezultat COVID-19. exposures comment - - Pokušajte ponovo kasnije. - - - Nije uspjelo - - - Dijagnoza predata - - - Kompletna - Slanje dijagnoze ... @@ -544,10 +532,6 @@ Morate pristati na uvjete korištenja. 利用規約に同意する必要があります。 - - COVID-19 Značajka obavijesti o kontaktu nije odobrena. Odobrite iz svakog OS-a ili ga ponovo odobrite nakon ponovne instalacije aplikacije. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - Obavijest o izloženosti nije podržana. Ažurirajte OS na najnoviju verziju. Ako i dalje imate problema, obratite nam se na appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Registrirajte se 登録 - - Otkazano - キャンセルしました - Pričekajte neko vrijeme dok ne krene registracija 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ Broj registracija dosegao je gornju granicu. Izlaz iz aplikacije 登録回数上限になりました。アプリケーションを終了します - - Greška u registraciji - 登録エラー - Ekki var hægt að staðfesta tengiliðafærslu sem samsvarar uppgjöf. Engin þörf á að leggja fram. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.it.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.it.resx index 53dd082f3..3eaccf749 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.it.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.it.resx @@ -67,18 +67,6 @@ Riceverai una notifica se sei stato esposto a qualcuno che ha segnalato di essere positivo al COVID-19. exposures comment - - Riprova più tardi. - - - Operazione non riuscita - - - Diagnosi inviata - - - Completato - Invio della diagnosi in corso... @@ -544,10 +532,6 @@ È necessario accettare le condizioni per l'utilizzo. 利用規約に同意する必要があります。 - - La funzione "notifica di esposizione" è disattivata. Si prega di attivarla. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - La funzione "notifica di esposizione" non è supportata. Aggiorna il sistema operativo alla versione più recente. Se hai ancora problemi, contattaci a appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Registra 登録 - - Annullato - キャンセルしました - Attendere un po 'fino all'inizio della registrazione 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ Il numero di registrazioni ha raggiunto il limite massimo. Uscire dall'applicazione 登録回数上限になりました。アプリケーションを終了します - - Errore di registrazione - 登録エラー - Impossibile confermare il record del contatto corrispondente all'invio. Non c'è bisogno di presentare. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.ja.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.ja.resx index b93294365..4b84f8f6a 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.ja.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.ja.resx @@ -65,16 +65,15 @@ exposures comment - 後でもう一度試してください。 + 処理番号を再度入力してください。 + 処理番号を再度入力してください。 - - 失敗 + + 陽性情報を登録できませんでした + 陽性情報を登録できませんでした - - 診断結果の提出 - - - 完了しました + + 登録が完了しました 診断を提出します。 @@ -85,6 +84,10 @@ キャンセル + + + 登録 + 登録 削除しています @@ -111,13 +114,20 @@ 登録中 - すべてのデータをリセットしますか? + すべてのデータを削除して、アプリの使用を中止します。よろしいですか? + すべてのデータを削除して、アプリの使用を中止します。よろしいですか? - すべてのデータを削除する + アプリの使用を中止します + アプリの使用を中止します + + + データを削除しました + データを削除しました - すべての設定とデータが削除されました。アプリケーションを再起動してください。 + アプリを終了します。 + アプリを終了します。 登録に戻る @@ -545,9 +555,13 @@ 利用規約に同意する必要があります。 利用規約に同意する必要があります。 - - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 + + 接触通知機能が停止しています + 接触通知機能が停止しています + + + アプリを再インストールするか、 OSの設定から接触通知を有効にしてください。 + アプリを再インストールするか、 OSの設定から接触通知を有効にしてください。 Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -566,40 +580,40 @@ Exposure Notificationを起動できませんでした。端末の設定を開いて、Exposure NotificationをONにするとともに、BluetoothをONにしてください。 - アプリで入力された処理番号が違います - アプリで入力された処理番号が違います + 正しい処理番号を入力してください。 + 正しい処理番号を入力してください。 センターに接続できません センターに接続できません - 陽性情報を登録しますか? - 陽性情報を登録しますか? + よろしいですか? + よろしいですか? - 登録 - 登録 + 陽性情報の登録をします + 陽性情報の登録をします - - キャンセルしました - キャンセルしました + + 登録をキャンセルしました + 登録をキャンセルしました - 登録開始までしばらくそのままでお待ちください - 登録開始までしばらくそのままでお待ちください + しばらくそのままでお待ちください。 + しばらくそのままでお待ちください。 - 登録待ち - 登録待ち + 登録を開始します + 登録を開始します 処理番号が入力されていません 処理番号が入力されていません - 処理番号のフォーマットが一致していません - 処理番号のフォーマットが一致していません + 処理番号は半角数字で入力してください。 + 処理番号は半角数字で入力してください。 陽性記録の登録を行う為にCOVID-19接触のログ記録を有効にする必要があります、アプリかOSの設定から有効にしてください。 @@ -608,22 +622,26 @@ COVID-19接触のログ記録を有効にしてください COVID-19接触のログ記録を有効にしてください + + + 登録回数の上限に達しました + 登録回数の上限に達しました - 登録回数上限になりました。アプリケーションを終了します - 登録回数上限になりました。アプリケーションを終了します + アプリを終了します。 + アプリを終了します。 - - 登録エラー - 登録エラー + + 処理番号が違います + 処理番号が違います - 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 - 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 + 登録する必要はありません。 + 登録する必要はありません。 - 該当接触なし - 該当接触なし + 接触記録がありません + 接触記録がありません https://covid19radarjpnprod.z11.web.core.windows.net/version.json @@ -954,9 +972,29 @@ 保健所からMy HER-SYSの利用案内を受けている場合は、そちらから接触確認アプリの利用を申し出てください。 保健所からMy HER-SYSの利用案内を受けている場合は、そちらから接触確認アプリの利用を申し出てください。 + + + 接触を通知 + 接触を通知 + + + 重要なお知らせ + 重要なお知らせ + + + 新型コロナウイルス感染症の陽性登録者と接触した可能性があります。タップして詳細を確認してください。 + 新型コロナウイルス感染症の陽性登録者と接触した可能性があります。タップして詳細を確認してください。 + + ウェブアクセシビリティ方針 + ウェブアクセシビリティ方針 + + + https://www.mhlw.go.jp/cocoa/webaccessibility_japanese.html + ウェブアクセシビリティ方針URL + \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.ka.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.ka.resx index 6499a3887..5ae1f6e04 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.ka.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.ka.resx @@ -43,15 +43,6 @@ ახლა არა - - გთხოვთ, ხელახლა სცადოთ მოგვიანებით. - - - ჩაიშალა - - - დასრულებული - გაუქმება @@ -140,8 +131,4 @@ რეგისტრაცია 登録 - - გაუქმებული - キャンセルしました - diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.kk.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.kk.resx index b9afbe44e..4c130abf2 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.kk.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.kk.resx @@ -75,18 +75,6 @@ Егер сіз coVID-19 нәтижесі туралы оң хабарлаған біреуге хабарландырыңыз. exposures comment - - Әрекетті кейінірек қайталаңыз. - - - Сәтсіз аяқталды - - - Диагноз ды ұсынған - - - Аяқталды - Диагноз ды ұсыну... @@ -544,10 +532,6 @@ Пайдалану шарттарына келіспеу керек. 利用規約に同意する必要があります。 - - COVID-19 Байланыс хабарламасы мүмкіндігі бекітілмеген. Өтінім қайта жасалғаннан кейін әрбір ОЖ-дан бекітуді немесе қайта бекітуді сұраймын. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - Экспозиция туралы хабарландыруға қолдау көрсетілмейді. ОЖ соңғы нұсқасына жаңартыңыз. Егер әлі де проблемалар туындаса, appsupport@cov19.mhlw.go.jp байланысыңызды сұраймыз. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Тіркеу 登録 - - Бас тартылды - キャンセルしました - Тіркеу басталғанша біраз уақыт күте тұрыңыз 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ Тіркеу саны жоғарғы шекке жетті. Шығу өтінімі 登録回数上限になりました。アプリケーションを終了します - - Тіркеу қатесі - 登録エラー - Ұсынысқа сәйкес келетін байланыс жазбасы расталмады. Ұсынудың қажеті жоқ. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.km.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.km.resx index 1a656a761..cdcce94c0 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.km.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.km.resx @@ -47,15 +47,6 @@ មិនមែនឥឡូវ - - សូមព្យាយាមម្ដងទៀតនៅពេលក្រោយ។ - - - បានបរាជ័យ - - - បញ្ចប់ - បោះបង់ @@ -164,8 +155,4 @@ ចុះឈ្មោះ 登録 - - បានបោះបង់ - キャンセルしました - diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.kn.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.kn.resx index ad4e0ce52..5acd21a38 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.kn.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.kn.resx @@ -67,18 +67,6 @@ ಸಕಾರಾತ್ಮಕ ಕೋವಿದ್-19 ಫಲಿತಾಂಶವನ್ನು ವರದಿ ಮಾಡಿದ ಯಾರಿಗಾದರೂ ನೀವು ಆಮಿಷ ಒಡ್ಡಿದ್ದರೆ ನಿಮಗೆ ಅಧಿಸೂಚನೆ ಹೊರಡಿಸಲಾಗುವುದು. exposures comment - - ದಯವಿಟ್ಟು ನಂತರ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ. - - - ವಿಫಲವಾಗಿದೆ - - - ನಾಪತ್ತೆ ಅರ್ಜಿ - - - ಪೂರ್ಣಗೊಳಿಸು - ರೋಗನಿರ್ಣಯ ಸಲ್ಲಿಸುವುದು.... @@ -544,10 +532,6 @@ ನೀವು ಬಳಕೆಯ ನಿಬಂಧನೆಗಳನ್ನು ಒಪ್ಪಬೇಕು. 利用規約に同意する必要があります。 - - ಎಕ್ಸ್ ಪೋಷರ್ ಅಧಿಸೂಚನೆಯನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಸಕ್ರಿಯರಾಗಿರಿ. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - ಎಕ್ಸ್ ಪೋಶರ್ ಅಧಿಸೂಚನೆಯನ್ನು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ. ದಯವಿಟ್ಟು ಇತ್ತೀಚಿನ ಆವೃತ್ತಿಗೆ OS ಅನ್ನು ಅಪ್ ಡೇಟ್ ಮಾಡಿ. ನಿಮಗೆ ಇನ್ನೂ ಸಮಸ್ಯೆಗಳಿದ್ದರೆ, ದಯವಿಟ್ಟು ನಮ್ಮನ್ನು appsupport@cov19.mhlw.go.jp ಸಂಪರ್ಕಿಸಿ. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ ನೋಂದಾಯಿಸಿ 登録 - - ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ - キャンセルしました - ನೋಂದಣಿ ಪ್ರಾರಂಭವಾಗುವವರೆಗೆ ದಯವಿಟ್ಟು ಸ್ವಲ್ಪ ಸಮಯ ಕಾಯಿರಿ 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ ನೋಂದಣಿಗಳ ಸಂಖ್ಯೆ ಗರಿಷ್ಠ ಮಿತಿಯನ್ನು ತಲುಪಿದೆ. ಅಪ್ಲಿಕೇಶನ್ ನಿಂದ ನಿರ್ಗಮಿಸು 登録回数上限になりました。アプリケーションを終了します - - ನೋಂದಣಿ ದೋಷ - 登録エラー - ಸಲ್ಲಿಕೆಯ ಸಂಬಂಧವಾದ ಸಂಪರ್ಕ ದಾಖಲೆಯನ್ನು ದೃಢೀಕರಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ. ಸಲ್ಲಿಸಬೇಕಾದ ಅಗತ್ಯವಿಲ್ಲ. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.ko.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.ko.resx index 29dd33a8b..144da7fe5 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.ko.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.ko.resx @@ -67,18 +67,6 @@ COVID-19 양성 판정을 받은 사람과 접촉한 경우 알림이 옵니다. exposures comment - - 나중에 다시 시도하세요. - - - 실패 - - - 진단 결과 제출 - - - 완료 - 진단 제출 중... @@ -544,10 +532,6 @@ 이용 약관에 동의해야 합니다. 利用規約に同意する必要があります。 - - 노출 알림이 제한됩니다. 활성화해 주세요. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - 노출 알림은 지원되지 않습니다. 최신 버전으로 OS를 업데이트하십시오. 그래도 문제가 있는 경우 appsupport@cov19.mhlw.go.jp 문의하시기 바랍니다. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ 등록 登録 - - 취소됨 - キャンセルしました - 등록이 시작될 때까지 잠시 기다려주십시오. 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ 등록 건수가 상한선에 도달했습니다. 종료 응용 프로그램 登録回数上限になりました。アプリケーションを終了します - - 등록 오류 - 登録エラー - 제출에 해당하는 연락처 레코드를 확인할 수 없습니다. 제출할 필요가 없습니다. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.ky.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.ky.resx index 42a77e33a..2f3cfba67 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.ky.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.ky.resx @@ -43,15 +43,6 @@ Азыр эмес - - Кийинирээк дагы аракет кылыңыз. - - - Ишке ашкан жок - - - Аяктоо - Жокко чыгаруу @@ -140,8 +131,4 @@ Каттоо 登録 - - Жокко чыгарылды - キャンセルしました - diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.lb.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.lb.resx index 679e7f457..46b61856b 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.lb.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.lb.resx @@ -43,15 +43,6 @@ Net elo - - Probéiert et w.e.g. méi spéit nach eng Kéier. - - - Feelgeschloen - - - Fäerdeg - Ofbriechen @@ -140,8 +131,4 @@ Registréieren 登録 - - Ofgebrach - キャンセルしました - diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.lo.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.lo.resx index 2e7d49b6d..c8c519020 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.lo.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.lo.resx @@ -43,15 +43,6 @@ ບໍ່ແມ່ນຕອນນີ້ - - ກະລຸນາລອງໃໝ່ອີກຄັ້ງໃນພາຍຫຼັງ. - - - ບໍ່ສຳເລັດ - - - ສຳເລັດແລ້ວ - ຍົກເລີກ @@ -160,8 +151,4 @@ ຈົດທະບຽນ 登録 - - ຍົກເລີກແລ້ວ - キャンセルしました - diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.lt.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.lt.resx index cdb2bc59e..52e83aca6 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.lt.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.lt.resx @@ -67,18 +67,6 @@ Jums bus pranešta, jei jums buvo veikiami asmens, kuris pranešė apie teigiamą COVID-19 rezultatą. exposures comment - - Pamėginkite vėliau. - - - Nepavyko - - - Diagnozė Pateikta - - - Atlikta - Pateikti diagnozę... @@ -544,10 +532,6 @@ Turite sutikti su naudojimo sąlygomis. 利用規約に同意する必要があります。 - - Pranešimas apie ekspoziciją yra ribojamas. Prašome aktyvūs. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - Pranešimas apie ekspoziciją nepalaikomas. Atnaujinkite OS į naujausią versiją. Jei vis dar turite problemų, prašome susisiekti su mumis appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Registruoti 登録 - - Atšaukta - キャンセルしました - Palaukite, kol prasidės registracija 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ Registracijų skaičius pasiekė viršutinę ribą. Išeiti iš programos 登録回数上限になりました。アプリケーションを終了します - - Registracijos klaida - 登録エラー - Nepavyko patvirtinti pateiktą kontakto įrašą. Nereikia pateikti. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.lv.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.lv.resx index 90b333b29..67cfd9e3a 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.lv.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.lv.resx @@ -67,18 +67,6 @@ Jums tiks paziņots, ja jums ir saskāries ar kādu, kurš ziņoja pozitīvs COVID-19 rezultātu. exposures comment - - Lūdzu, vēlāk mēģiniet vēlreiz. - - - Neizdevās - - - Diagnoze iesniegta - - - Pabeigts - Diagnozes iesniegšana... @@ -544,10 +532,6 @@ Jums ir jāpiekrīt lietošanas noteikumiem. 利用規約に同意する必要があります。 - - Paziņojums par iedarbību ir ierobežots. Lūdzu, aktīvs. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - Ekspozīcijas paziņojums netiek atbalstīts. Lūdzu, atjauniniet OS uz jaunāko versiju. Ja jums joprojām ir problēmas, lūdzu, sazinieties ar mums appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Reģistrs 登録 - - Atcelts - キャンセルしました - Lūdzu, uzgaidiet brīdi, līdz sākas reģistrācija 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ Reģistrāciju skaits ir sasniedzis augšējo robežu. Iziet no programmas 登録回数上限になりました。アプリケーションを終了します - - Reģistrācijas kļūda - 登録エラー - Iesniegšanas atbilstošo kontaktpersonas ierakstu nevarēja apstiprināt. Nav nepieciešams iesniegt. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.mg.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.mg.resx index c7ce40977..1e754a580 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.mg.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.mg.resx @@ -67,18 +67,6 @@ Ho hampahafantarina ianao raha toa ka niharan' ny olona iray izay nanao tatitra tsara COVID-19. exposures comment - - Mamerena manandrana aoriana kely azafady. - - - Tsy nahomby - - - Aretina ny Fangatahana - - - Fenoy - Fanekena ny Aretina ... @@ -544,10 +532,6 @@ Tsy maintsy manaiky ireo teny ampiasaina ianao. 利用規約に同意する必要があります。 - - Fampilazana ny hatsiaka. Aoka ianao ho mazoto. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - Tsy notohanana ny Fampilazana hatsiaka. Mba hanavao azafady ny OS amin' ny endriny farany. Raha mbola manana olana ianao dia mba mifandraisa aminay ao amin' ny appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Misoratra anarana 登録 - - Canceled - キャンセルしました - Miandrasa kely azafady raha tsy manomboka ny fisoratana anarana 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ Ny isan' ny registrations dia efa nahatratra ny fetra ambony. Fampiharana ny fivoahana 登録回数上限になりました。アプリケーションを終了します - - Fahadisoana fisoratana anarana - 登録エラー - Tsy azo raisina ho mpikambana ny firaketana ny rakitsoratra mifandraika amin' ilay fanoavana. Tsy mila manaiky izany. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.mi.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.mi.resx index b26a8fb23..e0ad9fbc5 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.mi.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.mi.resx @@ -67,18 +67,6 @@ Ka whakamōhiotia koe mēnā kua mārakerake koe ki tētahi hua o te COVID i te otinga. exposures comment - - Me ngana anō ā muri ake. - - - I Rahua - - - Tataritanga i Tukuna - - - Kua oti - I tuku Tataritanga... @@ -544,10 +532,6 @@ Me whakaae koe ki ngā whakaritenga o te whakamahi. 利用規約に同意する必要があります。 - - Kua rāhuitia te Whakamōhiotanga mārakerake. Hohe koa. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - Kāore te Whakamōhiotanga mārakerake i te tautokona. Whakahōu koa i te OS ki te putanga hou rawa. Mēnā kei te raruraru tonu koe, me whakapā atu ki a mātau i te appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Rēhita 登録 - - Kua whakakorea - キャンセルしました - Taihoa koa kia tīmata rā anō te rēhitatanga 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ Kua tae atu te tau o registrations ki te tepe o runga. Waiho te taupānga 登録回数上限になりました。アプリケーションを終了します - - Hapa rēhitatanga - 登録エラー - Kāore i taea te whakaū i te pūkete hoapā e ōrite ana ki te tukunga. Kāore e hiahiatia te tuku. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.mk.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.mk.resx index 56638d36d..5375d5aa2 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.mk.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.mk.resx @@ -47,15 +47,6 @@ Не сега - - Обидете се повторно подоцна. - - - Неуспешно - - - Комплетирано - Откажи @@ -164,8 +155,4 @@ Регистрирај 登録 - - Откажано - キャンセルしました - diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.ml.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.ml.resx index 0292e4335..d29a2cc8b 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.ml.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.ml.resx @@ -67,18 +67,6 @@ പോസിറ്റീവ് കോവിഡ്-19 ഫലം റിപ്പോർട്ട് ചെയ്ത ഒരാളുമായി സമ്പർക്കമുണ്ടെങ്കിൽ നിങ്ങളെ അറിയിക്കും. exposures comment - - പിന്നീട് വീണ്ടും ശ്രമിക്കുക. - - - പരാജയപ്പെട്ടു - - - രോഗനിർണ്ണയം സമർപ്പിച്ച - - - പൂർത്തിയാക്കുക - രോഗനിർണ്ണയം സമർപ്പിക്കുന്നത്... @@ -544,10 +532,6 @@ ഉപയോഗ വ്യവസ്ഥകൾ നിങ്ങൾ അംഗീകരിക്കണം. 利用規約に同意する必要があります。 - - എക്സ്പോഷർ അറിയിപ്പ് പരിമിതപ്പെടുത്തിയിരിക്കുന്നു. സജീവം. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - എക്സ്പോഷർ അറിയിപ്പ് പിന്തുണയ്ക്കുന്നില്ല. ഏറ്റവും പുതിയ പതിപ്പിലേക്ക് OS അപ് ഡേറ്റ് ചെയ്യുക. നിങ്ങൾക്ക് ഇപ്പോഴും പ്രശ്നങ്ങൾ ഉണ്ടെങ്കിൽ, appsupport@cov19.mhlw.go.jp ഞങ്ങളെ ബന്ധപ്പെടുക. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ രജിസ്റ്റർ ചെയ്യുക 登録 - - റദ്ദാക്കി - キャンセルしました - രജിസ്ട്രേഷൻ ആരംഭിക്കുന്നത് വരെ കുറച്ച് സമയം കാത്തിരിക്കുക 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ രജിസ് ട്രേഷനുകളുടെ എണ്ണം ഉയർന്ന പരിധിയിലെത്തിയിരിക്കുന്നു. പ്രയോഗം പുറത്തു് കടക്കുക 登録回数上限になりました。アプリケーションを終了します - - രജിസ്ട്രേഷൻ പിശക് - 登録エラー - സമർപ്പിക്കുന്നതിന് ബന്ധപ്പെട്ട സമ്പർക്ക രേഖ സ്ഥിരീകരിക്കുവാൻ സാധ്യമായില്ല. സമർപ്പിക്കേണ്ട ആവശ്യമില്ല. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.mr.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.mr.resx index 55e55859a..d41c04097 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.mr.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.mr.resx @@ -67,18 +67,6 @@ जर तुम्हाला एखाद्या सकारात्मक सीओव्हीआयडी-19 परिणामाची माहिती दिली असेल तर तुम्हाला सूचित केले जाईल. exposures comment - - कृपया नंतर पुन्हा प्रयत्न करा. - - - अयशस्वी - - - सादर केलेले निदान - - - पूर्ण - निदान सबमिट करत आहे... @@ -544,10 +532,6 @@ वापराच्या अटी मान्य करायला चला. 利用規約に同意する必要があります。 - - एक्स्पोजर सूचना प्रतिबंधित आहे. कृपया सक्रिय व्हा. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - एक्स्पोजर सूचना समर्थीत नाही. कृपया ओएस अद्ययावत करा. जर तुम्हाला अजूनही समस्या असतील तर कृपया appsupport@cov19.mhlw.go.jp आमच्याशी संपर्क साधा. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ नोंदणी करा 登録 - - रद्द केली - キャンセルしました - नोंदणी सुरू होईपर्यंत कृपया थोडा वेळ थांबा 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ नोंदणीची संख्या वरच्या मर्यादेपर्यंत पोहोचली आहे. अनुप्रयोग बाहेर पडा 登録回数上限になりました。アプリケーションを終了します - - नोंदणी त्रुटी - 登録エラー - सबमिशनशी संबंधित संपर्क रेकॉर्ड पुष्टी होऊ शकली नाही. सबमिट करण्याची गरज नाही. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.ms.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.ms.resx index 3bb2a8235..453b70d78 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.ms.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.ms.resx @@ -67,18 +67,6 @@ Anda akan dimaklumkan jika anda telah terdedah kepada seseorang yang melaporkan keputusan yang positif COVID-19. exposures comment - - Sila cuba lagi kemudian. - - - Gagal - - - Diagnosis dihantar - - - Selesai - Menghantar diagnosis... @@ -544,10 +532,6 @@ Anda mesti bersetuju dengan terma penggunaan. 利用規約に同意する必要があります。 - - Pemberitahuan pendedahan adalah terhad. Sila aktif. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - Pemberitahuan pendedahan tidak disokong. Sila kemas kini OS ke versi terkini. Jika anda masih mempunyai masalah, sila hubungi kami di appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Daftar 登録 - - Dibatalkan - キャンセルしました - Sila tunggu sebentar sehingga Pendaftaran bermula 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ Bilangan pendaftaran telah mencapai had atas. Permohonan Keluar 登録回数上限になりました。アプリケーションを終了します - - Kesalahan pendaftaran - 登録エラー - Rekod kenalan yang sepadan dengan penyerahan itu tidak dapat disahkan. Tidak perlu serah. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.mt.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.mt.resx index 757b7e6b9..dca420855 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.mt.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.mt.resx @@ -67,18 +67,6 @@ Int tkun avżat jekk ġejt espost għal xi ħadd li rrapporta riżultat pożittiv COVID-19. exposures comment - - Erġa’ pprova aktar tard. - - - Ma rnexxiex - - - Dijanjożi ppreżentata - - - Lest - Qed jissottometti d-dijanjo Żi... @@ -544,10 +532,6 @@ Għandek taqbel mat-termini tal-użu. 利用規約に同意する必要があります。 - - In-Notifika ta' Espożizzjoni hija ristretta. Jekk jogħġbok attiv. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - In-Notifika ta' Espożizzjoni mhijiex appoġġjata. Jekk jogħġbok aġġorna l-OS għall-aħħar verżjoni. Jekk għad għandek problemi, jekk jogħġbok ikkuntattjana fil-appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Irreġistra 登録 - - Ikkanċellat - キャンセルしました - Stenna ftit sakemm tibda r-reġistrazzjoni 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ In-numru ta' reġistrazzjonijiet laħaq il-limitu massimu. Applikazzjoni tal-ħruġ 登録回数上限になりました。アプリケーションを終了します - - Żball fir-reġistrazzjoni - 登録エラー - Ir-rekord ta' kuntatt li jikkorrispondi għas-sottomissjoni ma setax jiġi kkonfermat. M'hemmx għalfejn jiġu sottomessi. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.nb.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.nb.resx index f7b841461..c9500378d 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.nb.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.nb.resx @@ -67,18 +67,6 @@ Du vil bli varslet hvis du har blitt utsatt for noen som rapporterte et positivt COVID-19 resultat. exposures comment - - Prøv igjen senere. - - - Mislykket - - - Diagnose innsendt - - - Fullført - Sende inn diagnose... @@ -544,10 +532,6 @@ Du må godta vilkårene for bruk. 利用規約に同意する必要があります。 - - Eksponeringsvarselet er begrenset. Vennligst aktiv. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - Eksponeringsvarsel støttes ikke. Oppdater operativsystemet til den nyeste versjonen. Hvis du fortsatt har problemer, kan du kontakte oss på appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Registrer 登録 - - Avbrutt - キャンセルしました - Vent en stund til registreringen starter 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ Antall registreringer har nådd den øvre grensen. Avslutt programmet 登録回数上限になりました。アプリケーションを終了します - - Registreringsfeil - 登録エラー - Kontaktoppføringen som tilsvarer innsendingen, kan ikke bekreftes. Du trenger ikke å sende inn. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.nl.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.nl.resx index e20dec395..b8e2c0b37 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.nl.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.nl.resx @@ -67,18 +67,6 @@ U wordt op de hoogte gesteld als u blootgesteld bent aan iemand die een positief COVID-19 resultaat heeft gemeld. exposures comment - - Probeer het later nog eens. - - - Mislukt - - - Diagnose ingediend - - - Voltooien - Diagnose indienen... @@ -544,10 +532,6 @@ U moet akkoord gaan met de gebruiksvoorwaarden. 利用規約に同意する必要があります。 - - Melding van blootstelling is beperkt. Gelieve actief. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - Blootstellingsmelding wordt niet ondersteund. Werk het besturingssysteem bij naar de nieuwste versie. Als je nog steeds problemen hebt, neem dan contact met ons op appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Registreren 登録 - - Geannuleerd - キャンセルしました - Wacht even tot de registratie begint 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ Het aantal registraties heeft de bovengrens bereikt. Toepassing afsluiten 登録回数上限になりました。アプリケーションを終了します - - Registratiefout - 登録エラー - Het contactrecord dat overeenkomt met de indiening kan niet worden bevestigd. Geen behoefte om in te dienen. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.or.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.or.resx index 465502b7f..48a1154bf 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.or.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.or.resx @@ -43,15 +43,6 @@ ବର୍ତ୍ତମାନ ନୁହେଁ - - ଦୟାକରି ପରେ ପୁନଃ ଚେଷ୍ଟା କରନ୍ତୁ. - - - ବିଫଳ ହେଲା - - - ସମ୍ପୂର୍ଣ୍ଣ - ବାତିଲ୍ @@ -140,8 +131,4 @@ ପଞ୍ଜିକରଣ 登録 - - ବାତିଲ୍‌ ହୋଇଛି - キャンセルしました - diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.pl.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.pl.resx index 6ff693b3f..f17289e3e 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.pl.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.pl.resx @@ -67,18 +67,6 @@ Zostaniesz powiadomiony, jeśli byłeś narażony na działanie osoby, która zgłosiła pozytywny wynik COVID-19. exposures comment - - Próbuj ponownie później. - - - Niepowodzenie - - - Diagnoza Przedłożona - - - Wykonano - Składanie diagnozy... @@ -544,10 +532,6 @@ Musisz zaakceptować warunki użytkowania. 利用規約に同意する必要があります。 - - Powiadomienie o narażeniu jest ograniczone. Proszę aktywny. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - Powiadomienie o narażeniu nie jest obsługiwane. Zaktualizuj system operacyjny do najnowszej wersji. Jeśli nadal masz problemy, skontaktuj się z nami pod adresem appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Zarejestruj 登録 - - Anulowano - キャンセルしました - Poczekaj chwilę, aż rozpocznie się rejestracja 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ Liczba rejestracji osiągnęła górny limit. Wyjście z aplikacji 登録回数上限になりました。アプリケーションを終了します - - Błąd rejestracji - 登録エラー - Nie można potwierdzić rekordu kontaktu odpowiadającego zgłoszeniu. Nie ma potrzeby składania. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.pt.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.pt.resx index fed6171b2..0550c41ce 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.pt.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.pt.resx @@ -67,18 +67,6 @@ Você será notificado se tiver sido exposto a alguém que tenha relatado um resultado positivo do COVID-19. exposures comment - - Tente novamente mais tarde. - - - Falha - - - Diagnóstico Submetido - - - Concluído - Submetendo diagnóstico... @@ -544,10 +532,6 @@ Você deve concordar com os termos de uso. 利用規約に同意する必要があります。 - - Recurso de notificação de contato COVID-19 não aprovado. Por favor aprove de cada sistema operacional ou aprove novamente depois de reinstalar o aplicativo. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - A notificação de exposição não é suportada. Atualize o sistema operacional para a versão mais recente. Se você ainda tiver problemas, entre em contato conosco em appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Registrar 登録 - - Cancelado - キャンセルしました - Por favor, espere um pouco até que a inscrição comece 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ O número de registros atingiu o limite máximo. Sair do aplicativo 登録回数上限になりました。アプリケーションを終了します - - Erro de registro - 登録エラー - O registro de contato correspondente à submissão não pôde ser confirmado. Não há necessidade de se submeter. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.resx index b1bacc5a6..b066ebe96 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.resx @@ -178,16 +178,16 @@ exposures comment - Please try again later. + Please enter the processing number again. + 処理番号を再度入力してください。 - - Failed + + Could not register positive test result's information + 陽性情報を登録できませんでした - - Diagnosis Submitted - - - Complete + + Registration is complete + 登録が完了しました Submitting Diagnosis... @@ -198,6 +198,10 @@ Stop 使用中止 + + + Register + 登録 Deleting @@ -228,13 +232,20 @@ Waiting for register - Do you really want to reset all the data? + Do you really want to delete all the data and stop the usage of the app? + すべてのデータを削除して、アプリの使用を中止します。よろしいですか? - Delete all data + Stop app usage + アプリの使用を中止します + + + Data have been deleted + データを削除しました - All settings and data have been deleted. Please restart the application. + Close the app + アプリを終了します。 Version @@ -526,7 +537,7 @@ 登録する - Please enter below the process code that you have received by SMS or email + Please enter below the processing number that you have received by SMS or email SMSまたはメールで届いた処理番号を入力してください。 @@ -534,7 +545,7 @@ 症状が始まった日または検査を受けた日の2日前以降にあなたと接触した人に通知が行きます - How to receive a process code + How to receive a processing number 処理番号の取得方法 @@ -662,9 +673,13 @@ You must agree to the terms of use. 利用規約に同意する必要があります。 - - COVID-19 Contact notification feature not approved. Please approve from each OS or re-approve after reinstalling the application. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 + + The close contact notification function is disabled + 接触通知機能が停止しています + + + Please reinstall the app or enable the notification from the OS settings. + アプリを再インストールするか、 OSの設定から接触通知を有効にしてください。 Exposure Notification is not supported. Please update the OS to the latest version. If you still have problems, please contact us at appsupport@cov19.mhlw.go.jp. @@ -683,40 +698,40 @@ Exposure Notificationを起動できませんでした。端末の設定を開いて、Exposure NotificationをONにするとともに、BluetoothをONにしてください。 - Process number incorrect - アプリで入力された処理番号が違います + Please input a valid processing number. + 正しい処理番号を入力してください。 Cannot connect to registration center センターに接続できません - Do you want to register positive information? - 陽性情報を登録しますか? + Do you want to register it? + よろしいですか? - Register - 登録 + Register positive test result + 陽性情報の登録をします - - Canceled - キャンセルしました + + Registration was canceled + 登録をキャンセルしました - Please wait for a while until registration starts - 登録開始までしばらくそのままでお待ちください + Please wait. + しばらくそのままでお待ちください。 - Awaiting registration - 登録待ち + Processing the registration + 登録を開始します No processing number entered 処理番号が入力されていません - Processing number format does not match - 処理番号のフォーマットが一致していません + Please enter a processing number in half-width numbers. + 処理番号は半角数字で入力してください。 In order to register positive records, it is necessary to enable COVID-19 contact log recording, please enable it from the application or OS settings. @@ -725,22 +740,26 @@ Enable COVID-19 contact logging COVID-19接触のログ記録を有効にしてください + + + Reached the maximum number of registrations + 登録回数の上限に達しました - The number of registrations has reached the upper limit. Exit application - 登録回数上限になりました。アプリケーションを終了します + Close the app + アプリを終了します。 - - Registration error - 登録エラー + + Incorrect processing number + 処理番号が違います - The contact record corresponding to the submission could not be confirmed. No need to submit. - 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 + Registration is not necessary. + 登録する必要はありません。 - No applicable contact - 該当接触なし + No close contact record present + 接触記録がありません A new version of the app is available. Please update to the latest version. @@ -955,7 +974,7 @@ Storage : 発熱、咳、呼吸困難、全身倦怠感、咽頭痛、鼻汁・鼻閉、頭痛、関節・筋肉痛、下痢、嘔気・嘔吐など - After you register the process code + After you register the processing number 登録すると @@ -1059,9 +1078,29 @@ Storage : If you have received a usage guide for My HER-SYS from the health center, please apply to use the Contact Confirmation Application from there. 保健所からMy HER-SYSの利用案内を受けている場合は、そちらから接触確認アプリの利用を申し出てください。 + + + Exposure notification + 接触を通知 + + + Important Notice + 重要なお知らせ + + + It is possible you have been in close proximity to a user who tested positive for COVID-19. Tap for more details. + 新型コロナウイルス感染症の陽性登録者と接触した可能性があります。タップして詳細を確認してください。 * + + Web accessibility policy + ウェブアクセシビリティ方針 + + + https://www.mhlw.go.jp/cocoa/webaccessibility_english.html + ウェブアクセシビリティ方針URL + \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.ro.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.ro.resx index 53bb8340e..d9c84f064 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.ro.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.ro.resx @@ -67,18 +67,6 @@ Veți fi notificat dacă ați fost expus la cineva care a raportat un rezultat pozitiv COVID-19. exposures comment - - Vă rugăm să reîncercați mai târziu. - - - Nereușit - - - Diagnostic prezentat - - - Terminat - Trimiterea diagnosticului... @@ -544,10 +532,6 @@ Trebuie să fiți de acord cu termenii de utilizare. 利用規約に同意する必要があります。 - - Notificarea expunerii este restricționată. Vă rugăm să active. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - Notificarea de expunere nu este acceptată. Actualizați sistemul de operare la cea mai recentă versiune. Dacă mai aveți probleme, vă rugăm să ne contactați la appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Înregistrare 登録 - - Anulat - キャンセルしました - Vă rugăm să așteptați un timp până când începe înregistrarea 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ Numărul de înregistrări a atins limita superioară. Ieșire a aplicației 登録回数上限になりました。アプリケーションを終了します - - Eroare de înregistrare - 登録エラー - Înregistrarea de contact corespunzătoare trimiterii nu a putut fi confirmată. Nu e nevoie să te supui. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.ru.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.ru.resx index abcd5fc9f..258361fe6 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.ru.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.ru.resx @@ -67,18 +67,6 @@ Вы будете уведомлены, если вы подверглись воздействию кого-то, кто сообщил положительный результат COVID-19. exposures comment - - Повторите попытку позже. - - - Сбой - - - Поставлено диагноз - - - Завершение - Представление диагноза... @@ -544,10 +532,6 @@ Вы должны согласиться с условиями использования. 利用規約に同意する必要があります。 - - Уведомление об экспозиции ограничено. Пожалуйста, активный. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - Уведомление об экспозиции не поддерживается. Пожалуйста, обновите ОС до последней версии. Если у вас все еще есть проблемы, пожалуйста, свяжитесь с нами по appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Зарегистрировать 登録 - - Отменено - キャンセルしました - Пожалуйста, подождите некоторое время, пока регистрация начинается 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ Количество регистраций достигло верхнего предела. Приложение для выхода 登録回数上限になりました。アプリケーションを終了します - - Ошибка регистрации - 登録エラー - Контактная запись, соответствующая представлению, не может быть подтверждена. Нет необходимости подчиняться. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.rw.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.rw.resx index 14514f43a..77c677449 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.rw.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.rw.resx @@ -40,15 +40,6 @@ YEGO - - Wongere ugerageze mu kanya. - - - Byanze - - - Byarangiye - Kureka @@ -137,8 +128,4 @@ Kwandikisha 登録 - - Byahagaritswe - キャンセルしました - diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.si.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.si.resx index ddb66a557..dada4bce0 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.si.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.si.resx @@ -43,15 +43,6 @@ දැන් නොවේ - - පසුව නැවත උත්සාහ කරන්න. - - - අසාර්ථකයි - - - සම්පූර්ණ - අවලංගු කරන්න @@ -140,8 +131,4 @@ ලියාපදිංචි වන්න 登録 - - අවලංගු කෙරිණ - キャンセルしました - diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.sk.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.sk.resx index cc082b6e4..fb539e2f7 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.sk.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.sk.resx @@ -67,18 +67,6 @@ Budete upozornení, ak ste boli vystavení niekomu, kto hlásil pozitívny COVID-19 výsledok. exposures comment - - Zopakujte akciu neskôr. - - - Neúspešné - - - Diagnóza predložená - - - Dokončené - Podanie diagnózy... @@ -544,10 +532,6 @@ Musíte súhlasiť s podmienkami používania. 利用規約に同意する必要があります。 - - Oznámenie o expozícii je obmedzené. Prosím, aktívny. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - Upozornenie o expozícii nie je podporované. Aktualizujte operačný systém na najnovšiu verziu. Ak máte stále problémy, kontaktujte nás na appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Zaregistrovať 登録 - - Zrušené - キャンセルしました - Počkajte chvíľu, kým sa registrácia nespustí 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ Počet registrácií dosiahol hornú hranicu. Skončiť aplikáciu 登録回数上限になりました。アプリケーションを終了します - - Chyba pri registrácii - 登録エラー - Záznam kontaktu zodpovedajúci odoslaniu sa nepodarilo potvrdiť. Nie je potrebné predkladať. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.sl.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.sl.resx index 08143bfca..90f0c5571 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.sl.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.sl.resx @@ -67,18 +67,6 @@ Obveščeni boste, če ste bili izpostavljeni nekomu, ki je poročal o pozitivnem COVIDU-19 rezultatu. exposures comment - - Prosimo, poskusite znova kasneje. - - - Ni uspelo - - - Diagnoza predložena - - - Dokončano - Predložitev diagnoze... @@ -544,10 +532,6 @@ Strinjati se morate s pogoji uporabe. 利用規約に同意する必要があります。 - - Obvestilo o izpostavljenosti je omejeno. Prosim, aktivno. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - Obvestilo o izpostavljenosti ni podprto. Prosimo, posodobite OS na najnovejšo različico. Če imate še vedno težave, nam pišite na appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Registriraj 登録 - - Preklicano - キャンセルしました - Počakajte nekaj časa, dokler se registracija ne začne 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ Število registracij je doseglo zgornjo mejo. Izhod iz aplikacije 登録回数上限になりました。アプリケーションを終了します - - Napaka pri registraciji - 登録エラー - Kontaktnega zapisa, ki ustreza predložitvi, ni bilo mogoče potrditi. Ni potrebe, da predložijo. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.sq.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.sq.resx index 845335850..06574b964 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.sq.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.sq.resx @@ -47,15 +47,6 @@ Jo tani - - Provo sërish më vonë. - - - Dështoi - - - Përfundo - Anulo @@ -164,8 +155,4 @@ Regjistro 登録 - - U anulua - キャンセルしました - diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.sr-Cyrl.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.sr-Cyrl.resx index ce02945dc..18f5d0826 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.sr-Cyrl.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.sr-Cyrl.resx @@ -67,18 +67,6 @@ Бићете обавештени о томе да ли сте били изложени некоме ко је пријавио позитивне КОВИД-19 резултате. exposures comment - - Покушајте поново касније. - - - Није успело - - - Дијагноза је поднета - - - Довршено - Подношење дијагнозе... @@ -544,10 +532,6 @@ Морате да се слажете са условима коришћења. 利用規約に同意する必要があります。 - - Обавештење о експозицији је ограничено. Ацтиве. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - Обавештење о експозицији није подржано. Ажурирајте ОС на најновију верзију. Ако и даље имате проблема, контактирајте нас на appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Регистрација 登録 - - Отказано - キャンセルしました - Сачекајте неко време док се регистрација не покрене 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ Број Регистрација је достигао горњу границу. Изађи из апликације 登録回数上限になりました。アプリケーションを終了します - - Грешка у регистрацији - 登録エラー - Није било могуће потврдити запис контакта који одговара прослеђивању. Нема потребе за прослеђком. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.sr-Latn.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.sr-Latn.resx index ac9d02212..4bd4bcef9 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.sr-Latn.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.sr-Latn.resx @@ -67,18 +67,6 @@ Bićete obavešteni o tome da li ste bili izloženi nekome ko je prijavio pozitivne KOVID-19 rezultate. exposures comment - - Покушајте поново касније. - - - Nije uspelo - - - Dijagnoza je podneta - - - Dovršeno - Podnošenje dijagnoze... @@ -544,10 +532,6 @@ Morate da se slažete sa uslovima korišćenja. 利用規約に同意する必要があります。 - - Obaveštenje o ekspoziciji je ograničeno. Active. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - Obaveštenje o ekspoziciji nije podržano. Ažurirajte OS na najnoviju verziju. Ako i dalje imate problema, kontaktirajte nas na appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Registruj 登録 - - Otkazan - キャンセルしました - Sačekajte neko vreme dok se registracija ne pokrene 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ Broj Registracija je dostigao gornju granicu. Izađi iz aplikacije 登録回数上限になりました。アプリケーションを終了します - - Greška u registraciji - 登録エラー - Nije bilo moguće potvrditi zapis kontakta koji odgovara prosleđivanju. Nema potrebe za prosleđkom. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.sv.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.sv.resx index d1ca3033b..49386a35f 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.sv.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.sv.resx @@ -67,18 +67,6 @@ Du kommer att meddelas om du har utsatts för någon som rapporterat ett positivt COVID-19 resultat. exposures comment - - Försök igen senare. - - - Misslyckades - - - Inlämnad diagnos - - - Slutförd - Skickar in diagnos... @@ -544,10 +532,6 @@ Du måste godkänna användarvillkoren. 利用規約に同意する必要があります。 - - Exponering anmälan är begränsad. Vänligen aktiv. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - Exponeringsmeddelande stöds inte. Uppdatera operativsystemet till den senaste versionen. Om du fortfarande har problem, vänligen kontakta oss på appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Registrera 登録 - - Avbruten - キャンセルしました - Vänta ett tag tills registreringen börjar 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ Antalet registreringar har nått den övre gränsen. Avsluta program 登録回数上限になりました。アプリケーションを終了します - - Registreringsfel - 登録エラー - Det gick inte att bekräfta kontaktposten som motsvarar inlämningen. Du behöver inte skicka in. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.sw.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.sw.resx index e8d804816..07284aa92 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.sw.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.sw.resx @@ -67,18 +67,6 @@ Utaarifiwa ikiwa umekuwa wazi kwa mtu ambaye aliripoti matokeo mazuri ya kuwa ID-19. exposures comment - - Tafadhali jaribu tena baadaye. - - - Imeshindwa - - - Utambuzi kuwasilishwa - - - Imekamilika - Kuwasilisha utambuzi ... @@ -544,10 +532,6 @@ Lazima ukubali masharti ya matumizi. 利用規約に同意する必要があります。 - - Taarifa ya ufichuzi imezuiliwa. Tafadhali amilifu. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - Taarifa ya ufichuzi haitegemezwi. Tafadhali Sasisha OS kwa toleo la hivi karibuni. Kama bado una matatizo, tafadhali wasiliana nasi saa appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Sajili 登録 - - Imekatishwa - キャンセルしました - Tafadhali subiri kwa muda mpaka usajili kuanza 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ Idadi ya usajili imefikia kikomo cha juu. Toka programu tumizi 登録回数上限になりました。アプリケーションを終了します - - Kosa la usajili - 登録エラー - Rekodi ya mwasiliani inayoambatana na uwasilishaji haikuweza kuthibitishwa. Hakuna haja ya kuwasilisha. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.ta.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.ta.resx index b0ec465f3..35351c6dd 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.ta.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.ta.resx @@ -67,18 +67,6 @@ நேர்மறை குறியீடாகவும்-19 முடிவாகவும் அறிவிக்கப்பட்ட ஒருவரிடம் நீங்கள் வெளிப்படுத்தப்பட்டால் உங்களுக்கு அறிவிக்கப்படுவீர்கள். exposures comment - - பின்னர் மீண்டும் முயற்சிக்கவும். - - - தோல்வியடைந்தது - - - ஆய்வு அறிக்கை சமர்ப்பிக்கப்பட்டது - - - முழுமை - நோய் கண்டறிதல்... @@ -544,10 +532,6 @@ நீங்கள் பயன்பாட்டு விதிமுறைகளை ஏற்க வேண்டும். 利用規約に同意する必要があります。 - - வெளிப்பாடு அறிவிப்பு கட்டுப்படுத்தப்பட்டுள்ளது. தயவு செய்து செயலில். - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - வெளிப்பாடு அறிவிப்பு ஆதரிக்கப்படவில்லை. சமீபத்திய பதிப்பிற்கு OS ஐ புதுப்பிக்கவும். நீங்கள் இன்னும் பிரச்சினைகள் இருந்தால், appsupport@cov19.mhlw.go.jp எங்களை தொடர்பு கொள்ளவும். Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ பதிவு செய் 登録 - - ரத்துசெய்யப்பட்டது - キャンセルしました - பதிவு தொடங்கும் வரை சிறிது நேரம் காத்திருக்கவும் 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ பதிவுகளின் எண்ணிக்கை உச்ச வரம்பை எட்டியுள்ளது. பயன்பாட்டை விட்டு வெளியேறு 登録回数上限になりました。アプリケーションを終了します - - பதிவு பிழை - 登録エラー - சமர்ப்பிப்புடன் தொடர்புடைய தொடர்பு பதிவை உறுதிப்படுத்த முடியவில்லை. சமர்ப்பிக்க வேண்டிய அவசியம் இல்லை. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.te.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.te.resx index 63060746d..d95047ad7 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.te.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.te.resx @@ -67,18 +67,6 @@ పాజిటివ్ కోవిడ్-19 రిజల్ట్ ను రిపోర్ట్ చేసిన ఎవరికైనా మీరు బహిర్గతం చేస్తే మీకు తెలియజేయబడుతుంది. exposures comment - - దయచేసి తర్వాత మళ్లీ ప్రయత్నించండి. - - - విఫలమైంది - - - నిర్ధారణ సమర్పించిన - - - పూర్తయింది - రోగ నిర్ధారణ సమర్పించడం... @@ -544,10 +532,6 @@ మీరు విధిగా ఉపయోగ నిబంధనలను అంగీకరించాలి. 利用規約に同意する必要があります。 - - ప్రత్యక్షీకరణ నోటిఫికేషన్ పరిమితం చేయబడింది. దయచేసి యాక్టివ్ గా ఉండండి. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - ప్రత్యక్షీకరణ నోటిఫికేషన్ మద్దతు ఇవ్వదు. దయచేసి OSని తాజా వెర్షన్ కు అప్ డేట్ చేయండి. ఒకవేళ మీకు ఇంకా సమస్యలు ఉన్నట్లయితే, appsupport@cov19.mhlw.go.jp వద్ద దయచేసి మమ్మల్ని సంప్రదించండి. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ నమోదు చేయి 登録 - - రద్దు చేయబడింది - キャンセルしました - రిజిస్ట్రేషన్ ప్రారంభం అయ్యేంత వరకు దయచేసి కాసేపు వేచి ఉండండి. 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ రిజిస్ట్రేషన్ల సంఖ్య ఎగువ పరిమితికి చేరుకుంది. అనువర్తనం నుండి నిష్క్రమించు 登録回数上限になりました。アプリケーションを終了します - - నమోదు దోషం - 登録エラー - సబ్మిషన్ కు సంబంధించిన కాంటాక్ట్ రికార్డ్ ధృవీకరించబడదు. సబ్మిట్ చేయాల్సిన అవసరం లేదు. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.th.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.th.resx index 427068a85..6c98479ba 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.th.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.th.resx @@ -67,18 +67,6 @@ คุณจะได้รับแจ้งเตือน หากคุณเข้าใกล้กับคนที่มีมีผลตรวจ COVID-19 เป็นบวก (ติดเชื้อ) exposures comment - - โปรดลองอีกครั้งในภายหลัง - - - ล้มเหลว - - - ส่งผลการวินิจฉัยแล้ว - - - เสร็จสมบูรณ์ - กําลังส่งผลการวินิจฉัย... @@ -544,10 +532,6 @@ คุณจะเป็นต้องยอมรับข้อตกลงสิทธิ์การใช้งาน 利用規約に同意する必要があります。 - - การแจ้งเตือนการสัมผัสเชื้อไม่ได้รับการยืนยัน กรุณายืนยันจากระบบปฏิบัติการบนอุปกรณ์ของคุณ หรือยืนยันอีกครั้งหลังติดตั้งแอปพลิเคชันใหม่ - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - ไม่รองรับการแจ้งเตือนการสัมผัสเชื้อ กรุณาอัปเดทระบบปฏิบัติการให้เป็นรุ่นล่าสุด หากยังพบปัญหาอยู่กรุณาติดต่อ appsupport@cov19.mhlw.go.jp Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ ลงทะเบียน 登録 - - ยกเลิกแล้ว - キャンセルしました - กรุณารอสักพักจนกว่าการลงทะเบียนจะเริ่มต้น 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ จํานวนการลงทะเบียนถึงขีดจํากัดสูงสุดแล้ว กำลังออกจากแอปพลิเคชัน 登録回数上限になりました。アプリケーションを終了します - - การลงทะเบียนผิดพลาด - 登録エラー - ไม่สามารถยืนยันเรกคอร์ดที่ติดต่อที่สอดคล้องกับการส่งได้ ไม่จําเป็นต้องส่ง 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.tk.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.tk.resx index eabafbf58..de2df9aff 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.tk.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.tk.resx @@ -43,15 +43,6 @@ Häzir däl - - Soňra synanyşyň. - - - Şowsuz - - - Doly - Bes et @@ -140,8 +131,4 @@ Bellige al 登録 - - Bes edildi - キャンセルしました - diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.tr.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.tr.resx index 909d4b7d6..9c7511a30 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.tr.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.tr.resx @@ -67,18 +67,6 @@ Olumlu bir COVID-19 sonucu bildiren birine maruz kaldıysanız size bildirilir. exposures comment - - Lütfen daha sonra yeniden deneyin. - - - Başarısız - - - Tanı Gönderildi - - - Tamamlandı - Tanı Gönderme... @@ -544,10 +532,6 @@ Kullanım koşullarını kabul etmelisiniz. 利用規約に同意する必要があります。 - - Pozlama Bildirimi sınırlıdır. Lütfen aktif olun. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - Pozlama Bildirimi desteklenmez. Lütfen işletim sistemi en son sürüme güncelleyin. Hala sorun yaşıyorsanız, appsupport@cov19.mhlw.go.jp bize ulaşın. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Kaydet 登録 - - İptal Edildi - キャンセルしました - Lütfen kayıt başlayana kadar bir süre bekleyin 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ Kayıt sayısı üst sınıra ulaştı. Çıkış uygulaması 登録回数上限になりました。アプリケーションを終了します - - Kayıt hatası - 登録エラー - Gönderimle ilgili iletişim kaydı doğrulanamadı. Göndermeye gerek yok. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.tt.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.tt.resx index 513557597..370332326 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.tt.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.tt.resx @@ -43,15 +43,6 @@ Хәзер түгел - - Омтылышны соңрак кабатлагыз. - - - Хата - - - Тәмам - Баш тарту @@ -140,8 +131,4 @@ Теркәлү 登録 - - Баш тартылган - キャンセルしました - diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.ug.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.ug.resx index b86b03209..a627bca8f 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.ug.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.ug.resx @@ -43,15 +43,6 @@ ھازىر ئەمەس - - كېيىنرەك قايتا سىناڭ. - - - مەغلۇپ بولدى - - - تامام - بىكار قىلىش @@ -140,8 +131,4 @@ تىزىملىتىش 登録 - - بىكار قىلىندى - キャンセルしました - diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.uk.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.uk.resx index 8569e5714..f5ff115e0 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.uk.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.uk.resx @@ -67,18 +67,6 @@ Ви будете повідомлені, якщо ви були схильні до тих, хто повідомив позитивний COVID-19 результат. exposures comment - - Спробуйте ще раз пізніше. - - - Помилка - - - Діагноз подано - - - Завершено - Подача діагнозу... @@ -544,10 +532,6 @@ Ви повинні погодитися з умовами використання. 利用規約に同意する必要があります。 - - Сповіщення про експозицію обмежено. Будь ласка, активний. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - Сповіщення про експозицію не підтримується. Оновіть ОС до останньої версії. Якщо у вас ще є проблеми, будь ласка, зв'яжіться з нами за адресою appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Реєстрація 登録 - - Скасовано - キャンセルしました - Зачекайте деякий час до початку реєстрації 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ Кількість реєстрацій досягла верхньої межі. Вийти з програми 登録回数上限になりました。アプリケーションを終了します - - Помилка реєстрації - 登録エラー - Не вдалося підтвердити запис контактної особи, що відповідає поданням. Не потрібно подавати. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.ur.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.ur.resx index d6fd29398..eb641d8e3 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.ur.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.ur.resx @@ -67,18 +67,6 @@ آپ کو مطلع کیا جائے گا اگر آپ کسی ایسے شخص سے بے نقاب رہے ہیں جو کسی مثبت COVID کی اطلاع دی ہے-19 نتیجہ. exposures comment - - برائے مہربانی بعد میں دوبارہ کوشش کریں۔ - - - ناکام - - - پیش تشخیص - - - مکمل - تشخیص جمع کر رہا ہے... @@ -544,10 +532,6 @@ آپ کو استعمال کی شرائط سے اتفاق کرنا ضروری ہے. 利用規約に同意する必要があります。 - - نمائش کی اطلاع محدود ہے ۔ برائے مہربانی فعال. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - نمائش کی اطلاع کی تائید نہیں کی گئی ۔ براہ کرم تازہ ترین ورژن میں OS کو اپ ڈیٹ کریں. اگر اب بھی آپ کے مسائل ہیں ، تو براہ مہربانی ہم سے رابطہ کریں appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ رجسٹر کریں 登録 - - منسوخ شدہ - キャンセルしました - رجسٹریشن شروع ہونے تک تھوڑی دیر انتظار کریں 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ رجسٹریشن کی تعداد اوپری حد تک پہنچ گئی ہے. خروج اپیلی کیشن 登録回数上限になりました。アプリケーションを終了します - - رجسٹریشن نقص - 登録エラー - جمع کرانے کے متعلقہ رابطہ ریکارڈ کی تصدیق نہیں کی جا سکتی ۔ جمع کرنے کی ضرورت نہیں. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.vi.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.vi.resx index 541cd2cb8..fa126b919 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.vi.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.vi.resx @@ -67,18 +67,6 @@ Bạn sẽ được thông báo nếu bạn đã được tiếp xúc với một người báo cáo một kết quả COVID-19 dương tính. exposures comment - - Hãy thử lại sau. - - - Không thành công - - - Xét nghiệm đã được gửi - - - Hoàn tất - Đệ trình chẩn đoán... @@ -544,10 +532,6 @@ Bạn phải đồng ý với các điều khoản sử dụng. 利用規約に同意する必要があります。 - - Thông báo phơi nhiễm bị hạn chế. Vui lòng kích hoạt. - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - Thông báo phơi sáng không được hỗ trợ. Vui lòng cập nhật hệ điều hành lên phiên bản mới nhất. Nếu bạn vẫn còn có vấn đề, xin vui lòng liên hệ với chúng tôi tại appsupport@cov19.mhlw.go.jp. Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -580,10 +564,6 @@ Đăng ký 登録 - - Đã hủy - キャンセルしました - Vui lòng chờ trong một thời cho đến khi đăng ký bắt đầu 登録開始までしばらくそのままでお待ちください @@ -612,10 +592,6 @@ Số lượng đăng ký đã đạt đến giới hạn trên. Thoát khỏi ứng dụng 登録回数上限になりました。アプリケーションを終了します - - Lỗi đăng ký - 登録エラー - Hồ sơ liên hệ tương ứng với việc gửi không thể được xác nhận. Không cần phải gửi. 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.xh.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.xh.resx index f16cba6f0..57c9462c7 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.xh.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.xh.resx @@ -40,15 +40,6 @@ Kulungile - - Nceda uzame kwakhona. - - - Feyile - - - Gqiba - Rhoxisa @@ -137,8 +128,4 @@ Bhalisa 登録 - - Irhoxisiwe - キャンセルしました - diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.yo.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.yo.resx index 6aa744af3..e64e956aa 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.yo.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.yo.resx @@ -40,15 +40,6 @@ Ó DÁA - - Jọ̀wọ́ gbìyànjú lẹ́ẹ̀kansíi láìpẹ́. - - - Ti kùnà - - - Parí - Pa rẹ́ @@ -137,8 +128,4 @@ Forúkọsílẹ̀ 登録 - - Ti paá rẹ́ - キャンセルしました - diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.zh-Hans.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.zh-Hans.resx index 3d25ad330..951b6d5d2 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.zh-Hans.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.zh-Hans.resx @@ -39,7 +39,7 @@ 電波状況の良い場所でもう一度お試しください。 - 确定 + OK 暂不 @@ -65,16 +65,16 @@ exposures comment - 请稍后重试。 + 请再输入受理编号。 + 処理番号を再度入力してください。 - - 失败 - - - 诊断已提交 + + 无法登记阳性信息 + 陽性情報を登録できませんでした - - 完成 + + 登记完成 + 登録が完了しました 正在提交诊断结果... @@ -85,6 +85,11 @@ 取消 + キャンセル + + + 登记 + 登録 正在删除 @@ -111,13 +116,20 @@ 正在等待注册 - 是否确实要重置所有数据? + 所有数据将被删除,终止使用本应用吗? + すべてのデータを削除して、アプリの使用を中止します。よろしいですか? - 删除所有数据 + 终止使用本应用 + アプリの使用を中止します + + + 数据已删除 + データを削除しました - 所有设置和数据都已删除。请重新启动应用程序。 + 关闭应用。 + アプリを終了します。 返回注册 @@ -213,11 +225,11 @@ 検査により新型コロナウイルスの感染が確認された場合。 - 保健所等官方机构会给您开具“数字码”。 + 保健所等官方机构会给您开具“受理编号”。 保健所等公的機関から登録用の「処理番号」が発行されます。 - 使用该应用登记您的数字码。 + 使用该应用登记您的受理编号。 本アプリを用いて処理番号の登録を行います。 @@ -417,7 +429,7 @@ 登録する - 如何获得数字码 + 如何获得受理编号 処理番号の取得方法 @@ -477,7 +489,7 @@ から - 请输入八位数字码 + 请输入八位受理编号 8桁の処理番号を入力してください @@ -545,9 +557,13 @@ 您必须同意使用条款。 利用規約に同意する必要があります。 - - COVID-19 暴露通知受到限制。请于系统设置中允许通知,或重新安装应用后再次选择允许通知。 - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 + + 接触通知功能已停止 + 接触通知機能が停止しています + + + 请重新安装应用或从系统设置中启用接触通知。 + アプリを再インストールするか、 OSの設定から接触通知を有効にしてください。 不支持暴露通知。请将系统更新到最新版本。如果仍有问题,请通过appsupport@cov19.mhlw.go.jp与我们联系。 @@ -566,40 +582,40 @@ Exposure Notificationを起動できませんでした。端末の設定を開いて、Exposure NotificationをONにするとともに、BluetoothをONにしてください。 - 输入的数字码不正确 - アプリで入力された処理番号が違います + 请输入正确的受理编号。 + 正しい処理番号を入力してください。 无法连接到登记服务中心 センターに接続できません - 是否登记阳性信息? - 陽性情報を登録しますか? + 是否登记? + よろしいですか? - 登记 - 登録 + 阳性信息登记 + 陽性情報の登録をします - - 已取消 - キャンセルしました + + 登记已取消 + 登録をキャンセルしました - 在开始登记前请稍等片刻 - 登録開始までしばらくそのままでお待ちください + 请稍等。 + しばらくそのままでお待ちください。 - 等待登记 - 登録待ち + 登记开始 + 登録を開始します - 未输入数字码 + 未输入受理编号 処理番号が入力されていません - 数字码格式不匹配 - 処理番号のフォーマットが一致していません + 请输入半角数字的受理编号。 + 処理番号は半角数字で入力してください。 必须启用 COVID-19 接触日志才可进行阳性登记,请在应用或系统设置中启用设定。 @@ -608,22 +624,26 @@ 请启用 COVID-19 接触日志 COVID-19接触のログ記録を有効にしてください + + + 登记次数达到上限 + 登録回数の上限に達しました - 登记次数已达上限。退出应用程序 - 登録回数上限になりました。アプリケーションを終了します + 关闭应用。 + アプリを終了します。 - - 登记出现错误 - 登録エラー + + 受理编号错误 + 処理番号が違います - 无法确认与提交对应的联系人记录。无需提交。 - 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 + 不需要登记。 + 登録する必要はありません。 - 无适用联系人 - 該当接触なし + 没有接触记录 + 接触記録がありません https://covid19radarjpnprod.z11.web.core.windows.net/version.json @@ -832,7 +852,7 @@ ※「/Android」より前の部分は、お使いの環境によって「内部ストレージ」など表記が異なります - 请输入通过短信或电子邮件收到的处理号码 + 请输入通过短信或电子邮件收到的受理编号 SMSまたはメールで届いた処理番号を入力してください。 @@ -848,7 +868,7 @@ 発熱、咳、呼吸困難、全身倦怠感、咽頭痛、鼻汁・鼻閉、頭痛、関節・筋肉痛、下痢、嘔気・嘔吐など - 登录后 + 登记后 登録すると @@ -890,7 +910,7 @@ 陽性登録の前にお読みください - 如果处理号码是正确的,在您症状开始或接受检查后的两天以内与您接触过的人( 通常指1米以内彼此靠近15分钟以上的COCOA使用者 )将得到通知。接受通知者不会知道可以识别您的信息。 + 如果受理编号是正确的,在您症状开始或接受检查后的两天以内与您接触过的人( 通常指1米以内彼此靠近15分钟以上的COCOA使用者 )将得到通知。接受通知者不会知道可以识别您的信息。 処理番号が正しい場合には、症状が始まった日または検査を受けた日の2日前以降にあなたと接触した人(概ね1メートル以内で15分以上近接した可能性のあるアプリ使用者)に、通知が届きます。その通知が届いた人に、あなた個人が特定される情報が知られることはありません @@ -918,11 +938,11 @@ (※)新型コロナウイルスの検査で陽性となった時などに連絡先として伝えたもの - 当您在保健所提出在COCOA上进行阳性注册后,管理系统将会通过手机号码或者邮箱地址通知您「处理号码」 + 当您在保健所提出在COCOA上进行阳性注册后,管理系统将会通过手机号码或者邮箱地址通知您「受理编号」 あなたが保健所にCOCOAへの陽性登録を申し出ると、その携帯電話番号またはメールアドレスに、管理システムから「処理番号」が通知されます - 当您咋COCOA中输入处理号码后,您的手机将会通过管理系统来验证处理号码是否正确 + 当您咋COCOA中输入受理编号后,您的手机将会通过管理系统来验证受理编号是否正确 あなたが処理番号をCOCOAに入力すると、あなたの携帯電話から管理システムに対し、正しい処理番号であるかどうかの照会が行われます @@ -938,7 +958,7 @@ 利用規約URL - 如何获得数字码 + 如何获得受理编号 処理番号の取得方法 @@ -946,19 +966,39 @@ 保健所から連絡がありましたら「接触確認アプリでの陽性登録を希望」とお伝えください。 - 您将通过短信或电子邮件收到一个8位数的处理号码。 + 您将通过短信或电子邮件收到一个8位数的受理编号。 SMSまたはメールにて8桁の処理番号が送られてきます。 - 处理号码在发出后一小时内有效。 如果它已过期,您将收到一个新的处理号码。 + 受理编号在发出后一小时内有效。 如果它已过期,您将收到一个新的受理编号。 処理番号の有効期限は、発行から1時間です。有効期限を過ぎた場合は、新しい処理番号が再度送られてきます。 如果您从保健中心收到了My HER-SYS的使用指南,请从那里申请使用接触确认应用。 保健所からMy HER-SYSの利用案内を受けている場合は、そちらから接触確認アプリの利用を申し出てください。 + + + 接触通知 + 接触を通知 + + + 重要通知 + 重要なお知らせ + + + 您可能接触过感染新型冠状病毒的阳性登记者。点击查看详细信息。 + 新型コロナウイルス感染症の陽性登録者と接触した可能性があります。タップして詳細を確認してください。 * + + 网页无障碍访问政策 + ウェブアクセシビリティ方針 + + + https://www.mhlw.go.jp/cocoa/webaccessibility_chinese.html + ウェブアクセシビリティ方針URL + \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.zh-Hant.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.zh-Hant.resx index e5d8e306f..d3abc824c 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.zh-Hant.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.zh-Hant.resx @@ -67,18 +67,6 @@ 如果您接觸過確診 COVID-19 為陽性者,您將收到通知。 exposures comment - - 請稍後再試一次。 - - - 失敗 - - - 診斷已提交 - - - 完成 - 提交診斷中... @@ -548,10 +536,6 @@ 您必須同意使用條款。 利用規約に同意する必要があります。 - - 尚未允許使用 COVID-19 接觸通知功能。請允許行動裝置使用該功能,或是重新安裝此應用程式後再次允許使用。 - COVID-19接触通知機能が承認されていません。各OSから承認するか、またはアプリの再インストール後に、再承認してください。 - 不支援暴露通知。請將作業系統更新到最新版本。如果您仍有問題,請在 appsupport@cov19.mhlw.go.jp 與我們聯繫。 Exposure Notification機能は非対応の状態です。OSを最新版にアップデートしてください。それでも改善しなければ、appsupport@cov19.mhlw.go.jpまでお問い合わせください。 @@ -584,10 +568,6 @@ 註冊 登録 - - 已取消 - キャンセルしました - 請稍等片刻,稍後註冊將會開始 登録開始までしばらくそのままでお待ちください @@ -616,10 +596,6 @@ 註冊次數已達到上限。離開應用程式 登録回数上限になりました。アプリケーションを終了します - - 註冊發生錯誤 - 登録エラー - 無法確認與提交對應的聯繫人記錄。無需提交。 提出に該当する接触記録が確認できませんでした。提出の必要はありません。 diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.zu.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.zu.resx index c61770f71..88c1df04c 100644 --- a/Covid19Radar/Covid19Radar/Resources/AppResources.zu.resx +++ b/Covid19Radar/Covid19Radar/Resources/AppResources.zu.resx @@ -47,15 +47,6 @@ Hhayi Manje - - Sicela uzame futhi ngokuhamba kwesikhathi. - - - Ihlulekile - - - Kuphothuliwe - Khansela @@ -152,8 +143,4 @@ Bhalisa 登録 - - Kukhanseliwe - キャンセルしました - diff --git a/Covid19Radar/Covid19Radar/Resources/html/en/chatbot2.html b/Covid19Radar/Covid19Radar/Resources/html/en/chatbot2.html deleted file mode 100644 index a5b4dfd53..000000000 --- a/Covid19Radar/Covid19Radar/Resources/html/en/chatbot2.html +++ /dev/null @@ -1,87 +0,0 @@ - - - - - -If you have symptoms - - - - - -
-
- If you have symptoms -
-
-
-
-
-
-

- ・Please promptly make an appointment and visit COVID-19 Consultation Center(please wear a mask). -

- -
-
-

COVID-19 Consultation Centers

- Hokkaido
- Aomori  - Iwate  - Miyagi  - Akita  - Yamagata  - Fukushima
- Ibaraki  - Tochigi  - Gunma  - Saitama  - Chiba  - Tokyo  - Kanagawa
- Niigata  - Toyama  - Ishikawa  - Fukui  - Yamanashi  - Nagano
- Gifu  - Shizuoka  - Aichi  - Mie
- Shiga  - Kyoto  - Osaka  - Hyogo  - Nara  - Wakayama
- Tottori  - Shimane  - Okayama  - Hiroshima  - Yamaguchi
- Tokushima  - Kagawa  - Ehime  - Kouchi
- Fukuoka  - Saga  - Nagasaki  - Kumamoto  - Oita
- Miyazaki  - Kagoshima  - Okinawa
-

- -
- -
- - - -
- - \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar/Resources/html/en/chatbot3.html b/Covid19Radar/Covid19Radar/Resources/html/en/chatbot3.html deleted file mode 100644 index 5979a1f49..000000000 --- a/Covid19Radar/Covid19Radar/Resources/html/en/chatbot3.html +++ /dev/null @@ -1,39 +0,0 @@ - - - - - -Does any of the following apply to you? - - - - - -
-
- Does any of the following apply to you? -
-
-
-
-
-
-

- ・Someone among people you have been in proximity within 2 weeks, such as family, friends and colleagues was infected with COVID-19.
- ・Someone among people you have been in proximity within 2 weeks, such as family, friends and colleagues are suspected to have COVID-19 symptoms. - (You do not have to be precise, please answer "Yes" if you think so) -

-

-
- -

- -
-
-
- - \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar/Resources/html/en/chatbot4.html b/Covid19Radar/Covid19Radar/Resources/html/en/chatbot4.html deleted file mode 100644 index 3a4e8bafb..000000000 --- a/Covid19Radar/Covid19Radar/Resources/html/en/chatbot4.html +++ /dev/null @@ -1,87 +0,0 @@ - - - - - -If you answered yes - - - - - -
-
- If you answered yes -
-
-
-
-
-
-

- ・Please promptly make an appointment and visit COVID-19 Consultation Center(please wear a mask).
- ・Please stay home for the next 14 days. -

-
-
-

COVID-19 Consultation Centers

- Hokkaido
- Aomori  - Iwate  - Miyagi  - Akita  - Yamagata  - Fukushima
- Ibaraki  - Tochigi  - Gunma  - Saitama  - Chiba  - Tokyo  - Kanagawa
- Niigata  - Toyama  - Ishikawa  - Fukui  - Yamanashi  - Nagano
- Gifu  - Shizuoka  - Aichi  - Mie
- Shiga  - Kyoto  - Osaka  - Hyogo  - Nara  - Wakayama
- Tottori  - Shimane  - Okayama  - Hiroshima  - Yamaguchi
- Tokushima  - Kagawa  - Ehime  - Kouchi
- Fukuoka  - Saga  - Nagasaki  - Kumamoto  - Oita
- Miyazaki  - Kagoshima  - Okinawa
-

- -
- -
- - - -
- - \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar/Resources/html/en/chatbot5.html b/Covid19Radar/Covid19Radar/Resources/html/en/chatbot5.html deleted file mode 100644 index 3842ca2c3..000000000 --- a/Covid19Radar/Covid19Radar/Resources/html/en/chatbot5.html +++ /dev/null @@ -1,41 +0,0 @@ - - - - - -If you answered no - - - - - -
-
- If you answered no -
-
-
-
-
-
-

- ・Please keep an eye on changes in your physical condition for the next 14 days.
- ・If your physical condition changes, please use the symptoms checker below. -

-
- -
-

-
- -
- - - -
- - \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar/Resources/html/en/css/style.css b/Covid19Radar/Covid19Radar/Resources/html/en/css/style.css deleted file mode 100644 index c8b7eee20..000000000 --- a/Covid19Radar/Covid19Radar/Resources/html/en/css/style.css +++ /dev/null @@ -1,180 +0,0 @@ -.header-inner{ - height: 56px; - text-align: left; - font-family: 'Noto Sans JP', sans-serif; - font-size: 16px; - letter-spacing: 0px; - color: #404040; - opacity: 1; -} - -.header-logo{ - top: 44px; - left: 22px; - width: 16px; - height: 16px; - opacity: 1; -} - -.main-inner{ - top: 96px; - left: 20px; - width: 320px; - height: 520px; - background: #FFF3DD 0% 0% no-repeat padding-box; - opacity: 1; - margin-left: auto; - margin-right: auto; -} - -.main-text{ - text-align: left; - padding-top: 13px; - padding-right: 20px; - padding-left: 20px; - font-family: 'Noto Sans JP', sans-serif; - font-size: 16px; - letter-spacing: 0px; - color: #000000DE; - opacity: 1; -} - -.button_wrapper{ - text-align:center; - -} -.main-button{ - width: 284px; - height: 48px; - background: #E8F7FF 0% 0% no-repeat padding-box; - border: 4px solid #2196F3; - font-family: 'Noto Sans JP', sans-serif; - font-size: 16px; - text-align: center; - border-radius: 24px; - opacity: 1; - margin-left: auto; - margin-right: auto; -} - -.main-chatbot2{ - top: 96px; - left: 20px; - width: 320px; - height: 120px; - background: #FFF3DD 0% 0% no-repeat padding-box; - border-radius: 8px; - opacity: 1; - margin-left: auto; - margin-right: auto; -} - -.main-chatbot2-text{ - text-align: left; - padding-top: 13px; - padding-right: 20px; - padding-left: 20px; - font-family: 'Noto Sans JP', sans-serif; - font-size: 16px; - letter-spacing: 0px; - color: #000000DE; - opacity: 1; -} - -.main-back{ - top: 530px; - left: 38px; - width: 284px; - height: 48px; - opacity: 1; - margin-left: auto; - margin-right: auto; -} - -.main-covidcenter{ - font-family: 'Noto Sans JP', sans-serif; - width: 316px; - margin-left: auto; - margin-right: auto; -} - -.main-chatbot3{ - top: 96px; - left: 20px; - width: 320px; - height: 320px; - background: #FFF3DD 0% 0% no-repeat padding-box; - border-radius: 8px; - opacity: 1; - margin-left: auto; - margin-right: auto; -} - -.main-chatbot3-text{ - text-align: left; - padding-top: 13px; - padding-right: 20px; - padding-left: 20px; - font-family: 'Noto Sans JP', sans-serif; - font-size: 16px; - letter-spacing: 0px; - color: #000000DE; - opacity: 1; - margin-left: auto; - margin-right: auto; -} - -.main-chatbot4{ - top: 96px; - left: 20px; - width: 320px; - height: 180px; - background: #FFF3DD 0% 0% no-repeat padding-box; - border-radius: 8px; - opacity: 1; - margin-left: auto; - margin-right: auto; - margin-top: auto; - margin-bottom: auto; -} - -.main-chatbot4-text{ - text-align: left; - padding-top: 13px; - padding-right: 20px; - padding-left: 20px; - font-family: 'Noto Sans JP', sans-serif; - font-size: 16px; - letter-spacing: 0px; - color: #000000DE; - opacity: 1; - margin-left: auto; - margin-right: auto; -} - -.main-chatbot5{ - top: 96px; - left: 20px; - width: 320px; - height: 240px; - background: #FFF3DD 0% 0% no-repeat padding-box; - border-radius: 8px; - opacity: 1; - margin-left: auto; - margin-right: auto; -} - -.main-chatbot5-text{ - padding-top: 13px; - padding-right: 20px; - padding-left: 20px; - text-align: left; - font-family: 'Noto Sans JP', sans-serif; - font-size: 16px; - letter-spacing: 0px; - color: #000000DE; - opacity: 1; -} - - - diff --git a/Covid19Radar/Covid19Radar/Resources/html/en/img/Back Arrow.png b/Covid19Radar/Covid19Radar/Resources/html/en/img/Back Arrow.png deleted file mode 100644 index b35249661..000000000 Binary files a/Covid19Radar/Covid19Radar/Resources/html/en/img/Back Arrow.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar/Resources/html/en/img/Back Arrow@2x.png b/Covid19Radar/Covid19Radar/Resources/html/en/img/Back Arrow@2x.png deleted file mode 100644 index 8b7b41b20..000000000 Binary files a/Covid19Radar/Covid19Radar/Resources/html/en/img/Back Arrow@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar/Resources/html/en/index.html b/Covid19Radar/Covid19Radar/Resources/html/en/index.html deleted file mode 100644 index 3ae1e3cb3..000000000 --- a/Covid19Radar/Covid19Radar/Resources/html/en/index.html +++ /dev/null @@ -1,41 +0,0 @@ - - - - - -Do you have any of the following symptoms? - - - - -
-
- Do you have any of the following symptoms? -
-
-
-
-
-
-

- ・You have one or more of the following symptoms: shortness of breath (dyspnea), strong exhaustion (fatigue), high fever, etc.

- ・You are prone to serious illness(※) and have relatively mild cold symptoms such as fever and cough.
(※)Elderly, people with pre-existing conditions such as diabetes, heart failure, chronic respiratory diseases(COPD, etc.), people undergoing dialysis, people using immunosuppressants and anti-cancer agents.

- ・You do not fall into above categories and have relatively mild cold symptoms such as fever or cough. -

-
-
-
- -
- -

- -
- -
- - \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar/Resources/html/ja/chatbot2.html b/Covid19Radar/Covid19Radar/Resources/html/ja/chatbot2.html deleted file mode 100644 index 8519f4aae..000000000 --- a/Covid19Radar/Covid19Radar/Resources/html/ja/chatbot2.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - -症状のある方へのお願い - - - - - -
-
- 症状のある方へのお願い -
-
-
-
-
-
-

- 速やかに最寄りの帰国者・接触者相談センター等を予約し、受診してください(マスク着用)。 -

- -
-
- -
- -
- - - -
- - \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar/Resources/html/ja/chatbot3.html b/Covid19Radar/Covid19Radar/Resources/html/ja/chatbot3.html deleted file mode 100644 index c65e9185e..000000000 --- a/Covid19Radar/Covid19Radar/Resources/html/ja/chatbot3.html +++ /dev/null @@ -1,39 +0,0 @@ - - - - - -症状のない方への確認 - - - - - -
-
- 症状のない方への確認 -
-
-
-
-
-
-

- 以下のいずれかに該当しますか。
- ・家族や友人、職場の人など2週間以内に身近に接した人で、新型コロナウイルス感染症の感染者がいる。
- ・家族や友人、職場の人など2週間以内に身近に接した人で、質問した症状に該当すると思われた人がいる (厳密でなくとも、だいたいそう思われれば「はい」と回答ください) -

-

-
- -

- -
-
-
- - \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar/Resources/html/ja/chatbot4.html b/Covid19Radar/Covid19Radar/Resources/html/ja/chatbot4.html deleted file mode 100644 index 8d1be993c..000000000 --- a/Covid19Radar/Covid19Radar/Resources/html/ja/chatbot4.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - -はい、と回答された方へのお願い - - - - - -
-
- はい、と回答された方へのお願い -
-
-
-
-
-
-

- ・速やかに最寄りの帰国者・接触者相談センター等を予約し、受診してください (マスク着用)。
- ・14日以内は自宅で待機をお願いします。 -

-
-
- -
- -
- - - -
- - \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar/Resources/html/ja/chatbot5.html b/Covid19Radar/Covid19Radar/Resources/html/ja/chatbot5.html deleted file mode 100644 index fe622f860..000000000 --- a/Covid19Radar/Covid19Radar/Resources/html/ja/chatbot5.html +++ /dev/null @@ -1,41 +0,0 @@ - - - - - -いいえ、と回答された方へのお願い - - - - - -
-
- いいえ、と回答された方へのお願い -
-
-
-
-
-
-

- ・14日間は体調の変化に気を付けてください。
- ・体調に変化があった場合は、以下を選択ください。 -

-
- -
-

-
- -
- - - -
- - \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar/Resources/html/ja/css/style.css b/Covid19Radar/Covid19Radar/Resources/html/ja/css/style.css deleted file mode 100644 index f476933fa..000000000 --- a/Covid19Radar/Covid19Radar/Resources/html/ja/css/style.css +++ /dev/null @@ -1,201 +0,0 @@ -.header-inner{ - height: 56px; - text-align: left; - font-family: 'Noto Sans JP', sans-serif; - font-size: 16px; - letter-spacing: 0px; - color: #404040; - opacity: 1; -} - -.header-logo{ - top: 44px; - left: 22px; - width: 16px; - height: 16px; - opacity: 1; -} - -.main-inner{ - top: 96px; - left: 20px; - width: 320px; - height: 385px; - background: #FFF3DD 0% 0% no-repeat padding-box; - opacity: 1; - margin-left: auto; - margin-right: auto; -} - -.main-text{ - text-align: left; - padding-top: 13px; - padding-right: 20px; - padding-left: 20px; - font-family: 'Noto Sans JP', sans-serif; - font-size: 16px; - letter-spacing: 0px; - color: #000000DE; - opacity: 1; -} - -.button_wrapper{ - text-align:center; - -} -.main-button{ - width: 284px; - height: 48px; - background: #E8F7FF 0% 0% no-repeat padding-box; - border: 4px solid #2196F3; - font-family: 'Noto Sans JP', sans-serif; - font-size: 16px; - text-align: center; - border-radius: 24px; - opacity: 1; - margin-left: auto; - margin-right: auto; -} - -/* -.main-chatbot1-on{ - top: 489px; - left: 38px; - width: 284px; - height: 48px; - opacity: 1; - margin-left: auto; - margin-right: auto; -} - -.main-chatbot1-off{ - top: 546px; - left: 38px; - width: 284px; - height: 48px; - opacity: 1; - margin-left: auto; - margin-right: auto; -} */ - -.main-chatbot2{ - top: 96px; - left: 20px; - width: 320px; - height: 93px; - background: #FFF3DD 0% 0% no-repeat padding-box; - border-radius: 8px; - opacity: 1; - margin-left: auto; - margin-right: auto; -} - -.main-chatbot2-text{ - text-align: left; - padding-top: 13px; - padding-right: 20px; - padding-left: 20px; - font-family: 'Noto Sans JP', sans-serif; - font-size: 16px; - letter-spacing: 0px; - color: #000000DE; - opacity: 1; -} - -.main-back{ - top: 530px; - left: 38px; - width: 284px; - height: 48px; - opacity: 1; - margin-left: auto; - margin-right: auto; -} - -.main-covidcenter{ - font-family: 'Noto Sans JP', sans-serif; - width: 316px; - margin-left: auto; - margin-right: auto; -} - -.main-chatbot3{ - top: 96px; - left: 20px; - width: 320px; - height: 243px; - background: #FFF3DD 0% 0% no-repeat padding-box; - border-radius: 8px; - opacity: 1; - margin-left: auto; - margin-right: auto; -} - -.main-chatbot3-text{ - text-align: left; - padding-top: 13px; - padding-right: 20px; - padding-left: 20px; - font-family: 'Noto Sans JP', sans-serif; - font-size: 16px; - letter-spacing: 0px; - color: #000000DE; - opacity: 1; - margin-left: auto; - margin-right: auto; -} - -.main-chatbot4{ - top: 96px; - left: 20px; - width: 320px; - height: 140px; - background: #FFF3DD 0% 0% no-repeat padding-box; - border-radius: 8px; - opacity: 1; - margin-left: auto; - margin-right: auto; - margin-top: auto; - margin-bottom: auto; -} - -.main-chatbot4-text{ - text-align: left; - padding-top: 13px; - padding-right: 20px; - padding-left: 20px; - font-family: 'Noto Sans JP', sans-serif; - font-size: 16px; - letter-spacing: 0px; - color: #000000DE; - opacity: 1; - margin-left: auto; - margin-right: auto; -} - -.main-chatbot5{ - top: 96px; - left: 20px; - width: 320px; - height: 179px; - background: #FFF3DD 0% 0% no-repeat padding-box; - border-radius: 8px; - opacity: 1; - margin-left: auto; - margin-right: auto; -} - -.main-chatbot5-text{ - padding-top: 13px; - padding-right: 20px; - padding-left: 20px; - text-align: left; - font-family: 'Noto Sans JP', sans-serif; - font-size: 16px; - letter-spacing: 0px; - color: #000000DE; - opacity: 1; -} - - - diff --git a/Covid19Radar/Covid19Radar/Resources/html/ja/img/Back Arrow.png b/Covid19Radar/Covid19Radar/Resources/html/ja/img/Back Arrow.png deleted file mode 100644 index b35249661..000000000 Binary files a/Covid19Radar/Covid19Radar/Resources/html/ja/img/Back Arrow.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar/Resources/html/ja/img/Back Arrow@2x.png b/Covid19Radar/Covid19Radar/Resources/html/ja/img/Back Arrow@2x.png deleted file mode 100644 index 8b7b41b20..000000000 Binary files a/Covid19Radar/Covid19Radar/Resources/html/ja/img/Back Arrow@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar/Resources/html/ja/index.html b/Covid19Radar/Covid19Radar/Resources/html/ja/index.html deleted file mode 100644 index d9f52036c..000000000 --- a/Covid19Radar/Covid19Radar/Resources/html/ja/index.html +++ /dev/null @@ -1,41 +0,0 @@ - - - - - -症状の有無を入力してください - - - - -
-
- 症状の有無を入力してくだい -
-
-
-
-
-
-

- ・息苦しさ(呼吸困難)、強いだるさ(倦怠感)、高熱等の強い症状のいずれかがある

- ・重症しやすい方 (※) で、発熱や咳などの比較的軽い風邪の症状がある
※ 高齢者、糖尿病、心不全、呼吸器疾患(COPD等) などの基礎疾患がある方や透析を受けている方、免疫抑制剤や抗がん剤等を用いている方

- ・上記以外の方で発熱や咳など比較的軽い風邪の症状が続いている -

-
-
-
- -
- -

- -
- -
- - \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar/Resources/html/license.html b/Covid19Radar/Covid19Radar/Resources/html/license.html deleted file mode 100644 index 974ab0d9a..000000000 --- a/Covid19Radar/Covid19Radar/Resources/html/license.html +++ /dev/null @@ -1,320 +0,0 @@ - - - - - LICENSE Copyright / THIRD PARTY SOFTWARE NOTICES - - - - - - - - - - - - -

LICENSE Copyright / THIRD PARTY SOFTWARE NOTICES

-

Do Not Translate or Localize. -This file incorporates components from the projects listed below. -COVID-19Radar community licenses these components to you under COVID-19Radar community's software licensing terms, except that components licensed under open source licenses requiring that such components remain under their original license are being made available to you by COVID-19Radar community under their original licensing terms. -The original copyright notices and the licenses under which COVID-19Radar community received such components are set forth below for informational purposes.

-
-

COVID-19Radar

-
-

Copyright (C) 2020 COVID-19Radar Contributors

-

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

-
-

Copyright (c) Microsoft Corporation

-

The MIT License (MIT)

-

Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions:

-

The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software.

-

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.

-
-

Acr.UserDialogs

-
-

The MIT License (MIT)

-

Copyright (c) 2016 Allan Ritchie

-

Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions:

-

The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software.

-

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.

-
-

.NET Standard

-
-

The MIT License (MIT)

-

Copyright (c) .NET Foundation and Contributors

-

All rights reserved.

-

Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions:

-

The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software.

-

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.

-
-

Json.NET

-
-

The MIT License (MIT)

-

Copyright (c) 2007 James Newton-King

-

Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions:

-

The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software.

-

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.

-
-

Prism

-
-

The MIT License (MIT)

-

Copyright (c) .NET Foundation

-

All rights reserved.

-

Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions:

-

The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software.

-

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.

-
-

SQLite-net

-
-

The MIT License (MIT)

-

Copyright (c) Krueger Systems, Inc.

-

All rights reserved.

-

Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions:

-

The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software.

-

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.

-
-

Xamarin SDK

-
-

The MIT License (MIT)

-

Copyright (c) .NET Foundation Contributors

-

All rights reserved.

-

Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions:

-

The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software.

-

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.

-
-

Xamarin.Essentials

-
-

The MIT License (MIT)

-

Copyright (c) Microsoft Corporation

-

All rights reserved.

-

Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions:

-

The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software.

-

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.

-
-

Xamarin Exposure Notification

-
-

MIT License

-

Copyright (c) Microsoft Corporation.

-

Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions:

-

The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software.

-

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

-
-

FFImageLoading

-
-

The MIT License (MIT)

-

Copyright (c) 2015 Daniel Luberda & Fabien Molinet

-

Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions:

-

The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software.

-

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

-
-

Current Activity Plugin for Xamarin.Android

-
-

The MIT License (MIT)

-

Copyright (c) 2016 James Montemagno

-

Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions:

-

The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software.

-

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.

-
-

AndroidX for Xamarin.Android

-
-

The MIT License (MIT)

-

Copyright (c) .NET Foundation Contributors

-

Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions:

-

The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software.

-

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.

-
-

AndroidAltBeaconLibrary

-
-

Copyright 2014

-

Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at

-

http://www.apache.org/licenses/LICENSE-2.0

-

Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express -or implied. See the License for the specific language governing -permissions and limitations under the License.

-
-

(Sample Code) Exposure Notifications API: Android Reference Design

-
-

Copyright 2020

-

Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at

-

http://www.apache.org/licenses/LICENSE-2.0

-

Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express -or implied. See the License for the specific language governing -permissions and limitations under the License.

-
-

(Sample Code) Building an App to Notify Users of COVID-19 Exposure

-
-

Swift Protobuf is licensed under Apache 2.0., see ACKNOWLEDGEMENTS.txt for more information.

-

Copyright © 2020 Apple Inc.

-

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

-

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

-

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.

- - - \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar/Resources/html/license.md b/Covid19Radar/Covid19Radar/Resources/html/license.md deleted file mode 100644 index a5d049d3b..000000000 --- a/Covid19Radar/Covid19Radar/Resources/html/license.md +++ /dev/null @@ -1,433 +0,0 @@ -# LICENSE Copyright / THIRD PARTY SOFTWARE NOTICES -Do Not Translate or Localize. -This file incorporates components from the projects listed below. -COVID-19Radar community licenses these components to you under COVID-19Radar community's software licensing terms, except that components licensed under open source licenses requiring that such components remain under their original license are being made available to you by COVID-19Radar community under their original licensing terms. -The original copyright notices and the licenses under which COVID-19Radar community received such components are set forth below for informational purposes. - ---- -## COVID-19Radar ---- -Copyright (C) 2020 COVID-19Radar Contributors - -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 ---- - -Copyright (c) Microsoft Corporation - -The MIT License (MIT) - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -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. - ---- -## Acr.UserDialogs ---- - -The MIT License (MIT) - -Copyright (c) 2016 Allan Ritchie - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -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. - ---- -## .NET Standard ---- - -The MIT License (MIT) - -Copyright (c) .NET Foundation and Contributors - -All rights reserved. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -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. - ---- -## Json.NET ---- - -The MIT License (MIT) - -Copyright (c) 2007 James Newton-King - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -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. - ---- -## Prism ---- - -The MIT License (MIT) - -Copyright (c) .NET Foundation - -All rights reserved. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -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. - ---- -## SQLite-net ---- - -The MIT License (MIT) - -Copyright (c) Krueger Systems, Inc. - -All rights reserved. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -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. - ---- -## Xamarin SDK ---- - -The MIT License (MIT) - -Copyright (c) .NET Foundation Contributors - -All rights reserved. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -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. - ---- -## Xamarin.Essentials ---- - -The MIT License (MIT) - -Copyright (c) Microsoft Corporation - -All rights reserved. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -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. - ---- -## Xamarin Exposure Notification ---- - -MIT License - -Copyright (c) Microsoft Corporation. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -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 - ---- -## FFImageLoading ---- - -The MIT License (MIT) - -Copyright (c) 2015 Daniel Luberda & Fabien Molinet - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -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 - ---- -## Current Activity Plugin for Xamarin.Android ---- - -The MIT License (MIT) - -Copyright (c) 2016 James Montemagno - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -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. - ---- -## AndroidX for Xamarin.Android ---- - -The MIT License (MIT) - -Copyright (c) .NET Foundation Contributors - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -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. - ---- -## AndroidAltBeaconLibrary ---- - -Copyright 2014 - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express -or implied. See the License for the specific language governing -permissions and limitations under the License. - ---- -## (Sample Code) Exposure Notifications API: Android Reference Design ---- - -Copyright 2020 - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express -or implied. See the License for the specific language governing -permissions and limitations under the License. - ---- -## (Sample Code) Building an App to Notify Users of COVID-19 Exposure ---- - -Swift Protobuf is licensed under Apache 2.0., see ACKNOWLEDGEMENTS.txt for more information. - -Copyright © 2020 Apple Inc. - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -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 diff --git a/Covid19Radar/Covid19Radar/Resources/html/zh-hans/chatbot2.html b/Covid19Radar/Covid19Radar/Resources/html/zh-hans/chatbot2.html deleted file mode 100644 index e6e3cb9e7..000000000 --- a/Covid19Radar/Covid19Radar/Resources/html/zh-hans/chatbot2.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - -如果您有新冠病毒的一些症状 - - - - - -
-
- 如果您有新冠病毒的一些症状 -
-
-
-
-
-
-

- 请及时预约并去“回国者•接触者咨询中心”看(请戴口罩) -

- -
-
- -
- -
- - - -
- - \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar/Resources/html/zh-hans/chatbot3.html b/Covid19Radar/Covid19Radar/Resources/html/zh-hans/chatbot3.html deleted file mode 100644 index ff2419d12..000000000 --- a/Covid19Radar/Covid19Radar/Resources/html/zh-hans/chatbot3.html +++ /dev/null @@ -1,39 +0,0 @@ - - - - - -您有没有符合以下情况? - - - - - -
-
- 您有没有符合以下情况? -
-
-
-
-
-
-

- 您有没有符合以下情况?
- ・近两周内接触过新型冠状病毒感染患者。如家人/朋友/同事等您身边的人
- ・近两周内接触过符合上面症状的疑似新型冠状病毒感染患者。如家人/朋友/同事等您身边的人(如果记得不是特别清楚, 大致的话请回答“有”) -

-

-
- -

- -
-
-
- - \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar/Resources/html/zh-hans/chatbot4.html b/Covid19Radar/Covid19Radar/Resources/html/zh-hans/chatbot4.html deleted file mode 100644 index 21e32a39e..000000000 --- a/Covid19Radar/Covid19Radar/Resources/html/zh-hans/chatbot4.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - -如果您回答“有” - - - - - -
-
- 如果您回答“有” -
-
-
-
-
-
-

- ・请及时预约并去“回国者•接触者咨询中心”看(请戴口罩)
- ・请自觉在家隔离14天 -

-
-
- -
- -
- - - -
- - \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar/Resources/html/zh-hans/chatbot5.html b/Covid19Radar/Covid19Radar/Resources/html/zh-hans/chatbot5.html deleted file mode 100644 index 68be87145..000000000 --- a/Covid19Radar/Covid19Radar/Resources/html/zh-hans/chatbot5.html +++ /dev/null @@ -1,41 +0,0 @@ - - - - - -如果您回答“没有” - - - - - -
-
- 如果您回答“没有” -
-
-
-
-
-
-

- ・两周时间请密切关注自己的健康状况
- ・如果您的健康情况有所变化,请随时使用以下的症状检查 -

-
- -
-

-
- -
- - - -
- - \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar/Resources/html/zh-hans/css/style.css b/Covid19Radar/Covid19Radar/Resources/html/zh-hans/css/style.css deleted file mode 100644 index 1b73a2ed7..000000000 --- a/Covid19Radar/Covid19Radar/Resources/html/zh-hans/css/style.css +++ /dev/null @@ -1,201 +0,0 @@ -.header-inner{ - height: 56px; - text-align: left; - font-family: 'Noto Sans SC', sans-serif; - font-size: 16px; - letter-spacing: 0px; - color: #404040; - opacity: 1; -} - -.header-logo{ - top: 44px; - left: 22px; - width: 16px; - height: 16px; - opacity: 1; -} - -.main-inner{ - top: 96px; - left: 20px; - width: 320px; - height: 385px; - background: #FFF3DD 0% 0% no-repeat padding-box; - opacity: 1; - margin-left: auto; - margin-right: auto; -} - -.main-text{ - text-align: left; - padding-top: 13px; - padding-right: 20px; - padding-left: 20px; - font-family: 'Noto Sans SC', sans-serif; - font-size: 16px; - letter-spacing: 0px; - color: #000000DE; - opacity: 1; -} - -.button_wrapper{ - text-align:center; - -} -.main-button{ - width: 284px; - height: 48px; - background: #E8F7FF 0% 0% no-repeat padding-box; - border: 4px solid #2196F3; - font-family: 'Noto Sans SC', sans-serif; - font-size: 16px; - text-align: center; - border-radius: 24px; - opacity: 1; - margin-left: auto; - margin-right: auto; -} - -/* -.main-chatbot1-on{ - top: 489px; - left: 38px; - width: 284px; - height: 48px; - opacity: 1; - margin-left: auto; - margin-right: auto; -} - -.main-chatbot1-off{ - top: 546px; - left: 38px; - width: 284px; - height: 48px; - opacity: 1; - margin-left: auto; - margin-right: auto; -} */ - -.main-chatbot2{ - top: 96px; - left: 20px; - width: 320px; - height: 93px; - background: #FFF3DD 0% 0% no-repeat padding-box; - border-radius: 8px; - opacity: 1; - margin-left: auto; - margin-right: auto; -} - -.main-chatbot2-text{ - text-align: left; - padding-top: 13px; - padding-right: 20px; - padding-left: 20px; - font-family: 'Noto Sans SC', sans-serif; - font-size: 16px; - letter-spacing: 0px; - color: #000000DE; - opacity: 1; -} - -.main-back{ - top: 530px; - left: 38px; - width: 284px; - height: 48px; - opacity: 1; - margin-left: auto; - margin-right: auto; -} - -.main-covidcenter{ - font-family: 'Noto Sans SC', sans-serif; - width: 316px; - margin-left: auto; - margin-right: auto; -} - -.main-chatbot3{ - top: 96px; - left: 20px; - width: 320px; - height: 243px; - background: #FFF3DD 0% 0% no-repeat padding-box; - border-radius: 8px; - opacity: 1; - margin-left: auto; - margin-right: auto; -} - -.main-chatbot3-text{ - text-align: left; - padding-top: 13px; - padding-right: 20px; - padding-left: 20px; - font-family: 'Noto Sans SC', sans-serif; - font-size: 16px; - letter-spacing: 0px; - color: #000000DE; - opacity: 1; - margin-left: auto; - margin-right: auto; -} - -.main-chatbot4{ - top: 96px; - left: 20px; - width: 320px; - height: 140px; - background: #FFF3DD 0% 0% no-repeat padding-box; - border-radius: 8px; - opacity: 1; - margin-left: auto; - margin-right: auto; - margin-top: auto; - margin-bottom: auto; -} - -.main-chatbot4-text{ - text-align: left; - padding-top: 13px; - padding-right: 20px; - padding-left: 20px; - font-family: 'Noto Sans SC', sans-serif; - font-size: 16px; - letter-spacing: 0px; - color: #000000DE; - opacity: 1; - margin-left: auto; - margin-right: auto; -} - -.main-chatbot5{ - top: 96px; - left: 20px; - width: 320px; - height: 179px; - background: #FFF3DD 0% 0% no-repeat padding-box; - border-radius: 8px; - opacity: 1; - margin-left: auto; - margin-right: auto; -} - -.main-chatbot5-text{ - padding-top: 13px; - padding-right: 20px; - padding-left: 20px; - text-align: left; - font-family: 'Noto Sans SC', sans-serif; - font-size: 16px; - letter-spacing: 0px; - color: #000000DE; - opacity: 1; -} - - - diff --git a/Covid19Radar/Covid19Radar/Resources/html/zh-hans/img/Back Arrow.png b/Covid19Radar/Covid19Radar/Resources/html/zh-hans/img/Back Arrow.png deleted file mode 100644 index b35249661..000000000 Binary files a/Covid19Radar/Covid19Radar/Resources/html/zh-hans/img/Back Arrow.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar/Resources/html/zh-hans/img/Back Arrow@2x.png b/Covid19Radar/Covid19Radar/Resources/html/zh-hans/img/Back Arrow@2x.png deleted file mode 100644 index 8b7b41b20..000000000 Binary files a/Covid19Radar/Covid19Radar/Resources/html/zh-hans/img/Back Arrow@2x.png and /dev/null differ diff --git a/Covid19Radar/Covid19Radar/Resources/html/zh-hans/index.html b/Covid19Radar/Covid19Radar/Resources/html/zh-hans/index.html deleted file mode 100644 index 8855b0aca..000000000 --- a/Covid19Radar/Covid19Radar/Resources/html/zh-hans/index.html +++ /dev/null @@ -1,41 +0,0 @@ - - - - - -您有没有符合以下症状? - - - - -
-
- 您有没有符合以下症状? -
-
-
-
-
-
-

- ・有以下一种或多种症状:呼吸急促(呼吸困难)、严重疲劳、高烧等

- ・容易患重病(※),并有相对轻微的感冒症状,如发烧和咳嗽
(※) 老年人、糖尿病、心力衰竭、慢性呼吸系统疾病(COPD等)等既往疾病患者、透析患者、使用免疫抑制剂和抗癌药物的患者

- ・不符合以上症状,不过有相对轻微的感冒症状,如发烧或咳嗽 -

-
-
-
- -
- -

- -
- -
- - \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar/Services/DebugLogger.cs b/Covid19Radar/Covid19Radar/Services/DebugLogger.cs index d52d966c0..e69de29bb 100644 --- a/Covid19Radar/Covid19Radar/Services/DebugLogger.cs +++ b/Covid19Radar/Covid19Radar/Services/DebugLogger.cs @@ -1,26 +0,0 @@ -/* 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/. */ - -using FFImageLoading.Helpers; -using Prism.Logging; -using System; -using static System.Diagnostics.Debug; - -namespace Covid19Radar.Services -{ - public class DebugLogger : ILoggerFacade, IMiniLogger - { - public void Debug(string message) => - WriteLine($"Debug: {message}"); - - public void Error(string errorMessage) => - WriteLine($"Error: {errorMessage}"); - - public void Error(string errorMessage, Exception ex) => - WriteLine($"Error: {errorMessage}\n{ex.GetType().Name}: {ex}"); - - public void Log(string message, Category category, Priority priority) => - WriteLine($"{category} - {priority}: {message}"); - } -} diff --git a/Covid19Radar/Covid19Radar/Services/ExposureNotificationHandler.cs b/Covid19Radar/Covid19Radar/Services/ExposureNotificationHandler.cs index 854c0d5cb..9b5d46b96 100644 --- a/Covid19Radar/Covid19Radar/Services/ExposureNotificationHandler.cs +++ b/Covid19Radar/Covid19Radar/Services/ExposureNotificationHandler.cs @@ -16,6 +16,7 @@ using Covid19Radar.Model; using Covid19Radar.Resources; using Covid19Radar.Services.Logs; +using Newtonsoft.Json; using Xamarin.Essentials; using Xamarin.ExposureNotifications; @@ -29,6 +30,7 @@ public class ExposureNotificationHandler : IExposureNotificationHandler private IExposureNotificationService ExposureNotificationService => ServiceLocator.Current.GetInstance(); private IUserDataService UserDataService => ServiceLocator.Current.GetInstance(); private readonly IDeviceVerifier DeviceVerifier = ServiceLocator.Current.GetInstance(); + private ILocalNotificationService LocalNotificationService => ServiceLocator.Current.GetInstance(); public ExposureNotificationHandler() { @@ -71,7 +73,7 @@ public Task GetConfigurationAsync() loggerService.Info("Get default configuration"); var defaultConfiguration = Task.FromResult(configuration); - loggerService.Info($"configuration: {Utils.SerializeToJson(configuration)}"); + loggerService.Info($"configuration: {JsonConvert.SerializeObject(configuration)}"); loggerService.EndMethod(); return defaultConfiguration; @@ -96,6 +98,8 @@ public async Task ExposureDetectedAsync(ExposureDetectionSummary summary, Func= config.MinimumRiskScore) { var exposureInfo = await getExposureInfo(); @@ -113,15 +117,25 @@ public async Task ExposureDetectedAsync(ExposureDetectionSummary summary, Func a.Timestamp.CompareTo(b.Timestamp)); + if (isNewExposureDetected) + { + loggerService.Info($"Save ExposureSummary. MatchedKeyCount: {userExposureSummary.MatchedKeyCount}"); + loggerService.Info($"Save ExposureInformation. Count: {exposureInformationList.Count}"); + + exposureInformationList.Sort((a, b) => a.Timestamp.CompareTo(b.Timestamp)); + exposureNotificationService.SetExposureInformation(userExposureSummary, exposureInformationList); - loggerService.Info($"Save ExposureSummary. MatchedKeyCount: {userExposureSummary.MatchedKeyCount}"); - loggerService.Info($"Save ExposureInformation. Count: {exposureInformationList.Count}"); - exposureNotificationService.SetExposureInformation(userExposureSummary, exposureInformationList); + await LocalNotificationService.ShowExposureNotificationAsync(); + } + else + { + loggerService.Info($"MatchedKeyCount: {userExposureSummary.MatchedKeyCount}, but no new exposure detected"); + } loggerService.EndMethod(); } @@ -189,8 +203,10 @@ public async Task FetchExposureKeyBatchFilesFromServerAsync(Func startTimestamp) { var tmpFile = Path.Combine(tmpDir, Guid.NewGuid().ToString() + ".zip"); - Debug.WriteLine(Utils.SerializeToJson(tekItem)); + Debug.WriteLine(JsonConvert.SerializeObject(tekItem)); Debug.WriteLine(tmpFile); loggerService.Info($"Download TEK file. url: {tekItem.Url}"); @@ -305,8 +321,8 @@ public async Task UploadSelfExposureKeysToServerAsync(IEnumerable CreateSubmissionAsync(IEnumerab RollingPeriod = (uint)(k.RollingDuration.TotalMinutes / 10), }); - var beforeKey = Utils.SerializeToJson(temporaryExposureKeys.ToList()); - var afterKey = Utils.SerializeToJson(keys.ToList()); + var beforeKey = JsonConvert.SerializeObject(temporaryExposureKeys.ToList()); + var afterKey = JsonConvert.SerializeObject(keys.ToList()); Debug.WriteLine($"C19R {beforeKey}"); Debug.WriteLine($"C19R {afterKey}"); diff --git a/Covid19Radar/Covid19Radar/Services/ExposureNotificationService.cs b/Covid19Radar/Covid19Radar/Services/ExposureNotificationService.cs index 3bf586c20..ca202cba6 100644 --- a/Covid19Radar/Covid19Radar/Services/ExposureNotificationService.cs +++ b/Covid19Radar/Covid19Radar/Services/ExposureNotificationService.cs @@ -76,7 +76,7 @@ public async Task MigrateFromUserData(UserDataModel userData) if (userData.LastProcessTekTimestamp != null && userData.LastProcessTekTimestamp.Count > 0) { - var stringValue = Utils.SerializeToJson(userData.LastProcessTekTimestamp); + var stringValue = JsonConvert.SerializeObject(userData.LastProcessTekTimestamp); preferencesService.SetValue(PreferenceKey.LastProcessTekTimestamp, stringValue); userData.LastProcessTekTimestamp.Clear(); loggerService.Info("Migrated LastProcessTekTimestamp"); @@ -345,7 +345,7 @@ private async Task GetStatusMessageAsync() break; case Status.Restricted: // call out settings in each os - await UserDialogs.Instance.AlertAsync(Resources.AppResources.ExposureNotificationStatusMessageRestricted, "", Resources.AppResources.ButtonOk); + await UserDialogs.Instance.AlertAsync(Resources.AppResources.ExposureNotificationStatusMessageRestricted, Resources.AppResources.ExposureNotificationRestrictedTitle, Resources.AppResources.ButtonOk); message = Resources.AppResources.ExposureNotificationStatusMessageRestricted; break; default: diff --git a/Covid19Radar/Covid19Radar/Services/FFImageLoadingLogger.cs b/Covid19Radar/Covid19Radar/Services/FFImageLoadingLogger.cs deleted file mode 100644 index e7edfa37c..000000000 --- a/Covid19Radar/Covid19Radar/Services/FFImageLoadingLogger.cs +++ /dev/null @@ -1,38 +0,0 @@ -/* 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/. */ - -using FFImageLoading.Helpers; -using Prism.Logging; -using System; -using System.Collections.Generic; - -namespace Covid19Radar.Services -{ - public class FFImageLoadingLogger : IMiniLogger - { - private ILogger _logger { get; } - - public FFImageLoadingLogger(ILogger logger) - { - _logger = logger; - } - - public void Debug(string message) - { - _logger.Debug(message); - } - - public void Error(string errorMessage) - { - _logger.Warn(errorMessage); - } - - public void Error(string errorMessage, Exception ex) - { - _logger.Report(ex, new Dictionary{ - { "message", errorMessage } - }); - } - } -} diff --git a/Covid19Radar/Covid19Radar/Services/HttpDataService.cs b/Covid19Radar/Covid19Radar/Services/HttpDataService.cs index 4d4dbd9cd..54d49cf0f 100644 --- a/Covid19Radar/Covid19Radar/Services/HttpDataService.cs +++ b/Covid19Radar/Covid19Radar/Services/HttpDataService.cs @@ -79,7 +79,7 @@ public async Task PutSelfExposureKeysAsync(DiagnosisSubmissionPa { loggerService.StartMethod(); var url = $"{AppSettings.Instance.ApiUrlBase.TrimEnd('/')}/v2/diagnosis"; - var content = new StringContent(Utils.SerializeToJson(request), Encoding.UTF8, "application/json"); + var content = new StringContent(JsonConvert.SerializeObject(request), Encoding.UTF8, "application/json"); HttpStatusCode status = await PutAsync(url, content); loggerService.EndMethod(); return status; @@ -96,7 +96,7 @@ public async Task> GetTemporaryExposur { loggerService.Info("Success to download"); loggerService.EndMethod(); - return Utils.DeserializeFromJson>(result); + return JsonConvert.DeserializeObject>(result); } else { diff --git a/Covid19Radar/Covid19Radar/Model/UnUsed/HomeMenuModel.cs b/Covid19Radar/Covid19Radar/Services/ILocalContentPathService.cs similarity index 55% rename from Covid19Radar/Covid19Radar/Model/UnUsed/HomeMenuModel.cs rename to Covid19Radar/Covid19Radar/Services/ILocalContentPathService.cs index 689670ea4..70c5c40b9 100644 --- a/Covid19Radar/Covid19Radar/Model/UnUsed/HomeMenuModel.cs +++ b/Covid19Radar/Covid19Radar/Services/ILocalContentPathService.cs @@ -2,13 +2,12 @@ * 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 System.Windows.Input; - -namespace Covid19Radar.Model +namespace Covid19Radar.Services { - public class HomeMenuModel + public interface ILocalContentService { - public string Title { get; set; } - public ICommand Command { get; set; } + public const string LICENSE_FILENAME = "license.html"; + + public string LicenseUrl { get; } } } diff --git a/Covid19Radar/Covid19Radar/Model/UnUsed/ISQLiteConnectionProvider.cs b/Covid19Radar/Covid19Radar/Services/ILocalNotificationService.cs similarity index 53% rename from Covid19Radar/Covid19Radar/Model/UnUsed/ISQLiteConnectionProvider.cs rename to Covid19Radar/Covid19Radar/Services/ILocalNotificationService.cs index 4803d5018..8c5ef54ec 100644 --- a/Covid19Radar/Covid19Radar/Model/UnUsed/ISQLiteConnectionProvider.cs +++ b/Covid19Radar/Covid19Radar/Services/ILocalNotificationService.cs @@ -2,15 +2,14 @@ * 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 SQLite; -using System; -using System.Collections.Generic; -using System.Text; +using System.Threading.Tasks; -namespace Covid19Radar.Model +namespace Covid19Radar.Services { - public interface ISQLiteConnectionProvider + public interface ILocalNotificationService { - SQLiteConnection GetConnection(); + public Task PrepareAsync(); + + public Task ShowExposureNotificationAsync(); } } diff --git a/Covid19Radar/Covid19Radar/Services/TermsUpdateService.cs b/Covid19Radar/Covid19Radar/Services/TermsUpdateService.cs index 81f600b6e..3618bb3b2 100644 --- a/Covid19Radar/Covid19Radar/Services/TermsUpdateService.cs +++ b/Covid19Radar/Covid19Radar/Services/TermsUpdateService.cs @@ -9,6 +9,7 @@ using Covid19Radar.Model; using Covid19Radar.Resources; using Covid19Radar.Services.Logs; +using Newtonsoft.Json; namespace Covid19Radar.Services { @@ -87,7 +88,7 @@ public async Task GetTermsUpdateInfo() loggerService.Info($"uri: {uri}"); loggerService.Info($"TermsUpdateInfo: {json}"); - var deserializedJson = Utils.DeserializeFromJson(json); + var deserializedJson = JsonConvert.DeserializeObject(json); loggerService.EndMethod(); diff --git a/Covid19Radar/Covid19Radar/Services/UserDataService.cs b/Covid19Radar/Covid19Radar/Services/UserDataService.cs index 69e3d00c7..360e662ff 100644 --- a/Covid19Radar/Covid19Radar/Services/UserDataService.cs +++ b/Covid19Radar/Covid19Radar/Services/UserDataService.cs @@ -5,6 +5,7 @@ using Covid19Radar.Common; using Covid19Radar.Model; using Covid19Radar.Services.Logs; +using Newtonsoft.Json; using System; using System.Threading; using System.Threading.Tasks; @@ -102,7 +103,7 @@ private UserDataModel GetFromApplicationProperties() { loggerService.EndMethod(); var userData = applicationPropertyService.GetProperties("UserData"); - return Utils.DeserializeFromJson(userData.ToString()); + return JsonConvert.DeserializeObject(userData.ToString()); } loggerService.EndMethod(); diff --git a/Covid19Radar/Covid19Radar/Templates/UnUsed/BeaconItemTemplate .xaml b/Covid19Radar/Covid19Radar/Templates/UnUsed/BeaconItemTemplate .xaml deleted file mode 100644 index 8b2c262db..000000000 --- a/Covid19Radar/Covid19Radar/Templates/UnUsed/BeaconItemTemplate .xaml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar/Templates/UnUsed/ContributorItemTemplate.xaml b/Covid19Radar/Covid19Radar/Templates/UnUsed/ContributorItemTemplate.xaml deleted file mode 100644 index c2e8052e2..000000000 --- a/Covid19Radar/Covid19Radar/Templates/UnUsed/ContributorItemTemplate.xaml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar/Templates/UnUsed/ContributorItemTemplate.xaml.cs b/Covid19Radar/Covid19Radar/Templates/UnUsed/ContributorItemTemplate.xaml.cs deleted file mode 100644 index 919a8dd30..000000000 --- a/Covid19Radar/Covid19Radar/Templates/UnUsed/ContributorItemTemplate.xaml.cs +++ /dev/null @@ -1,14 +0,0 @@ -/* 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/. */ - -namespace Covid19Radar.Templates -{ - public partial class ContributorItemTemplate - { - public ContributorItemTemplate() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar/Templates/UnUsed/StepItemTemplate.xaml b/Covid19Radar/Covid19Radar/Templates/UnUsed/StepItemTemplate.xaml deleted file mode 100644 index c814c70ed..000000000 --- a/Covid19Radar/Covid19Radar/Templates/UnUsed/StepItemTemplate.xaml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar/Templates/UnUsed/StepItemTemplate.xaml.cs b/Covid19Radar/Covid19Radar/Templates/UnUsed/StepItemTemplate.xaml.cs deleted file mode 100644 index 10f7281b5..000000000 --- a/Covid19Radar/Covid19Radar/Templates/UnUsed/StepItemTemplate.xaml.cs +++ /dev/null @@ -1,14 +0,0 @@ -/* 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/. */ - -namespace Covid19Radar.Templates -{ - public partial class StepItemTemplate - { - public StepItemTemplate() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar/ViewModels/HomePage/HomePageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/HomePage/HomePageViewModel.cs index a0bde1481..0847d7b1d 100644 --- a/Covid19Radar/Covid19Radar/ViewModels/HomePage/HomePageViewModel.cs +++ b/Covid19Radar/Covid19Radar/ViewModels/HomePage/HomePageViewModel.cs @@ -19,6 +19,7 @@ public class HomePageViewModel : ViewModelBase private readonly ILoggerService loggerService; private readonly IUserDataService userDataService; private readonly IExposureNotificationService exposureNotificationService; + private readonly ILocalNotificationService localNotificationService; private string _startDate; private string _pastDate; @@ -34,16 +35,25 @@ public string PastDate set { SetProperty(ref _pastDate, value); } } - public HomePageViewModel(INavigationService navigationService, ILoggerService loggerService, IUserDataService userDataService, IExposureNotificationService exposureNotificationService) : base(navigationService) + public HomePageViewModel( + INavigationService navigationService, + ILoggerService loggerService, + IUserDataService userDataService, + IExposureNotificationService exposureNotificationService, + ILocalNotificationService localNotificationService + ) : base(navigationService) { Title = AppResources.HomePageTitle; this.loggerService = loggerService; this.userDataService = userDataService; this.exposureNotificationService = exposureNotificationService; + this.localNotificationService = localNotificationService; } public override async void Initialize(INavigationParameters parameters) { + base.Initialize(parameters); + loggerService.StartMethod(); // It seems the life cycle methods are not called after background fetch in iOS. @@ -61,25 +71,30 @@ public override async void Initialize(INavigationParameters parameters) // Check Version AppUtils.CheckVersion(loggerService); + try { await exposureNotificationService.StartExposureNotification(); await exposureNotificationService.FetchExposureKeyAsync(); + } + catch (Exception ex) + { + loggerService.Exception("Failed to fetch exposure key.", ex); + } + try + { var statusMessage = await exposureNotificationService.UpdateStatusMessageAsync(); loggerService.Info($"Exposure notification status: {statusMessage}"); - - base.Initialize(parameters); - - loggerService.EndMethod(); } catch (Exception ex) { - Debug.WriteLine(ex.ToString()); - loggerService.Exception("Failed to exposure notification status.", ex); - loggerService.EndMethod(); } + + await localNotificationService.PrepareAsync(); + + loggerService.EndMethod(); } public Command OnClickExposures => new Command(async () => @@ -122,6 +137,7 @@ private void SettingDaysOfUse() public override void OnAppearing() { base.OnAppearing(); + SettingDaysOfUse(); } diff --git a/Covid19Radar/Covid19Radar/ViewModels/HomePage/NotifyOtherPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/HomePage/NotifyOtherPageViewModel.cs index 60329f224..ec93739d1 100644 --- a/Covid19Radar/Covid19Radar/ViewModels/HomePage/NotifyOtherPageViewModel.cs +++ b/Covid19Radar/Covid19Radar/ViewModels/HomePage/NotifyOtherPageViewModel.cs @@ -80,12 +80,12 @@ public NotifyOtherPageViewModel(INavigationService navigationService, ILoggerSer { loggerService.StartMethod(); - var result = await UserDialogs.Instance.ConfirmAsync(AppResources.NotifyOtherPageDiag1Message, AppResources.NotifyOtherPageDiag1Title, AppResources.NotifyOtherPageButton, AppResources.ButtonCancel); + var result = await UserDialogs.Instance.ConfirmAsync(AppResources.NotifyOtherPageDiag1Message, AppResources.NotifyOtherPageDiag1Title, AppResources.ButtonRegister, AppResources.ButtonCancel); if (!result) { await UserDialogs.Instance.AlertAsync( - AppResources.NotifyOtherPageDiag2Message, "", + AppResources.NotifyOtherPageDiag2Title, AppResources.ButtonOk ); @@ -101,7 +101,7 @@ await UserDialogs.Instance.AlertAsync( { await UserDialogs.Instance.AlertAsync( AppResources.NotifyOtherPageDiagAppClose, - AppResources.NotifyOtherPageDiagErrorTitle, + AppResources.NotifyOtherPageDiagAppCloseTitle, AppResources.ButtonOk ); UserDialogs.Instance.HideLoading(); @@ -116,10 +116,8 @@ await UserDialogs.Instance.AlertAsync( if (errorCount > 0) { - var current = errorCount + 1; - var max = AppConstants.MaxErrorCount; await UserDialogs.Instance.AlertAsync(AppResources.NotifyOtherPageDiag3Message, - AppResources.NotifyOtherPageDiag3Title + $"{current}/{max}", + AppResources.NotifyOtherPageDiag3Title, AppResources.ButtonOk ); await Task.Delay(errorCount * 5000); @@ -131,7 +129,7 @@ await UserDialogs.Instance.AlertAsync(AppResources.NotifyOtherPageDiag3Message, { await UserDialogs.Instance.AlertAsync( AppResources.NotifyOtherPageDiag4Message, - AppResources.NotifyOtherPageDiagErrorTitle, + AppResources.ProcessingNumberErrorDiagTitle, AppResources.ButtonOk ); errorCount++; @@ -147,7 +145,7 @@ await UserDialogs.Instance.AlertAsync( { await UserDialogs.Instance.AlertAsync( AppResources.NotifyOtherPageDiag5Message, - AppResources.NotifyOtherPageDiagErrorTitle, + AppResources.ProcessingNumberErrorDiagTitle, AppResources.ButtonOk ); errorCount++; @@ -187,8 +185,8 @@ await UserDialogs.Instance.AlertAsync( await Xamarin.ExposureNotifications.ExposureNotification.SubmitSelfDiagnosisAsync(); UserDialogs.Instance.HideLoading(); await UserDialogs.Instance.AlertAsync( - AppResources.NotifyOtherPageDialogSubmittedText, - AppResources.ButtonComplete, + "", + AppResources.NotifyOtherPageDialogSubmittedTitle, AppResources.ButtonOk ); await NavigationService.NavigateAsync("/" + nameof(MenuPage) + "/" + nameof(NavigationPage) + "/" + nameof(HomePage)); @@ -212,7 +210,7 @@ await UserDialogs.Instance.AlertAsync( errorCount++; UserDialogs.Instance.Alert( AppResources.NotifyOtherPageDialogExceptionText, - AppResources.ButtonFailed, + AppResources.NotifyOtherPageDialogExceptionTitle, AppResources.ButtonOk ); loggerService.Exception("Failed to submit UID.", ex); diff --git a/Covid19Radar/Covid19Radar/ViewModels/HomePage/UnUsed/ContributorsPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/HomePage/UnUsed/ContributorsPageViewModel.cs deleted file mode 100644 index d82835fe0..000000000 --- a/Covid19Radar/Covid19Radar/ViewModels/HomePage/UnUsed/ContributorsPageViewModel.cs +++ /dev/null @@ -1,27 +0,0 @@ -/* 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/. */ - -using System.Collections.Generic; -using Covid19Radar.Model; -using Covid19Radar.Renderers; -using Prism.Navigation; - -namespace Covid19Radar.ViewModels -{ - public class ContributorsPageViewModel : ViewModelBase - { - private string _url; - - public string Url - { - get { return _url; } - set { SetProperty(ref _url, value); } - } - public ContributorsPageViewModel(INavigationService navigationService) : base(navigationService) - { - Title = Resources.AppResources.TitleContributorsPage; - Url = Resources.AppResources.UrlContributor; - } - } -} diff --git a/Covid19Radar/Covid19Radar/ViewModels/HomePage/UnUsed/UpdateInformationPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/HomePage/UnUsed/UpdateInformationPageViewModel.cs deleted file mode 100644 index 348a63f1d..000000000 --- a/Covid19Radar/Covid19Radar/ViewModels/HomePage/UnUsed/UpdateInformationPageViewModel.cs +++ /dev/null @@ -1,36 +0,0 @@ -/* 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/. */ - -using Covid19Radar.Common; -using Covid19Radar.Renderers; -using Prism.Commands; -using Prism.Mvvm; -using Prism.Navigation; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Reflection; -using System.Text; -using Xamarin.Forms; - -namespace Covid19Radar.ViewModels -{ - public class UpdateInformationPageViewModel : ViewModelBase - { - private string _url; - - public string Url - { - get { return _url; } - set { SetProperty(ref _url, value); } - } - - public UpdateInformationPageViewModel(INavigationService navigationService) : base(navigationService) - { - Title = Resources.AppResources.TitleUpdateInformation; - Url = Resources.AppResources.UrlUpdate; - } - } -} diff --git a/Covid19Radar/Covid19Radar/Templates/UnUsed/BeaconItemTemplate .xaml.cs b/Covid19Radar/Covid19Radar/ViewModels/HomePage/WebAccessibilityPolicyPageViewModel.cs similarity index 58% rename from Covid19Radar/Covid19Radar/Templates/UnUsed/BeaconItemTemplate .xaml.cs rename to Covid19Radar/Covid19Radar/ViewModels/HomePage/WebAccessibilityPolicyPageViewModel.cs index 46afecc52..19ccd4935 100644 --- a/Covid19Radar/Covid19Radar/Templates/UnUsed/BeaconItemTemplate .xaml.cs +++ b/Covid19Radar/Covid19Radar/ViewModels/HomePage/WebAccessibilityPolicyPageViewModel.cs @@ -2,13 +2,12 @@ * 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/. */ -namespace Covid19Radar.Templates +namespace Covid19Radar.ViewModels.HomePage { - public partial class BeaconItemTemplate + public class WebAccessibilityPolicyPageViewModel : ViewModelBase { - public BeaconItemTemplate() + public WebAccessibilityPolicyPageViewModel() : base() { - InitializeComponent(); } } -} \ No newline at end of file +} diff --git a/Covid19Radar/Covid19Radar/ViewModels/MenuPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/MenuPageViewModel.cs index e0ca338a9..cc187c1c5 100644 --- a/Covid19Radar/Covid19Radar/ViewModels/MenuPageViewModel.cs +++ b/Covid19Radar/Covid19Radar/ViewModels/MenuPageViewModel.cs @@ -8,7 +8,6 @@ using Xamarin.Forms; using Covid19Radar.Model; using Covid19Radar.Views; -using System.Diagnostics; using Xamarin.Forms.Internals; namespace Covid19Radar.ViewModels @@ -71,6 +70,14 @@ public MenuPageViewModel(INavigationService navigationService) : base(navigation IconColor = "#019AE8", TextColor = "#000" }); + MenuItems.Add(new MainMenuModel() + { + Icon = "\uf70e", + PageName = nameof(WebAccessibilityPolicyPage), + Title = Resources.AppResources.WebAccessibilityPolicyPageTitle, + IconColor = "#019AE8", + TextColor = "#000" + }); NavigateCommand = new DelegateCommand(Navigate); } diff --git a/Covid19Radar/Covid19Radar/ViewModels/Settings/LicenseAgreementPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/Settings/LicenseAgreementPageViewModel.cs index 138d0594f..598caf8ee 100644 --- a/Covid19Radar/Covid19Radar/ViewModels/Settings/LicenseAgreementPageViewModel.cs +++ b/Covid19Radar/Covid19Radar/ViewModels/Settings/LicenseAgreementPageViewModel.cs @@ -2,6 +2,7 @@ * 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.Services; using Prism.Navigation; namespace Covid19Radar.ViewModels @@ -16,10 +17,13 @@ public string Url set { SetProperty(ref _url, value); } } - public LicenseAgreementPageViewModel(INavigationService navigationService) : base(navigationService) + public LicenseAgreementPageViewModel( + INavigationService navigationService, + ILocalContentService localContentService + ) : base(navigationService) { Title = Resources.AppResources.TitleLicenseAgreement; - Url = AppSettings.Instance.LicenseUrl; + Url = localContentService.LicenseUrl; } } } diff --git a/Covid19Radar/Covid19Radar/ViewModels/Settings/SettingsPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/Settings/SettingsPageViewModel.cs index 1e6f2d6c5..57a7475d2 100644 --- a/Covid19Radar/Covid19Radar/ViewModels/Settings/SettingsPageViewModel.cs +++ b/Covid19Radar/Covid19Radar/ViewModels/Settings/SettingsPageViewModel.cs @@ -73,7 +73,11 @@ public SettingsPageViewModel(INavigationService navigationService, ILoggerServic _ = logFileService.DeleteLogsDir(); UserDialogs.Instance.HideLoading(); - await UserDialogs.Instance.AlertAsync(AppResources.SettingsPageDialogResetCompletedText); + await UserDialogs.Instance.AlertAsync( + AppResources.SettingsPageDialogResetCompletedText, + AppResources.SettingsPageDialogResetCompletedTitle, + AppResources.ButtonOk + ); Application.Current.Quit(); // Application close DependencyService.Get().closeApplication(); diff --git a/Covid19Radar/Covid19Radar/ViewModels/Tutorial/UnUsed/DescriptionPage1ViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/Tutorial/UnUsed/DescriptionPage1ViewModel.cs deleted file mode 100644 index e13b51782..000000000 --- a/Covid19Radar/Covid19Radar/ViewModels/Tutorial/UnUsed/DescriptionPage1ViewModel.cs +++ /dev/null @@ -1,26 +0,0 @@ -/* 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/. */ - -using System.Collections.Generic; -using Covid19Radar.Model; -using Covid19Radar.Renderers; -using Covid19Radar.Views; -using Prism.Navigation; -using Xamarin.Forms; - -namespace Covid19Radar.ViewModels -{ - public class DescriptionPage1ViewModel : ViewModelBase - { - public DescriptionPage1ViewModel(INavigationService navigationService) : base(navigationService) - { - Title = Resources.AppResources.TitleHowItWorks; - } - - public Command OnClickNext => new Command(async () => - { - await NavigationService.NavigateAsync(nameof(DescriptionPage3)); - }); - } -} \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar/ViewModels/Tutorial/UnUsed/DescriptionPage2ViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/Tutorial/UnUsed/DescriptionPage2ViewModel.cs deleted file mode 100644 index f8292b3b8..000000000 --- a/Covid19Radar/Covid19Radar/ViewModels/Tutorial/UnUsed/DescriptionPage2ViewModel.cs +++ /dev/null @@ -1,27 +0,0 @@ -/* 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/. */ - -using System.Collections.Generic; -using Covid19Radar.Model; -using Covid19Radar.Renderers; -using Covid19Radar.Views; -using Prism.Navigation; -using Xamarin.Forms; - -namespace Covid19Radar.ViewModels -{ - public class DescriptionPage2ViewModel : ViewModelBase - { - public DescriptionPage2ViewModel(INavigationService navigationService) : base(navigationService) - { - Title = Resources.AppResources.TitleHowItWorks; - } - - public Command OnClickNext => new Command(async () => - { - await NavigationService.NavigateAsync(nameof(DescriptionPage3)); - }); - - } -} \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar/ViewModels/Tutorial/UnUsed/DescriptionPage3ViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/Tutorial/UnUsed/DescriptionPage3ViewModel.cs deleted file mode 100644 index 17b400001..000000000 --- a/Covid19Radar/Covid19Radar/ViewModels/Tutorial/UnUsed/DescriptionPage3ViewModel.cs +++ /dev/null @@ -1,27 +0,0 @@ -/* 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/. */ - -using System.Collections.Generic; -using Covid19Radar.Model; -using Covid19Radar.Renderers; -using Covid19Radar.Views; -using Prism.Navigation; -using Xamarin.Forms; - -namespace Covid19Radar.ViewModels -{ - public class DescriptionPage3ViewModel : ViewModelBase - { - public DescriptionPage3ViewModel(INavigationService navigationService) : base(navigationService) - { - Title = Resources.AppResources.TitleHowItWorks; - } - - public Command OnClickNext => new Command(async () => - { - await NavigationService.NavigateAsync(nameof(DescriptionPage4)); - }); - - } -} \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar/ViewModels/Tutorial/UnUsed/DescriptionPage4ViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/Tutorial/UnUsed/DescriptionPage4ViewModel.cs deleted file mode 100644 index 76a44140f..000000000 --- a/Covid19Radar/Covid19Radar/ViewModels/Tutorial/UnUsed/DescriptionPage4ViewModel.cs +++ /dev/null @@ -1,26 +0,0 @@ -/* 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/. */ - -using System.Collections.Generic; -using Covid19Radar.Model; -using Covid19Radar.Renderers; -using Covid19Radar.Views; -using Prism.Navigation; -using Xamarin.Forms; - -namespace Covid19Radar.ViewModels -{ - public class DescriptionPage4ViewModel : ViewModelBase - { - public DescriptionPage4ViewModel(INavigationService navigationService) : base(navigationService) - { - Title = Resources.AppResources.TitleHowItWorks; - } - - public Command OnClickNext => new Command(async () => - { - await NavigationService.NavigateAsync(nameof(InitSettingPage)); - }); - } -} \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar/ViewModels/Tutorial/UnUsed/InitSettingPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/Tutorial/UnUsed/InitSettingPageViewModel.cs deleted file mode 100644 index 735e43cdf..000000000 --- a/Covid19Radar/Covid19Radar/ViewModels/Tutorial/UnUsed/InitSettingPageViewModel.cs +++ /dev/null @@ -1,59 +0,0 @@ -/* 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/. */ - -using Acr.UserDialogs; -using Covid19Radar.Common; -using Covid19Radar.Model; -using Covid19Radar.Renderers; -using Covid19Radar.Services; -using Covid19Radar.Views; -using Prism.Navigation; -using Xamarin.ExposureNotifications; -using Xamarin.Forms; - -namespace Covid19Radar.ViewModels -{ - public class InitSettingPageViewModel : ViewModelBase - { - private readonly UserDataService userDataService; - private readonly ExposureNotificationService exposureNotificationService; - private UserDataModel userData; - - public InitSettingPageViewModel(INavigationService navigationService, UserDataService userDataService, ExposureNotificationService exposureNotificationService) : base(navigationService, userDataService, exposureNotificationService) - { - Title = Resources.AppResources.TitleDeviceAccess; - this.userDataService = userDataService; - this.exposureNotificationService = exposureNotificationService; - userData = this.userDataService.Get(); - } - - public Command OnClickNotNow => new Command(async () => - { - userData.IsExposureNotificationEnabled = false; - await userDataService.SetAsync(userData); - await NavigationService.NavigateAsync(nameof(SetupCompletedPage)); - }); - - public Command OnClickEnable => new Command(async () => - { - /* - var check = await UserDialogs.Instance.ConfirmAsync( - "周辺の他のスマートフォンとの間でランダムIDを安全に収集したり共有したりするには、Bluetoothを使用する必要があります。\nCOVID-19(新型コロナウイルス感染症)の検査結果が陽性だった人があなたの周囲にいた場合、 [TODO Replace Public Health Authority] から通知を受け取ることができます。\n濃厚接触の可能性がある日付、期間、電波強度がアプリと共有されます。", - Resources.AppResources.InitSettingPageDialogExposureNotificationTitle, - Resources.AppResources.ButtonOk, - Resources.AppResources.ButtonCancel - ); - if (!check){ - - } - */ - - userData.IsExposureNotificationEnabled = true; - userData.IsNotificationEnabled = true; - await userDataService.SetAsync(userData); - await NavigationService.NavigateAsync(nameof(SetupCompletedPage)); - - }); - } -} diff --git a/Covid19Radar/Covid19Radar/ViewModels/Tutorial/UnUsed/SetupCompletedPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/Tutorial/UnUsed/SetupCompletedPageViewModel.cs deleted file mode 100644 index 9c75ba301..000000000 --- a/Covid19Radar/Covid19Radar/ViewModels/Tutorial/UnUsed/SetupCompletedPageViewModel.cs +++ /dev/null @@ -1,28 +0,0 @@ -/* 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/. */ - -using System.Windows.Input; -using Covid19Radar.Renderers; -using Covid19Radar.Resources; -using Covid19Radar.Views; -using Prism.Navigation; -using Xamarin.Forms; - -namespace Covid19Radar.ViewModels -{ - public class SetupCompletedPageViewModel : ViewModelBase - { - public SetupCompletedPageViewModel(INavigationService navigationService) : base(navigationService) - { - Title = AppResources.TitleSetupCompleted; - } - - public Command OnClickToMain => new Command(async () => - { - - await NavigationService.NavigateAsync("/" + nameof(MenuPage) + "/" + nameof(NavigationPage) + "/" + nameof(HomePage), useModalNavigation: true); - }); - - } -} diff --git a/Covid19Radar/Covid19Radar/ViewModels/Tutorial/UnUsed/StartTutorialPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/Tutorial/UnUsed/StartTutorialPageViewModel.cs deleted file mode 100644 index 6a8ecce24..000000000 --- a/Covid19Radar/Covid19Radar/ViewModels/Tutorial/UnUsed/StartTutorialPageViewModel.cs +++ /dev/null @@ -1,26 +0,0 @@ -/* 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/. */ - -using Covid19Radar.Resources; -using Covid19Radar.Renderers; -using Covid19Radar.Views; -using Prism.Navigation; -using Xamarin.Forms; - -namespace Covid19Radar.ViewModels -{ - public class StartTutorialPageViewModel : ViewModelBase - { - public StartTutorialPageViewModel(INavigationService navigationService) : base(navigationService) - { - // TODO: Add Title so we can test it :) - } - - public Command OnClickStart => new Command(async () => - { - await NavigationService.NavigateAsync(nameof(PrivacyPolicyPage)); - }); - - } -} diff --git a/Covid19Radar/Covid19Radar/ViewModels/UnUsed/DescriptionPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/UnUsed/DescriptionPageViewModel.cs deleted file mode 100644 index 7825e0973..000000000 --- a/Covid19Radar/Covid19Radar/ViewModels/UnUsed/DescriptionPageViewModel.cs +++ /dev/null @@ -1,68 +0,0 @@ -/* 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/. */ - -using System.Collections.Generic; -using Covid19Radar.Model; -using Covid19Radar.Renderers; -using Prism.Navigation; -using Xamarin.Forms; - -namespace Covid19Radar.ViewModels -{ - public class DescriptionPageViewModel : ViewModelBase - { - public List Steps { get; set; } - - public DescriptionPageViewModel(INavigationService navigationService, IStatusBarPlatformSpecific statusBarPlatformSpecific) : base(navigationService, statusBarPlatformSpecific) - { - Title = Resources.AppResources.TitleHowItWorks; - SetData(); - } - - public Command OnClickNext => new Command(async () => - { - await NavigationService.NavigateAsync("ConsentByUserPage"); - }); - - - private void SetData() - { - Steps = new List - { - new StepModel - { - Title = Resources.AppResources.DescriptionPageTitleTextStep1, - Image = "descriptionStep11.png", - Image2 = "descriptionStep12.png", - Description = Resources.AppResources.DescriptionPageTextStep1Description1, - Description2 = Resources.AppResources.DescriptionPageTextStep1Description2, - StepNumber = 1 - }, - new StepModel - { - Title = Resources.AppResources.DescriptionPageTitleTextStep2, - Image = "descriptionStep21.png", - Image2 = "descriptionStep22.png", - Description = Resources.AppResources.DescriptionPageTextStep2Description1, - Description2 = Resources.AppResources.DescriptionPageTextStep2Description2, - StepNumber = 2 - }, - new StepModel - { - Title = Resources.AppResources.DescriptionPageTitleTextStep3, - Image = "descriptionStep3.png", - Description = Resources.AppResources.DescriptionPageTextStep3Description1, - StepNumber = 3 - }, - new StepModel - { - Title = Resources.AppResources.DescriptionPageTitleTextStep4, - Image = "descriptionStep4.png", - Description = Resources.AppResources.DescriptionPageTextStep4Description - } - }; - - } - } -} \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar/ViewModels/UnUsed/DetectedBeaconPageViewmodel.cs b/Covid19Radar/Covid19Radar/ViewModels/UnUsed/DetectedBeaconPageViewmodel.cs deleted file mode 100644 index 11629b48b..000000000 --- a/Covid19Radar/Covid19Radar/ViewModels/UnUsed/DetectedBeaconPageViewmodel.cs +++ /dev/null @@ -1,70 +0,0 @@ -/* 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/. */ - -using Covid19Radar.Model; -using Covid19Radar.Renderers; -using Covid19Radar.Services; -using Prism.Commands; -using Prism.Mvvm; -using Prism.Navigation; -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.Text; -using Xamarin.Forms; - -namespace Covid19Radar.ViewModels -{ - public class DetectedBeaconPageViewmodel : ViewModelBase - { - public List Beacons { get; set; } - private ObservableCollection _beaconDataList; - - - public ObservableCollection BeaconDataList - { - get => _beaconDataList; - set => SetProperty(ref _beaconDataList, value); - } - - - public DetectedBeaconPageViewmodel(INavigationService navigationService, IStatusBarPlatformSpecific statusBarPlatformSpecific) : base(navigationService, statusBarPlatformSpecific) - { - Title = Resources.AppResources.TitleDetectedBeaconPage; - //_beaconService = beaconService; - //SetData(); - - BeaconDataList = new ObservableCollection(); - } - - - private void SetData() - { - //Beacons = Xamarin.Forms.DependencyService.Resolve().GetBeaconData(); - } - - public override void OnNavigatedTo(INavigationParameters parameters) - { - base.OnNavigatedTo(parameters); - var navMode = parameters.GetNavigationMode(); - - if (navMode == NavigationMode.New) - { - /* - var beaconList = _beaconService.GetBeaconData(); - foreach (var beacon in beaconList) - { - if (beacon.LastDetectTime.Kind != DateTimeKind.Local) - { - beacon.LastDetectTime = TimeZoneInfo.ConvertTimeFromUtc(beacon.LastDetectTime, TimeZoneInfo.Local); - } - } - - BeaconDataList = new ObservableCollection(beaconList); - */ - } - } - } -} diff --git a/Covid19Radar/Covid19Radar/ViewModels/UnUsed/HeadsupPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/UnUsed/HeadsupPageViewModel.cs deleted file mode 100644 index 8deb4d84b..000000000 --- a/Covid19Radar/Covid19Radar/ViewModels/UnUsed/HeadsupPageViewModel.cs +++ /dev/null @@ -1,39 +0,0 @@ -/* 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/. */ - -using Covid19Radar.Renderers; -using Prism.Commands; -using Prism.Mvvm; -using Prism.Navigation; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Xamarin.Forms; - -namespace Covid19Radar.ViewModels -{ - public class HeadsupPageViewModel : ViewModelBase - { - private string _url; - - public string Url - { - get { return _url; } - set { SetProperty(ref _url, value); } - } - public HeadsupPageViewModel(INavigationService navigationService, IStatusBarPlatformSpecific statusBarPlatformSpecific) : base(navigationService, statusBarPlatformSpecific) - { - Title = Resources.AppResources.TitleHeadsup; - Url = Resources.AppResources.UrlHeadsup; - } - - public Command OnClickPrev => (new Command(() => - { - NavigationService.NavigateAsync("HomePage"); - })); - - - } -} diff --git a/Covid19Radar/Covid19Radar/ViewModels/UnUsed/InputSmsOTPPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/UnUsed/InputSmsOTPPageViewModel.cs deleted file mode 100644 index fd7de374f..000000000 --- a/Covid19Radar/Covid19Radar/ViewModels/UnUsed/InputSmsOTPPageViewModel.cs +++ /dev/null @@ -1,76 +0,0 @@ -/* 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/. */ - -using System.Windows.Input; -using Covid19Radar.Renderers; -using Covid19Radar.Resources; -using Prism.Commands; -using Prism.Navigation; -using Prism.Services; -using Xamarin.Forms; - -namespace Covid19Radar.ViewModels -{ - public class InputSmsOTPPageViewModel : ViewModelBase - { - private string _otp; - public string Otp - { - get => _otp; - set - { - SetProperty(ref _otp, value); - OnClickNext.RaiseCanExecuteChanged(); - } - } - - private string _phoneNumber; - public string PhoneNumber - { - get => _phoneNumber; - set => SetProperty(ref _phoneNumber, value); - } - - public ICommand ResendOtp { get; } - public DelegateCommand OnClickNext { get; } - - private readonly IPageDialogService _pageDialogService; - - public InputSmsOTPPageViewModel(INavigationService navigationService, - IPageDialogService pageDialogService, - IStatusBarPlatformSpecific statusBarPlatformSpecific) : base(navigationService, statusBarPlatformSpecific) - { - Title = AppResources.TitleOtp; - _pageDialogService = pageDialogService; - - ResendOtp = new Command(async () => - { - await _pageDialogService.DisplayAlertAsync("Error", "This is not implemented yet", "OK"); - }); - OnClickNext = new DelegateCommand(async () => - { - await NavigationService.NavigateAsync("StatusUpdateCompletePage"); - }, CanVerifyOtp); - } - - private bool CanVerifyOtp() - { - if (string.IsNullOrEmpty(Otp)) - { - return false; - } - return Otp.Length == 6; - } - - public override void OnNavigatedTo(INavigationParameters parameters) - { - base.OnNavigatedTo(parameters); - if (parameters.TryGetValue("phone_number", out var phoneNumber)) - { - PhoneNumber = phoneNumber; - } - } - - } -} diff --git a/Covid19Radar/Covid19Radar/ViewModels/UnUsed/MainPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/UnUsed/MainPageViewModel.cs deleted file mode 100644 index 5303755f9..000000000 --- a/Covid19Radar/Covid19Radar/ViewModels/UnUsed/MainPageViewModel.cs +++ /dev/null @@ -1,26 +0,0 @@ -/* 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/. */ - -using System.Collections.Generic; -using System.ComponentModel; -using Covid19Radar.Model; -using Covid19Radar.Renderers; -using Covid19Radar.Resources; -using Covid19Radar.Services; -using Prism.Navigation; -using Xamarin.Forms; - -namespace Covid19Radar.ViewModels -{ - public class MainPageViewModel : ViewModelBase, INotifyPropertyChanged - { - public List MainMenus { get; private set; } - - public MainPageViewModel(INavigationService navigationService, IStatusBarPlatformSpecific statusBarPlatformSpecific) - : base(navigationService, statusBarPlatformSpecific) - { - Title = "main page"; - } - } -} diff --git a/Covid19Radar/Covid19Radar/ViewModels/UnUsed/SharePositiveDiagnosisPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/UnUsed/SharePositiveDiagnosisPageViewModel.cs deleted file mode 100644 index 08fd512ac..000000000 --- a/Covid19Radar/Covid19Radar/ViewModels/UnUsed/SharePositiveDiagnosisPageViewModel.cs +++ /dev/null @@ -1,98 +0,0 @@ -/* 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/. */ - -using Acr.UserDialogs; -using Covid19Radar.Model; -using Covid19Radar.Renderers; -using Covid19Radar.Services; -using Covid19Radar.Views; -using Prism.Navigation; -using System; -using System.Collections.Generic; -using System.Text; -using Xamarin.Forms; - -namespace Covid19Radar.ViewModels -{ - public class SharePositiveDiagnosisPageViewModel : ViewModelBase - { - public bool IsEnabled { get; set; } = true; - public string DiagnosisUid { get; set; } - public DateTime? DiagnosisTimestamp { get; set; } = DateTime.Now; - - private readonly UserDataService userDataService; - private UserDataModel userData; - - public SharePositiveDiagnosisPageViewModel(INavigationService navigationService, UserDataService userDataService) : base(navigationService, userDataService) - { - Title = Resources.AppResources.TitileSharePositiveDiagnosis; - this.userDataService = userDataService; - userData = this.userDataService.Get(); - } - - public Command CancelCommand => (new Command(async () => - { - await NavigationService.NavigateAsync(nameof(MenuPage) + "/" + nameof(HomePage)); - })); - - - public Command SubmitAndVerifyCommand => (new Command(async () => - { - - // Verify Check the parameters - - if (string.IsNullOrEmpty(DiagnosisUid)) - { - // Check gov's positive api check here!! - - await UserDialogs.Instance.AlertAsync("Please provide a valid Diagnosis ID", "Invalid Diagnosis ID", "OK"); - return; - } - if (!DiagnosisTimestamp.HasValue || DiagnosisTimestamp.Value > DateTime.Now) - { - await UserDialogs.Instance.AlertAsync("Please provide a valid Test Date", "Invalid Test Date", "OK"); - return; - } - - // Submit the UID - using var dialog = UserDialogs.Instance.Loading("Submitting Diagnosis..."); - IsEnabled = false; - try - { - var enabled = await Xamarin.ExposureNotifications.ExposureNotification.IsEnabledAsync(); - - if (!enabled) - { - dialog.Hide(); - - await UserDialogs.Instance.AlertAsync("Please enable Exposure Notifications before submitting a diagnosis.", "Exposure Notifications Disabled", "OK"); - return; - } - - // Set the submitted UID - userData.AddDiagnosis(DiagnosisUid, new DateTimeOffset(DiagnosisTimestamp.Value)); - await userDataService.SetAsync(userData); - - // Submit our diagnosis - await Xamarin.ExposureNotifications.ExposureNotification.SubmitSelfDiagnosisAsync(); - - dialog.Hide(); - - await UserDialogs.Instance.AlertAsync("Diagnosis Submitted", "Complete", "OK"); - await NavigationService.NavigateAsync(nameof(MenuPage) + "/" + nameof(HomePage)); - } - catch (Exception ex) - { - Console.WriteLine(ex); - - dialog.Hide(); - UserDialogs.Instance.Alert("Please try again later.", "Failed", "OK"); - } - finally - { - IsEnabled = true; - } - })); - } -} diff --git a/Covid19Radar/Covid19Radar/ViewModels/UnUsed/SmsVerificationPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/UnUsed/SmsVerificationPageViewModel.cs deleted file mode 100644 index cf7b5ccc9..000000000 --- a/Covid19Radar/Covid19Radar/ViewModels/UnUsed/SmsVerificationPageViewModel.cs +++ /dev/null @@ -1,46 +0,0 @@ -/* 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/. */ - -using Covid19Radar.Renderers; -using Prism.Commands; -using Prism.Mvvm; -using Prism.Navigation; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Xamarin.Forms; - -namespace Covid19Radar.ViewModels -{ - public class SmsVerificationPageViewModel : ViewModelBase - { - private string _phoneNumber; - public string PhoneNumber - { - get => _phoneNumber; - set => SetProperty(ref _phoneNumber, value); - } - - public SmsVerificationPageViewModel(INavigationService navigationService, IStatusBarPlatformSpecific statusBarPlatformSpecific) : base(navigationService, statusBarPlatformSpecific) - { - Title = "Input Phone number"; - } - - public override void OnNavigatedTo(INavigationParameters parameters) - { - base.OnNavigatedTo(parameters); - if (parameters.TryGetValue("phone_number", out var phoneNumber)) - { - PhoneNumber = phoneNumber; - } - } - - public Command OnClickNext => (new Command(() => - { - NavigationService.NavigateAsync($"InputSmsOTPPage?phone_number={PhoneNumber}"); - })); - - } -} diff --git a/Covid19Radar/Covid19Radar/ViewModels/UnUsed/StatusUpdateCompletePageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/UnUsed/StatusUpdateCompletePageViewModel.cs deleted file mode 100644 index 7b4340c8b..000000000 --- a/Covid19Radar/Covid19Radar/ViewModels/UnUsed/StatusUpdateCompletePageViewModel.cs +++ /dev/null @@ -1,21 +0,0 @@ -/* 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/. */ - -using Covid19Radar.Renderers; -using Covid19Radar.Resources; -using Prism.Navigation; -using Xamarin.Forms; - -namespace Covid19Radar.ViewModels -{ - public class StatusUpdateCompletePageViewModel : ViewModelBase - { - public StatusUpdateCompletePageViewModel(INavigationService navigationService, IStatusBarPlatformSpecific statusBarPlatformSpecific) : base(navigationService, statusBarPlatformSpecific) - { - Title = AppResources.TitleStatusUpdateComplete; - } - - public Command OnClickHome => new Command(() => NavigationService.NavigateAsync("/NavigationPage/HomePage")); - } -} diff --git a/Covid19Radar/Covid19Radar/ViewModels/UnUsed/UserSettingPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/UnUsed/UserSettingPageViewModel.cs deleted file mode 100644 index 1aab6c67c..000000000 --- a/Covid19Radar/Covid19Radar/ViewModels/UnUsed/UserSettingPageViewModel.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* 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/. */ - -using System.Linq; -using Covid19Radar.Renderers; -using Covid19Radar.Services; -using Prism.Ioc; -using Prism.Navigation; -using Xamarin.Forms; - -namespace Covid19Radar.ViewModels -{ - public class UserSettingPageViewModel : ViewModelBase - { - private readonly OTPService _otpService; - private readonly UserDataService _userDataService; - private string _phoneNumber; - - public string PhoneNumber - { - get => _phoneNumber; - set - { - SetProperty(ref _phoneNumber, value); - RaisePropertyChanged(nameof(IsPhoneNumberValid)); - } - } - - public bool IsPhoneNumberValid => !string.IsNullOrWhiteSpace(PhoneNumber); - - public UserSettingPageViewModel(INavigationService navigationService, IStatusBarPlatformSpecific statusBarPlatformSpecific) : base(navigationService, statusBarPlatformSpecific) - { - Title = Resources.AppResources.TitleUserSettings; - _otpService = App.Current.Container.Resolve(); - _userDataService = App.Current.Container.Resolve(); - } - - public override void OnNavigatedTo(INavigationParameters parameters) - { - PhoneNumber = string.Empty; - } - - public Command OnClickNext => new Command(async () => - { - var user = _userDataService.Get(); - await _otpService.SendOTPAsync(user, PhoneNumberWithoutMask()); - await NavigationService.NavigateAsync($"InputSmsOTPPage?phone_number={PhoneNumber}"); - }, () => IsPhoneNumberValid); - - private string PhoneNumberWithoutMask() - { - return new string(("+81").Concat(PhoneNumber.Where(char.IsDigit).Skip(1)).ToArray()); - } - } -} diff --git a/Covid19Radar/Covid19Radar/Views/HelpPage/HelpPage4.xaml b/Covid19Radar/Covid19Radar/Views/HelpPage/HelpPage4.xaml index 463fc8271..a7a855971 100644 --- a/Covid19Radar/Covid19Radar/Views/HelpPage/HelpPage4.xaml +++ b/Covid19Radar/Covid19Radar/Views/HelpPage/HelpPage4.xaml @@ -19,13 +19,9 @@ - - diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/UnUsed/ContributorsPage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/UnUsed/ContributorsPage.xaml deleted file mode 100644 index edf1a87ac..000000000 --- a/Covid19Radar/Covid19Radar/Views/HomePage/UnUsed/ContributorsPage.xaml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/UnUsed/ContributorsPage.xaml.cs b/Covid19Radar/Covid19Radar/Views/HomePage/UnUsed/ContributorsPage.xaml.cs deleted file mode 100644 index a5e4386d9..000000000 --- a/Covid19Radar/Covid19Radar/Views/HomePage/UnUsed/ContributorsPage.xaml.cs +++ /dev/null @@ -1,16 +0,0 @@ -/* 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/. */ - -using Xamarin.Forms; - -namespace Covid19Radar.Views -{ - public partial class ContributorsPage : ContentPage - { - public ContributorsPage() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/UnUsed/UpdateInformationPage.xaml.cs b/Covid19Radar/Covid19Radar/Views/HomePage/UnUsed/UpdateInformationPage.xaml.cs deleted file mode 100644 index 281f78c4e..000000000 --- a/Covid19Radar/Covid19Radar/Views/HomePage/UnUsed/UpdateInformationPage.xaml.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* 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/. */ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Xamarin.Forms; -using Xamarin.Forms.Xaml; - -namespace Covid19Radar.Views -{ - [XamlCompilation(XamlCompilationOptions.Compile)] - - public partial class UpdateInformationPage : ContentPage - { - public UpdateInformationPage() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/UnUsed/UpdateInformationPage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/WebAccessibilityPolicyPage.xaml similarity index 60% rename from Covid19Radar/Covid19Radar/Views/HomePage/UnUsed/UpdateInformationPage.xaml rename to Covid19Radar/Covid19Radar/Views/HomePage/WebAccessibilityPolicyPage.xaml index 050eb2c7b..bcf282297 100644 --- a/Covid19Radar/Covid19Radar/Views/HomePage/UnUsed/UpdateInformationPage.xaml +++ b/Covid19Radar/Covid19Radar/Views/HomePage/WebAccessibilityPolicyPage.xaml @@ -1,25 +1,25 @@ - + - - - - - - + + + + diff --git a/Covid19Radar/Covid19Radar/Views/Tutorial/UnUsed/DescriptionPage3.xaml.cs b/Covid19Radar/Covid19Radar/Views/HomePage/WebAccessibilityPolicyPage.xaml.cs similarity index 78% rename from Covid19Radar/Covid19Radar/Views/Tutorial/UnUsed/DescriptionPage3.xaml.cs rename to Covid19Radar/Covid19Radar/Views/HomePage/WebAccessibilityPolicyPage.xaml.cs index dc32d0490..c94dd7575 100644 --- a/Covid19Radar/Covid19Radar/Views/Tutorial/UnUsed/DescriptionPage3.xaml.cs +++ b/Covid19Radar/Covid19Radar/Views/HomePage/WebAccessibilityPolicyPage.xaml.cs @@ -8,11 +8,11 @@ namespace Covid19Radar.Views { [XamlCompilation(XamlCompilationOptions.Compile)] - public partial class DescriptionPage3 : ContentPage + public partial class WebAccessibilityPolicyPage : ContentPage { - public DescriptionPage3() + public WebAccessibilityPolicyPage() { InitializeComponent(); } } -} \ No newline at end of file +} diff --git a/Covid19Radar/Covid19Radar/Views/NavigatePopoverWebView.cs b/Covid19Radar/Covid19Radar/Views/NavigatePopoverWebView.cs index ab230121c..6d5247557 100644 --- a/Covid19Radar/Covid19Radar/Views/NavigatePopoverWebView.cs +++ b/Covid19Radar/Covid19Radar/Views/NavigatePopoverWebView.cs @@ -4,6 +4,7 @@ using Xamarin.Forms; using Xamarin.Essentials; +using System; namespace Covid19Radar.Views { @@ -14,7 +15,12 @@ public NavigatePopoverWebView() : base() { Navigating += async (_, e) => { - if (firstNavigateUrl != null && firstNavigateUrl != e.Url) + if (e.Url.StartsWith("mailto")) + { + e.Cancel = true; + await Launcher.OpenAsync(e.Url); + } + else if (firstNavigateUrl != null && firstNavigateUrl != e.Url) { e.Cancel = true; await Browser.OpenAsync(e.Url); diff --git a/Covid19Radar/Covid19Radar/Views/Tutorial/UnUsed/DescriptionPage1.xaml b/Covid19Radar/Covid19Radar/Views/Tutorial/UnUsed/DescriptionPage1.xaml deleted file mode 100644 index 8da9eab7c..000000000 --- a/Covid19Radar/Covid19Radar/Views/Tutorial/UnUsed/DescriptionPage1.xaml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - -