BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/js/controllers/tabsController.js
View File

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

15
src/js/directives/showTabs.js Normal file
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();
});
});
}
};
});

2
www/views/activity.html
View File

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

2
www/views/add.html
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-title>{{'Add wallet' | translate}}</ion-nav-title>
<ion-nav-back-button>

2
www/views/advancedSettings.html
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-title>{{'Advanced Settings' | translate}}</ion-nav-title>
<ion-nav-back-button>

2
www/views/amazon.html
View File

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

4
www/views/amazonCards.html
View File

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

2
www/views/bitpayCard.html
View File

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

2
www/views/buyandsell.html
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-back-button>
</ion-nav-back-button>

2
www/views/export.html
View File

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

4
www/views/glidera.html
View File

@ -1,4 +1,4 @@
<ion-view id="glidera">
<ion-view id="glidera" show-tabs>
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
</ion-nav-back-button>
@ -13,7 +13,7 @@
Refresh
</button>
</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-logo">
<img src="img/glidera-logo.png">

2
www/views/glideraUri.html
View File

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

2
www/views/import.html
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-title>{{'Import Wallet' | translate}}</ion-nav-title>
<ion-nav-back-button>

2
www/views/join.html
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-back-button>
</ion-nav-back-button>

2
www/views/lockSetup.html
View File

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

2
www/views/preferences.html
View File

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

2
www/views/preferencesAbout.html
View File

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

2
www/views/preferencesAdvanced.html
View File

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

2
www/views/preferencesAlias.html
View File

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

2
www/views/preferencesAltCurrency.html
View File

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

2
www/views/preferencesBitpayServices.html
View File

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

2
www/views/preferencesBwsUrl.html
View File

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

2
www/views/preferencesCoinbase.html
View File

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

2
www/views/preferencesColor.html
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-title>
{{'Wallet Color'|translate}}

2
www/views/preferencesDeleteWallet.html
View File

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

4
www/views/preferencesExternal.html
View File

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

2
www/views/preferencesFee.html
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-title>
{{'Bitcoin Network Fee Policy'|translate}}

2
www/views/preferencesGlidera.html
View File

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

2
www/views/preferencesHistory.html
View File

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

2
www/views/preferencesInformation.html
View File

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

2
www/views/preferencesLanguage.html
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-title>
{{'Language'|translate}}

2
www/views/preferencesLogs.html
View File

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

2
www/views/preferencesNotifications.html
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-title>{{'Notifications' | translate}}</ion-nav-title>
<ion-nav-back-button>

2
www/views/preferencesUnit.html
View File

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

3
www/views/proposals.html
View File

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

2
www/views/tab-create-personal.html
View File

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

2
www/views/tab-create-shared.html
View File

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

2
www/views/tab-home.html
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-title><img class="tab-home__logo" src="img/app/logo-negative.svg"></ion-nav-title>
</ion-nav-bar>

16
www/views/tab-receive.html
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-title>{{'Receive' | translate}}</ion-nav-title>
<ion-nav-buttons side="secondary">
<button class="button-share ng-hide" ng-show="wallets[0] && showShareButton" ng-click="shareAddress()">
<i class="icon"
<i class="icon"
ng-class="{
'ion-ios-upload-outline': showShareButton == 'iOS',
'ion-ios-upload-outline': showShareButton == 'iOS',
'ion-android-share-alt': showShareButton != 'iOS'
}"></i>
</button>
@ -27,7 +27,7 @@
<button class="button button-standard button-primary" ng-click="goCopayers()" translate>Open wallet</button>
</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">
<span ng-show="shouldShowReceiveAddressFromHardware()">
<button class="button button-standard button-primary" ng-click="showReceiveAddressFromHardware()">
@ -42,16 +42,16 @@
</div>
<div>
<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>
</button>
</div>
<div>
<button ng-show="addr" class="button-address" ng-click="setAddress(true)">
<span translate>Generate new address</span>
<span translate>Generate new address</span>
</button>
</div>
</div>
</div>
</article>
<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>
</a>
</div>
</ion-content>
<wallet-selector
wallet-selector-title="walletSelectorTitle"

2
www/views/tab-scan.html
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-title>{{'Scan' | translate}}</ion-nav-title>
<ion-nav-buttons side="primary">

2
www/views/tab-send.html
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-title>{{'Send' | translate}}</ion-nav-title>
</ion-nav-bar>

2
www/views/tab-settings.html
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-title>{{'Settings' | translate}}</ion-nav-title>
</ion-nav-bar>

2
www/views/termsOfUse.html
View File

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