Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 2FA support dark mode #2699

Merged
merged 3 commits into from
Feb 19, 2024
Merged

fix: 2FA support dark mode #2699

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cfdfc8f
Commit with unresolved merge conflicts outside of kalium
borichellow Feb 13, 2024
894826a
Fix kalium version
borichellow Feb 19, 2024
d6de6aa
Merge branch 'develop' into fix/2fa_support_dark_mode-cherry-pick
borichellow Feb 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...kotlin/com/wire/android/ui/authentication/login/email/LoginEmailVerificationCodeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,12 @@ import com.wire.android.R
import com.wire.android.ui.authentication.verificationcode.VerificationCode
import com.wire.android.ui.authentication.verificationcode.VerificationCodeState
import com.wire.android.ui.common.Logo
import com.wire.android.ui.common.colorsScheme
import com.wire.android.ui.common.dimensions
import com.wire.android.ui.common.spacers.VerticalSpace
import com.wire.android.ui.common.textfield.CodeFieldValue
import com.wire.android.ui.common.typography
import com.wire.android.util.ui.PreviewMultipleThemes
import com.wire.android.util.ui.UIText

@Composable
Expand Down Expand Up @@ -111,6 +113,7 @@ private fun MainContent(
) {
Text(
text = UIText.StringResource(R.string.second_factor_authentication_title).asString(),
color = colorsScheme().onBackground,
style = typography().title01,
textAlign = TextAlign.Start
)
Expand All @@ -120,6 +123,7 @@ private fun MainContent(
R.string.second_factor_authentication_instructions_label,
codeState.emailUsed
).asString(),
color = colorsScheme().onBackground,
style = typography().body01,
textAlign = TextAlign.Start
)
Expand All @@ -135,6 +139,7 @@ private fun MainContent(
}

@Preview(showBackground = true)
@PreviewMultipleThemes
@Composable
internal fun LoginEmailVerificationCodeScreenPreview() = LoginEmailVerificationCodeContent(
VerificationCodeState(
Expand Down
2 changes: 1 addition & 1 deletion kalium
Open in desktop
Submodule kalium updated 13 files
+57 −0 README.md
+6 −0 build.gradle.kts
+56 −6 cryptography/src/commonMain/kotlin/com/wire/kalium/cryptography/MLSClient.kt
+2 −0 gradle/libs.versions.toml
+33 −4 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/MLSConversationRepository.kt
+25 −8 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt
+5 −2 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/conversation/ConversationScope.kt
+27 −20 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/conversation/CreateGroupConversationUseCase.kt
+2 −3 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/user/UserScope.kt
+17 −2 logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/conversation/MLSWelcomeEventHandler.kt
+174 −23 logic/src/commonTest/kotlin/com/wire/kalium/logic/data/conversation/MLSConversationRepositoryTest.kt
+10 −1 logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/conversation/CreateGroupConversationUseCaseTest.kt
+59 −12 logic/src/commonTest/kotlin/com/wire/kalium/logic/sync/receiver/conversation/MLSWelcomeEventHandlerTest.kt
Loading