diff options
| author | Allan Wang <me@allanwang.ca> | 2017-11-12 04:03:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-12 04:03:41 -0500 |
| commit | 4aed05a8923a7f76799bbaa254f407f7e11fef0b (patch) | |
| tree | badd20ad111989ce7bbeed3f7e9ed8df47b94331 /app/src/main/kotlin/com/pitchedapps/frost/activities/BaseActivity.kt | |
| parent | 2b51bc4bfa86863ed14b550fe3281840587ab038 (diff) | |
| download | frost-4aed05a8923a7f76799bbaa254f407f7e11fef0b.tar.gz frost-4aed05a8923a7f76799bbaa254f407f7e11fef0b.tar.bz2 frost-4aed05a8923a7f76799bbaa254f407f7e11fef0b.zip | |
Translations (#482)
* Update translators
* Remove translation for some other texts
* Update kau
* Fix build and optimize
* Add translations
* Update readme and changelog
* Clean unnecessary strings
* Fix translations
* Add korean translations for kau
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/activities/BaseActivity.kt')
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/activities/BaseActivity.kt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseActivity.kt index ab08981f..803a9690 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseActivity.kt @@ -3,10 +3,11 @@ package com.pitchedapps.frost.activities import android.content.res.Configuration import android.os.Bundle import ca.allanwang.kau.internal.KauBaseActivity +import ca.allanwang.kau.searchview.SearchViewHolder import com.github.pwittchen.reactivenetwork.library.rx2.Connectivity import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork import com.pitchedapps.frost.R -import com.pitchedapps.frost.contracts.VideoViewerContract +import com.pitchedapps.frost.contracts.VideoViewHolder import com.pitchedapps.frost.utils.L import com.pitchedapps.frost.utils.Prefs import com.pitchedapps.frost.utils.materialDialogThemed @@ -20,8 +21,8 @@ import io.reactivex.schedulers.Schedulers */ abstract class BaseActivity : KauBaseActivity() { override fun onBackPressed() { - if (this is MainActivity && searchView?.onBackPressed() == true) return - if (this is VideoViewerContract && videoOnBackPress()) return + if (this is SearchViewHolder && searchViewOnBackPress()) return + if (this is VideoViewHolder && videoOnBackPress()) return if (this is MainActivity && currentFragment.onBackPressed()) return if (this !is WebOverlayActivityBase && isTaskRoot && Prefs.exitConfirmation) { materialDialogThemed { @@ -81,12 +82,12 @@ abstract class BaseActivity : KauBaseActivity() { override fun onStop() { - if (this is VideoViewerContract) videoOnStop() + if (this is VideoViewHolder) videoOnStop() super.onStop() } override fun onConfigurationChanged(newConfig: Configuration) { super.onConfigurationChanged(newConfig) - if (this is VideoViewerContract) videoViewer?.updateLocation() + if (this is VideoViewHolder) videoViewer?.updateLocation() } }
\ No newline at end of file |