diff --git a/app-template/.desktop b/app-template/.desktop index aff7c857b..ea5bb0424 100644 --- a/app-template/.desktop +++ b/app-template/.desktop @@ -1,9 +1,9 @@ [Desktop Entry] Type=Application Version=*VERSION* -Name=*NAMECASENOSPACE* -Comment=*DESCRIPTION* -Exec=*NAMENOSPACE* +Name=*USERVISIBLENAME* +Comment=*PURPOSELINE* +Exec=*PACKAGENAME* Icon=icon-256.png Terminal=false Categories=Finance diff --git a/app-template/Makefile b/app-template/Makefile index c8b86509c..3a1c121ca 100644 --- a/app-template/Makefile +++ b/app-template/Makefile @@ -9,7 +9,7 @@ clean: $(WORKDIR)android $(WORKDIR)ios: config.xml - cordova create $@ com.bitpay.*NAMENOSPACE* '*NAMECASENOSPACE*' || echo "Project Path Existed" + cordova create $@ com.bitpay.*BUNDLENAME* "*USERVISIBLENAME*" || echo "Project Path Existed" cp ProjectMakefile $@/Makefile rm -r $@/www && ln -sF ../../public $@/www cp config.xml $@/config.xml @@ -28,7 +28,7 @@ android: project-android make -C $(WORKDIR)android build-android wp-init: config.xml - cordova create $(WORKDIR)$@ com.bitpay.*NAMENOSPACE* *NAMECASENOSPACE* || echo "Project Path Existed" + cordova create $(WORKDIR)$@ com.bitpay.*BUNDLENAME* "*USERVISIBLENAME*" || echo "Project Path Existed" cp ProjectMakefile $(WORKDIR)$@/Makefile mkdir -p $(WORKDIR)$@/www cp -Rf ../public/* $(WORKDIR)$@/www diff --git a/app-template/ProjectMakefile b/app-template/ProjectMakefile index 1116fc159..0fc91e66a 100644 --- a/app-template/ProjectMakefile +++ b/app-template/ProjectMakefile @@ -1,7 +1,7 @@ .PHONY:plugins ios-platform android-platform wp8-platform plugins: - cordova plugin add https://github.com/cmgustavo/Custom-URL-scheme.git --variable URL_SCHEME=bitcoin --variable SECOND_URL_SCHEME=*NAMENOSPACE* + cordova plugin add https://github.com/cmgustavo/Custom-URL-scheme.git --variable URL_SCHEME=bitcoin --variable SECOND_URL_SCHEME=*APPURI* cordova prepare rm -rf platforms/android/res/values-es diff --git a/app-template/WMAppManifest.xml b/app-template/WMAppManifest.xml index 86ff38421..506d8d941 100644 --- a/app-template/WMAppManifest.xml +++ b/app-template/WMAppManifest.xml @@ -11,7 +11,7 @@ - + Assets\icon@2.png diff --git a/app-template/config.xml b/app-template/config.xml index e865b2bbf..ab0260c0f 100644 --- a/app-template/config.xml +++ b/app-template/config.xml @@ -3,9 +3,9 @@ version="*VERSION*" android-versionCode="*ANDROIDVERSION*" ios-CFBundleVersion="*VERSION*"> - *NAMECASENOSPACE* + *USERVISIBLENAME* - *APPDESCRIPTION* + *PURPOSELINE* BitPay Inc. diff --git a/app-template/manifest.json b/app-template/manifest.json index dc9419ca5..dca54d40b 100644 --- a/app-template/manifest.json +++ b/app-template/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, - "name": "*NAMECASENOSPACE*", - "description": "*DESCRIPTION*", + "name": "*PACKAGENAME*", + "description": "*PACKAGEDESCRIPTION*", "version": "*VERSION*", "permissions": [ "storage", diff --git a/app-template/package.json b/app-template/package.json index 2bd898d52..8dc7f749c 100644 --- a/app-template/package.json +++ b/app-template/package.json @@ -1,5 +1,5 @@ { - "name": "*NAMENOSPACE*", + "name": "*PACKAGENAME*", "description": "*DESCRIPTION*", "author": "BitPay", "version": "*VERSION*", @@ -13,7 +13,7 @@ ], "main": "public/index.html", "window": { - "title": "*NAMECASE* - *DESCRIPTION*", + "title": "*USERVISIBLENAME* - *PURPOSELINE*", "icon": "./public/img/icons/icon-256.png", "toolbar": false, "show": true, @@ -95,7 +95,7 @@ "test": "./node_modules/.bin/grunt test-coveralls", "clean": "git clean -dfx", "start:ios": "npm run build && cd cordova && trash project-ios && make ios && open project-ios/platforms/ios/BitPay\\ Wallet.xcodeproj", - "start:android": "npm run build && cd cordova && trash project-android && make android" + "start:android": "npm run build && cd cordova && trash project-android && make android && open -a /Applications/Android\\ Studio.app project-android/platforms/android" }, "devDependencies": { "trash-cli": "^1.4.0" diff --git a/app-template/setup-win.iss b/app-template/setup-win.iss index 3f129e4ef..0cb3cba5c 100755 --- a/app-template/setup-win.iss +++ b/app-template/setup-win.iss @@ -1,11 +1,11 @@ ; Script generated by the Inno Setup Script Wizard. ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! -#define MyAppName "*NAMENOSPACE*" +#define MyAppName "*USERVISIBLENAME*" #define MyAppVersion "*VERSION*" #define MyAppPublisher "BitPay" #define MyAppURL "*URL*" -#define MyAppExeName "*NAMECASENOSPACE.exe" +#define MyAppExeName "*PACKAGENAME.exe" [Setup] AppId={{804636ee-b017-4cad-8719-e58ac97ffa5c} @@ -18,7 +18,7 @@ AppSupportURL={#MyAppURL} AppUpdatesURL={#MyAppURL} DefaultDirName={pf}\{#MyAppName} DefaultGroupName={#MyAppName} -OutputBaseFilename=*NAMECASENOSPACE*-win +OutputBaseFilename=*PACKAGENAME*-win OutputDir=./ Compression=lzma SolidCompression=yes @@ -32,8 +32,8 @@ Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl" Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked [Files] -Source: "*NAMECASENOSPACE*\win64\*NAMENOSPACE*.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "*NAMECASENOSPACE*\win64\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "*PACKAGENAME*\win64\*PACKAGENAME*.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "*PACKAGENAME*\win64\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs Source: "../public/img/icons/favicon.ico"; DestDir: "{app}"; DestName: "icon.ico"; Flags: ignoreversion ; NOTE: Don't use "Flags: ignoreversion" on any shared system files @@ -50,8 +50,7 @@ Root: HKCR; Subkey: "bitcoin"; ValueType: "string"; ValueName: "URL Protocol"; V Root: HKCR; Subkey: "bitcoin\DefaultIcon"; ValueType: "string"; ValueData: "{app}\{#MyAppExeName},0" Root: HKCR; Subkey: "bitcoin\shell\open\command"; ValueType: "string"; ValueData: """{app}\{#MyAppExeName}"" ""%1""" -Root: HKCR; Subkey: "*NAMENOSPACE*"; ValueType: "string"; ValueData: "URL:*NAMECASENOSPACE* Custom Protocol"; Flags: uninsdeletekey -Root: HKCR; Subkey: "*NAMENOSPACE*"; ValueType: "string"; ValueName: "URL Protocol"; ValueData: "" -Root: HKCR; Subkey: "*NAMENOSPACE*\DefaultIcon"; ValueType: "string"; ValueData: "{app}\{#MyAppExeName},0" -Root: HKCR; Subkey: "*NAMENOSPACE*\shell\open\command"; ValueType: "string"; ValueData: """{app}\{#MyAppExeName}"" ""%1""" - +Root: HKCR; Subkey: "*APPURI*"; ValueType: "string"; ValueData: "URL:*USERVISIBLENAME* Custom Protocol"; Flags: uninsdeletekey +Root: HKCR; Subkey: "*APPURI*"; ValueType: "string"; ValueName: "URL Protocol"; ValueData: "" +Root: HKCR; Subkey: "*APPURI*\DefaultIcon"; ValueType: "string"; ValueData: "{app}\{#MyAppExeName},0" +Root: HKCR; Subkey: "*APPURI*\shell\open\command"; ValueType: "string"; ValueData: """{app}\{#MyAppExeName}"" ""%1""" diff --git a/chrome-app/manifest.json b/chrome-app/manifest.json index 66fed64f0..e5cf3add7 100644 --- a/chrome-app/manifest.json +++ b/chrome-app/manifest.json @@ -3,9 +3,9 @@ "//":" Modify it at app-template/", "manifest_version": 2, - "name": "BitPay Wallet", + "name": "bitpay-wallet", "description": "Secure Bitcoin Storage", - "version": "0.6.0", + "version": "0.14.0", "permissions": [ "storage", "unlimitedStorage", diff --git a/package.json b/package.json index 4d42bde88..443069cd0 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ - { + { "//":"PLEASE! Do not edit this file directly", - "//":" Modify it at app-template/", + "//":" Modify it at app-template/", - "name": "wallet", + "name": "bitpay-wallet", "description": "Secure Bitcoin Storage", "author": "BitPay", - "version": "0.6.0", + "version": "0.14.0", "keywords": [ "bitcoin", "wallet", @@ -97,7 +97,8 @@ "watch": "grunt watch", "test": "./node_modules/.bin/grunt test-coveralls", "clean": "git clean -dfx", - "start:ios": "npm run build && cd cordova && trash project-ios && make ios && open project-ios/platforms/ios/BitPay\\ Wallet.xcodeproj" + "start:ios": "npm run build && cd cordova && trash project-ios && make ios && open project-ios/platforms/ios/BitPay\\ Wallet.xcodeproj", + "start:android": "npm run build && cd cordova && trash project-android && make android && open -a /Applications/Android\\ Studio.app project-android/platforms/android" }, "devDependencies": { "trash-cli": "^1.4.0" diff --git a/webkitbuilds/.desktop b/webkitbuilds/.desktop index b886061ba..c95b8448e 100644 --- a/webkitbuilds/.desktop +++ b/webkitbuilds/.desktop @@ -1,9 +1,9 @@ [Desktop Entry] Type=Application -Version=0.6.0 +Version=0.14.0 Name=BitPay Wallet Comment=Secure Bitcoin Storage -Exec=wallet +Exec=bitpay-wallet Icon=icon-256.png Terminal=false Categories=Finance diff --git a/webkitbuilds/setup-win.iss b/webkitbuilds/setup-win.iss index 75890c496..45bcc25e4 100755 --- a/webkitbuilds/setup-win.iss +++ b/webkitbuilds/setup-win.iss @@ -1,11 +1,11 @@ ; Script generated by the Inno Setup Script Wizard. ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! -#define MyAppName "wallet" -#define MyAppVersion "0.6.0" +#define MyAppName "BitPay Wallet" +#define MyAppVersion "0.14.0" #define MyAppPublisher "BitPay" #define MyAppURL "https://bitpay.com" -#define MyAppExeName "*NAMECASENOSPACE.exe" +#define MyAppExeName "*PACKAGENAME.exe" [Setup] AppId={{804636ee-b017-4cad-8719-e58ac97ffa5c} @@ -18,7 +18,7 @@ AppSupportURL={#MyAppURL} AppUpdatesURL={#MyAppURL} DefaultDirName={pf}\{#MyAppName} DefaultGroupName={#MyAppName} -OutputBaseFilename=BitPay Wallet-win +OutputBaseFilename=bitpay-wallet-win OutputDir=./ Compression=lzma SolidCompression=yes @@ -32,8 +32,8 @@ Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl" Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked [Files] -Source: "BitPay Wallet\win64\wallet.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "BitPay Wallet\win64\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "bitpay-wallet\win64\bitpay-wallet.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "bitpay-wallet\win64\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs Source: "../public/img/icons/favicon.ico"; DestDir: "{app}"; DestName: "icon.ico"; Flags: ignoreversion ; NOTE: Don't use "Flags: ignoreversion" on any shared system files @@ -50,8 +50,7 @@ Root: HKCR; Subkey: "bitcoin"; ValueType: "string"; ValueName: "URL Protocol"; V Root: HKCR; Subkey: "bitcoin\DefaultIcon"; ValueType: "string"; ValueData: "{app}\{#MyAppExeName},0" Root: HKCR; Subkey: "bitcoin\shell\open\command"; ValueType: "string"; ValueData: """{app}\{#MyAppExeName}"" ""%1""" -Root: HKCR; Subkey: "wallet"; ValueType: "string"; ValueData: "URL:BitPay Wallet Custom Protocol"; Flags: uninsdeletekey -Root: HKCR; Subkey: "wallet"; ValueType: "string"; ValueName: "URL Protocol"; ValueData: "" -Root: HKCR; Subkey: "wallet\DefaultIcon"; ValueType: "string"; ValueData: "{app}\{#MyAppExeName},0" -Root: HKCR; Subkey: "wallet\shell\open\command"; ValueType: "string"; ValueData: """{app}\{#MyAppExeName}"" ""%1""" - +Root: HKCR; Subkey: "bitpay-wallet"; ValueType: "string"; ValueData: "URL:BitPay Wallet Custom Protocol"; Flags: uninsdeletekey +Root: HKCR; Subkey: "bitpay-wallet"; ValueType: "string"; ValueName: "URL Protocol"; ValueData: "" +Root: HKCR; Subkey: "bitpay-wallet\DefaultIcon"; ValueType: "string"; ValueData: "{app}\{#MyAppExeName},0" +Root: HKCR; Subkey: "bitpay-wallet\shell\open\command"; ValueType: "string"; ValueData: """{app}\{#MyAppExeName}"" ""%1"""