diff --git a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/shared/activity/FragmentActivityWithTransport.kt b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/shared/activity/FragmentActivityWithTransport.kt index c5cf8d136..db4d2b65d 100644 --- a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/shared/activity/FragmentActivityWithTransport.kt +++ b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/shared/activity/FragmentActivityWithTransport.kt @@ -12,8 +12,7 @@ import io.casey.musikcube.remote.ui.shared.fragment.BaseFragment import io.casey.musikcube.remote.ui.shared.fragment.TransportFragment abstract class FragmentActivityWithTransport: BaseActivity(), IFilterable { - protected var transport: TransportFragment? = null - private set + private var transport: TransportFragment? = null protected lateinit var content: BaseFragment private set @@ -83,7 +82,7 @@ abstract class FragmentActivityWithTransport: BaseActivity(), IFilterable { } ?: Unit override val transitionType: Transition - get() = intent.transitionType + get() = extras.transitionType protected abstract fun createContentFragment(): BaseFragment protected abstract val contentFragmentTag: String diff --git a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/shared/extension/Extensions.kt b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/shared/extension/Extensions.kt index 570e7b322..94e5d5fde 100644 --- a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/shared/extension/Extensions.kt +++ b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/shared/extension/Extensions.kt @@ -232,8 +232,8 @@ fun Intent.withTransitionType(type: Transition) = putExtra(Shared.Extra.TRANSITION_TYPE, type.name) } -val Intent.transitionType - get() = Transition.from(getStringExtra(Shared.Extra.TRANSITION_TYPE)) +val Bundle.transitionType + get() = Transition.from(getString(Shared.Extra.TRANSITION_TYPE, "")) /* *