Skip to content

Show keyboard upon entry #12085

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 1 commit into from
Jun 3, 2020
Merged

Show keyboard upon entry #12085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions ...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 @@ -193,7 +193,8 @@ class SiteCreationDomainsViewModel @Inject constructor(
searchInputUiState = createSearchInputUiState(
showProgress = state is Loading,
showClearButton = isNonEmptyUserQuery,
showDivider = state.data.isNotEmpty()
showDivider = state.data.isNotEmpty(),
showKeyboard = true
),
contentState = createDomainsUiContentState(query, state),
createSiteButtonContainerVisibility = selectedDomain != null
Expand Down Expand Up @@ -298,13 +299,15 @@ class SiteCreationDomainsViewModel @Inject constructor(
private fun createSearchInputUiState(
showProgress: Boolean,
showClearButton: Boolean,
showDivider: Boolean
showDivider: Boolean,
showKeyboard: Boolean
): SiteCreationSearchInputUiState {
return SiteCreationSearchInputUiState(
hint = UiStringRes(R.string.new_site_creation_search_domain_input_hint),
showProgress = showProgress,
showClearButton = showClearButton,
showDivider = showDivider
showDivider = showDivider,
showKeyboard = showKeyboard
)
}

Expand Down
9 changes: 9 additions & 0 deletions WordPress/src/main/java/org/wordpress/android/ui/sitecreation/misc/SearchInputWithHeader.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import android.widget.EditText
import android.widget.TextView
import org.wordpress.android.R
import org.wordpress.android.ui.utils.UiHelpers
import org.wordpress.android.util.ActivityUtils

class SearchInputWithHeader(private val uiHelpers: UiHelpers, rootView: View, onClear: () -> Unit) {
private val headerLayout = rootView.findViewById<ViewGroup>(R.id.header_layout)
Expand Down Expand Up @@ -61,5 +62,13 @@ class SearchInputWithHeader(private val uiHelpers: UiHelpers, rootView: View, on
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) {
searchInput.requestFocus()
ActivityUtils.showKeyboard(searchInput)
}
}
}
3 changes: 2 additions & 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 @@ -6,5 +6,6 @@ data class SiteCreationSearchInputUiState(
val hint: UiString,
val showProgress: Boolean,
val showClearButton: Boolean,
val showDivider: Boolean
val showDivider: Boolean,
val showKeyboard: Boolean
)