moved send max button to middle of screen

This commit is contained in:
Kadir Sekha 2017-12-28 15:08:58 +00:00
commit 584d85f127
3 changed files with 29 additions and 17 deletions

View file

@ -128,7 +128,6 @@ angular.module('copayApp.controllers').controller('amountController', function($
$scope.toName = data.stateParams.toName; $scope.toName = data.stateParams.toName;
$scope.toEmail = data.stateParams.toEmail; $scope.toEmail = data.stateParams.toEmail;
$scope.toColor = data.stateParams.toColor; $scope.toColor = data.stateParams.toColor;
$scope.showSendMax = false;
if (!$scope.nextStep && !data.stateParams.toAddress) { if (!$scope.nextStep && !data.stateParams.toAddress) {
$log.error('Bad params at amount') $log.error('Bad params at amount')
@ -208,12 +207,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
if (value && evaluate(value) > 0) paste(evaluate(value)); if (value && evaluate(value) > 0) paste(evaluate(value));
}; };
$scope.showSendMaxMenu = function() {
$scope.showSendMax = true;
};
$scope.sendMax = function() { $scope.sendMax = function() {
$scope.showSendMax = false;
$scope.useSendMax = true; $scope.useSendMax = true;
$scope.finish(); $scope.finish();
}; };

View file

@ -40,3 +40,7 @@
@include button-outline($v-button-secondary-color); @include button-outline($v-button-secondary-color);
} }
} }
.button-sendmax {
line-height: inherit;
}

View file

@ -3,13 +3,7 @@
<ion-nav-title> <ion-nav-title>
{{'Enter amount' | translate}} {{'Enter amount' | translate}}
</ion-nav-title> </ion-nav-title>
<ion-nav-back-button ng-click="goBack()"> <ion-nav-back-button ng-click="goBack()"></ion-nav-back-button>
</ion-nav-back-button>
<ion-nav-buttons side="secondary">
<button class="button back-button" ng-click="showSendMaxMenu()" ng-if="showMenu">
<i class="icon ion-ios-more"></i>
</button>
</ion-nav-buttons>
</ion-nav-bar> </ion-nav-bar>
<ion-content scroll="false"> <ion-content scroll="false">
@ -54,6 +48,18 @@
<div class="amount__result" ng-show="globalResult">{{globalResult}} {{unit}}</div> <div class="amount__result" ng-show="globalResult">{{globalResult}} {{unit}}</div>
<div class="amount__result-equiv">&asymp; {{alternativeAmount || '0.00'}} {{alternativeUnit}}</div> <div class="amount__result-equiv">&asymp; {{alternativeAmount || '0.00'}} {{alternativeUnit}}</div>
</div> </div>
<div>
<button class="button button-standard button-sendmax">
<a class="item item-icon-left option no-border" ng-click="sendMax()">
<i class="icon ion-ios-speedometer-outline"></i>
<div class="item-selector-inner">
<div class="item-selector-details">
<div class="item-selector-name" translate>Send max amount</div>
</div>
</div>
</a>
</button>
</div>
</div> </div>
</div> </div>
@ -71,6 +77,18 @@
<span ng-show="globalResult">{{globalResult}} {{unit}}</span> <span ng-show="globalResult">{{globalResult}} {{unit}}</span>
<span>&asymp; {{alternativeAmount || '0.00'}} {{alternativeUnit}}</span> <span>&asymp; {{alternativeAmount || '0.00'}} {{alternativeUnit}}</span>
</div> </div>
<div>
<button class="button button-standard button-sendmax">
<a class="item item-icon-left option no-border" ng-click="sendMax()">
<i class="icon ion-ios-speedometer-outline"></i>
<div class="item-selector-inner">
<div class="item-selector-details">
<div class="item-selector-name" translate>Send max amount</div>
</div>
</div>
</a>
</button>
</div>
</div> </div>
<div class="item" ng-show="isAndroid || isIos"> <div class="item" ng-show="isAndroid || isIos">
@ -118,8 +136,4 @@
</div> </div>
</ion-content> </ion-content>
<item-selector
item-selector-show="showSendMax"
item-selector-on-select="sendMax">
</item-selector>
</ion-view> </ion-view>