diff --git a/app-template/WMAppManifest.xml b/app-template/WMAppManifest.xml deleted file mode 100644 index 506d8d941..000000000 --- a/app-template/WMAppManifest.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - Assets\icon@2.png - - - - - - - - - - - - - Assets\200x200@1.png - 0 - Assets\200x200@2.png - *APPDESCRIPTION* - - - - - - - - false - - - - - - - - - - diff --git a/app-template/apply.js b/app-template/apply.js index 5f95484bb..fa35abce4 100755 --- a/app-template/apply.js +++ b/app-template/apply.js @@ -7,11 +7,8 @@ var templates = { 'package-template.json': '/', 'index.html': 'www/', - 'Makefile': 'cordova/', - 'ProjectMakefile': 'cordova/', 'config-template.xml': '/', 'ionic.config.json': '/', - 'Package.appxmanifest': 'cordova/wp/', '.desktop': 'webkitbuilds/', 'setup-win.iss': 'webkitbuilds/', 'build-macos.sh': 'webkitbuilds/', diff --git a/app-template/config-template.xml b/app-template/config-template.xml index e984f2e8d..d1695f4f1 100644 --- a/app-template/config-template.xml +++ b/app-template/config-template.xml @@ -20,7 +20,7 @@ - + @@ -35,7 +35,6 @@ - @@ -63,16 +62,17 @@ - + - + + @@ -108,6 +108,7 @@ + diff --git a/app-template/package-template.json b/app-template/package-template.json index d804a47ae..734f9946e 100644 --- a/app-template/package-template.json +++ b/app-template/package-template.json @@ -84,12 +84,14 @@ "start": "npm run build:www && ionic serve --nolivereload --nogulp -s", "start:ios": "npm run build:www && npm run build:ios && npm run open:ios", "start:android": "npm run build:www && npm run build:android && npm run run:android", + "start:windows": "npm run build:www && npm run build:windows", "start:desktop": "npm start", "watch": "grunt watch", "build:www": "grunt", "build:www-release": "grunt prod", "build:ios": "cordova prepare ios && cordova build ios --debug", "build:android": "cordova prepare android && cordova build android --debug", + "build:windows": "cordova prepare windows && cordova build windows --debug", "build:ios-release": "cordova prepare ios && cordova build ios --release", "build:android-release": "cordova prepare android && cordova build android --release", "build:desktop": "grunt desktop", diff --git a/cordova/readme.md b/cordova/readme.md deleted file mode 100644 index b80002e41..000000000 --- a/cordova/readme.md +++ /dev/null @@ -1,18 +0,0 @@ -# Mobile building - -## Requisites -* [Install Android SDK](https://developer.android.com/sdk/installing/index.html?pkg=tools) -* [Install XCode for IOS](https://itunes.apple.com/en/app/xcode/id497799835?mt=12) -* Install Cordova: ``sudo npm install -g cordova`` -* Install Copay dependecies: ``bower install && npm install`` -* Install Java-SDK and Apache Ant - -## Build the project - - $ make [clean] open-ios - OR $ make [clean] android-run - OR $ make [clean] wp8 - - See Makefile for more targets - - diff --git a/cordova/wp/MainPage.xaml b/cordova/wp/MainPage.xaml deleted file mode 100644 index 10a9fbbd3..000000000 --- a/cordova/wp/MainPage.xaml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - diff --git a/cordova/wp/Properties/AppManifest.xml b/cordova/wp/Properties/AppManifest.xml deleted file mode 100644 index 547c35469..000000000 --- a/cordova/wp/Properties/AppManifest.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - diff --git a/cordova/wp/Properties/AssemblyInfo.cs b/cordova/wp/Properties/AssemblyInfo.cs deleted file mode 100644 index 04907da92..000000000 --- a/cordova/wp/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,52 +0,0 @@ -/* - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using System.Resources; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("CordovaAppProj")] -[assembly: AssemblyDescription("2.0.0.0")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Apache Cordova")] -[assembly: AssemblyProduct("CordovaAppProj")] -[assembly: AssemblyCopyright("Copyright © Apache Cordova 2013")] -[assembly: AssemblyTrademark("Apache Cordova")] -[assembly: AssemblyCulture("")] - - -[assembly: NeutralResourcesLanguageAttribute("en-US")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("9e27b972-0825-4386-ba17-63c695262c3d")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Revision and Build Numbers -// by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/cordova/wp/Properties/WMAppManifest.xml b/cordova/wp/Properties/WMAppManifest.xml deleted file mode 100644 index 81a7e9513..000000000 --- a/cordova/wp/Properties/WMAppManifest.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - Assets\icon@2.png - - - - - - - - - - - - - Assets\200x200@1.png - 0 - Assets\200x200@2.png - Copay Bitcoin Wallet - - - - - - - - false - - - - - - - - - - diff --git a/cordova/wp/fix-svg.sh b/cordova/wp/fix-svg.sh deleted file mode 100755 index 8015e1dac..000000000 --- a/cordova/wp/fix-svg.sh +++ /dev/null @@ -1,12 +0,0 @@ -#/bin/bash - -PROJECT=./build-wp/platforms -for i in $PROJECT/wp8/www/img/*.svg -do - cat $i |grep -v ?xml > $i -done - -for i in $PROJECT/wp8/www/font/*.svg -do - cat $i |grep -v ?xml > $i -done diff --git a/resources/bitpay/windows/app-store/icon-300x300.png b/resources/bitpay/windows/app-store/icon-300x300.png new file mode 100644 index 000000000..cd48dc3c8 Binary files /dev/null and b/resources/bitpay/windows/app-store/icon-300x300.png differ diff --git a/src/js/routes.js b/src/js/routes.js index df76b0fbb..e95c63bb4 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -1100,7 +1100,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr if (screen.width < 768 && platformInfo.isCordova) screen.lockOrientation('portrait'); - if (window.cordova && window.cordova.plugins && window.cordova.plugins.Keyboard) { + if (window.cordova && window.cordova.plugins && window.cordova.plugins.Keyboard && !platformInfo.isWP) { cordova.plugins.Keyboard.hideKeyboardAccessoryBar(false); cordova.plugins.Keyboard.disableScroll(true); }