Fix topbar for mobile
This commit is contained in:
parent
95e29aed9a
commit
f8fddd2431
12 changed files with 18 additions and 63 deletions
|
|
@ -30,4 +30,8 @@ angular.module('copayApp.controllers').controller('collectEmailController', func
|
|||
});
|
||||
});
|
||||
};
|
||||
|
||||
$scope.onboardingMailSkip = function() {
|
||||
$state.go('onboarding.backupRequest');
|
||||
};
|
||||
});
|
||||
|
|
|
|||
|
|
@ -30,9 +30,6 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
|
|||
$scope.glideraEnabled = config.glidera.enabled;
|
||||
$scope.coinbaseEnabled = config.coinbase.enabled;
|
||||
$scope.pushNotifications = config.pushNotifications.enabled;
|
||||
if (isCordova && StatusBar.isVisible) {
|
||||
StatusBar.backgroundColorByHexString("#4B6178");
|
||||
}
|
||||
$scope.otherWallets = lodash.filter(profileService.getWallets(self.network), function(w) {
|
||||
return w.id != self.walletId;
|
||||
});
|
||||
|
|
|
|||
|
|
@ -254,12 +254,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
|
|||
url: '/add',
|
||||
views: {
|
||||
'tab-home': {
|
||||
templateUrl: 'views/add.html',
|
||||
controller: function(platformInfo) {
|
||||
if (platformInfo.isCordova && StatusBar.isVisible) {
|
||||
StatusBar.backgroundColorByHexString("#4B6178");
|
||||
}
|
||||
}
|
||||
templateUrl: 'views/add.html'
|
||||
}
|
||||
}
|
||||
})
|
||||
|
|
@ -807,54 +802,16 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
|
|||
})
|
||||
.run(function($rootScope, $state, $location, $log, $timeout, $ionicHistory, $ionicPlatform, lodash, platformInfo, profileService, uxLanguage, gettextCatalog, openURLService) {
|
||||
|
||||
if (platformInfo.isCordova) {
|
||||
if (screen.width < 768) {
|
||||
screen.lockOrientation('portrait');
|
||||
} else {
|
||||
window.addEventListener("orientationchange", function() {
|
||||
var leftMenuWidth = document.querySelector("ion-side-menu[side='left']").clientWidth;
|
||||
if (screen.orientation.includes('portrait')) {
|
||||
// Portrait
|
||||
document.querySelector("ion-side-menu-content").style.width = (screen.width - leftMenuWidth) + "px";
|
||||
} else {
|
||||
// Landscape
|
||||
document.querySelector("ion-side-menu-content").style.width = (screen.height - leftMenuWidth) + "px";
|
||||
}
|
||||
});
|
||||
}
|
||||
} else {
|
||||
if (screen.width >= 768) {
|
||||
window.addEventListener('resize', lodash.throttle(function() {
|
||||
$rootScope.$emit('Local/WindowResize');
|
||||
}, 100));
|
||||
}
|
||||
}
|
||||
|
||||
uxLanguage.init();
|
||||
openURLService.init();
|
||||
|
||||
$ionicPlatform.ready(function() {
|
||||
if (platformInfo.isCordova) {
|
||||
|
||||
window.addEventListener('native.keyboardhide', function() {
|
||||
$timeout(function() {
|
||||
$rootScope.shouldHideMenuBar = false; //show menu bar when keyboard is hidden with back button action on send screen
|
||||
}, 100);
|
||||
});
|
||||
|
||||
window.addEventListener('native.keyboardshow', function() {
|
||||
$timeout(function() {
|
||||
$rootScope.shouldHideMenuBar = true; //hide menu bar when keyboard opens with back button action on send screen
|
||||
}, 300);
|
||||
});
|
||||
|
||||
if (window.cordova && window.cordova.plugins && window.cordova.plugins.Keyboard) {
|
||||
cordova.plugins.Keyboard.hideKeyboardAccessoryBar(true);
|
||||
cordova.plugins.Keyboard.disableScroll(true);
|
||||
}
|
||||
if (window.StatusBar) {
|
||||
StatusBar.styleLightContent();
|
||||
}
|
||||
|
||||
$ionicPlatform.registerBackButtonAction(function(e) {
|
||||
|
||||
|
|
@ -873,8 +830,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
|
|||
}, 5000);
|
||||
}
|
||||
e.preventDefault();
|
||||
},
|
||||
101);
|
||||
}, 101);
|
||||
|
||||
$ionicPlatform.on('pause', function() {
|
||||
// Nothing to do
|
||||
|
|
@ -890,7 +846,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
|
|||
|
||||
setTimeout(function() {
|
||||
navigator.splashscreen.hide();
|
||||
}, 1000);
|
||||
}, 500);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
#shopping-24 {
|
||||
content: url("../img/onboarding-welcome-shopping24.png");
|
||||
position: absolute;
|
||||
top: 2%;
|
||||
top: 5%;
|
||||
right: 5%;
|
||||
width: 35px;
|
||||
height: auto;
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
@include center-block();
|
||||
}
|
||||
.logo {
|
||||
margin-top: 15rem;
|
||||
margin-top: 13rem;
|
||||
}
|
||||
button {
|
||||
@include center-block(1rem);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue