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

mobile support for send/receive buttons and some refactors to fix the navigation flow.

Browse source
This commit is contained in:
Sebastiaan Pasma 2018-07-26 19:38:29 +02:00
commit b2ed16bf21
No known key found for this signature in database
GPG key ID: 9A2B0C8B95A1D26F
4 changed files with 44 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/js/controllers/walletDetails.js
View file

@ -483,7 +483,14 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
function rgbToHex(r, g, b) { function rgbToHex(r, g, b) {
return "#" + componentToHex(r) + componentToHex(g) + componentToHex(b); return "#" + componentToHex(r) + componentToHex(g) + componentToHex(b);
} }
$scope.goToSend = function() {
$state.go('tabs.home', {
walletId: $scope.wallet.id
}).then(function () {
$ionicHistory.clearHistory();
$state.go('tabs.send');
});
};
$scope.goToReceive = function() { $scope.goToReceive = function() {
$state.go('tabs.home', { $state.go('tabs.home', {
walletId: $scope.wallet.id walletId: $scope.wallet.id
@ -494,4 +501,12 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
}); });
}); });
}; };
$scope.goToBuy = function() {
$state.go('tabs.home', {
walletId: $scope.wallet.id
}).then(function () {
$ionicHistory.clearHistory();
$state.go('tabs.buyandsell');
});
};
}); });

6
src/sass/views/tab-home.scss
View file

@ -70,7 +70,7 @@
} }
} }
.buttons { .buttons {
margin: 6px auto 0px; margin: 6px auto -12px;
max-width: 600px; max-width: 600px;
>.col { >.col {
padding: 5px 10px; padding: 5px 10px;
@ -84,8 +84,8 @@
width: 100%; width: 100%;
font-size: 19px; font-size: 19px;
font-weight: bolder; font-weight: bolder;
min-height: 45px; min-height: auto;
line-height: 45px; line-height: 36px;
} }
} }
.wallet-coin-logo { .wallet-coin-logo {

12
src/sass/views/walletDetails.scss
View file

@ -132,10 +132,6 @@
position: relative; position: relative;
height: 100%; height: 100%;
height: calc(100% - env(safe-area-inset-bottom) * 2); height: calc(100% - env(safe-area-inset-bottom) * 2);
&.status-bar {
margin-top: 20px;
}
} }
.bar-header { .bar-header {
border: 0; border: 0;
@ -191,9 +187,9 @@
} }
} }
.buttons { .send-receive-buttons {
max-width: 600px; max-width: 600px;
margin: 30px auto 0; margin: 45px auto 0;
>.col { >.col {
padding: 5px 10px; padding: 5px 10px;
margin-bottom: 0; margin-bottom: 0;
@ -206,8 +202,8 @@
width: 100%; width: 100%;
font-size: 19px; font-size: 19px;
font-weight: bolder; font-weight: bolder;
min-height: 40px; min-height: auto;
line-height: 40px; line-height: 36px;
} }
} }
} }

24
www/views/walletDetails.html
View file

@ -90,21 +90,23 @@
</span> </span>
</button> </button>
</div> </div>
<div class="buttons row" ng-style="{opacity: buttonsOpacity}">
<div class="send-receive-buttons row" ng-if="status.availableBalanceSat || status.availableBalanceSat === 0" ng-style="{opacity: buttonsOpacity}">
<div class="col"> <div class="col">
<div class="button button-outline button-white-outline" ng-click="goToReceive()"> <div class="button button-outline button-white-outline" ng-click="goToReceive()">
<span translate>Receive</span> <span translate>Receive</span>
</div> </div>
</div> </div>
<div class="col"> <div class="col">
<div class="button button-outline button-white-outline" ng-if="!status.availableBalanceSat" ui-sref="tabs.buyandsell"> <div class="button button-outline button-white-outline" ng-if="!status.availableBalanceSat" ng-click="goToBuy()">
<span translate>Buy Bitcoin</span> <span translate>Buy Bitcoin</span>
</div> </div>
<div class="button button-outline button-white-outline" ng-if="status.availableBalanceSat>0" ui-sref="tabs.send"> <div class="button button-outline button-white-outline" ng-if="status.availableBalanceSat>0" ng-click="goToSend()">
<span translate>Send</span> <span translate>Send</span>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="wallet-details-wallet-info" ng-style="{opacity: altAmountOpacity}"> <div class="wallet-details-wallet-info" ng-style="{opacity: altAmountOpacity}">
<span ng-include="'views/includes/walletInfo.html'"></span> <span ng-include="'views/includes/walletInfo.html'"></span>
@ -212,6 +214,22 @@
</button> </button>
</div> </div>
<div class="send-receive-buttons row" ng-style="{opacity: buttonsOpacity}">
<div class="col">
<div class="button button-outline button-white-outline" ng-click="goToReceive()">
<span translate>Receive</span>
</div>
</div>
<div class="col">
<div class="button button-outline button-white-outline" ng-if="!status.availableBalanceSat" ui-sref="tabs.buyandsell">
<span translate>Buy Bitcoin</span>
</div>
<div class="button button-outline button-white-outline" ng-if="status.availableBalanceSat>0" ui-sref="tabs.send">
<span translate>Send</span>
</div>
</div>
</div>
</div> </div>
<div class="wallet-details-wallet-info" ng-style="{opacity: altAmountOpacity}"> <div class="wallet-details-wallet-info" ng-style="{opacity: altAmountOpacity}">
<span ng-include="'views/includes/walletInfo.html'"></span> <span ng-include="'views/includes/walletInfo.html'"></span>