diff options
| author | Allan Wang <me@allanwang.ca> | 2017-06-21 16:03:00 -0700 |
|---|---|---|
| committer | Allan Wang <me@allanwang.ca> | 2017-06-21 16:03:00 -0700 |
| commit | 8769be855196f17bb7bfdfb411994ea901eb51a9 (patch) | |
| tree | ae2ba73fcb63ab02dc7e83bff2f0c7f86c02c320 /app/src/main/kotlin/com/pitchedapps/frost/WebOverlayActivity.kt | |
| parent | 1ec75d0b2b7f746e2a0ae982b936fa4f566ec738 (diff) | |
| download | frost-8769be855196f17bb7bfdfb411994ea901eb51a9.tar.gz frost-8769be855196f17bb7bfdfb411994ea901eb51a9.tar.bz2 frost-8769be855196f17bb7bfdfb411994ea901eb51a9.zip | |
Lots of theming and fixes
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/WebOverlayActivity.kt')
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/WebOverlayActivity.kt | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/WebOverlayActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/WebOverlayActivity.kt index 665e32b4..7cc3dfe8 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/WebOverlayActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/WebOverlayActivity.kt @@ -39,7 +39,7 @@ open class WebOverlayActivity : AppCompatActivity() { supportActionBar?.setDisplayShowHomeEnabled(true) supportActionBar?.setDisplayHomeAsUpEnabled(true) toolbar.navigationIcon = GoogleMaterial.Icon.gmd_close.toDrawable(this, 16, Prefs.iconColor) - toolbar.setNavigationOnClickListener { slideOut() } + toolbar.setNavigationOnClickListener { finishSlideOut() } SwipeBackHelper.onCreate(this) SwipeBackHelper.getCurrentPage(this) .setSwipeBackEnable(true) @@ -95,12 +95,7 @@ open class WebOverlayActivity : AppCompatActivity() { override fun onBackPressed() { if (!frostWeb.onBackPressed()) { - slideOut() + finishSlideOut() } } - - fun slideOut() { - finish() - overridePendingTransition(R.anim.kau_fade_in, R.anim.kau_slide_out_right_top) - } }
\ No newline at end of file |