Merge pull request #417 from rokwire/release/v2.9.4+904

Release/v2.9.4+904
rokwire · Nov 18, 2020 · e3fdb4a · e3fdb4a
2 parents bc3aa87 + ee5dbba
commit e3fdb4a
Show file tree

Hide file tree

Showing 53 changed files with 3,045 additions and 2,804 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,52 @@
+## Description
+_Please provide a summary of the pull request and the issue it fixes. Please add necessary details, context, dependencies, explanation of when review is needed (see next section), etc._
+
+**Fixes #(add issue number here and remove parentheses)**
+
+[comment]: # (This project only accepts pull requests related to open issues.)
+[comment]: # (If suggesting a new feature or change, please discuss it in an issue first.)
+[comment]: # (If fixing a bug, there should be an issue describing it with steps to reproduce.)
+
+## Review Time Estimate
+_Please give your idea of how soon this pull request needs to be reviewed by selecting one of the options below. This can be based on the criticality of the issue at hand and/or other relevant factors._
+
+[comment]: # (To select an option, please put an 'x' in the applicable box.)
+[comment]: # (If you're unsure about any of these, don't hesitate to ask. We're here to help!.)
+
+- [ ] Immediately
+- [ ] Within a week
+- [ ] When possible
+
+## Type of changes
+_Please select a relevant option:_
+
+[comment]: # (To select an option, please put an 'x' in the applicable box.)
+[comment]: # (If you're unsure about any of these, don't hesitate to ask. We're here to help!.)
+
+- [ ] Bug fix (non-breaking change which fixes an issue).
+- [ ] New feature (non-breaking change which adds functionality).
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected).
+- [ ] Other (any another change that does not fall in one of the above categories.)
+
+## Checklist:
+_Please select all applicable options:_
+
+[comment]: # (To select your options, please put an 'x' in the all boxes that apply.)
+[comment]: # (If you're unsure about any of these, don't hesitate to ask. We're here to help!.)
+
+- [ ] I have signed the Rokwire Contributor License Agreement ([CLA](https://rokwire.org/rokwire_cla)). (_Any contributor who is not an employee of the University of Illinois whose official duties include contributing to the Rokwire software, or who is not paid by the Rokwire project, needs to sign the CLA before their contribution can be accepted._)
+- [ ] I have updated the [CHANGELOG](../CHANGELOG.md).
+- [ ] I have read the [Contributor Guidelines](../CONTRIBUTING.md).
+- [ ] I have performed a self-review of my own code.
+- [ ] I have commented my code, particularly in hard-to-understand areas.
+- [ ] My change requires updating the documentation.
+- [ ] I have made necessary changes to the documentation.
+- [ ] I have added tests related to my changes.
+- [ ] My changes generate no new warnings.
+- [ ] New and existing unit tests pass locally with my changes.
+- [ ] Any dependent changes have been merged and published in downstream modules.
+
+---
+
+[comment]: # (Template credit: This pull request template is based on Embedded Artistry {https://github.com/embeddedartistry/templates/blob/master/.github/PULL_REQUEST_TEMPLATE.md}, Clowder {https://github.com/clowder-framework/clowder/blob/develop/.github/PULL_REQUEST_TEMPLATE.md}, and TalAter {https://github.com/TalAter/open-source-templates} templates.)
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,46 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [2.9.4] - 2020-11-18
+### Fixed
+- Error message cannot be read if keyboard is up - please hide the keyboard after a send - see error_message_hidden.png [#414](https://github.com/rokwire/safer-illinois-app/issues/414).
+- Change everywhere we have "Capitol Staff" to "Non University Member" - on boarding roles, messages etc [#412](https://github.com/rokwire/safer-illinois-app/issues/412).
+- Updated Updated capitol staff persona icons.
+- Make sure to display localized symptom name everywhere [#411](https://github.com/rokwire/safer-illinois-app/issues/411).
+
+## [2.9.3] - 2020-11-17
+### Added
+- Implemented permanent muted audio playback in native iOS Exposure service [#407](https://github.com/rokwire/safer-illinois-app/issues/407).
+
+## [2.9.2] - 2020-11-16
+### Changed
+- Show full name for Capitol Staff in the status card [#401](https://github.com/rokwire/safer-illinois-app/issues/401).
+
+### Fixed
+- iOS Crash while trying to retrieve device uuid from native part [#397](https://github.com/rokwire/safer-illinois-app/issues/397).
+- Crashes with FCM notifications in Android [#394](https://github.com/rokwire/safer-illinois-app/issues/394).
+- Do not show the wait time if the location is closed [#398](https://github.com/rokwire/safer-illinois-app/issues/398).
+
+## [2.9.1] - 2020-11-12
+### Changed
+- Safer onboarding changes 11/12 [#390](https://github.com/rokwire/safer-illinois-app/issues/390).
+
+## [2.9.0] - 2020-11-10
+### Added
+- A pull request template. [#324](https://github.com/rokwire/safer-illinois-app/issues/324)
+- Contributor guidelines (CONTRIBUTING.md). [#322](https://github.com/rokwire/safer-illinois-app/issues/322).
+
+## [2.8.13] - 2020-11-09
+### Fixed
+- Cannot confirm one time code [#379](https://github.com/rokwire/safer-illinois-app/issues/379).
+- Added symptoms translations [#337](https://github.com/rokwire/safer-illinois-app/issues/337).
+
+## [2.8.12] - 2020-11-06
+### Fixed
+- CareTeamPanel fix non student aditional message. [#269](https://github.com/rokwire/safer-illinois-app/issues/269).
+- Build error related to ios app [#374](https://github.com/rokwire/safer-illinois-app/issues/374).
+- Fixed the error related to app framework minimum os version [#375](https://github.com/rokwire/safer-illinois-app/issues/375).
+
 ## [2.8.11] - 2020-11-05
 ### Added
 - Pass application id as header field in FCM API calls from sports service [#364](https://github.com/rokwire/safer-illinois-app/issues/364).
@@ -66,7 +106,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Fixed miscellaneous strings translation, display dates localized [#308](https://github.com/rokwire/safer-illinois-app/issues/308).
 
-
 ## [2.8.2] - 2020-10-21
 ### Added
 - Added "force-test" rule status and action. [#319](https://github.com/rokwire/safer-illinois-app/issues/319).

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,45 @@
+# Contributing to Rokwire Platform
+
+First of all, thanks for considering contributing to the Rokwire Platform. We look forward to hearing and learning from you and receiving your contribution. We have put together the following guidelines to help you navigate the contribution process and to outline expectations.
+
+## Code of Conduct
+
+The [Rokwire Code of Conduct](CODE_OF_CONDUCT.md) governs this project and everyone participating in it. By participating in this project, we expect you to uphold this code. Please report unacceptable behavior to [email protected].
+
+## How to Contribute
+
+There are different ways you can contribute to the Rokwire Platform. You can start by searching the existing issues and pull requests in the Rokwire GitHub repositories. It will help to see if what you are planning to contribute is already under discussion. As described below, we welcome various kinds of contributions, such as Reporting Bugs, Requesting Features/Enhancements, Contributing Code.
+
+## Reporting Bugs/Accessibility/Usability Issues
+
+If you find any bugs, accessibility or usability issues please report them using the appropriate [issue templates](https://github.com/rokwire/safer-illinois-app/issues/new/choose). Please make sure that it’s not a duplicate of an existing issue by searching the [issues list](https://github.com/rokwire/safer-illinois-app/issues). Please provide as many details as possible to help the contributors who, like you, will be working on it in the future.
+
+## Requesting Features/Enhancements
+
+We are always on the lookout for new ideas and feature requests. Please share your thoughts about a new feature or enhancement by submitting a [Feature Request](https://github.com/rokwire/safer-illinois-app/issues/new?assignees=pmarkhennessy&labels=Type%3A+Feature+Request&template=feature_request.md&title=%5BFEATURE%5D+). Please make sure that this is not a duplicate of an existing feature request by searching the [issues list](https://github.com/rokwire/safer-illinois-app/issues). Here also, please share as many details as possible for future discussion.
+
+## Contributing Code
+
+We are excited that you may be interested in contributing code to the Rokwire Platform. To maintain standards of programming and to keep things manageable, we request that you follow the workflow shared below. Any contributor who is not an employee of the University of Illinois whose official duties include contributing to the Rokwire software, or who is not paid by the Rokwire project, needs to sign the [Rokwire Contributors License Agreement (CLA)](https://rokwire.org/rokwire_cla) before their contribution can be accepted. If you belong to this group, please complete and sign the CLA and then scan and email a PDF file of the CLA to [email protected]. If necessary, you can send an original signed agreement to Rokwire, University of Illinois, 331 Grainger Engineering Library, 1301 W. Springfield Avenue, MC-274, Urbana, Illinois 61801.
+
+### Development Workflow
+
+1. Create a [GitHub account](https://github.com/join), if you don’t already have one.
+2. Start the development workflow either by [creating a new issue](https://docs.github.com/en/free-pro-team@latest/github/managing-your-work-on-github/creating-an-issue) or by starting from an already existing issue in the repository. We expect that each contribution, whether major or minor, always starts from an issue. An issue can be either a bug report, accessibility report, usability report, or a feature request. When creating a new GitHub issue, please make sure to include as many details as possible. If starting from an existing GitHub issue, please make sure that you understand it clearly, and if not, please share your questions/comments in the issue to get things clarified before you start writing code. When working on a new feature request, it will be a good idea to have discussions with the Rokwire Open Source community through GitHub issues, before starting design and development.
+3. [Create a fork of the repository and clone](https://docs.github.com/en/free-pro-team@latest/github/getting-started-with-github/fork-a-repo) it to your development machine.
+4. [Create a new branch](https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/creating-and-deleting-branches-within-your-repository#creating-a-branch) from the `develop` branch. Please use the following naming convention for naming branches: `<issue number>-<short-description-separated-by-hyphens>`. For example, `201-add-maps-for-event-locations`.
+5. Implement the code changes on your branch. Please make sure to update the [CHANGELOG](CHANGELOG.md) and relevant documentation as needed.
+6. From your branch in the forked repository, make a pull request against the develop branch in the root repository. Please follow the instructions and provide more details about your pull request using the [pull request template](.github/pull_request_template.md).
+7. Please link your pull request to the GitHub issue that you are trying to implement or fix. Please see the relevant [GitHub documentation](https://docs.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue) on this.
+8. When the pull request is created, the code repository maintainer(s) gets added as reviewers automatically. Work with the maintainer(s) to get your change reviewed. The maintainer(s) may also invite other experts or developers as reviewers.
+9. After your pull request is reviewed and approved by the maintainer(s), a maintainer will [merge your branch](https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request#merging-a-pull-request-on-github) to the develop branch using a squash commit.
+10. After your branch has been merged to the remote develop branch, pull the latest code from the remote repository to your forked repository to view your change in your development environment.
+11. At this point, you may want to [delete your local branch](https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/creating-and-deleting-branches-within-your-repository#deleting-a-branch) in your forked repository.
+
+### Code Reviews
+
+Each repository will have at least one maintainer who will be responsible for reviewing the incoming pull request. In certain situations, other contributors may also be brought in as reviewers by the maintainer. After a pull request gets successfully reviewed, the incoming branch is merged to the develop branch. To keep the commit history clean, we will try to squash the commits into a single commit for each merge onto the develop branch.
+
+### Documentation
+
+Currently, most of the developer documentation is available as READMEs in the code repositories. We describe the various API endpoints using the OpenAPI specification. The Rokwire Platform API documentation is available for your reference at https://api.rokwire.illinois.edu/docs/.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -105,13 +105,6 @@
                 <!-- note that the leading "/" is required for pathPrefix-->
             </intent-filter>
         </activity>
-        <activity
-            android:name="edu.illinois.covid.maps.MapPickLocationActivity"
-            android:theme="@style/DefaultTheme"
-            android:screenOrientation="portrait"
-            android:configChanges="orientation|keyboardHidden"
-
-        />
         <activity
             android:name="edu.illinois.covid.maps.MapDirectionsActivity"
             android:theme="@style/DefaultTheme"

diff --git a/android/app/src/main/java/edu/illinois/covid/App.java b/android/app/src/main/java/edu/illinois/covid/App.java
@@ -23,10 +23,7 @@
 
 import androidx.core.app.NotificationCompat;
 import androidx.core.app.NotificationManagerCompat;
-
-
-import io.flutter.plugin.common.PluginRegistry;
-import io.flutter.plugins.GeneratedPluginRegistrant;
+import io.flutter.view.FlutterMain;
 
 public class App extends Application {
 
@@ -35,6 +32,7 @@ public class App extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
+        FlutterMain.startInitialization(this);
     }
 
 

diff --git a/android/app/src/main/java/edu/illinois/covid/MainActivity.java b/android/app/src/main/java/edu/illinois/covid/MainActivity.java
@@ -63,7 +63,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
-import java.util.Random;
 import java.util.Set;
 import java.util.UUID;
 
@@ -78,7 +77,6 @@
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.PluginRegistry;
-import io.flutter.view.FlutterMain;
 
 public class MainActivity extends FlutterActivity implements MethodChannel.MethodCallHandler, PluginRegistry.PluginRegistrantCallback {
 
@@ -117,9 +115,6 @@ protected void onCreate(Bundle savedInstanceState) {
 
         instance = this;
         initScreenOrientation();
-
-        // TODO: Check do we need the next two lines at all?
-        FlutterMain.startInitialization(this);
     }
 
     @Override

diff --git a/android/app/src/main/res/layout/map_pick_location_layout.xml b/android/app/src/main/res/layout/map_pick_location_layout.xml
diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml
@@ -45,13 +45,6 @@
     <!-- MapActivity -->
     <string name="mapTitle">Mapas</string>
 
-    <!-- MapPickLocationActivity -->
-    <string name="pick_location">Elegir ubicación</string>
-    <string name="custom">PERSONALIZADO</string>
-    <string name="select_location_msg">Por favor, seleccione una ubicación</string>
-    <string name="location_label">Ubicación: %1$s</string>
-    <string name="save">Salvar</string>
-
     <!-- Exposure -->
     <string name="exposure_notification_channel_description">Sistema de notificación de exposición</string>
     <string name="exposure_notification_title">Comprobación del sistema de notificación de exposición</string>

diff --git a/android/app/src/main/res/values-zh/strings.xml b/android/app/src/main/res/values-zh/strings.xml
@@ -45,13 +45,6 @@
     <!-- MapActivity -->
     <string name="mapTitle">地圖</string>
 
-    <!-- MapPickLocationActivity -->
-    <string name="pick_location">選擇地點</string>
-    <string name="custom">定制</string>
-    <string name="select_location_msg">請選擇一個位置</string>
-    <string name="location_label">位置: %1$s</string>
-    <string name="save">保存</string>
-
     <!-- Exposure -->
     <string name="exposure_notification_channel_description">曝光通知系統</string>
     <string name="exposure_notification_title">曝光通知系統檢查</string>

diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
@@ -45,13 +45,6 @@
     <!-- MapActivity -->
     <string name="mapTitle">Maps</string>
 
-    <!-- MapPickLocationActivity -->
-    <string name="pick_location">Pick Location</string>
-    <string name="custom">CUSTOM</string>
-    <string name="select_location_msg">Please, select a location</string>
-    <string name="location_label">Location: %1$s</string>
-    <string name="save">Save</string>
-
     <!-- Exposure -->
     <string name="exposure_notification_channel_description">Exposure Notification system</string>
     <string name="exposure_notification_title">Exposure Notification system checking</string>