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

Revert "Expo camera" #18

Merged
merged 1 commit into from
Feb 3, 2024
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
38 changes: 14 additions & 24 deletions hmns-app/client/app/(tabs)/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,43 +3,33 @@ import { StyleSheet } from "react-native";
import EditScreenInfo from "../../components/EditScreenInfo";
import { Text, View } from "../../components/Themed";

export default function TabOneScreen() {
export default function TabOneScreen () {
return (
<View style={styles.container}>
<View style={styles.header}>
<Text style={styles.title}>Tab One</Text>
<View
style={styles.separator}
lightColor='#eee'
darkColor='rgba(255,255,255,0.1)'
/>
<EditScreenInfo path='app/(tabs)/index.tsx' />
</View>
<Text style={styles.title}>Tab One</Text>
<View
style={styles.separator}
lightColor='#eee'
darkColor='rgba(255,255,255,0.1)'
/>
<EditScreenInfo path='app/(tabs)/index.tsx' />
</View>
);
}

const styles = StyleSheet.create({
container: {
flex: 1,
},
header: {
alignItems: "center",
justifyContent: "center",
// Adjust the flex value or height as needed
flex: 0.45,
flex: 1,
justifyContent: "center"
},
separator: {
height: 1,
marginVertical: 30,
width: "80%",
width: "80%"
},
title: {
fontSize: 20,
fontWeight: "bold",
},
camera: {
flex: 1, // Take up all available space
},
fontWeight: "bold"
}
});

22 changes: 18 additions & 4 deletions hmns-app/client/app/(tabs)/two.tsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,31 @@
import { StyleSheet } from "react-native";
import CameraComponent from "../../components/CameraComponent";
import { View } from "../../components/Themed";

export default function TabTwoScreen() {
import EditScreenInfo from "../../components/EditScreenInfo";
import { Text, View } from "../../components/Themed";

export default function TabTwoScreen () {
return (
<View style={styles.container}>
<CameraComponent/>
<Text style={styles.title}>Tab Two</Text>
<View style={styles.separator} lightColor="#eee" darkColor="rgba(255,255,255,0.1)" />
<EditScreenInfo path="app/(tabs)/two.tsx" />
</View>
);
}

const styles = StyleSheet.create({
container: {
alignItems: "center",
flex: 1,
justifyContent: "center"
},
separator: {
height: 1,
marginVertical: 30,
width: "80%"
},
title: {
fontSize: 20,
fontWeight: "bold"
}
});
Binary file removed hmns-app/client/assets/images/gallery.jpg
Binary file not shown.
16 changes: 8 additions & 8 deletions hmns-app/client/babel.config.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module.exports = function (api) {
api.cache(true);
return {
presets: ["babel-preset-expo"],
plugins: [
// Required for expo-router
"expo-router/babel",
],
};
api.cache(true);
return {
presets: ['babel-preset-expo'],
plugins: [
// Required for expo-router
'expo-router/babel',
],
};
};
Binary file not shown.
264 changes: 0 additions & 264 deletions hmns-app/client/components/CameraComponent.tsx

This file was deleted.

Loading
Loading