Browse Source

Merge pull request #2726 from element-hq/renovate/activity

Update activity to v1.9.0
pull/2977/head
Benoit Marty 4 months ago committed by GitHub
parent
commit
11a8bbe7a9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 8
      features/call/src/main/kotlin/io/element/android/features/call/ui/ElementCallActivity.kt
  2. 2
      gradle/libs.versions.toml

8
features/call/src/main/kotlin/io/element/android/features/call/ui/ElementCallActivity.kt

@ -31,12 +31,12 @@ import android.webkit.PermissionRequest @@ -31,12 +31,12 @@ import android.webkit.PermissionRequest
import androidx.activity.compose.setContent
import androidx.activity.result.ActivityResultLauncher
import androidx.activity.result.contract.ActivityResultContracts
import androidx.appcompat.app.AppCompatActivity
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.core.content.IntentCompat
import com.bumble.appyx.core.integrationpoint.NodeComponentActivity
import io.element.android.compound.theme.ElementTheme
import io.element.android.compound.theme.Theme
import io.element.android.compound.theme.isDark
@ -49,7 +49,7 @@ import io.element.android.features.preferences.api.store.AppPreferencesStore @@ -49,7 +49,7 @@ import io.element.android.features.preferences.api.store.AppPreferencesStore
import io.element.android.libraries.architecture.bindings
import javax.inject.Inject
class ElementCallActivity : NodeComponentActivity(), CallScreenNavigator {
class ElementCallActivity : AppCompatActivity(), CallScreenNavigator {
companion object {
private const val EXTRA_CALL_WIDGET_SETTINGS = "EXTRA_CALL_WIDGET_SETTINGS"
@ -121,13 +121,11 @@ class ElementCallActivity : NodeComponentActivity(), CallScreenNavigator { @@ -121,13 +121,11 @@ class ElementCallActivity : NodeComponentActivity(), CallScreenNavigator {
override fun onConfigurationChanged(newConfig: Configuration) {
super.onConfigurationChanged(newConfig)
updateUiMode(newConfig)
}
override fun onNewIntent(intent: Intent?) {
override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent)
setCallType(intent)
}

2
gradle/libs.versions.toml

@ -19,7 +19,7 @@ datastore = "1.0.0" @@ -19,7 +19,7 @@ datastore = "1.0.0"
constraintlayout = "2.1.4"
constraintlayout_compose = "1.0.1"
lifecycle = "2.7.0"
activity = "1.8.2"
activity = "1.9.0"
media3 = "1.3.1"
camera = "1.3.3"

Loading…
Cancel
Save