From f0532865ce1d5decc39cca6eeeea0d61ebd8d63d Mon Sep 17 00:00:00 2001 From: Hailey <153161762+haileyok@users.noreply.github.com> Date: Thu, 28 Dec 2023 12:58:28 -0800 Subject: [PATCH 1/2] minor search screen ux improvements (#2264) * handle taps while keyboard is displayed * dismiss keyboard on drag when searching feeds * dismiss on drag and persist taps on suggested follows * add hitslop to clear button * add hitslop to cancel button * dismiss keyboard on drag when searching users * hit slop for feed search clear button * move import --- src/view/com/util/forms/SearchInput.tsx | 4 +++- src/view/screens/Feeds.tsx | 2 ++ src/view/screens/Search/Search.tsx | 15 ++++++++++++--- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/view/com/util/forms/SearchInput.tsx b/src/view/com/util/forms/SearchInput.tsx index 02b462b5..a88046d4 100644 --- a/src/view/com/util/forms/SearchInput.tsx +++ b/src/view/com/util/forms/SearchInput.tsx @@ -11,6 +11,7 @@ import { FontAwesomeIcon, FontAwesomeIconStyle, } from '@fortawesome/react-native-fontawesome' +import {HITSLOP_10} from 'lib/constants' import {MagnifyingGlassIcon} from 'lib/icons' import {useTheme} from 'lib/ThemeContext' import {usePalette} from 'lib/hooks/usePalette' @@ -71,7 +72,8 @@ export function SearchInput({ onPress={onPressCancelSearchInner} accessibilityRole="button" accessibilityLabel={_(msg`Clear search query`)} - accessibilityHint=""> + accessibilityHint="" + hitSlop={HITSLOP_10}> {hasSession && ( diff --git a/src/view/screens/Search/Search.tsx b/src/view/screens/Search/Search.tsx index b522edfb..bdc324c4 100644 --- a/src/view/screens/Search/Search.tsx +++ b/src/view/screens/Search/Search.tsx @@ -162,6 +162,8 @@ function SearchScreenSuggestedFollows() { // @ts-ignore web only -prf desktopFixedHeight contentContainerStyle={{paddingBottom: 1200}} + keyboardShouldPersistTaps="handled" + keyboardDismissMode="on-drag" /> ) : ( @@ -572,7 +574,8 @@ export function SearchScreenMobile( onPress={onPressClearQuery} accessibilityRole="button" accessibilityLabel={_(msg`Clear search query`)} - accessibilityHint=""> + accessibilityHint="" + hitSlop={HITSLOP_10}> - + Cancel @@ -598,7 +604,10 @@ export function SearchScreenMobile( {isFetching ? ( ) : ( - + {searchResults.length ? ( searchResults.map((item, i) => ( Date: Thu, 28 Dec 2023 13:03:54 -0800 Subject: [PATCH 2/2] Disable spanish translation until it's more thoroughly reviewed (#2362) * Disable spanish translation until it's more thoroughly reviewed * missed a line --- src/locale/helpers.ts | 5 +++-- src/locale/i18n.ts | 12 +++++++----- src/locale/i18n.web.ts | 9 +++++---- src/locale/languages.ts | 6 ++++-- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/locale/helpers.ts b/src/locale/helpers.ts index 2e6868e6..ef09e5e6 100644 --- a/src/locale/helpers.ts +++ b/src/locale/helpers.ts @@ -119,8 +119,9 @@ export function sanitizeAppLanguageSetting(appLanguage: string): AppLanguage { // DISABLED until this translation is fixed -prf // case 'de': // return AppLanguage.de - case 'es': - return AppLanguage.es + // DISABLED until this translation is more thoroughly reviewed -prf + // case 'es': + // return AppLanguage.es default: continue } diff --git a/src/locale/i18n.ts b/src/locale/i18n.ts index 9a9407c4..164fce9f 100644 --- a/src/locale/i18n.ts +++ b/src/locale/i18n.ts @@ -8,7 +8,8 @@ import {messages as messagesJa} from '#/locale/locales/ja/messages' import {messages as messagesFr} from '#/locale/locales/fr/messages' // DISABLED until this translation is fixed -prf // import {messages as messagesDe} from '#/locale/locales/de/messages' -import {messages as messagesEs} from '#/locale/locales/es/messages' +// DISABLED until this translation is more thoroughly reviewed -prf +// import {messages as messagesEs} from '#/locale/locales/es/messages' import {sanitizeAppLanguageSetting} from '#/locale/helpers' import {AppLanguage} from '#/locale/languages' @@ -35,10 +36,11 @@ export async function dynamicActivate(locale: AppLanguage) { // i18n.loadAndActivate({locale, messages: messagesDe}) // break // } - case AppLanguage.es: { - i18n.loadAndActivate({locale, messages: messagesEs}) - break - } + // DISABLED until this translation is more thoroughly reviewed -prf + // case AppLanguage.es: { + // i18n.loadAndActivate({locale, messages: messagesEs}) + // break + // } default: { i18n.loadAndActivate({locale, messages: messagesEn}) break diff --git a/src/locale/i18n.web.ts b/src/locale/i18n.web.ts index 734f6a0d..bf6f6e19 100644 --- a/src/locale/i18n.web.ts +++ b/src/locale/i18n.web.ts @@ -29,10 +29,11 @@ export async function dynamicActivate(locale: AppLanguage) { // mod = await import(`./locales/de/messages`) // break // } - case AppLanguage.es: { - mod = await import(`./locales/es/messages`) - break - } + // DISABLED until this translation is more thoroughly reviewed -prf + // case AppLanguage.es: { + // mod = await import(`./locales/es/messages`) + // break + // } default: { mod = await import(`./locales/en/messages`) break diff --git a/src/locale/languages.ts b/src/locale/languages.ts index d9cdbd9d..d7559b57 100644 --- a/src/locale/languages.ts +++ b/src/locale/languages.ts @@ -11,7 +11,8 @@ export enum AppLanguage { fr = 'fr', // DISABLED until this translation is fixed -prf // de = 'de', - es = 'es', + // DISABLED until this translation is more thoroughly reviewed -prf + // es = 'es', } interface AppLanguageConfig { @@ -26,7 +27,8 @@ export const APP_LANGUAGES: AppLanguageConfig[] = [ {code2: AppLanguage.fr, name: 'Français'}, // DISABLED until this translation is fixed -prf // {code2: AppLanguage.de, name: 'Deutsch'}, - {code2: AppLanguage.es, name: 'Español'}, + // DISABLED until this translation is more thoroughly reviewed -prf + // {code2: AppLanguage.es, name: 'Español'}, ] export const LANGUAGES: Language[] = [