Skip to content

Fix styles on multiple screens #384

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
CommanderRedYT merged 1 commit into from
Jul 4, 2025
Merged

Fix styles on multiple screens #384

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
2 changes: 1 addition & 1 deletion src/components/Charts/ImportantCharts.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ const ImportantCharts: FC = () => {
justifyContent: 'space-between',
}}
>
<View>
<View style={{ flex: 1 }}>
<Text variant="titleMedium">
{t('livedata.configureGraphs')}
</Text>
Expand Down
2 changes: 1 addition & 1 deletion src/components/StatusWidget.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const StatusWidget: FC<StatusWidgetProps> = ({
gap: spacing,
}}
>
<Text variant="titleLarge" style={{ fontSize: 20 }}>
<Text variant="titleLarge" style={{ fontSize: 18 }}>
{title}
</Text>
{icon ? <Icon size={iconSize ?? 20} source={icon} /> : null}
Expand Down
10 changes: 10 additions & 0 deletions src/components/modals/AddDatabaseModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ const AddDatabaseModal: FC<AddDatabaseModalProps> = props => {
mode="outlined"
onChangeText={setName}
style={{ backgroundColor: theme.colors.elevation.level3 }}
autoCapitalize="none"
autoCorrect={false}
/>
</Box>
<Box mb={4}>
Expand All @@ -85,6 +87,9 @@ const AddDatabaseModal: FC<AddDatabaseModalProps> = props => {
onChangeText={setBaseUrl}
placeholder={baseUrlPlaceholder}
style={{ backgroundColor: theme.colors.elevation.level3 }}
textContentType="URL"
autoCapitalize="none"
autoCorrect={false}
/>
</Box>
<Box mb={4}>
Expand All @@ -93,6 +98,8 @@ const AddDatabaseModal: FC<AddDatabaseModalProps> = props => {
mode="outlined"
onChangeText={setUsername}
style={{ backgroundColor: theme.colors.elevation.level3 }}
autoCapitalize="none"
autoCorrect={false}
/>
</Box>
<Box mb={4}>
Expand All @@ -102,6 +109,9 @@ const AddDatabaseModal: FC<AddDatabaseModalProps> = props => {
onChangeText={setPassword}
style={{ backgroundColor: theme.colors.elevation.level3 }}
secureTextEntry
textContentType="password"
autoCapitalize="none"
autoCorrect={false}
/>
</Box>
</Box>
Expand Down
55 changes: 34 additions & 21 deletions src/views/navigation/screens/GraphsGroup/ManageDatabasesScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,31 +45,44 @@ const ManageDatabasesScreen: FC<PropsWithNavigation> = ({ navigation }) => {
<Appbar.Action icon="plus" onPress={handleClickAdd} />
</Appbar.Header>
<StyledView theme={theme}>
<Box style={{ flex: 1, width: '100%' }}>
<Box
style={{
flex: 1,
width: '100%',
display: 'flex',
flexDirection: 'column',
alignItems: 'center',
}}
>
{!hasConfiguredDatabases ? (
<Box
style={{
display: 'flex',
justifyContent: 'center',
height: '100%',
}}
>
<Box mb={16}>
<Text style={{ textAlign: 'center' }} variant="titleLarge">
{t('manageDatabases.noDatabasesConfigured')}
</Text>
</Box>
<Box mb={16}>
<Text style={{ textAlign: 'center' }} variant="titleMedium">
{t('manageDatabases.noDatabasesConfiguredHint')}
</Text>
<Box>
<Box
style={{
display: 'flex',
justifyContent: 'center',
height: '100%',
width: '90%',
}}
>
<Box mb={16}>
<Text style={{ textAlign: 'center' }} variant="titleLarge">
{t('manageDatabases.noDatabasesConfigured')}
</Text>
</Box>
<Box mb={16}>
<Text style={{ textAlign: 'center' }} variant="titleMedium">
{t('manageDatabases.noDatabasesConfiguredHint')}
</Text>
</Box>
<Button icon="plus" onPress={handleClickAdd}>
{t('manageDatabases.addDatabase')}
</Button>
</Box>
<Button icon="plus" onPress={handleClickAdd}>
{t('manageDatabases.addDatabase')}
</Button>
</Box>
) : (
<ScrollView style={{ marginTop: 16, marginBottom: 16 }}>
<ScrollView
style={{ marginTop: 16, marginBottom: 16, width: '100%' }}
>
<Box style={{ gap: spacing, marginHorizontal: 16 }}>
{databases.map((config, index) => (
<StyledListItem
Expand Down