diff --git a/js/angular/service/platform.js b/js/angular/service/platform.js index 17d4fd4c95..53f4ba234e 100644 --- a/js/angular/service/platform.js +++ b/js/angular/service/platform.js @@ -28,12 +28,12 @@ IonicModule }, 'android': { '$ionicNavBarConfig': { - transition: 'no-animation', - alignTitle: 'left', - backButtonIcon: 'ion-android-arrow-back' + transition: 'nav-title-slide-ios7', + alignTitle: 'center', + backButtonIcon: 'ion-ios7-arrow-back' }, '$ionicNavViewConfig': { - transition: 'fade-implode' + transition: 'slide-left-right-ios7' }, '$ionicTabsConfig': { type: 'tabs-striped', diff --git a/scss/_animations.scss b/scss/_animations.scss index d32e235820..fd00fdf54e 100644 --- a/scss/_animations.scss +++ b/scss/_animations.scss @@ -801,4 +801,39 @@ $nav-title-slide-ios7-delay: $ios7-transition-duration; } } +$nav-title-android-delay: 200ms; +$nav-title-android-timing-function: linear; +.nav-title-android { + &:not(.no-animation) .button.back-button { + @include transition(all $nav-title-android-delay); + @include transition-timing-function($nav-title-android-timing-function); + opacity: 1; + &.ng-hide { + opacity: 0; + } + &.ng-hide-add, + &.ng-hide-remove { + display: block !important; + } + &.ng-hide-add { + position: absolute; + } + &.ng-hide-remove { + } + } + > .ng-enter, &.ng-enter, + > .ng-leave, &.ng-leave { + @include transition(all $nav-title-android-delay); + @include transition-timing-function($nav-title-android-timing-function); + } + > .ng-enter, &.ng-enter { + opacity: 0; + } + > .ng-enter.ng-enter-active, &.ng-enter.ng-enter-active { + opacity: 1; + } + > .ng-leave.ng-leave-active, &.ng-leave.ng-leave-active { + opacity: 0; + } +} diff --git a/scss/_platform.scss b/scss/_platform.scss index 01c2427628..8b4a66f9ee 100644 --- a/scss/_platform.scss +++ b/scss/_platform.scss @@ -17,6 +17,7 @@ font-family: "Roboto", $font-family-base; } } +/* .platform-android { @@ -93,7 +94,7 @@ font-family: 'Roboto', $font-family-base; } */ -} +//} .platform-ios7.platform-cordova { // iOS7 has a status bar which sits on top of the header. diff --git a/test/html/nav.html b/test/html/nav.html index 7f41eda3ac..84dcd789f2 100644 --- a/test/html/nav.html +++ b/test/html/nav.html @@ -14,6 +14,7 @@