Skip to content
Merged

V2 #104

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
4 changes: 2 additions & 2 deletions Client/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ export default function App() {
<>
<AppNavigator />
<StatusBar
style="dark"
backgroundColor="#F8FAFC"
style="light"
backgroundColor="#1E293B"
translucent={Platform.OS === 'android'}
/>
</>
Expand Down
14 changes: 6 additions & 8 deletions Client/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,23 @@
"expo": {
"name": "Splitlyr",
"slug": "splitlyr",
"version": "1.0.0",
"version": "2.0.0",
"orientation": "portrait",
"icon": "./assets/icon.png",
"userInterfaceStyle": "light",
"backgroundColor": "#F8FAFC",
"newArchEnabled": true,
"splash": {
"image": "./assets/splash-icon.png",
"resizeMode": "contain"
"image": "./assets/icon.png",
"resizeMode": "contain",
"backgroundColor": "#FFFFFF"
},
"android": {
"adaptiveIcon": {
"foregroundImage": "./assets/adaptive-icon.png",
"backgroundColor": "#F8FAFC"
},
"icon": "./assets/icon.png",
"edgeToEdgeEnabled": true,
"package": "com.clestiq.splitlyr.app",
"predictiveBackGestureEnabled": false,
"versionCode": 1,
"versionCode": 2,
"permissions": [
"android.permission.READ_CONTACTS"
]
Expand Down
14 changes: 14 additions & 0 deletions Client/package-lock.json

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

6 changes: 3 additions & 3 deletions Client/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "splitlyr",
"version": "1.0.0",
"version": "2.0.0",
"main": "index.ts",
"scripts": {
"start": "expo start",
"android": "expo start --android",
"ios": "expo start --ios",
"android": "expo run:android",
"ios": "expo run:ios",
"web": "expo start --web"
},
"dependencies": {
Expand Down
4 changes: 4 additions & 0 deletions Client/src/components/AddPersonModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ const AddPersonModal: React.FC<AddPersonModalProps> = ({
value={name}
onChangeText={setName}
placeholder="Enter full name"
placeholderTextColor={colors.text.quaternary}
autoCapitalize="words"
/>
</View>
Expand All @@ -135,6 +136,7 @@ const AddPersonModal: React.FC<AddPersonModalProps> = ({
value={email}
onChangeText={setEmail}
placeholder="Enter email address"
placeholderTextColor={colors.text.quaternary}
keyboardType="email-address"
autoCapitalize="none"
/>
Expand All @@ -147,6 +149,7 @@ const AddPersonModal: React.FC<AddPersonModalProps> = ({
value={phoneNumber}
onChangeText={setPhoneNumber}
placeholder="Enter phone number"
placeholderTextColor={colors.text.quaternary}
keyboardType="phone-pad"
/>
</View>
Expand Down Expand Up @@ -224,6 +227,7 @@ const styles = StyleSheet.create({
paddingHorizontal: 16,
paddingVertical: 12,
fontSize: 16,
color: colors.text.primary,
borderWidth: 1,
borderColor: colors.border.medium,
},
Expand Down
17 changes: 10 additions & 7 deletions Client/src/screens/friends/AddExpenseScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ import {
TextInput,
ActivityIndicator,
Alert,
StatusBar,
Image,
} from 'react-native';
import { useNavigation, useRoute } from '@react-navigation/native';
import { useSafeAreaInsets, SafeAreaView } from 'react-native-safe-area-context';
import { useSafeAreaInsets } from 'react-native-safe-area-context';
import { Ionicons } from '@expo/vector-icons';
import colors from '../../theme/colors';
import { getProfileImageUri } from '../../utils/defaultImage';
Expand Down Expand Up @@ -394,11 +393,9 @@ const AddExpenseScreen: React.FC = () => {
};

return (
<SafeAreaView style={styles.container}>
<StatusBar backgroundColor={colors.background.body} barStyle="dark-content" />

<View style={styles.container}>
{/* Header */}
<View style={[styles.header, { paddingTop: insets.top - 16 }]}>
<View style={[styles.header, { paddingTop: insets.top + 15 }]}>
<TouchableOpacity
style={styles.backButton}
onPress={() => navigation.goBack()}
Expand Down Expand Up @@ -470,6 +467,7 @@ const AddExpenseScreen: React.FC = () => {
<TextInput
style={styles.searchInput}
placeholder="Search friends..."
placeholderTextColor={colors.text.quaternary}
value={searchQuery}
onChangeText={setSearchQuery}
autoFocus
Expand Down Expand Up @@ -520,6 +518,7 @@ const AddExpenseScreen: React.FC = () => {
<TextInput
style={styles.textInput}
placeholder="Enter expense title"
placeholderTextColor={colors.text.quaternary}
value={title}
onChangeText={setTitle}
maxLength={100}
Expand All @@ -531,6 +530,7 @@ const AddExpenseScreen: React.FC = () => {
<TextInput
style={[styles.textInput, styles.textArea]}
placeholder="Add a description (optional)"
placeholderTextColor={colors.text.quaternary}
value={description}
onChangeText={setDescription}
multiline
Expand All @@ -546,6 +546,7 @@ const AddExpenseScreen: React.FC = () => {
<TextInput
style={styles.amountInput}
placeholder="0.00"
placeholderTextColor={colors.text.quaternary}
value={amount}
onChangeText={setAmount}
keyboardType="decimal-pad"
Expand Down Expand Up @@ -672,6 +673,7 @@ const AddExpenseScreen: React.FC = () => {
onChangeText={(value) => updateSplitPercentage(split.userId, value)}
keyboardType="decimal-pad"
placeholder="0"
placeholderTextColor={colors.text.quaternary}
/>
) : (
<TextInput
Expand All @@ -681,6 +683,7 @@ const AddExpenseScreen: React.FC = () => {
keyboardType="decimal-pad"
editable={splitType !== 'equal'}
placeholder="0"
placeholderTextColor={colors.text.quaternary}
/>
)}
</View>
Expand All @@ -707,7 +710,7 @@ const AddExpenseScreen: React.FC = () => {
)}
</TouchableOpacity>
</View>
</SafeAreaView>
</View>
);
};

Expand Down
16 changes: 5 additions & 11 deletions Client/src/screens/friends/AddFriendScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@ import {
Alert,
ActivityIndicator,
Image,
StatusBar,
} from 'react-native';
import { useNavigation } from '@react-navigation/native';
import { useSafeAreaInsets, SafeAreaView } from 'react-native-safe-area-context';
import { useSafeAreaInsets } from 'react-native-safe-area-context';
import { Ionicons } from '@expo/vector-icons';
import colors from '../../theme/colors';
import { friendsService, Contact, AppUser } from '../../services/friends';
Expand Down Expand Up @@ -246,16 +245,10 @@ const AddFriendScreen: React.FC = () => {
navigation.navigate('ReviewFriends', { pendingFriends });
};





return (
<SafeAreaView style={styles.container}>
<StatusBar backgroundColor={colors.background.body} barStyle="dark-content" />

<View style={styles.container}>
{/* Header */}
<View style={[styles.header, { paddingTop: insets.top -1 }]}>
<View style={[styles.header, { paddingTop: insets.top + 15 }]}>
<TouchableOpacity onPress={() => navigation.goBack()}>
<Ionicons name="arrow-back" size={24} color={colors.text.primary} />
</TouchableOpacity>
Expand Down Expand Up @@ -286,6 +279,7 @@ const AddFriendScreen: React.FC = () => {
<TextInput
style={styles.searchInput}
placeholder={pendingFriends.length > 0 ? "Add more..." : "Search by name, email, or phone"}
placeholderTextColor={colors.text.quaternary}
value={searchQuery}
onChangeText={setSearchQuery}
multiline={false}
Expand Down Expand Up @@ -397,7 +391,7 @@ const AddFriendScreen: React.FC = () => {
onSubmit={handleAddPersonModalSubmit}
initialQuery={searchQuery}
/>
</SafeAreaView>
</View>
);
};

Expand Down
Loading
Loading