From a138f4ba091b04a8a422cb8697fb931e3e2a2d67 Mon Sep 17 00:00:00 2001 From: "K. Shankari" Date: Wed, 17 Oct 2018 17:44:18 -0700 Subject: [PATCH] Allow the base app to be customized in the setup screen + accessibility - Allow the base app to be customized in the setup screen - base app is specified as a `base_app` query parameter - if `base_app` is missing or invalid, we default to `emTripLog` - we look up the relevant URLs from the `base_app`. It would have been good to construct them using `{{base_app}}` but that would only work for android, not the iOS URL, which has a unique numeric ID - other text and icons are all switched to the `base_app` - add alt-text and aria-label to all image-like elements. This fixes #600 --- webapp/www/img/emTripLog-icon-96x96.png | Bin 0 -> 13193 bytes webapp/www/img/emission-icon-96x96.png | Bin 0 -> 8794 bytes webapp/www/js/app.js | 2 +- webapp/www/js/controllers.js | 26 ++++++++++++++++++++++++ webapp/www/templates/client_setup.html | 18 ++++++++-------- 5 files changed, 36 insertions(+), 10 deletions(-) create mode 100644 webapp/www/img/emTripLog-icon-96x96.png create mode 100644 webapp/www/img/emission-icon-96x96.png diff --git a/webapp/www/img/emTripLog-icon-96x96.png b/webapp/www/img/emTripLog-icon-96x96.png new file mode 100644 index 0000000000000000000000000000000000000000..4eead146a91f8a69b416fef1c46e42d161e66980 GIT binary patch literal 13193 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 O0CG~wlI1XykpBfSXgWav literal 0 HcmV?d00001 diff --git a/webapp/www/js/app.js b/webapp/www/js/app.js index bf4b51fda..3231b0aed 100644 --- a/webapp/www/js/app.js +++ b/webapp/www/js/app.js @@ -65,7 +65,7 @@ angular.module('starter', ['ionic', 'starter.controllers', 'starter.services', controller: 'SetupCtrl' }) .state('client_setup', { - url: '/client_setup?new_client&clear_local_storage&clear_usercache', + url: '/client_setup?base_app&new_client&clear_local_storage&clear_usercache', templateUrl: 'templates/client_setup.html', controller: 'ClientSetupCtrl' }); diff --git a/webapp/www/js/controllers.js b/webapp/www/js/controllers.js index 855d8149e..bc36af0ea 100644 --- a/webapp/www/js/controllers.js +++ b/webapp/www/js/controllers.js @@ -92,6 +92,32 @@ angular.module('starter.controllers', ['starter.heatmap', 'starter.metrics']) .controller('ClientSetupCtrl', function($scope, $stateParams) { console.log("in client setup, routeParams = "+JSON.stringify($stateParams)); + var BASE_APP_URL = { + "emTripLog": { + "android": "https://play.google.com/store/apps/details?id=edu.berkeley.eecs.embase", + "ios": "https://itunes.apple.com/us/app/emtriplog/id1362434685" + }, + "emission": { + "android": "https://play.google.com/store/apps/details?id=edu.berkeley.eecs.emission", + "ios": "https://itunes.apple.com/us/app/emission/id1084198445" + } + } + if (angular.isDefined($stateParams.base_app)) { + if (angular.isDefined(BASE_APP_URL[$stateParams.base_app])) { + $scope.base_app = $stateParams.base_app; + console.log("base_app defined in paramters, setting to "+$scope.base_app); + } else { + // emTripLog is the default + $scope.base_app = "emTripLog" + console.log("invalid base_app "+$stateParams.base_app+" defined, defaulting to emTripLog"); + } + } else { + // emTripLog is the default + $scope.base_app = "emTripLog" + console.log("base_app not defined in paramters, defaulting to emTripLog"); + } + $scope.android_base_app = BASE_APP_URL[$scope.base_app]["android"] + $scope.ios_base_app = BASE_APP_URL[$scope.base_app]["ios"] $scope.client_label = $stateParams.new_client; $scope.clear_local_storage_flag = $stateParams.clear_local_storage; $scope.clear_usercache_flag = $stateParams.clear_usercache; diff --git a/webapp/www/templates/client_setup.html b/webapp/www/templates/client_setup.html index be8ae465d..b071de5ed 100644 --- a/webapp/www/templates/client_setup.html +++ b/webapp/www/templates/client_setup.html @@ -2,7 +2,7 @@
- +

Thank you for participating - only two steps left!

@@ -11,7 +11,7 @@

Thank you for participating - only two steps left!

- + Created with Sketch. @@ -26,20 +26,20 @@

Thank you for participating - only two steps left!

-

Install the e-mission app

+

Install the {{base_app}} app

- Get it on Google Play - + Get it on Google Play +
- - + Get it on the iOS app store +
- + Created with Sketch. @@ -63,7 +63,7 @@

Join this study

- +