anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merged sprint.

Browse source
This commit is contained in:
Brendon Duncan 2018-09-11 15:33:26 +12:00
commit 7d29490b0f
3 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Gruntfile.js
View file

@ -65,6 +65,9 @@ module.exports = function(grunt) {
run_android: { run_android: {
command: 'cordova run android --device', command: 'cordova run android --device',
}, },
run_android_emulator: {
command: 'cordova run android --emulator',
},
sign_android: { sign_android: {
// When the build log outputs "Built the following apk(s):", it seems to need the filename to start with "android-release". // When the build log outputs "Built the following apk(s):", it seems to need the filename to start with "android-release".
// It looks like it simply lists all apk files starting with "android-release" // It looks like it simply lists all apk files starting with "android-release"
@ -370,6 +373,7 @@ module.exports = function(grunt) {
// Build android // Build android
grunt.registerTask('start-android', ['build-android-debug', 'exec:run_android']); grunt.registerTask('start-android', ['build-android-debug', 'exec:run_android']);
grunt.registerTask('build-android-debug', ['exec:build_android_debug']); grunt.registerTask('build-android-debug', ['exec:build_android_debug']);
grunt.registerTask('start-android-emulator', ['build-android-debug', 'exec:run_android_emulator']);
grunt.registerTask('build-android-release', ['prod', 'exec:build_android_release', 'sign-android']); grunt.registerTask('build-android-release', ['prod', 'exec:build_android_release', 'sign-android']);
grunt.registerTask('sign-android', ['exec:sign_android']); grunt.registerTask('sign-android', ['exec:sign_android']);

1
app-template/package-template.json
View file

@ -126,6 +126,7 @@
"start": "npm run build:www && ionic serve --nolivereload --nogulp -s --address 0.0.0.0", "start": "npm run build:www && ionic serve --nolivereload --nogulp -s --address 0.0.0.0",
"start:chrome": "npm run build:www && ionic serve --nolivereload --nogulp -s --address 0.0.0.0 --browser \"google chrome\"", "start:chrome": "npm run build:www && ionic serve --nolivereload --nogulp -s --address 0.0.0.0 --browser \"google chrome\"",
"start:android": "grunt start-android", "start:android": "grunt start-android",
"start:android-emulator": "grunt start-android",
"start:android-log": "grunt start-android && npm run log:android", "start:android-log": "grunt start-android && npm run log:android",
"start:ios": "grunt start-ios", "start:ios": "grunt start-ios",
"start:windows": "npm run build:www && npm run build:windows", "start:windows": "npm run build:www && npm run build:windows",

4
src/js/services/bitcoincomService.js
View file

@ -85,7 +85,9 @@ angular.module('copayApp.services').factory('bitcoincomService', function(gettex
}; };
var register = function() { var register = function() {
nextStepsService.register(cashGamesItem); if (!platformInfo.isAndroid) { // To comply with Google Play policies
nextStepsService.register(cashGamesItem);
}
nextStepsService.register(newsItem); nextStepsService.register(newsItem);
nextStepsService.register(poolItem); nextStepsService.register(poolItem);
nextStepsService.register(toolsItem); nextStepsService.register(toolsItem);