diff --git a/cordova/android/AndroidManifest.xml b/cordova/android/AndroidManifest.xml index cab29c6a8..51d0fd69d 100644 --- a/cordova/android/AndroidManifest.xml +++ b/cordova/android/AndroidManifest.xml @@ -1,8 +1,8 @@ - + - + diff --git a/cordova/android/config.xml b/cordova/android/config.xml index c69016dfc..2ed46fe4e 100644 --- a/cordova/android/config.xml +++ b/cordova/android/config.xml @@ -11,8 +11,8 @@ - - + + diff --git a/cordova/android/project.properties b/cordova/android/project.properties new file mode 100644 index 000000000..ff931ef96 --- /dev/null +++ b/cordova/android/project.properties @@ -0,0 +1,17 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system edit +# "ant.properties", and override values to adapt the script to your +# project structure. +# +# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): +#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt + +android.library.reference.1=CordovaLib +# Project target. +target=android-19 +key.store=../../../copay.keystore +key.alias=copay_play \ No newline at end of file diff --git a/cordova/android/res/drawable-hdpi/copay.png b/cordova/android/res/drawable-hdpi/copay.png new file mode 100644 index 000000000..5f2e988f9 Binary files /dev/null and b/cordova/android/res/drawable-hdpi/copay.png differ diff --git a/cordova/android/res/drawable-ldpi/copay.png b/cordova/android/res/drawable-ldpi/copay.png new file mode 100644 index 000000000..2def9ba5e Binary files /dev/null and b/cordova/android/res/drawable-ldpi/copay.png differ diff --git a/cordova/android/res/drawable-mdpi/copay.png b/cordova/android/res/drawable-mdpi/copay.png new file mode 100644 index 000000000..c4082b193 Binary files /dev/null and b/cordova/android/res/drawable-mdpi/copay.png differ diff --git a/cordova/android/res/drawable-xhdpi/copay.png b/cordova/android/res/drawable-xhdpi/copay.png new file mode 100644 index 000000000..f755f3bab Binary files /dev/null and b/cordova/android/res/drawable-xhdpi/copay.png differ diff --git a/cordova/android/res/drawable/copay.png b/cordova/android/res/drawable/copay.png new file mode 100644 index 000000000..f755f3bab Binary files /dev/null and b/cordova/android/res/drawable/copay.png differ diff --git a/cordova/android/res/drawable/copayscreen.9.png b/cordova/android/res/drawable/copayscreen.9.png new file mode 100644 index 000000000..5ca954990 Binary files /dev/null and b/cordova/android/res/drawable/copayscreen.9.png differ diff --git a/cordova/android/res/drawable/launcher_icon.png b/cordova/android/res/drawable/launcher_icon.png new file mode 100644 index 000000000..fc5fafcf0 Binary files /dev/null and b/cordova/android/res/drawable/launcher_icon.png differ diff --git a/cordova/android/res/drawable/share_via_barcode.png b/cordova/android/res/drawable/share_via_barcode.png new file mode 100644 index 000000000..56c344929 Binary files /dev/null and b/cordova/android/res/drawable/share_via_barcode.png differ diff --git a/cordova/android/res/drawable/shopper_icon.png b/cordova/android/res/drawable/shopper_icon.png new file mode 100644 index 000000000..63346faab Binary files /dev/null and b/cordova/android/res/drawable/shopper_icon.png differ diff --git a/cordova/build.sh b/cordova/build.sh index 53c59f38c..6d1f4bed6 100644 --- a/cordova/build.sh +++ b/cordova/build.sh @@ -41,9 +41,8 @@ echo "${OpenColor}${Green}* Checking dependencies...${CloseColor}" command -v cordova >/dev/null 2>&1 || { echo >&2 "Cordova is not present, please install it: sudo npm -g cordova."; exit 1; } command -v xcodebuild >/dev/null 2>&1 || { echo >&2 "XCode is not present, install it or use [--android]."; exit 1; } - # Create project dir -if [[ CLEAR ]] +if $CLEAR then if [ -d $PROJECT ]; then rm -rf $PROJECT @@ -61,7 +60,7 @@ if [ ! -d $PROJECT ]; then cordova platforms add android checkOK - if [[ !SKIPIOS ]]; then + if [[ !$SKIPIOS ]]; then echo "${OpenColor}${Green}* Adding IOS platform... ${CloseColor}" cordova platforms add ios checkOK @@ -113,11 +112,19 @@ checkOK cp android/config.xml $PROJECT/platforms/android/res/xml/config.xml checkOK -if [[ !SKIPIOS ]]; then - cp -R ios/icons $PROJECT/platforms/ios/Copay/Resources/icons +cp android/project.properties $PROJECT/platforms/android/project.properties +checkOK + +cp -R android/res/* $PROJECT/platforms/android/res +checkOK + +echo $SKIPIOS; +if [[ !$SKIPIOS ]]; then + echo "Copiando IOS"; + cp -R ios/icons/* $PROJECT/platforms/ios/Copay/Resources/icons checkOK - cp -R ios/splash $PROJECT/platforms/ios/Copay/Resources/splash + cp -R ios/splash/* $PROJECT/platforms/ios/Copay/Resources/splash checkOK fi diff --git a/cordova/config.xml b/cordova/config.xml index 4f619774c..51c490074 100644 --- a/cordova/config.xml +++ b/cordova/config.xml @@ -1,5 +1,5 @@ - + Copay A secure bitcoin wallet for friends and companies. @@ -9,8 +9,8 @@ - - + + diff --git a/cordova/ios/Copay-Info.plist b/cordova/ios/Copay-Info.plist index 05a473a89..65716be05 100644 --- a/cordova/ios/Copay-Info.plist +++ b/cordova/ios/Copay-Info.plist @@ -57,7 +57,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.4.7 + 0.5.0 CFBundleSignature ???? CFBundleURLTypes @@ -72,7 +72,7 @@ CFBundleVersion - 0.4.7 + 0.5.0 LSRequiresIPhoneOS NSMainNibFile diff --git a/cordova/readme.md b/cordova/readme.md index 4907a8435..e22456628 100644 --- a/cordova/readme.md +++ b/cordova/readme.md @@ -10,4 +10,8 @@ $ sh cordova/build.sh $ cd cordova/project $ cordova run android - $ cordova emulate ios \ No newline at end of file + $ cordova emulate ios + +## Build for release + + $ cordova build android --release \ No newline at end of file