Skip to content
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.

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

fix: make status bar work great in all kind of modes #363

Merged
merged 3 commits into from
Dec 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.18.1
18.15.0
3 changes: 3 additions & 0 deletions example/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
"ios": {
"supportsTablet": true
},
"androidStatusBar": {
"translucent": true
},
"web": {
"favicon": "./favicon.png",
"name": "React Native Paper Dates",
Expand Down
2 changes: 1 addition & 1 deletion example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"expo-splash-screen": "~0.20.5",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-native": "0.72.4",
"react-native": "0.72.6",
"react-native-paper": "^5.10.4",
"react-native-web": "~0.19.8"
},
Expand Down
84 changes: 76 additions & 8 deletions example/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import {
Chip,
MD3DarkTheme,
MD3LightTheme,
MD2LightTheme,
} from 'react-native-paper'
import {
DatePickerModal,
Expand Down Expand Up @@ -55,6 +56,7 @@ import {
} from 'react-native-paper-dates'
import { useCallback, useState } from 'react'

const presentationStyles = ['overFullScreen', 'pageSheet'] as const
const locales: [string, TranslationsType][] = [
['ar', ar],
['ca', ca],
Expand Down Expand Up @@ -83,7 +85,13 @@ locales.forEach((locale) => {
registerTranslation(locale[0], locale[1])
})

function App() {
function App({
materialYouEnabled,
setMaterialYouEnabled,
}: {
materialYouEnabled: boolean
setMaterialYouEnabled: (v: boolean) => void
}) {
/** Hooks. */
const theme = useTheme()
const insets = useSafeAreaInsets()
Expand All @@ -101,6 +109,8 @@ function App() {
minutes: number | undefined
}>({ hours: undefined, minutes: undefined })
const [locale, setLocale] = useState('en-GB')
const [presentationStyle, setPresentationStyle] =
useState<(typeof presentationStyles)[number]>('overFullScreen')
const [timeOpen, setTimeOpen] = useState(false)
const [rangeOpen, setRangeOpen] = useState(false)
const [singleOpen, setSingleOpen] = useState(false)
Expand Down Expand Up @@ -182,16 +192,16 @@ function App() {
return (
<>
<StatusBar
barStyle="light-content"
backgroundColor={theme.colors.primary}
// barStyle="light-content"
// backgroundColor={theme.colors.primary}
translucent={true}
/>
<ScrollView
style={{ backgroundColor: theme.colors.background }}
contentContainerStyle={[
styles.contentContainer,
styles.paddingSixteen,
{ marginTop: insets.top },
{ paddingTop: insets.top + 24, paddingBottom: insets.bottom },
]}
>
<View style={isLarge && styles.surface}>
Expand Down Expand Up @@ -269,7 +279,58 @@ function App() {
View documentation
</Button>
</View>
<Divider style={styles.marginVerticalEight} />
<Text
maxFontSizeMultiplier={maxFontSizeMultiplier}
style={[styles.marginVerticalEight, styles.bold]}
>
Material theme
</Text>
<View style={styles.chipContainer}>
<Chip
compact
selected={materialYouEnabled}
onPress={() => setMaterialYouEnabled(true)}
style={styles.chip}
>
Material You
</Chip>
<Chip
compact
selected={!materialYouEnabled}
onPress={() => setMaterialYouEnabled(false)}
style={styles.chip}
>
Material Design 2
</Chip>
</View>

<Divider style={styles.marginVerticalEight} />
<Text
maxFontSizeMultiplier={maxFontSizeMultiplier}
style={[styles.marginVerticalEight, styles.bold]}
>
Presentation Style (iOS only)
</Text>
<View style={styles.chipContainer}>
{presentationStyles.map((option) => {
return (
<Chip
compact
key={option}
selected={presentationStyle === option}
onPress={() =>
setPresentationStyle(
option as (typeof presentationStyles)[number]
)
}
style={styles.chip}
>
{option}
</Chip>
)
})}
</View>
<Divider style={styles.marginVerticalEight} />
<Text
maxFontSizeMultiplier={maxFontSizeMultiplier}
Expand Down Expand Up @@ -468,6 +529,7 @@ function App() {
startDate={range.startDate}
endDate={range.endDate}
onConfirm={onChangeRange}
presentationStyle={presentationStyle}
/>
<DatePickerModal
locale={locale}
Expand All @@ -480,6 +542,7 @@ function App() {
startDate: pastDate,
disabledDates: [futureDate],
}}
presentationStyle={presentationStyle}
/>
<DatePickerModal
locale={locale}
Expand All @@ -489,6 +552,7 @@ function App() {
dates={dates}
validRange={{ startDate: new Date() }}
onConfirm={onChangeMulti}
presentationStyle={presentationStyle}
/>
<TimePickerModal
locale={locale}
Expand All @@ -504,12 +568,16 @@ function App() {

export default function AppWithProviders() {
const colorScheme = useColorScheme()
const [materialYouEnabled, setMaterialYouEnabled] = React.useState(true)
const m3Theme = colorScheme === 'dark' ? MD3DarkTheme : MD3LightTheme
const m2Theme = colorScheme === 'dark' ? MD2LightTheme : MD2LightTheme
return (
<SafeAreaProvider>
<PaperProvider
theme={colorScheme === 'dark' ? MD3DarkTheme : MD3LightTheme}
>
<App />
<PaperProvider theme={materialYouEnabled ? m3Theme : m2Theme}>
<App
materialYouEnabled={materialYouEnabled}
setMaterialYouEnabled={setMaterialYouEnabled}
/>
</PaperProvider>
</SafeAreaProvider>
)
Expand Down
Loading