Merge pull request #8563 from shamim-emon/fix-issue-8512 (35d21c90) · Commits · e / os / Mail

feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/autodiscovery/view/AutoDiscoveryResultHeaderView.kt

+0 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,6 @@ internal fun AutoDiscoveryResultHeaderView(
		)
		TextBodyMedium(
		text = stringResource(state.subtitleResourceId),
		color = selectColor(state),
		)
		}
		if (state.isExpandable) {

+10 −8

Original line number	Diff line number	Diff line
		@@ -25,6 +25,14 @@ internal fun AutoDiscoveryResultView(
		mutableStateOf(settings?.isTrusted?.not() ?: false)
		}

		val discoveryResultHeaderState = if (settings == null) {
		AutoDiscoveryResultHeaderState.NoSettings
		} else if (settings.isTrusted) {
		AutoDiscoveryResultHeaderState.Trusted
		} else {
		AutoDiscoveryResultHeaderState.Untrusted
		}

		Column(
		modifier = modifier,
		) {
		@@ -36,19 +44,13 @@ internal fun AutoDiscoveryResultView(
		color = Color.Gray.copy(alpha = 0.5f),
		shape = MainTheme.shapes.small,
		)
		.clickable { expanded.value = !expanded.value },
		.clickable(enabled = discoveryResultHeaderState.isExpandable) { expanded.value = !expanded.value },
		) {
		Column(
		modifier = Modifier.padding(MainTheme.spacings.default),
		) {
		AutoDiscoveryResultHeaderView(
		state = if (settings == null) {
		AutoDiscoveryResultHeaderState.NoSettings
		} else if (settings.isTrusted) {
		AutoDiscoveryResultHeaderState.Trusted
		} else {
		AutoDiscoveryResultHeaderState.Untrusted
		},
		state = discoveryResultHeaderState,
		isExpanded = expanded.value,
		)