Skip to content

Commit

Permalink
change style
Browse files Browse the repository at this point in the history
  • Loading branch information
mmmyr authored and mmmyr committed Nov 20, 2023
1 parent a6694bd commit 74ba0fc
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 12 deletions.
Binary file added hmns-app/client/assets/images/gallery.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 19 additions & 12 deletions hmns-app/client/components/CameraComponent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -119,23 +119,24 @@ export default function CameraComponent() {
<View style={styles.topToolbar}>
{/* You can add additional icons or information at the top */}
</View>
<View style={styles.bottomToolbar}>
{/* Placeholder for gallery button/icon */}
{photo && (
<TouchableOpacity style={styles.galleryButton}>
<Image
source={{ uri: photo.uri }}
style={styles.thumbnail}
/>
</TouchableOpacity>
)}

<TouchableOpacity style={styles.galleryButton}>
<Image
source={{ uri: 'https://icons.iconarchive.com/icons/praveen/minimal-outline/256/gallery-icon.png' }}
style={styles.thumbnail}
/>
</TouchableOpacity>

<TouchableOpacity style={styles.captureButton} onPress={takePhoto} />

<TouchableOpacity style={styles.tipsButton} onPress={showPhotoTips}>
<Text style={styles.tipsButtonText}>Tips</Text>
</TouchableOpacity>
</View>
</View>

</View>
</Camera>
</View>
Expand Down Expand Up @@ -168,8 +169,9 @@ const styles = StyleSheet.create({
bottomToolbar: {
padding: 20,
flexDirection: "row",
justifyContent: "space-between",
justifyContent: "center",
alignItems: "center",
backgroundColor: "black"
},
captureButton: {
width: 70,
Expand All @@ -179,6 +181,9 @@ const styles = StyleSheet.create({
borderRadius: 35,
backgroundColor: "white",
alignSelf: "center",
marginHorizontal: 20, // Add horizontal margin for spacing
marginLeft: 30,

},
flipButton: {
alignSelf: "center",
Expand All @@ -191,6 +196,7 @@ const styles = StyleSheet.create({
borderRadius: 10,
alignSelf: "center",
overflow: "hidden",
backgroundColor: "white",
},
thumbnail: {
width: 50,
Expand All @@ -201,6 +207,7 @@ const styles = StyleSheet.create({
backgroundColor: "rgba(255, 255, 255, 0.5)",
borderRadius: 10,
padding: 10,
marginLeft: 20,
},
tipsButtonText: {
color: "white",
Expand All @@ -213,7 +220,7 @@ const styles = StyleSheet.create({
},
confirmButtons: {
flexDirection: "row",
justifyContent: "space-around",
//justifyContent: "space-around",
width: "100%",
padding: 20,
},
Expand Down
23 changes: 23 additions & 0 deletions hmns-app/server/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions hmns-app/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
},
"dependencies": {
"apollo-server-express": "^3.12.1",
"config": "^3.3.9",
"express": "^4.18.2",
"graphql": "^16.8.1",
"mongoose": "^7.6.2"
Expand Down

0 comments on commit 74ba0fc

Please sign in to comment.