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

Merge pull request #6144 from cmgustavo/bug/addressbook-02

Browse source 
Bug/addressbook 02
This commit is contained in:
Gabriel Edgardo Bazán 2017-05-31 10:50:18 -03:00 • committed by GitHub
commit 77bd9c74b5
5 changed files with 32 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/js/controllers/addressbook.js
View file

@ -49,6 +49,7 @@ angular.module('copayApp.controllers').controller('addressbookListController', f
$scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.$on("$ionicView.beforeEnter", function(event, data) {
$scope.isChromeApp = platformInfo.isChromeApp; $scope.isChromeApp = platformInfo.isChromeApp;
$scope.showAddIcon = false; $scope.showAddIcon = false;
$scope.addrSearch = { value: null };
initAddressbook(); initAddressbook();
}); });

21
src/js/controllers/addressbookView.js
View file

@ -1,6 +1,6 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('addressbookViewController', function($scope, $state, $timeout, $stateParams, lodash, addressbookService, popupService, $ionicHistory, platformInfo) { angular.module('copayApp.controllers').controller('addressbookViewController', function($scope, $state, $timeout, $stateParams, lodash, addressbookService, popupService, $ionicHistory, platformInfo, gettextCatalog) {
$scope.isChromeApp = platformInfo.isChromeApp; $scope.isChromeApp = platformInfo.isChromeApp;
$scope.addressbookEntry = {}; $scope.addressbookEntry = {};
$scope.addressbookEntry.name = $stateParams.name; $scope.addressbookEntry.name = $stateParams.name;
@ -20,13 +20,18 @@ angular.module('copayApp.controllers').controller('addressbookViewController', f
}; };
$scope.remove = function(addr) { $scope.remove = function(addr) {
addressbookService.remove(addr, function(err, ab) { var title = gettextCatalog.getString('Warning!');
if (err) { var message = gettextCatalog.getString('Are you sure you want to delete this contact?');
popupService.showAlert(gettextCatalog.getString('Error'), err); popupService.showConfirm(title, message, null, null, function(res) {
return; if (!res) return;
} addressbookService.remove(addr, function(err, ab) {
$ionicHistory.goBack(); if (err) {
}); popupService.showAlert(gettextCatalog.getString('Error'), err);
return;
}
$ionicHistory.goBack();
});
});
}; };
}); });

3
src/sass/views/address-book.scss
View file

@ -114,6 +114,9 @@
} }
#address-book-view { #address-book-view {
.has-click {
cursor: pointer;
}
.bar.bar-royal { .bar.bar-royal {
border: 0 transparent; border: 0 transparent;
} }

6
www/views/addressbook.html
View file

@ -24,13 +24,13 @@
</div> </div>
</ion-content> </ion-content>
<ion-content ng-show="!isEmptyList"> <ion-content ng-show="!isEmptyList">
<div class="bar bar-header item-input-inset" ng-show="addressbook.length >= 5"> <div class="bar bar-header item-input-inset">
<label class="item-input-wrapper"> <label class="item-input-wrapper">
<i class="icon ion-ios-search placeholder-icon"></i> <i class="icon ion-ios-search placeholder-icon"></i>
<input type="search" <input type="search"
placeholder="Search" placeholder="Search"
ng-model="addrSearch" ng-model="addrSearch.value"
ng-change="findAddressbook(addrSearch)" ng-model-onblur> ng-change="findAddressbook(addrSearch.value)" ng-model-onblur>
</label> </label>
</div> </div>
<ion-list> <ion-list>

23
www/views/addressbook.view.html
View file

@ -5,11 +5,6 @@
<ion-nav-title> <ion-nav-title>
<span>{{addressbookEntry.name}}</span> <span>{{addressbookEntry.name}}</span>
</ion-nav-title> </ion-nav-title>
<ion-nav-buttons side="secondary">
<button class="button back-button" ng-click="remove(addressbookEntry.address)">
Remove
</button>
</ion-nav-buttons>
</ion-nav-bar> </ion-nav-bar>
<ion-content scroll="false"> <ion-content scroll="false">
<div class="gravatar-content"> <div class="gravatar-content">
@ -27,13 +22,19 @@
<span class="address-book-field-label" translate>Email</span> <span class="address-book-field-label" translate>Email</span>
<span>{{addressbookEntry.email}}</span> <span>{{addressbookEntry.email}}</span>
</div> </div>
<div class="item item-text-wrap"> <div class="item item-text-wrap" copy-to-clipboard="addressbookEntry.address">
<span class="address-book-field-label" copy-to-clipboard="addressbookEntry.address" translate>Address</span> <span class="address-book-field-label" translate>Address</span>
<span>{{addressbookEntry.address}}</span> <span>{{addressbookEntry.address}}</span>
</div> </div>
</div> <div class="item item-divider"></div>
<button class="button button-standard button-primary" ng-click="sendTo()" translate> <div class="item item-icon-right has-click" ng-click="sendTo()">
Send Money <span class="positive" translate>Send Money</span>
</button> <i class="icon bp-arrow-right"></i>
</div>
<div class="item item-divider"></div>
<div class="item has-click" ng-click="remove(addressbookEntry.address)">
<span class="assertive" translate>Remove</span>
</div>
</div>
</ion-content> </ion-content>
</ion-view> </ion-view>