-
Notifications
You must be signed in to change notification settings - Fork 155
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3159 from element-hq/feature/bma/elementCallPip
Add support for Picture In Picture for Element Call
- Loading branch information
Showing
19 changed files
with
517 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 21 additions & 0 deletions
21
.../impl/src/main/kotlin/io/element/android/features/call/impl/pip/PictureInPictureEvents.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| /* | ||
| * Copyright (c) 2024 New Vector Ltd | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package io.element.android.features.call.impl.pip | ||
|
|
||
| sealed interface PictureInPictureEvents { | ||
| data object EnterPictureInPicture : PictureInPictureEvents | ||
| } |
105 changes: 105 additions & 0 deletions
105
...pl/src/main/kotlin/io/element/android/features/call/impl/pip/PictureInPicturePresenter.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| /* | ||
| * Copyright (c) 2024 New Vector Ltd | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package io.element.android.features.call.impl.pip | ||
|
|
||
| import android.app.Activity | ||
| import android.app.PictureInPictureParams | ||
| import android.os.Build | ||
| import android.util.Rational | ||
| import androidx.annotation.RequiresApi | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.mutableStateOf | ||
| import io.element.android.libraries.architecture.Presenter | ||
| import io.element.android.libraries.core.log.logger.LoggerTag | ||
| import timber.log.Timber | ||
| import java.lang.ref.WeakReference | ||
| import javax.inject.Inject | ||
|
|
||
| private val loggerTag = LoggerTag("PiP") | ||
|
|
||
| class PictureInPicturePresenter @Inject constructor( | ||
| pipSupportProvider: PipSupportProvider, | ||
| ) : Presenter<PictureInPictureState> { | ||
| private val isPipSupported = pipSupportProvider.isPipSupported() | ||
| private var isInPictureInPicture = mutableStateOf(false) | ||
| private var hostActivity: WeakReference<Activity>? = null | ||
|
|
||
| @Composable | ||
| override fun present(): PictureInPictureState { | ||
| fun handleEvent(event: PictureInPictureEvents) { | ||
| when (event) { | ||
| PictureInPictureEvents.EnterPictureInPicture -> switchToPip() | ||
| } | ||
| } | ||
|
|
||
| return PictureInPictureState( | ||
| supportPip = isPipSupported, | ||
| isInPictureInPicture = isInPictureInPicture.value, | ||
| eventSink = ::handleEvent, | ||
| ) | ||
| } | ||
|
|
||
| fun onCreate(activity: Activity) { | ||
| if (isPipSupported) { | ||
| Timber.tag(loggerTag.value).d("onCreate: Setting PiP params") | ||
| hostActivity = WeakReference(activity) | ||
| hostActivity?.get()?.setPictureInPictureParams(getPictureInPictureParams()) | ||
| } else { | ||
| Timber.tag(loggerTag.value).d("onCreate: PiP is not supported") | ||
| } | ||
| } | ||
|
|
||
| fun onDestroy() { | ||
| Timber.tag(loggerTag.value).d("onDestroy") | ||
| hostActivity?.clear() | ||
| hostActivity = null | ||
| } | ||
|
|
||
| @RequiresApi(Build.VERSION_CODES.O) | ||
| private fun getPictureInPictureParams(): PictureInPictureParams { | ||
| return PictureInPictureParams.Builder() | ||
| // Portrait for calls seems more appropriate | ||
| .setAspectRatio(Rational(3, 5)) | ||
| .apply { | ||
| if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { | ||
| setAutoEnterEnabled(true) | ||
| } | ||
| } | ||
| .build() | ||
| } | ||
|
|
||
| /** | ||
| * Enters Picture-in-Picture mode. | ||
| */ | ||
| private fun switchToPip() { | ||
| if (isPipSupported) { | ||
| Timber.tag(loggerTag.value).d("Switch to PiP mode") | ||
| hostActivity?.get()?.enterPictureInPictureMode(getPictureInPictureParams()) | ||
| ?.also { Timber.tag(loggerTag.value).d("Switch to PiP mode result: $it") } | ||
| } | ||
| } | ||
|
|
||
| fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean) { | ||
| Timber.tag(loggerTag.value).d("onPictureInPictureModeChanged: $isInPictureInPictureMode") | ||
| isInPictureInPicture.value = isInPictureInPictureMode | ||
| } | ||
|
|
||
| fun onUserLeaveHint() { | ||
| Timber.tag(loggerTag.value).d("onUserLeaveHint") | ||
| switchToPip() | ||
| } | ||
| } |
23 changes: 23 additions & 0 deletions
23
...l/impl/src/main/kotlin/io/element/android/features/call/impl/pip/PictureInPictureState.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| /* | ||
| * Copyright (c) 2024 New Vector Ltd | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package io.element.android.features.call.impl.pip | ||
|
|
||
| data class PictureInPictureState( | ||
| val supportPip: Boolean, | ||
| val isInPictureInPicture: Boolean, | ||
| val eventSink: (PictureInPictureEvents) -> Unit, | ||
| ) |
29 changes: 29 additions & 0 deletions
29
...rc/main/kotlin/io/element/android/features/call/impl/pip/PictureInPictureStateProvider.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| /* | ||
| * Copyright (c) 2024 New Vector Ltd | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package io.element.android.features.call.impl.pip | ||
|
|
||
| fun aPictureInPictureState( | ||
| supportPip: Boolean = false, | ||
| isInPictureInPicture: Boolean = false, | ||
| eventSink: (PictureInPictureEvents) -> Unit = {}, | ||
| ): PictureInPictureState { | ||
| return PictureInPictureState( | ||
| supportPip = supportPip, | ||
| isInPictureInPicture = isInPictureInPicture, | ||
| eventSink = eventSink, | ||
| ) | ||
| } |
42 changes: 42 additions & 0 deletions
42
...call/impl/src/main/kotlin/io/element/android/features/call/impl/pip/PipSupportProvider.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| /* | ||
| * Copyright (c) 2024 New Vector Ltd | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package io.element.android.features.call.impl.pip | ||
|
|
||
| import android.content.Context | ||
| import android.content.pm.PackageManager | ||
| import android.os.Build | ||
| import androidx.annotation.ChecksSdkIntAtLeast | ||
| import com.squareup.anvil.annotations.ContributesBinding | ||
| import io.element.android.libraries.core.bool.orFalse | ||
| import io.element.android.libraries.di.AppScope | ||
| import io.element.android.libraries.di.ApplicationContext | ||
| import javax.inject.Inject | ||
|
|
||
| interface PipSupportProvider { | ||
| @ChecksSdkIntAtLeast(Build.VERSION_CODES.O) | ||
| fun isPipSupported(): Boolean | ||
| } | ||
|
|
||
| @ContributesBinding(AppScope::class) | ||
| class DefaultPipSupportProvider @Inject constructor( | ||
| @ApplicationContext private val context: Context, | ||
| ) : PipSupportProvider { | ||
| override fun isPipSupported(): Boolean { | ||
| val hasSystemFeaturePip = context.packageManager?.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE).orFalse() | ||
| return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && hasSystemFeaturePip | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.