Skip to content

Fix layout issue in Valometer for 21st legislative period #1618

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 2 commits into from
Mar 16, 2025
Merged

Fix layout issue in Valometer for 21st legislative period #1618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbb5277
feat: add development container configuration with build and test tasks
Mar 16, 2025
a5d4603
feat: update container styles for verification and WahlOMeter screens
Mar 16, 2025
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
7 changes: 7 additions & 0 deletions .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"tasks": {
"build": "yarn install && yarn codegen",
"test": "yarn install && yarn lint && yarn lint:ts && yarn test:e2e && yarn test:e2e:smoke && yarn test:e2e:verification",
"launch": "yarn install && yarn ios"
}
}
2 changes: 2 additions & 0 deletions src/screens/Verification/Code.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import { AppLogo } from "../../components/AppLogo";
import { VerificationStackParamList } from "../../app/(verification)/_layout";

const Container = styled.View`
background-color: #fff;
flex: 1;
justify-content: space-between;
align-items: center;
padding-horizontal: 20px;
Expand Down
58 changes: 26 additions & 32 deletions src/screens/Verification/Donate.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import { Platform } from "react-native";
import DeviceInfo from "react-native-device-info";
import { SafeAreaView } from "react-native-safe-area-context";

Check warning on line 5 in src/screens/Verification/Donate.tsx

View workflow job for this annotation

GitHub Actions / 🧹 Code Linting 

'SafeAreaView' is defined but never used
import styled from "styled-components/native";
import { useInitialState } from "../../api/state/initialState";
import { NativeStackNavigationProp } from "@react-navigation/native-stack";
Expand Down Expand Up @@ -85,37 +85,31 @@
};

return (
<SafeAreaView
style={{
flex: 1,
}}
>
<Container>
<AppLogo />
<TextHead>{"Deine Verifikation\nwar erfolgreich!"}</TextHead>
<TextCenter>
<TextCenterNormal>
{
"Das Versenden Deiner Bestätigungs-\nSMS hat das Projekt DEMOCRACY\nDeutschland "
}
</TextCenterNormal>
<TextCenterBold>7,2 Cent</TextCenterBold>
<TextCenterNormal>
{
" gekostet.\n\nJede Spende hilft dem DEMOCRACY\nDeutschland e.V. erfolgreich seine\nunabhängige, überparteiliche und\nallgemeinnützige demokratische\nArbeit voranzubringen."
}
</TextCenterNormal>
</TextCenter>
<ButtonContainer>
<Button onPress={onClose} textColor="red" text="Später" />
<Button
onPress={onDonate}
textColor="white"
backgroundColor="blue"
text="SPENDEN"
/>
</ButtonContainer>
</Container>
</SafeAreaView>
<Container>
<AppLogo />
<TextHead>{"Deine Verifikation\nwar erfolgreich!"}</TextHead>
<TextCenter>
<TextCenterNormal>
{
"Das Versenden Deiner Bestätigungs-\nSMS hat das Projekt DEMOCRACY\nDeutschland "
}
</TextCenterNormal>
<TextCenterBold>7,2 Cent</TextCenterBold>
<TextCenterNormal>
{
" gekostet.\n\nJede Spende hilft dem DEMOCRACY\nDeutschland e.V. erfolgreich seine\nunabhängige, überparteiliche und\nallgemeinnützige demokratische\nArbeit voranzubringen."
}
</TextCenterNormal>
</TextCenter>
<ButtonContainer>
<Button onPress={onClose} textColor="red" text="Später" />
<Button
onPress={onDonate}
textColor="white"
backgroundColor="blue"
text="SPENDEN"
/>
</ButtonContainer>
</Container>
);
};
1 change: 1 addition & 0 deletions src/screens/Verification/PhoneNumber.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ const Container = styled(KeyboardAvoidingView).attrs(() => ({
enabled: true,
keyboardVerticalOffset: 100,
}))`
background-color: #fff;
flex: 1;
flex-direction: column;
justify-content: space-between;
Expand Down
1 change: 1 addition & 0 deletions src/screens/Verification/Start.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ const ScrollView = styled.ScrollView.attrs(() => ({
},
}))`
background-color: #fff;
flex: 1;
`;

const Text = styled.Text`
Expand Down
1 change: 1 addition & 0 deletions src/screens/WahlOMeter/Bundestag/VotedProceduresWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import { useLegislaturePeriodStore } from "src/api/state/legislaturePeriod";

const Container = styled.View`
background-color: #fff;
flex: 1;
`;

export interface ChartData {
Expand Down
1 change: 1 addition & 0 deletions src/screens/WahlOMeter/Fraktionen/WomPartyList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import { useLegislaturePeriodStore } from "src/api/state/legislaturePeriod";

const Container = styled.View`
background-color: #fff;
flex: 1;
`;

export interface WomPartyListProps {
Expand Down
2 changes: 1 addition & 1 deletion src/screens/WahlOMeter/Fraktionen/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { useRouter } from "expo-router";

const Container = styled.View`
background-color: #fff;
flex-grow: 1;
flex: 1;
`;

type ScreenNavigationProp = NativeStackNavigationProp<
Expand Down