Skip to content

Commit

Permalink
fix(food): add bottom padding to allergen and flag selection
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert27 committed Dec 9, 2024
1 parent bd40f70 commit a9a720f
Show file tree
Hide file tree
Showing 7 changed files with 101 additions and 86 deletions.
155 changes: 80 additions & 75 deletions CHANGELOG.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ Check out the [contributing guidelines](https://next.neuland.app/en/app/setup) t

Click on the link below to join the beta testing of the app:

- iOS: [TestFlight](https://testflight.apple.com/join/PABWZys2)
- Android: [Google Play](https://play.google.com/store/apps/details?id=app.neuland)
- iOS: [TestFlight](https://testflight.apple.com/join/PABWZys2)
- Android: [Google Play](https://play.google.com/store/apps/details?id=app.neuland)

> [!IMPORTANT]
> Please let us know about any bugs and send us ideas for improvement so that we can improve the app.
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ android {
applicationId 'app.neuland'
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 243
versionCode 244
versionName "0.11.0"
}
signingConfigs {
Expand Down
2 changes: 1 addition & 1 deletion app.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"android": {
"package": "app.neuland",
"userInterfaceStyle": "automatic",
"versionCode": 243
"versionCode": 244
},
"sdkVersion": "52.0.0",
"experiments": {
Expand Down
6 changes: 3 additions & 3 deletions src/app/(flow)/whatsnew.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable react-hooks/rules-of-hooks */
import WhatsNewBox from '@/components/Flow/WhatsnewBox'
import { FlowContext } from '@/components/contexts'
import changelogData from '@/data/changelog.json'
import { useFlowStore } from '@/hooks/useFlowStore'
import { type LanguageKey } from '@/localization/i18n'
import { type Changelog } from '@/types/data'
import { convertToMajorMinorPatch } from '@/utils/app-utils'
Expand All @@ -24,12 +24,12 @@ import { createStyleSheet, useStyles } from 'react-native-unistyles'

export default function WhatsNewScreen(): JSX.Element {
const { styles } = useStyles(stylesheet)
const flow = React.useContext(FlowContext)
const changelog: Changelog = changelogData as Changelog
const { t, i18n } = useTranslation('flow')
const version = convertToMajorMinorPatch(
Application.nativeApplicationVersion ?? '0.0.0'
)
const toggleUpdated = useFlowStore((state) => state.toggleUpdated)
if (changelog.version[version] === undefined) {
router.navigate('/(tabs)/(index)')
}
Expand Down Expand Up @@ -172,7 +172,7 @@ export default function WhatsNewScreen(): JSX.Element {
<Pressable
style={styles.button}
onPress={() => {
flow.setUpdated(true)
toggleUpdated()
router.navigate('/(tabs)/(index)')
}}
>
Expand Down
8 changes: 7 additions & 1 deletion src/components/Food/ItemsPickerScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,10 @@ const ItemsPickerScreen = (params: {
}, [navigation, isDark])

return (
<ScrollView contentInsetAdjustmentBehavior="automatic">
<ScrollView
contentInsetAdjustmentBehavior="automatic"
contentContainerStyle={styles.contentContainer}
>
<View style={styles.container}>
<MultiSectionPicker
elements={filteredEntries}
Expand Down Expand Up @@ -118,6 +121,9 @@ const stylesheet = createStyleSheet((theme) => ({
justifyContent: 'center',
width: '100%',
},
contentContainer: {
paddingBottom: theme.margins.bottomSafeArea,
},
filteredText: {
alignSelf: 'center',
color: theme.colors.labelColor,
Expand Down
10 changes: 7 additions & 3 deletions src/components/Map/SearchResuts.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { MapContext } from '@/contexts/map'
import { usePreferencesStore } from '@/hooks/usePreferencesStore'
import { type SearchResult } from '@/types/map'
import { trackEvent } from '@aptabase/react-native'
import Fuse from 'fuse.js'
Expand All @@ -9,7 +10,6 @@ import { Alert, Platform, SectionList, Text } from 'react-native'
import { createStyleSheet, useStyles } from 'react-native-unistyles'

import Divider from '../Universal/Divider'
import { PreferencesContext } from '../contexts'
import ResultRow from './SearchResultRow'

interface SearchResultsProps {
Expand All @@ -25,8 +25,12 @@ const SearchResults: React.FC<SearchResultsProps> = ({
const { t, i18n } = useTranslation('common')
const { searchHistory, updateSearchHistory, localSearch } =
useContext(MapContext)
const { unlockedAppIcons, addUnlockedAppIcon } =
useContext(PreferencesContext)
const unlockedAppIcons = usePreferencesStore(
(state) => state.unlockedAppIcons
)
const addUnlockedAppIcon = usePreferencesStore(
(state) => state.addUnlockedAppIcon
)
useEffect(() => {
if (
localSearch.toLocaleLowerCase() === 'neuland' &&
Expand Down

0 comments on commit a9a720f

Please sign in to comment.