Merge branch 'master_for_platform' of https://github.com/e-mission/e-…

…mission-phone into master_for_platform

README.md

@@ -16,7 +16,7 @@ Updating the UI only
 ---
 [![osx-serve-install](https://github.com/e-mission/e-mission-phone/workflows/osx-serve-install/badge.svg)](https://github.com/e-mission/e-mission-phone/actions?query=workflow%3Aosx-serve-install)
 
-If you want to make only UI changes, (as opposed to modifying the existing plugins, adding new plugins, etc), you can use the **new and improved** (as of June 2018) e-mission dev app. 
+If you want to make only UI changes, (as opposed to modifying the existing plugins, adding new plugins, etc), you can use the **new and improved** (as of June 2018) [e-mission dev app](https://github.com/e-mission/e-mission-devapp/) and install the most recent version from [releases](https://github.com/e-mission/e-mission-devapp/releases). 
 
 ### Installing (one-time)
 

setup/setup_serve.sh

@@ -15,3 +15,5 @@ npx bower update --allow-root
 
 echo "Pulling the plugin-specific UIs"
 npm run setup-serve
+
+npx cordova prepare

www/js/common/services.js

@@ -177,7 +177,7 @@ angular.module('emission.main.common.services', ['emission.plugin.logger'])
           +" data = "+JSON.stringify(response.data));
         return address2Name(response.data);
       }).catch((error) => {
-        Logger.displayError("while reading address data ",error);
+        // Logger.displayError("while reading address data ",error);
       });
     };
 

www/js/control/general-settings.js

@@ -190,9 +190,13 @@ angular.module('emission.main.control',['emission.services',
             // Backwards compat hack to fill in the `app_required` based on the
             // old-style "program_or_study"
             // remove this at the end of 2023 when all programs have been migrated over
-            $scope.ui_config.intro.app_required = $scope.ui_config?.intro.app_required || $scope.ui_config?.intro.program_or_study == 'program';
+            if ($scope.ui_config.intro.app_required == undefined) {
+                $scope.ui_config.intro.app_required = $scope.ui_config?.intro.program_or_study == 'program';
+            }
             $scope.ui_config.opcode = $scope.ui_config.opcode || {};
-            $scope.ui_config.opcode.autogen = $scope.ui_config?.opcode?.autogen || $scope.ui_config?.intro.program_or_study == 'study';
+            if ($scope.ui_config.opcode.autogen == undefined) {
+                $scope.ui_config.opcode.autogen = $scope.ui_config?.intro.program_or_study == 'study';
+            }
             $scope.refreshScreen();
         });
     });

www/templates/appstatus/permissioncheck.html

@@ -12,8 +12,8 @@
     </div>
     <div class="row item-text-wrap">{{locCheck.desc}}</div>
     <div class="row">
-        <button class="button button-icon" ng-click="locCheck.fix()">Fix</button>
-        <button class="button button-icon" ng-click="locCheck.refresh()">Refresh</button>
+        <button class="button button-assertive button-outline" ng-click="locCheck.fix()">Fix</button>
+        <button class="button button-royal button-outline" ng-click="locCheck.refresh()">Refresh</button>
     </div>
 </ion-item>
 </ion-list>
@@ -32,8 +32,8 @@
     </div>
     <div class="row item-text-wrap">{{fitnessCheck.desc}}</div>
     <div class="row">
-        <button class="button button-icon" ng-click="fitnessCheck.fix()">Fix</button>
-        <button class="button button-icon" ng-click="fitnessCheck.refresh()">Refresh</button>
+        <button class="button button-assertive button-outline" ng-click="fitnessCheck.fix()">Fix</button>
+        <button class="button button-royal button-outline" ng-click="fitnessCheck.refresh()">Refresh</button>
     </div>
 </ion-item>
 </ion-list>
@@ -51,8 +51,8 @@
     </div>
     <div class="row item-text-wrap">{{notificationCheck.desc}}</div>
     <div class="row">
-        <button class="button button-icon" ng-click="notificationCheck.fix()">Fix</button>
-        <button class="button button-icon" ng-click="notificationCheck.refresh()">Refresh</button>
+        <button class="button button-assertive button-outline" ng-click="notificationCheck.fix()">Fix</button>
+        <button class="button button-royal button-outline" ng-click="notificationCheck.refresh()">Refresh</button>
     </div>
 </ion-item>
 </ion-list>
@@ -71,8 +71,8 @@
     </div>
     <div class="row item-text-wrap">{{backgroundRestrictionCheck.desc}}</div>
     <div class="row">
-        <button class="button button-icon" ng-click="backgroundRestrictionCheck.fix()">Fix</button>
-        <button class="button button-icon" ng-click="backgroundRestrictionCheck.refresh()">Refresh</button>
+        <button class="button button-assertive button-outline" ng-click="backgroundRestrictionCheck.fix()">Fix</button>
+        <button class="button button-royal button-outline" ng-click="backgroundRestrictionCheck.refresh()">Refresh</button>
     </div>
 </ion-item>
 </ion-list>