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

Merge pull request #13 from cmgustavo/bug/wp-white-box

Browse source 
Bug/wp white box
This commit is contained in:
Juan Ignacio Sosa Lopez 2015-01-16 00:01:01 -03:00
commit 2f4dc38eb4
24 changed files with 110 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cordova/build.sh
View file

@ -173,6 +173,7 @@ if [ $CURRENT_OS == "WP8" ]; then
checkOK checkOK
cp -vf wp/Properties/* $PROJECT/platforms/wp8/Properties/ cp -vf wp/Properties/* $PROJECT/platforms/wp8/Properties/
cp -vf wp/Package.appxmanifest $PROJECT/platforms/wp8/ cp -vf wp/Package.appxmanifest $PROJECT/platforms/wp8/
cp -vf wp/MainPage.xaml $PROJECT/platforms/wp8/
checkOK checkOK
cp -vf wp/Assets/* $PROJECT/platforms/wp8/Assets/ cp -vf wp/Assets/* $PROJECT/platforms/wp8/Assets/
cp -vf wp/SplashScreenImage.jpg $PROJECT/platforms/wp8/ cp -vf wp/SplashScreenImage.jpg $PROJECT/platforms/wp8/

2
cordova/config.xml
View file

@ -21,7 +21,7 @@
<preference name="StatusBarBackgroundColor" value="#3C4E60" /> <preference name="StatusBarBackgroundColor" value="#3C4E60" />
<preference name="StatusBarStyle" value="lightcontent" /> <preference name="StatusBarStyle" value="lightcontent" />
<preference name="BackupWebStorage" value="none"/> <preference name="BackupWebStorage" value="none"/>
<preference name="windows-target-version" value="8.1"/> <preference name="windows-target-version" value="8.1"/>
<feature name="App"> <feature name="App">
<param name="android-package" value="com.bitpay.copay" /> <param name="android-package" value="com.bitpay.copay" />
</feature> </feature>

19
cordova/wp/MainPage.xaml
View file

@ -31,15 +31,16 @@
SupportedOrientations="Portrait" Orientation="Portrait" SupportedOrientations="Portrait" Orientation="Portrait"
shell:SystemTray.IsVisible="True" d:DesignHeight="768" d:DesignWidth="480" shell:SystemTray.IsVisible="True" d:DesignHeight="768" d:DesignWidth="480"
xmlns:my="clr-namespace:WPCordovaClassLib"> xmlns:my="clr-namespace:WPCordovaClassLib">
<Grid x:Name="LayoutRoot" Background="Transparent" HorizontalAlignment="Stretch"> <Grid x:Name="LayoutRoot" Background="Transparent">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="*"/> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<my:CordovaView HorizontalAlignment="Stretch" <my:CordovaView
Margin="0,0,0,0" HorizontalAlignment="Stretch"
x:Name="CordovaView" Margin="1,0,0,0"
VerticalAlignment="Stretch" /> x:Name="CordovaView"
VerticalAlignment="Stretch" />
</Grid> </Grid>
</phone:PhoneApplicationPage> </phone:PhoneApplicationPage>

BIN
cordova/wp/SplashScreenImage-original.jpg Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 34 KiB

BIN
cordova/wp/SplashScreenImage.jpg Normal file → Executable file
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Before After
Before After

1
css/src/main.css
View file

@ -688,7 +688,6 @@ a.button-setup {
.locked { .locked {
font-size: 11px; font-size: 11px;
margin-top: 0.2rem;
color: #7A8C9E; color: #7A8C9E;
} }

47
css/src/mobile.css
View file

@ -5,6 +5,10 @@
*/ */
@media (max-width: 1024px) { @media (max-width: 1024px) {
body {
overflow: hidden;
-ms-content-zooming: none;
}
.loading-screen { .loading-screen {
background-color: #2C3E50; background-color: #2C3E50;
@ -19,15 +23,48 @@
} }
.page, .main { .page, .main {
height: auto; height: 100%;
} }
.main { .main {
height: 92%;
margin-top: 30px;
margin-left: 0; margin-left: 0;
margin-bottom: -30px; padding: 60px 0 80px 0;
padding: 20px 0 80px 0; }
/* Fix IE 10 */
.extra-margin-bottom {
display: block
height: 75px
overflow: hidden
clear: both
}
.main {
height: 99%
overflow: auto
}
/* Fix IE 11 */
_:-ms-fullscreen, :root .extra-margin-bottom {
display: block;
height: 75px;
overflow: hidden;
clear: both;
}
_:-ms-fullscreen, :root .main {
height: 99%;
overflow: auto;
}
/* Fix Firefox */
@-moz-document url-prefix() {
.extra-margin-bottom {
display: block;
height: 75px;
overflow: hidden;
clear: both;
}
} }
.tab-bar { .tab-bar {

6
index.html
View file

@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
<meta name="msapplication-tap-highlight" content="no"> <meta name="msapplication-tap-highlight" content="no">
<title>Copay - Multisignature Wallet</title> <title>Copay - Multisignature Wallet</title>
<style type="text/css"> <style type="text/css">
@ -121,7 +121,9 @@
ng-class="{'dni':$root.hideNavigation || $root.wpInputFocused}" ng-class="{'dni':$root.hideNavigation || $root.wpInputFocused}"
></div> ></div>
<section ng-class="{'main':$root.iden && !$root.starting && !$root.hideNavigation && !$root.wpInputFocused}" ng-view></section> <section
ng-class="{'main':$root.iden && !$root.starting && !$root.hideNavigation && !$root.wpInputFocused}"
ng-view></section>
<a class="exit-off-canvas"></a> <a class="exit-off-canvas"></a>

6
js/controllers/homeWallet.js
View file

@ -1,10 +1,8 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('HomeWalletController', function($scope, $rootScope, $timeout, $filter, $modal, rateService, notification, txStatus, identityService) { angular.module('copayApp.controllers').controller('HomeWalletController', function($scope, $rootScope, $timeout, $filter, $modal, rateService, notification, txStatus, identityService, isMobile) {
$scope.initHome = function() { $scope.isMobile = isMobile.any();
$rootScope.title = 'Home';
};
$scope.openTxModal = function(tx) { $scope.openTxModal = function(tx) {
var ModalInstanceCtrl = function($scope, $modalInstance) { var ModalInstanceCtrl = function($scope, $modalInstance) {

3
views/add.html
View file

@ -18,4 +18,5 @@
<span>Import wallet</span> <span>Import wallet</span>
</a> </a>
</div> </div>
</div> </div>
<div class="extra-margin-bottom"></div>

3
views/copayers.html
View file

@ -1,7 +1,7 @@
<div ng-controller="CopayersController" ng-init="init()"> <div ng-controller="CopayersController" ng-init="init()">
<div class="row"> <div class="row">
<div class="large-12 medium-12 small-12 columns"> <div class="large-12 medium-12 small-12 columns">
<h1 class="hide-for-large-up size-18">{{$root.title}}</h1> <h1>Share this secret with your copayers</h1>
</div> </div>
</div> </div>
@ -50,4 +50,5 @@
</div> </div>
<!-- end of row --> <!-- end of row -->
</div> </div>
<div class="extra-margin-bottom"></div>

1
views/create.html
View file

@ -87,3 +87,4 @@
</form> </form>
</div> </div>
</div> </div>
<div class="extra-margin-bottom"></div>

1
views/createProfile.html
View file

@ -241,4 +241,5 @@
</div> </div>
</div> </div>
<div class="extra-margin-bottom"></div>

2
views/errors/404.html
View file

@ -8,4 +8,4 @@
<h3 translate class="text-center" ng-class="{'text-white': !$root.wallet}">Page not found</h3> <h3 translate class="text-center" ng-class="{'text-white': !$root.wallet}">Page not found</h3>
<p class="text-center"><a href="#!/">&laquo; <span translate>Back</span></a></p> <p class="text-center"><a href="#!/">&laquo; <span translate>Back</span></a></p>
</div> </div>
<div class="extra-margin-bottom"></div>

3
views/history.html
View file

@ -47,7 +47,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="m50b" ng-show="blockchain_txs[0].txid"> <div class="m10b" ng-show="blockchain_txs[0].txid">
<div class="row"> <div class="row">
<div class="large-9 columns"> <div class="large-9 columns">
<pagination page="currentPage" total-items="totalItems" items-per-page="itemsPerPage" on-select-page="selectPage(page)" max-size="10" /> <pagination page="currentPage" total-items="totalItems" items-per-page="itemsPerPage" on-select-page="selectPage(page)" max-size="10" />
@ -67,3 +67,4 @@
</div> </div>
</div> </div>
</div> </div>
<div class="extra-margin-bottom"></div>

2
views/home.html
View file

@ -36,7 +36,7 @@
<div class="large-4 large-centered medium-6 medium-centered columns" ng-show="!$root.starting && !showDisclaimer"> <div class="large-4 large-centered medium-6 medium-centered columns" ng-show="!$root.starting && !showDisclaimer">
<div class="logo-setup" ng-show="!$root.iden && !hideForWP"> <div class="logo-setup" ng-show="!$root.iden && !hideForWP">
<img src="img/logo-negative-beta.svg" alt="Cop ay" width="100"> <img src="img/logo-negative-beta.svg" alt="Copay" width="100">
<div ng-include="'views/includes/version.html'"></div> <div ng-include="'views/includes/version.html'"></div>
</div> </div>

16
views/homeWallet.html
View file

@ -1,6 +1,6 @@
<div class="home-wallet" ng-controller="HomeWalletController" ng-init="initHome()"> <div class="home-wallet" ng-controller="HomeWalletController">
<div class="row show-for-large-up"> <div class="row show-for-large-up">
<div class="medium-12 small-12 columns"> <div class="large-12 columns">
<h1 translate>Home</h1> <h1 translate>Home</h1>
</div> </div>
</div> </div>
@ -14,7 +14,6 @@
<div class="avatar-wallet left">{{$root.wallet.getName() | limitTo: 1}}</div> <div class="avatar-wallet left">{{$root.wallet.getName() | limitTo: 1}}</div>
<h2 class="m10t left"> <h2 class="m10t left">
{{$root.wallet.getName()}} {{$root.wallet.getName()}}
<a ng-click="$root.go('more')"><i class="fi-widget size-24"></i></a>
</h2> </h2>
</div> </div>
</div> </div>
@ -39,7 +38,7 @@
<div class="row "> <div class="row ">
<div class="large-12 columns line-t m10t"> <div class="large-12 columns line-t m10t">
<div class="right size-12"> <div class="text-right size-12">
<span ng-if="!$root.wallet.isShared()">Personal Wallet</span> <span ng-if="!$root.wallet.isShared()">Personal Wallet</span>
<span ng-if="$root.wallet.isShared()"> <span ng-if="$root.wallet.isShared()">
Multisignature wallet [{{$root.wallet.requiredCopayers}} of {{$root.wallet.totalCopayers}} ] Multisignature wallet [{{$root.wallet.requiredCopayers}} of {{$root.wallet.totalCopayers}} ]
@ -76,7 +75,7 @@
</div> </div>
</div> </div>
<div class="row m50b" ng-if="$root.wallet.isShared()"> <div class="row" ng-if="$root.wallet.isShared()">
<!-- List of copayers --> <!-- List of copayers -->
<div class="large-12 columns"> <div class="large-12 columns">
<div class="panel oh"> <div class="panel oh">
@ -85,4 +84,11 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row" ng-show="isMobile">
<div class="large-12 columns text-right size-12">
<a ng-click="$root.go('more')"><i class="fi-widget"></i> Settings</a>
</div>
</div>
</div> </div>
<div class="extra-margin-bottom"></div>

1
views/import.html
View file

@ -97,3 +97,4 @@
</div> </div>
</div> </div>
<div class="extra-margin-bottom"></div>

37
views/includes/head.html
View file

@ -1,26 +1,21 @@
<div class="founds"> <div class="founds" ng-if="$root.wallet.isComplete()">
<span ng-if="!$root.wallet.isComplete()">Waiting for copayers...</span> <span ng-if="$root.wallet.balanceInfo.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
<div ng-if="$root.wallet.isComplete()"> <div ng-if="$root.wallet && !$root.wallet.balanceInfo.updatingBalance" data-options="disable_for_touch:true">
<span ng-if="$root.wallet.balanceInfo.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span> <small class="db text-light">Balance:</small>
<div ng-if="$root.wallet && !$root.wallet.balanceInfo.updatingBalance" data-options="disable_for_touch:true"> <b class="m5r">{{$root.wallet.balanceInfo.totalBalance || 0}} {{$root.wallet.settings.unitName}}</b>
<small class="db text-light">Balance:</small> <span ng-if="$root.wallet.balanceInfo.alternativeBalanceAvailable" class="alt-currency gray">{{$root.wallet.balanceInfo.totalBalanceAlternative}} {{$root.wallet.balanceInfo.alternativeIsoCode}}</span>
<b class="m5r">{{$root.wallet.balanceInfo.totalBalance || 0}} {{$root.wallet.settings.unitName}}</b> <span ng-if="!$root.wallet.balanceInfo.alternativeBalanceAvailable" class="alt-currency gray">N/A</span>
<span ng-if="$root.wallet.balanceInfo.alternativeBalanceAvailable" class="alt-currency gray">{{$root.wallet.balanceInfo.totalBalanceAlternative}} {{$root.wallet.balanceInfo.alternativeIsoCode}}</span> <small ng-if="$root.wallet">
<span ng-if="!$root.wallet.balanceInfo.alternativeBalanceAvailable" class="alt-currency gray">N/A</span> <a class="text-gray" ng-click="refresh()" ng-if="$root.wallet.isComplete() && !$root.updatingBalance">
<small ng-if="$root.wallet"> <i class="fi-refresh"></i>
<a class="text-gray" ng-click="refresh()" ng-if="$root.wallet.isComplete() && !$root.updatingBalance"> </a>
<i class="fi-refresh"></i> <span ng-if="$root.updatingBalance">
</a> <i class="fi-bitcoin-circle icon-rotate spinner"></i>
<span ng-if="$root.updatingBalance"> </span>
<i class="fi-bitcoin-circle icon-rotate spinner"></i> </small>
</span> </div>
</small>
</div>
</div>
</div> </div>
<div class="menu" ng-mouseover="hoverIn()" ng-mouseleave="hoverOut()" ng-init="init()" ng-click="hoverMenu = !hoverMenu"> <div class="menu" ng-mouseover="hoverIn()" ng-mouseleave="hoverOut()" ng-init="init()" ng-click="hoverMenu = !hoverMenu">
<a class="dropdown ellipsis text-gray pr" ng-class="{'hover': hoverMenu}"> <a class="dropdown ellipsis text-gray pr" ng-class="{'hover': hoverMenu}">
<div class="photo-container"> <div class="photo-container">

1
views/join.html
View file

@ -76,4 +76,5 @@
<!-- End !loading --> <!-- End !loading -->
</div> </div>
<div class="extra-margin-bottom"></div>

1
views/more.html
View file

@ -102,3 +102,4 @@
</div> </div>
</div> </div>
<div class="extra-margin-bottom"></div>

5
views/profile.html
View file

@ -103,7 +103,7 @@
<div class="line-dashed-h m20b"></div> <div class="line-dashed-h m20b"></div>
<div class="m50b row oh"> <div class="row oh">
<div class="large-12 columns"> <div class="large-12 columns">
<a class="small left button-setup" ng-click="hideAdv=!hideAdv"> <a class="small left button-setup" ng-click="hideAdv=!hideAdv">
<i class="fi-widget m3r"></i> <i class="fi-widget m3r"></i>
@ -116,7 +116,7 @@
</div> </div>
</div> </div>
<div ng-hide="hideAdv" class="row m50b"> <div ng-hide="hideAdv" class="row">
<div class="large-12 columns"> <div class="large-12 columns">
<div class="panel"> <div class="panel">
<h2><i class="fi-minus-circle m10r"></i> <h2><i class="fi-minus-circle m10r"></i>
@ -142,3 +142,4 @@
</div> </div>
</div> </div>
</div> </div>
<div class="extra-margin-bottom"></div>

3
views/receive.html
View file

@ -22,7 +22,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row m50b"> <div class="row">
<div class="large-12 columns" ng-if="showAll"> <div class="large-12 columns" ng-if="showAll">
<div ng-repeat="addr in addresses" ng-click="openAddressModal(addr)" class="pointer"> <div ng-repeat="addr in addresses" ng-click="openAddressModal(addr)" class="pointer">
<div class="panel"> <div class="panel">
@ -64,3 +64,4 @@
</div> </div>
</div> </div>
<div class="extra-margin-bottom"></div>

9
views/send.html
View file

@ -164,19 +164,20 @@
</div> </div>
</div> </div>
</form> </form>
<div class="locked" ng-show="$root.wallet.balanceInfo.lockedBalance && !walletSelection"> <div class="locked m10b" ng-show="$root.wallet.balanceInfo.lockedBalance && !walletSelection">
<i class="fi-lock"></i>
<span> <span>
{{'Locked'|translate}} &nbsp; {{'Locked'|translate}} &nbsp;
</span> </span>
<span ng-if="$root.wallet.balanceInfo.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span> <span ng-if="$root.wallet.balanceInfo.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
<span ng-if="$root.wallet && !$root.wallet.balanceInfo.updatingBalance"> <span ng-if="$root.wallet && !$root.wallet.balanceInfo.updatingBalance">
<b>{{$root.wallet.balanceInfo.lockedBalance}} {{$root.wallet.settings.unitName}} </b> <b>{{$root.wallet.balanceInfo.lockedBalance}} {{$root.wallet.settings.unitName}} </b>
- {{$root.wallet.balanceInfo.lockedBalanceAlternative}} {{$root.wallet.balanceInfo.alternativeIsoCode}} - {{$root.wallet.balanceInfo.lockedBalanceAlternative}} {{$root.wallet.balanceInfo.alternativeIsoCode}}
</span> </span>
<a href="#" class="has-tip" tooltip-placement="left" tooltip="More info"><i class="fi-info"></i></a>
</div> </div>
</div> </div>
</div> </div>
<!-- end of row --> <!-- end of row -->
</div> </div>
<div class="extra-margin-bottom"></div>