mirror of
				https://gitlab.com/ceda_ei/sonzai.git
				synced 2025-11-04 00:50:05 +01:00 
			
		
		
		
	Add ScrollView and Portal.Host to Subjects. Add margin to last card.
Move FAB inside Portal
This commit is contained in:
		@@ -4,10 +4,12 @@ import {
 | 
				
			|||||||
	Button,
 | 
						Button,
 | 
				
			||||||
	Card,
 | 
						Card,
 | 
				
			||||||
	FAB,
 | 
						FAB,
 | 
				
			||||||
 | 
						Portal,
 | 
				
			||||||
	Text
 | 
						Text
 | 
				
			||||||
} from "react-native-paper";
 | 
					} from "react-native-paper";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import {
 | 
					import {
 | 
				
			||||||
 | 
						ScrollView,
 | 
				
			||||||
	StyleSheet
 | 
						StyleSheet
 | 
				
			||||||
} from "react-native";
 | 
					} from "react-native";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -20,13 +22,23 @@ export default function Subjects({ subjects, addSubject, removeSubject }) {
 | 
				
			|||||||
		setShowDialog(false);
 | 
							setShowDialog(false);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	return (
 | 
						return (
 | 
				
			||||||
		<>
 | 
							<Portal.Host><ScrollView>
 | 
				
			||||||
			{subjects.length === 0 ?
 | 
								{subjects.length === 0 ?
 | 
				
			||||||
				<Text style={style.text}>No Subjects added. Press + to add a subject.</Text>
 | 
									<Text style={style.text}>
 | 
				
			||||||
 | 
										No Subjects added. Press + to add a subject.
 | 
				
			||||||
 | 
									</Text>
 | 
				
			||||||
				: null
 | 
									: null
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
			{subjects.map(subject => (
 | 
								{subjects.map((subject, idx) => (
 | 
				
			||||||
				<Card key={subject.id} style={style.card}>
 | 
									<Card
 | 
				
			||||||
 | 
										key={subject.id}
 | 
				
			||||||
 | 
										style={
 | 
				
			||||||
 | 
											[
 | 
				
			||||||
 | 
												style.card,
 | 
				
			||||||
 | 
												{marginBottom: idx === subjects.length - 1 ? 12 : 0 }
 | 
				
			||||||
 | 
											]
 | 
				
			||||||
 | 
										}
 | 
				
			||||||
 | 
									>
 | 
				
			||||||
					<Card.Title title={subject.name} />
 | 
										<Card.Title title={subject.name} />
 | 
				
			||||||
					<Card.Actions>
 | 
										<Card.Actions>
 | 
				
			||||||
						<Button onPress={() => removeSubject(subject.id)}>
 | 
											<Button onPress={() => removeSubject(subject.id)}>
 | 
				
			||||||
@@ -43,6 +55,7 @@ export default function Subjects({ subjects, addSubject, removeSubject }) {
 | 
				
			|||||||
				label="Subject Name"
 | 
									label="Subject Name"
 | 
				
			||||||
				onOK={onInput}
 | 
									onOK={onInput}
 | 
				
			||||||
			/>
 | 
								/>
 | 
				
			||||||
 | 
								<Portal>
 | 
				
			||||||
				<FAB
 | 
									<FAB
 | 
				
			||||||
					large
 | 
										large
 | 
				
			||||||
					icon="plus"
 | 
										icon="plus"
 | 
				
			||||||
@@ -54,7 +67,8 @@ export default function Subjects({ subjects, addSubject, removeSubject }) {
 | 
				
			|||||||
						bottom: 0,
 | 
											bottom: 0,
 | 
				
			||||||
					}}
 | 
										}}
 | 
				
			||||||
				/>
 | 
									/>
 | 
				
			||||||
		</>
 | 
								</Portal>
 | 
				
			||||||
 | 
							</ScrollView></Portal.Host>
 | 
				
			||||||
	);
 | 
						);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user