Remove `ContentLoadingErrorView` when it wasn't really used (b4fd053b) · Commits · e / os / Mail

feature/account/edit/src/test/kotlin/app/k9mail/feature/account/edit/ui/server/settings/modify/ModifyIncomingServerSettingsViewModelTest.kt

+0 −2

Original line number	Diff line number	Diff line
		@@ -80,8 +80,6 @@ class ModifyIncomingServerSettingsViewModelTest {
		imapPrefix = StringInputField(value = ""),
		imapUseCompression = true,
		imapSendClientInfo = true,

		isLoading = false,
		),
		)
		}

+0 −2

Original line number	Diff line number	Diff line
		@@ -69,8 +69,6 @@ class ModifyOutgoingServerSettingsViewModelTest {
		authenticationType = AuthenticationType.PasswordCleartext,
		username = StringInputField(value = "username"),
		password = StringInputField(value = "password"),

		isLoading = false,
		),
		)
		}

+12 −20

Original line number	Diff line number	Diff line
		@@ -12,11 +12,9 @@ import androidx.compose.ui.Alignment
		import androidx.compose.ui.Modifier
		import androidx.compose.ui.platform.LocalContext
		import androidx.compose.ui.platform.testTag
		import app.k9mail.core.ui.compose.designsystem.molecule.ContentLoadingErrorView
		import app.k9mail.core.ui.compose.designsystem.template.ResponsiveWidthContainer
		import app.k9mail.core.ui.compose.theme2.MainTheme
		import app.k9mail.feature.account.common.domain.entity.InteractionMode
		import app.k9mail.feature.account.common.ui.loadingerror.rememberContentLoadingErrorViewState
		import app.k9mail.feature.account.server.settings.ui.incoming.IncomingServerSettingsContract.Event
		import app.k9mail.feature.account.server.settings.ui.incoming.IncomingServerSettingsContract.State
		import app.k9mail.feature.account.server.settings.ui.incoming.content.incomingFormItems
		@@ -37,11 +35,6 @@ internal fun IncomingServerSettingsContent(
		.padding(contentPadding)
		.fillMaxWidth()
		.then(modifier),
		) {
		ContentLoadingErrorView(
		state = rememberContentLoadingErrorViewState(state = state),
		loading = { /* no-op */ },
		error = { /* no-op */ },
		) {
		LazyColumn(
		modifier = Modifier
		@@ -59,4 +52,3 @@ internal fun IncomingServerSettingsContent(
		}
		}
		}
		}

+1 −5

Original line number	Diff line number	Diff line
		@@ -9,7 +9,6 @@ import app.k9mail.feature.account.common.domain.entity.toDefaultPort
		import app.k9mail.feature.account.common.domain.input.NumberInputField
		import app.k9mail.feature.account.common.domain.input.StringInputField
		import app.k9mail.feature.account.common.ui.WithInteractionMode
		import app.k9mail.feature.account.common.ui.loadingerror.LoadingErrorState

		interface IncomingServerSettingsContract {

		@@ -30,10 +29,7 @@ interface IncomingServerSettingsContract {
		val imapPrefix: StringInputField = StringInputField(),
		val imapUseCompression: Boolean = true,
		val imapSendClientInfo: Boolean = true,

		override val isLoading: Boolean = true,
		override val error: Error? = null,
		) : LoadingErrorState<Error>
		)

		sealed interface Event {
		data class ProtocolTypeChanged(val protocolType: IncomingProtocolType) : Event

+0 −4

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ import com.fsck.k9.mail.store.imap.ImapStoreSettings.pathPrefix
		fun AccountState.toIncomingServerSettingsState() = incomingServerSettings?.toIncomingServerSettingsState()
		?: State(
		username = StringInputField(value = emailAddress ?: ""),
		isLoading = false,
		)

		private fun ServerSettings.toIncomingServerSettingsState(): State {
		@@ -36,9 +35,6 @@ private fun ServerSettings.toIncomingServerSettingsState(): State {
		imapPrefix = StringInputField(value = pathPrefix ?: ""),
		imapUseCompression = isUseCompression,
		imapSendClientInfo = isSendClientInfo,

		isLoading = false,
		error = null,
		)
		}