diff --git a/config.xml b/config.xml index b5fae8f..e6f9fdb 100644 --- a/config.xml +++ b/config.xml @@ -80,7 +80,8 @@ - + + @@ -99,5 +100,4 @@ - diff --git a/makefile b/makefile new file mode 100644 index 0000000..8bffb07 --- /dev/null +++ b/makefile @@ -0,0 +1,22 @@ +all: + make release + make sign + make zipalign + -make install + +release: + ionic cordova build --release android + -rm ../android-release-unsigned.apk + cp ./platforms/android/build/outputs/apk/android-release-unsigned.apk ../android-release-unsigned.apk + +sign: + make -C .. sign + +zipalign: + -rm ../android-release-signed-zipaligned.apk + zipalign -v 4 ../android-release-signed.apk ../android-release-signed-zipaligned.apk + +install: + adb install -r ../android-release-signed-zipaligned.apk + + diff --git a/package.json b/package.json index 4bf37de..666b29f 100644 --- a/package.json +++ b/package.json @@ -33,19 +33,8 @@ "@ionic/storage": "2.0.1", "@types/node": "7.0.18", "chart.js": "2.6.0", - "ionic-angular": "3.2.1", - "ionic-orm": "0.0.5", - "ionic-typeorm": "0.0.15", - "ionicons": "3.0.0", - "moment": "2.18.1", - "ng2-charts": "1.5.0", - "reflect-metadata": "0.1.10", - "rxjs": "5.1.1", - "sw-toolbox": "3.4.0", - "typeorm": "0.0.11", - "zone.js": "0.8.5", + "cordova-android": "^6.1.2", "cordova-browser": "~4.1.0", - "cordova-android": "~6.1.2", "cordova-plugin-actionsheet": "~2.3.3", "cordova-plugin-console": "1.0.5", "cordova-plugin-crosswalk-webview": "~2.3.0", @@ -56,15 +45,27 @@ "cordova-plugin-x-socialsharing": "~5.1.8", "cordova-plugin-x-toast": "~2.6.0", "cordova-sqlite-storage": "~2.0.3", - "ionic-plugin-keyboard": "~2.2.1" + "ionic-angular": "3.2.1", + "ionic-orm": "0.0.5", + "ionic-plugin-keyboard": "~2.2.1", + "ionic-typeorm": "0.0.15", + "ionicons": "3.0.0", + "moment": "2.18.1", + "ng2-charts": "1.5.0", + "reflect-metadata": "0.1.10", + "rxjs": "5.1.1", + "sw-toolbox": "3.4.0", + "typeorm": "0.0.11", + "zone.js": "0.8.5" }, "devDependencies": { "@angular/cli": "1.0.2", "@ionic/app-scripts": "1.3.6", - "@ionic/cli-plugin-cordova": "1.2.1", - "@ionic/cli-plugin-ionic-angular": "1.2.0", + "@ionic/cli-plugin-cordova": "1.6.2", + "@ionic/cli-plugin-ionic-angular": "1.4.1", "@types/jasmine": "2.5.47", "codecov": "2.1.0", + "ionic": "3.7.0", "jasmine-core": "2.6.1", "jasmine-spec-reporter": "4.1.0", "karma": "1.7.0", @@ -116,4 +117,4 @@ "ionic-plugin-keyboard": {} } } -} +} \ No newline at end of file diff --git a/putOnParent_makefile b/putOnParent_makefile new file mode 100644 index 0000000..75e0a26 --- /dev/null +++ b/putOnParent_makefile @@ -0,0 +1,4 @@ +sign: + touch sign.sh + chmod +x sign.sh + ./sign.sh diff --git a/putOnParent_sign.sh b/putOnParent_sign.sh new file mode 100755 index 0000000..021fb16 --- /dev/null +++ b/putOnParent_sign.sh @@ -0,0 +1,4 @@ +#!/bin/bash +cp android-release-unsigned.apk android-release-signed.apk +jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -storepass -keypass -keystore android-release-signed.apk + diff --git a/screenshots/historico_precos.png b/screenshots/historico_precos.png new file mode 100755 index 0000000..22bc04d Binary files /dev/null and b/screenshots/historico_precos.png differ diff --git a/screenshots/inicio.png b/screenshots/inicio.png new file mode 100755 index 0000000..4484e0c Binary files /dev/null and b/screenshots/inicio.png differ diff --git a/screenshots/menu.png b/screenshots/menu.png new file mode 100755 index 0000000..edbbacc Binary files /dev/null and b/screenshots/menu.png differ