Skip to content

Commit

Permalink
Merge pull request #8 from cepdnaclk/features/app
Browse files Browse the repository at this point in the history
start app
  • Loading branch information
KavinduMethpura authored Jan 13, 2025
2 parents 6c2b742 + 55ac37b commit 7f333c9
Show file tree
Hide file tree
Showing 38 changed files with 16,200 additions and 0 deletions.
38 changes: 38 additions & 0 deletions app/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# Learn more https://docs.github.com/en/get-started/getting-started-with-git/ignoring-files

# dependencies
node_modules/

# Expo
.expo/
dist/
web-build/
expo-env.d.ts

# Native
*.orig.*
*.jks
*.p8
*.p12
*.key
*.mobileprovision

# Metro
.metro-health-check*

# debug
npm-debug.*
yarn-debug.*
yarn-error.*

# macOS
.DS_Store
*.pem

# local env files
.env*.local

# typescript
*.tsbuildinfo

app-example
145 changes: 145 additions & 0 deletions app/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
# Welcome to your Expo app 👋

This is an [Expo](https://expo.dev) project created with [`create-expo-app`](https://www.npmjs.com/package/create-expo-app).

## Get started

1. Install dependencies

```bash
npm install
```

2. Start the app

```bash
npx expo start
```

In the output, you'll find options to open the app in a

- [development build](https://docs.expo.dev/develop/development-builds/introduction/)
- [Android emulator](https://docs.expo.dev/workflow/android-studio-emulator/)
- [iOS simulator](https://docs.expo.dev/workflow/ios-simulator/)
- [Expo Go](https://expo.dev/go), a limited sandbox for trying out app development with Expo

You can start developing by editing the files inside the **app** directory. This project uses [file-based routing](https://docs.expo.dev/router/introduction).

## Get a fresh project

When you're ready, run:

```bash
npm run reset-project
```

This command will move the starter code to the **app-example** directory and create a blank **app** directory where you can start developing.

## Learn more

To learn more about developing your project with Expo, look at the following resources:

- [Expo documentation](https://docs.expo.dev/): Learn fundamentals, or go into advanced topics with our [guides](https://docs.expo.dev/guides).
- [Learn Expo tutorial](https://docs.expo.dev/tutorial/introduction/): Follow a step-by-step tutorial where you'll create a project that runs on Android, iOS, and the web.

## Join the community

Join our community of developers creating universal apps.

- [Expo on GitHub](https://github.com/expo/expo): View our open source platform and contribute.
- [Discord community](https://chat.expo.dev): Chat with Expo users and ask questions.


## Branching Strategy

This repository follows a structured branching strategy to ensure efficient collaboration and maintain a clean version history. Please adhere to the following guidelines when working on this project:

### Main Branch

- The main branch is the production-ready branch and should always remain stable.
- Direct commits or unreviewed changes must not be pushed to the main branch.

### Feature Branches

For all new features or issues, create a branch following the naming convention:

```
features/<your-name>/<issue-number>
```

- Replace `<your-name>` with your GitHub username or your name.
- Replace `<issue-number>` with the issue number or a short description related to the feature.

Example:
If your name is JohnDoe and you are working on issue number 123, your branch name should be:

```
features/JohnDoe/123
```

### Workflow

The workflow outlines how to handle the process of creating, modifying, reviewing, and merging feature branches. Follow these steps to maintain an organized and efficient development cycle:

1. **Create a New Branch:**
- Start from the latest main branch.
- Use the naming convention as outlined above.

```bash
git checkout main
git pull origin main
git checkout -b features/JohnDoe/123
```

2. **Commit Changes:**
- Ensure that your commits are clear and concise. Each commit should reflect a logical unit of work (e.g., adding a feature, fixing a bug).
- Follow a consistent commit message style, such as:
- `[Feature] Add functionality for X`
- `[Fix] Resolve issue Y`
- `[Refactor] Update code for Z`
- Avoid making large or unrelated commits in a single branch.

3. **Push to Remote:**
- After committing your changes locally, push your feature branch to the remote repository.

```bash
git push origin features/JohnDoe/123
```

4. **Create a Pull Request (PR):**
- After pushing your feature branch to GitHub, create a Pull Request (PR) to merge your changes into the main branch.
- Provide a detailed description of the changes in the PR, including context, the issue you're addressing, and the solution.

5. **Code Review:**
- Your changes will be reviewed by peers or maintainers. During this phase:
- Address any feedback and make adjustments as needed.
- Re-request reviews if additional changes are made.
- If necessary, update your branch with the latest changes from main to avoid conflicts before merging:

```bash
git fetch origin
git merge origin/main
```

6. **Merge:**
- Once your PR is approved and any necessary reviews have been completed, merge the PR into the main branch.
- The PR should be merged by a maintainer after reviewing.
- Always delete the feature branch after merging to keep the repository clean:

```bash
git branch -d features/JohnDoe/123
```

### Important Notes:

- **Sync regularly with main:** Always keep your feature branch in sync with the latest changes from the main branch to minimize merge conflicts.

```bash
git fetch origin
git merge origin/main
```

- **Avoid long-lived feature branches:** Feature branches should be short-lived to minimize the potential for merge conflicts. Try to merge them as soon as your feature or fix is completed.
- **Branch deletion:** Once the feature branch is merged, delete it to avoid cluttering the repository with unused branches.

By following this branching strategy and workflow, we can maintain a clean and organized development process that ensures efficient collaboration and a stable production environment.
41 changes: 41 additions & 0 deletions app/app.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"expo": {
"name": "app",
"slug": "app",
"version": "1.0.0",
"orientation": "portrait",
"icon": "./assets/images/icon.png",
"scheme": "myapp",
"userInterfaceStyle": "automatic",
"newArchEnabled": true,
"ios": {
"supportsTablet": true
},
"android": {
"adaptiveIcon": {
"foregroundImage": "./assets/images/adaptive-icon.png",
"backgroundColor": "#ffffff"
}
},
"web": {
"bundler": "metro",
"output": "static",
"favicon": "./assets/images/favicon.png"
},
"plugins": [
"expo-router",
[
"expo-splash-screen",
{
"image": "./assets/images/splash-icon.png",
"imageWidth": 200,
"resizeMode": "contain",
"backgroundColor": "#ffffff"
}
]
],
"experiments": {
"typedRoutes": true
}
}
}
45 changes: 45 additions & 0 deletions app/app/(tabs)/_layout.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
import { Tabs } from 'expo-router';
import React from 'react';
import { Platform } from 'react-native';

import { HapticTab } from '@/components/HapticTab';
import { IconSymbol } from '@/components/ui/IconSymbol';
import TabBarBackground from '@/components/ui/TabBarBackground';
import { Colors } from '@/constants/Colors';
import { useColorScheme } from '@/hooks/useColorScheme';

export default function TabLayout() {
const colorScheme = useColorScheme();

return (
<Tabs
screenOptions={{
tabBarActiveTintColor: Colors[colorScheme ?? 'light'].tint,
headerShown: false,
tabBarButton: HapticTab,
tabBarBackground: TabBarBackground,
tabBarStyle: Platform.select({
ios: {
// Use a transparent background on iOS to show the blur effect
position: 'absolute',
},
default: {},
}),
}}>
<Tabs.Screen
name="index"
options={{
title: 'Home',
tabBarIcon: ({ color }) => <IconSymbol size={28} name="house.fill" color={color} />,
}}
/>
<Tabs.Screen
name="explore"
options={{
title: 'Explore',
tabBarIcon: ({ color }) => <IconSymbol size={28} name="paperplane.fill" color={color} />,
}}
/>
</Tabs>
);
}
109 changes: 109 additions & 0 deletions app/app/(tabs)/explore.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
import { StyleSheet, Image, Platform } from 'react-native';

import { Collapsible } from '@/components/Collapsible';
import { ExternalLink } from '@/components/ExternalLink';
import ParallaxScrollView from '@/components/ParallaxScrollView';
import { ThemedText } from '@/components/ThemedText';
import { ThemedView } from '@/components/ThemedView';
import { IconSymbol } from '@/components/ui/IconSymbol';

export default function TabTwoScreen() {
return (
<ParallaxScrollView
headerBackgroundColor={{ light: '#D0D0D0', dark: '#353636' }}
headerImage={
<IconSymbol
size={310}
color="#808080"
name="chevron.left.forwardslash.chevron.right"
style={styles.headerImage}
/>
}>
<ThemedView style={styles.titleContainer}>
<ThemedText type="title">Explore</ThemedText>
</ThemedView>
<ThemedText>This app includes example code to help you get started.</ThemedText>
<Collapsible title="File-based routing">
<ThemedText>
This app has two screens:{' '}
<ThemedText type="defaultSemiBold">app/(tabs)/index.tsx</ThemedText> and{' '}
<ThemedText type="defaultSemiBold">app/(tabs)/explore.tsx</ThemedText>
</ThemedText>
<ThemedText>
The layout file in <ThemedText type="defaultSemiBold">app/(tabs)/_layout.tsx</ThemedText>{' '}
sets up the tab navigator.
</ThemedText>
<ExternalLink href="https://docs.expo.dev/router/introduction">
<ThemedText type="link">Learn more</ThemedText>
</ExternalLink>
</Collapsible>
<Collapsible title="Android, iOS, and web support">
<ThemedText>
You can open this project on Android, iOS, and the web. To open the web version, press{' '}
<ThemedText type="defaultSemiBold">w</ThemedText> in the terminal running this project.
</ThemedText>
</Collapsible>
<Collapsible title="Images">
<ThemedText>
For static images, you can use the <ThemedText type="defaultSemiBold">@2x</ThemedText> and{' '}
<ThemedText type="defaultSemiBold">@3x</ThemedText> suffixes to provide files for
different screen densities
</ThemedText>
<Image source={require('@/assets/images/react-logo.png')} style={{ alignSelf: 'center' }} />
<ExternalLink href="https://reactnative.dev/docs/images">
<ThemedText type="link">Learn more</ThemedText>
</ExternalLink>
</Collapsible>
<Collapsible title="Custom fonts">
<ThemedText>
Open <ThemedText type="defaultSemiBold">app/_layout.tsx</ThemedText> to see how to load{' '}
<ThemedText style={{ fontFamily: 'SpaceMono' }}>
custom fonts such as this one.
</ThemedText>
</ThemedText>
<ExternalLink href="https://docs.expo.dev/versions/latest/sdk/font">
<ThemedText type="link">Learn more</ThemedText>
</ExternalLink>
</Collapsible>
<Collapsible title="Light and dark mode components">
<ThemedText>
This template has light and dark mode support. The{' '}
<ThemedText type="defaultSemiBold">useColorScheme()</ThemedText> hook lets you inspect
what the user's current color scheme is, and so you can adjust UI colors accordingly.
</ThemedText>
<ExternalLink href="https://docs.expo.dev/develop/user-interface/color-themes/">
<ThemedText type="link">Learn more</ThemedText>
</ExternalLink>
</Collapsible>
<Collapsible title="Animations">
<ThemedText>
This template includes an example of an animated component. The{' '}
<ThemedText type="defaultSemiBold">components/HelloWave.tsx</ThemedText> component uses
the powerful <ThemedText type="defaultSemiBold">react-native-reanimated</ThemedText>{' '}
library to create a waving hand animation.
</ThemedText>
{Platform.select({
ios: (
<ThemedText>
The <ThemedText type="defaultSemiBold">components/ParallaxScrollView.tsx</ThemedText>{' '}
component provides a parallax effect for the header image.
</ThemedText>
),
})}
</Collapsible>
</ParallaxScrollView>
);
}

const styles = StyleSheet.create({
headerImage: {
color: '#808080',
bottom: -90,
left: -35,
position: 'absolute',
},
titleContainer: {
flexDirection: 'row',
gap: 8,
},
});
Loading

0 comments on commit 7f333c9

Please sign in to comment.