Skip to content

Commit 4ad8fa1

Browse files
committed
Fix issues after rebase
1 parent 701fe8e commit 4ad8fa1

File tree

4 files changed

+4
-11
lines changed

4 files changed

+4
-11
lines changed

features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeNode.kt

+1-5
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import dagger.assisted.Assisted
1717
import dagger.assisted.AssistedInject
1818
import io.element.android.anvilannotations.ContributesNode
1919
import io.element.android.features.logout.api.direct.DirectLogoutView
20-
import io.element.android.features.logout.api.util.onSuccessLogout
2120
import io.element.android.libraries.architecture.Presenter
2221
import io.element.android.libraries.di.SessionScope
2322

@@ -50,9 +49,6 @@ class ChooseSelfVerificationModeNode @AssistedInject constructor(
5049
modifier = modifier,
5150
)
5251

53-
directLogoutView.Render(
54-
state = state.directLogoutState,
55-
onSuccessLogout = ::onSuccessLogout,
56-
)
52+
directLogoutView.Render(state = state.directLogoutState)
5753
}
5854
}

features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutView.kt

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
package io.element.android.features.logout.impl
99

10-
import android.app.Activity
1110
import androidx.compose.foundation.layout.Arrangement
1211
import androidx.compose.foundation.layout.Column
1312
import androidx.compose.foundation.layout.ColumnScope

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -557,9 +557,9 @@ private fun FavoriteItem(
557557
private fun ProfileItem(
558558
onClick: () -> Unit,
559559
) {
560-
PreferenceText(
561-
icon = CompoundIcons.UserProfile(),
562-
title = stringResource(id = R.string.screen_room_details_profile_row_title),
560+
ListItem(
561+
leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.UserProfile())),
562+
headlineContent = { Text(stringResource(id = R.string.screen_room_details_profile_row_title)) },
563563
onClick = onClick,
564564
)
565565
}

features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/VerifySelfSessionNode.kt

-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ import com.bumble.appyx.core.plugin.plugins
1616
import dagger.assisted.Assisted
1717
import dagger.assisted.AssistedInject
1818
import io.element.android.anvilannotations.ContributesNode
19-
import io.element.android.appconfig.LearnMoreConfig
20-
import io.element.android.compound.theme.ElementTheme
2119
import io.element.android.features.verifysession.api.VerifySessionEntryPoint
2220
import io.element.android.libraries.architecture.inputs
2321
import io.element.android.libraries.di.SessionScope

0 commit comments

Comments
 (0)