ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-03 06:55:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation issue after rebase.

Browse Source
This commit is contained in:
Benoit Marty
2023-01-18 16:13:45 +01:00
parent 1a847f5d67
commit 3423ec1f9d
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/io/element/android/x/root/RootView.kt
+3 -4
View File
@@ -16,6 +16,7 @@
package io.element.android.x.root package io.element.android.x.root
import android.app.Activity
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.BoxScope import androidx.compose.foundation.layout.BoxScope
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
@@ -23,14 +24,12 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.core.content.ContextCompat
import com.airbnb.android.showkase.models.Showkase
import io.element.android.x.component.ShowkaseButton import io.element.android.x.component.ShowkaseButton
import io.element.android.x.features.rageshake.crash.ui.CrashDetectionEvents import io.element.android.x.features.rageshake.crash.ui.CrashDetectionEvents
import io.element.android.x.features.rageshake.crash.ui.CrashDetectionView import io.element.android.x.features.rageshake.crash.ui.CrashDetectionView
import io.element.android.x.features.rageshake.detection.RageshakeDetectionEvents import io.element.android.x.features.rageshake.detection.RageshakeDetectionEvents
import io.element.android.x.features.rageshake.detection.RageshakeDetectionView import io.element.android.x.features.rageshake.detection.RageshakeDetectionView
import io.element.android.x.getBrowserIntent import io.element.android.x.tests.uitests.openShowkase
@Composable @Composable
fun RootView( fun RootView(
@@ -57,7 +56,7 @@ fun RootView(
ShowkaseButton( ShowkaseButton(
isVisible = state.isShowkaseButtonVisible, isVisible = state.isShowkaseButtonVisible,
onCloseClicked = { eventSink(RootEvents.HideShowkaseButton) }, onCloseClicked = { eventSink(RootEvents.HideShowkaseButton) },
onClick = { ContextCompat.startActivity(context, Showkase.getBrowserIntent(context), null) } onClick = { openShowkase(context as Activity) }
) )
RageshakeDetectionView( RageshakeDetectionView(
state = state.rageshakeDetectionState, state = state.rageshakeDetectionState,