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

Merge pull request #6322 from gabrielbazan7/fix/tabsFlash 

avoid flickers on transitions and fixes hidden tab bug
This commit is contained in:
Gustavo Maximiliano Cortez 2017-06-30 15:31:06 -03:00 committed by GitHub
parent 362b5f729e e75791e126
commit b730921fab
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>

2
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>

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>

2
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>

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>

2
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>

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>

2
www/views/tab-receive.html
View File

@ -1,4 +1,4 @@
<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">

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>