Skip to content

Fix site creation illegal state #21670

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

Merged
merged 5 commits into from
Feb 7, 2025
Merged

Fix site creation illegal state #21670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5059d78
Only call showKeyboard when true
nbradbury Feb 7, 2025
9f8942f
Only call showKeyboard when requestFocus succeeded
nbradbury Feb 7, 2025
507c32f
Minor formatting change
nbradbury Feb 7, 2025
d9eea52
Removed force showing of keyboard
nbradbury Feb 7, 2025
39d4316
Renamed showKeyboard to focusSearch
nbradbury Feb 7, 2025
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
16 changes: 1 addition & 15 deletions ...rc/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ package org.wordpress.android.ui.sitecreation.domains

import android.content.Context
import android.os.Bundle
import android.os.Handler
import android.os.Looper
import android.text.Editable
import android.text.TextWatcher
import android.view.View
Expand All @@ -29,7 +27,6 @@ import org.wordpress.android.ui.sitecreation.misc.OnHelpClickedListener
import org.wordpress.android.ui.sitecreation.misc.SiteCreationHeaderUiState
import org.wordpress.android.ui.sitecreation.misc.SiteCreationSearchInputUiState
import org.wordpress.android.ui.utils.UiHelpers
import org.wordpress.android.util.ActivityUtils
import org.wordpress.android.util.DisplayUtilsWrapper
import javax.inject.Inject

Expand Down Expand Up @@ -148,7 +145,6 @@ class SiteCreationDomainsFragment : SiteCreationBaseFormFragment() {
private val progressBar = rootView.findViewById<View>(R.id.progress_bar)
private val clearAllLayout = rootView.findViewById<View>(R.id.clear_all_layout)
private val divider = rootView.findViewById<View>(R.id.divider)
private val showKeyboardHandler = Handler(Looper.getMainLooper())

var onTextChanged: ((String) -> Unit)? = null

Expand Down Expand Up @@ -192,24 +188,14 @@ class SiteCreationDomainsFragment : SiteCreationBaseFormFragment() {
uiHelpers.updateVisibility(progressBar, uiState.showProgress)
uiHelpers.updateVisibility(clearAllLayout, uiState.showClearButton)
uiHelpers.updateVisibility(divider, uiState.showDivider)
showKeyboard(uiState.showKeyboard)
}

private fun showKeyboard(shouldShow: Boolean) {
if (shouldShow) {
if (uiState.focusSearch) {
searchInput.requestFocus()
/**
* This workaround handles the case where the SiteCreationDomainsFragment appears after the
* DesignPreviewFragment dismisses and the keyboard fails to appear
*/
showKeyboardHandler.postDelayed({ ActivityUtils.showKeyboard(searchInput) }, SHOW_KEYBOARD_DELAY)
}
}
}

companion object {
const val TAG = "site_creation_domains_fragment_tag"
const val SHOW_KEYBOARD_DELAY = 200L

fun newInstance(screenTitle: String): SiteCreationDomainsFragment {
val fragment = SiteCreationDomainsFragment()
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ private fun createSearchInputUiState(
showProgress = showProgress,
showClearButton = showClearButton,
showDivider = showDivider,
showKeyboard = true
focusSearch = true
)
}

Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/org/wordpress/android/ui/sitecreation/misc/SiteCreationSearchInputUiState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ data class SiteCreationSearchInputUiState(
val showProgress: Boolean,
val showClearButton: Boolean,
val showDivider: Boolean,
val showKeyboard: Boolean
val focusSearch: Boolean
)