avoid flickers on transitions and fixes hidden tab bug

This commit is contained in:
Gabriel Bazán 2017-06-28 16:28:17 -03:00
parent e6f774c989
commit e75791e126
43 changed files with 66 additions and 56 deletions

View File

@ -41,8 +41,4 @@ angular.module('copayApp.controllers').controller('tabsController', function($ro
}; };
$scope.$on("$ionicView.beforeEnter", function(event, data) {
$rootScope.hideTabs = '';
});
}); });

View File

@ -0,0 +1,15 @@
'use strict';
angular.module('copayApp.directives')
.directive('showTabs', function($rootScope, $timeout) {
return {
restrict: 'A',
link: function($scope, $el) {
$scope.$on("$ionicView.beforeEnter", function(event, data) {
$timeout(function() {
$rootScope.hideTabs = '';
$rootScope.$apply();
});
});
}
};
});

View File

@ -1,4 +1,4 @@
<ion-view> <ion-view show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-title> <ion-nav-title>
{{'Recent Transactions'|translate}} {{'Recent Transactions'|translate}}

View File

@ -1,4 +1,4 @@
<ion-view id="view-add"> <ion-view id="view-add" show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Add wallet' | translate}}</ion-nav-title> <ion-nav-title>{{'Add wallet' | translate}}</ion-nav-title>
<ion-nav-back-button> <ion-nav-back-button>

View File

@ -1,4 +1,4 @@
<ion-view id="advanced-settings" class="settings"> <ion-view id="advanced-settings" class="settings" show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Advanced Settings' | translate}}</ion-nav-title> <ion-nav-title>{{'Advanced Settings' | translate}}</ion-nav-title>
<ion-nav-back-button> <ion-nav-back-button>

View File

@ -1,4 +1,4 @@
<ion-view> <ion-view show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-back-button> <ion-nav-back-button>
</ion-nav-back-button> </ion-nav-back-button>

View File

@ -1,4 +1,4 @@
<ion-view> <ion-view show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-back-button> <ion-nav-back-button>
</ion-nav-back-button> </ion-nav-back-button>
@ -16,7 +16,7 @@
</ion-spinner> </ion-spinner>
<h2 ng-if="item.amount"> <h2 ng-if="item.amount">
{{item.amount | currency : '$ ' : 2}} {{item.currency}} {{item.amount | currency : '$ ' : 2}} {{item.currency}}
</h2> </h2>
<p> <p>
<span class="assertive" ng-if="item.status == 'FAILURE' || item.status == 'RESEND'">Error</span> <span class="assertive" ng-if="item.status == 'FAILURE' || item.status == 'RESEND'">Error</span>
<span class="assertive" ng-if="item.status == 'expired'">Expired</span> <span class="assertive" ng-if="item.status == 'expired'">Expired</span>

View File

@ -1,4 +1,4 @@
<ion-view id="bitpayCard"> <ion-view id="bitpayCard" show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-back-button> <ion-nav-back-button>
</ion-nav-back-button> </ion-nav-back-button>

View File

@ -1,4 +1,4 @@
<ion-view id="buy-and-sell"> <ion-view id="buy-and-sell" show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-back-button> <ion-nav-back-button>
</ion-nav-back-button> </ion-nav-back-button>

View File

@ -1,4 +1,4 @@
<ion-view id="export"> <ion-view id="export" show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Export wallet' | translate}}</ion-nav-title> <ion-nav-title>{{'Export wallet' | translate}}</ion-nav-title>
<ion-nav-back-button> <ion-nav-back-button>

View File

@ -1,4 +1,4 @@
<ion-view id="glidera"> <ion-view id="glidera" show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-back-button> <ion-nav-back-button>
</ion-nav-back-button> </ion-nav-back-button>
@ -13,7 +13,7 @@
Refresh Refresh
</button> </button>
</ion-nav-buttons> </ion-nav-buttons>
<ion-content scroll="false" class="ng-hide" ng-show="!account.token"> <ion-content scroll="false" class="ng-hide" ng-show="!account.token">
<div class="integration-onboarding"> <div class="integration-onboarding">
<div class="integration-onboarding-logo"> <div class="integration-onboarding-logo">
<img src="img/glidera-logo.png"> <img src="img/glidera-logo.png">

View File

@ -1,4 +1,4 @@
<ion-view> <ion-view show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-back-button> <ion-nav-back-button>
</ion-nav-back-button> </ion-nav-back-button>

View File

@ -1,4 +1,4 @@
<ion-view id="import" class="settings"> <ion-view id="import" class="settings" show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Import Wallet' | translate}}</ion-nav-title> <ion-nav-title>{{'Import Wallet' | translate}}</ion-nav-title>
<ion-nav-back-button> <ion-nav-back-button>

View File

@ -1,4 +1,4 @@
<ion-view id="join" class="settings"> <ion-view id="join" class="settings" show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-back-button> <ion-nav-back-button>
</ion-nav-back-button> </ion-nav-back-button>

View File

@ -1,4 +1,4 @@
<ion-view class="settings"> <ion-view class="settings" show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Startup Lock' | translate}}</ion-nav-title> <ion-nav-title>{{'Startup Lock' | translate}}</ion-nav-title>
<ion-nav-back-button> <ion-nav-back-button>

View File

@ -1,4 +1,4 @@
<ion-view class="settings"> <ion-view class="settings" show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-title> <ion-nav-title>
{{'Wallet Settings'|translate}} {{'Wallet Settings'|translate}}

View File

@ -1,4 +1,4 @@
<ion-view class="settings"> <ion-view class="settings" show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-title>{{title}}</ion-nav-title> <ion-nav-title>{{title}}</ion-nav-title>
<ion-nav-back-button> <ion-nav-back-button>

View File

@ -1,4 +1,4 @@
<ion-view class="settings"> <ion-view class="settings" show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-title>{{'More Options' | translate}}</ion-nav-title> <ion-nav-title>{{'More Options' | translate}}</ion-nav-title>
<ion-nav-back-button> <ion-nav-back-button>

View File

@ -1,4 +1,4 @@
<ion-view class="settings"> <ion-view class="settings" show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-title> <ion-nav-title>
{{'Wallet Name'|translate}} {{'Wallet Name'|translate}}

View File

@ -1,4 +1,4 @@
<ion-view class="settings"> <ion-view class="settings" show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-title> <ion-nav-title>
{{'Alternative Currency'|translate}} {{'Alternative Currency'|translate}}

View File

@ -1,4 +1,4 @@
<ion-view id="bitpayServicesPreferences"> <ion-view id="bitpayServicesPreferences" show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-back-button> <ion-nav-back-button>
</ion-nav-back-button> </ion-nav-back-button>

View File

@ -1,4 +1,4 @@
<ion-view class="settings"> <ion-view class="settings" show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-title>Wallet Service URL</ion-nav-title> <ion-nav-title>Wallet Service URL</ion-nav-title>
<ion-nav-back-button> <ion-nav-back-button>

View File

@ -1,4 +1,4 @@
<ion-view> <ion-view show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-back-button> <ion-nav-back-button>
</ion-nav-back-button> </ion-nav-back-button>

View File

@ -1,4 +1,4 @@
<ion-view id="settings-color" class="settings"> <ion-view id="settings-color" class="settings" show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-title> <ion-nav-title>
{{'Wallet Color'|translate}} {{'Wallet Color'|translate}}

View File

@ -1,4 +1,4 @@
<ion-view> <ion-view show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Delete Wallet' | translate}}</ion-nav-title> <ion-nav-title>{{'Delete Wallet' | translate}}</ion-nav-title>
<ion-nav-back-button> <ion-nav-back-button>

View File

@ -1,4 +1,4 @@
<ion-view class="settings"> <ion-view class="settings" show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-title>{{externalSource.longName}}</ion-nav-title> <ion-nav-title>{{externalSource.longName}}</ion-nav-title>
<ion-nav-back-button> <ion-nav-back-button>
@ -13,7 +13,7 @@
</div> </div>
</div> </div>
<div ng-if="externalSource.isEmbeddedHardware"> <div ng-if="externalSource.isEmbeddedHardware">
<div ng-if="!hardwareConnected" class="warning centered"> <div ng-if="!hardwareConnected" class="warning centered">
<span translate>Hardware not connected.</span><br> <span translate>Hardware not connected.</span><br>
<span translate>Check installation and retry.</span> <span translate>Check installation and retry.</span>

View File

@ -1,4 +1,4 @@
<ion-view id="settings-fee" class="settings"> <ion-view id="settings-fee" class="settings" show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-title> <ion-nav-title>
{{'Bitcoin Network Fee Policy'|translate}} {{'Bitcoin Network Fee Policy'|translate}}

View File

@ -1,4 +1,4 @@
<ion-view> <ion-view show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-back-button> <ion-nav-back-button>
</ion-nav-back-button> </ion-nav-back-button>

View File

@ -1,4 +1,4 @@
<ion-view class="settings"> <ion-view class="settings" show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Transaction History' | translate}}</ion-nav-title> <ion-nav-title>{{'Transaction History' | translate}}</ion-nav-title>
<ion-nav-back-button> <ion-nav-back-button>

View File

@ -1,4 +1,4 @@
<ion-view class="settings"> <ion-view class="settings" show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Wallet Information' | translate}}</ion-nav-title> <ion-nav-title>{{'Wallet Information' | translate}}</ion-nav-title>
<ion-nav-back-button> <ion-nav-back-button>

View File

@ -1,4 +1,4 @@
<ion-view id="preferences-language" class="settings"> <ion-view id="preferences-language" class="settings" show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-title> <ion-nav-title>
{{'Language'|translate}} {{'Language'|translate}}

View File

@ -1,4 +1,4 @@
<ion-view class="settings"> <ion-view class="settings" show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Session Log' | translate}}</ion-nav-title> <ion-nav-title>{{'Session Log' | translate}}</ion-nav-title>
<ion-nav-back-button> <ion-nav-back-button>

View File

@ -1,4 +1,4 @@
<ion-view id="tab-notifications" class="settings"> <ion-view id="tab-notifications" class="settings" show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Notifications' | translate}}</ion-nav-title> <ion-nav-title>{{'Notifications' | translate}}</ion-nav-title>
<ion-nav-back-button> <ion-nav-back-button>

View File

@ -1,4 +1,4 @@
<ion-view class="settings"> <ion-view class="settings" show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-title> <ion-nav-title>
{{'Unit'|translate}} {{'Unit'|translate}}

View File

@ -1,5 +1,4 @@
<ion-view show-tabs>
<ion-view>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-title> <ion-nav-title>
{{'Pending Proposals'|translate}} {{'Pending Proposals'|translate}}

View File

@ -1,4 +1,4 @@
<ion-view class="settings"> <ion-view class="settings" show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Create Personal Wallet' | translate}}</ion-nav-title> <ion-nav-title>{{'Create Personal Wallet' | translate}}</ion-nav-title>
<ion-nav-back-button> <ion-nav-back-button>

View File

@ -1,4 +1,4 @@
<ion-view class="settings"> <ion-view class="settings" show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Create Shared Wallet' | translate}}</ion-nav-title> <ion-nav-title>{{'Create Shared Wallet' | translate}}</ion-nav-title>
<ion-nav-back-button> <ion-nav-back-button>

View File

@ -1,4 +1,4 @@
<ion-view id="tab-home"> <ion-view id="tab-home" show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-title><img class="tab-home__logo" src="img/app/logo-negative.svg"></ion-nav-title> <ion-nav-title><img class="tab-home__logo" src="img/app/logo-negative.svg"></ion-nav-title>
</ion-nav-bar> </ion-nav-bar>

View File

@ -1,11 +1,11 @@
<ion-view id="tab-receive"> <ion-view id="tab-receive" show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Receive' | translate}}</ion-nav-title> <ion-nav-title>{{'Receive' | translate}}</ion-nav-title>
<ion-nav-buttons side="secondary"> <ion-nav-buttons side="secondary">
<button class="button-share ng-hide" ng-show="wallets[0] && showShareButton" ng-click="shareAddress()"> <button class="button-share ng-hide" ng-show="wallets[0] && showShareButton" ng-click="shareAddress()">
<i class="icon" <i class="icon"
ng-class="{ ng-class="{
'ion-ios-upload-outline': showShareButton == 'iOS', 'ion-ios-upload-outline': showShareButton == 'iOS',
'ion-android-share-alt': showShareButton != 'iOS' 'ion-android-share-alt': showShareButton != 'iOS'
}"></i> }"></i>
</button> </button>
@ -27,7 +27,7 @@
<button class="button button-standard button-primary" ng-click="goCopayers()" translate>Open wallet</button> <button class="button button-standard button-primary" ng-click="goCopayers()" translate>Open wallet</button>
</div> </div>
</div> </div>
<div class="address-info" ng-if="wallet && wallet.isComplete()"> <div class="address-info" ng-if="wallet && wallet.isComplete()">
<div copy-to-clipboard="addr"> <div copy-to-clipboard="addr">
<span ng-show="shouldShowReceiveAddressFromHardware()"> <span ng-show="shouldShowReceiveAddressFromHardware()">
<button class="button button-standard button-primary" ng-click="showReceiveAddressFromHardware()"> <button class="button button-standard button-primary" ng-click="showReceiveAddressFromHardware()">
@ -42,16 +42,16 @@
</div> </div>
<div> <div>
<button ng-show="addr" class="button-request" ng-click="requestSpecificAmount()"> <button ng-show="addr" class="button-request" ng-click="requestSpecificAmount()">
<span translate>Request Specific amount</span> <span translate>Request Specific amount</span>
<i class="icon ion-ios-arrow-right"></i> <i class="icon ion-ios-arrow-right"></i>
</button> </button>
</div> </div>
<div> <div>
<button ng-show="addr" class="button-address" ng-click="setAddress(true)"> <button ng-show="addr" class="button-address" ng-click="setAddress(true)">
<span translate>Generate new address</span> <span translate>Generate new address</span>
</button> </button>
</div> </div>
</div> </div>
</article> </article>
<div class="backup" ng-if="wallets[0] && wallet && wallet.isComplete() && wallet.needsBackup" ng-click="openBackupNeededModal()"> <div class="backup" ng-if="wallets[0] && wallet && wallet.isComplete() && wallet.needsBackup" ng-click="openBackupNeededModal()">
@ -81,7 +81,7 @@
<i ng-if="!singleWallet" class="icon bp-arrow-right"></i> <i ng-if="!singleWallet" class="icon bp-arrow-right"></i>
</a> </a>
</div> </div>
</ion-content> </ion-content>
<wallet-selector <wallet-selector
wallet-selector-title="walletSelectorTitle" wallet-selector-title="walletSelectorTitle"

View File

@ -1,4 +1,4 @@
<ion-view id="tab-scan"> <ion-view id="tab-scan" show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Scan' | translate}}</ion-nav-title> <ion-nav-title>{{'Scan' | translate}}</ion-nav-title>
<ion-nav-buttons side="primary"> <ion-nav-buttons side="primary">

View File

@ -1,4 +1,4 @@
<ion-view id="tab-send"> <ion-view id="tab-send" show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Send' | translate}}</ion-nav-title> <ion-nav-title>{{'Send' | translate}}</ion-nav-title>
</ion-nav-bar> </ion-nav-bar>

View File

@ -1,4 +1,4 @@
<ion-view id="tab-settings" class="settings"> <ion-view id="tab-settings" class="settings" show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Settings' | translate}}</ion-nav-title> <ion-nav-title>{{'Settings' | translate}}</ion-nav-title>
</ion-nav-bar> </ion-nav-bar>

View File

@ -1,4 +1,4 @@
<ion-view> <ion-view show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Terms Of Use' | translate}}</ion-nav-title> <ion-nav-title>{{'Terms Of Use' | translate}}</ion-nav-title>
<ion-nav-back-button> <ion-nav-back-button>