Skip to content

Commit

Permalink
Merge branch 'main' into emily/storyStyling
Browse files Browse the repository at this point in the history
  • Loading branch information
adityapawar1 authored Apr 24, 2024
2 parents 8d6a6a7 + 3148c48 commit ca3fd58
Show file tree
Hide file tree
Showing 91 changed files with 4,853 additions and 1,793 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ name: Lint
#############################
on:
push:
branches-ignore: [main]
pull_request:
branches: [main]

###############
# Set the Job #
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,6 @@ yarn-error.*

# typescript
*.tsbuildinfo

.vscode/
eas.json
8 changes: 0 additions & 8 deletions .vscode/extensions.json

This file was deleted.

4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.codeActionsOnSave": {
"source.formatDocument": true,
"source.fixAll.eslint": true
"source.formatDocument": "explicit",
"source.fixAll.eslint": "explicit"
}
}
14 changes: 11 additions & 3 deletions app.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,24 @@
"supportsTablet": true
},
"android": {
"package": "org.calblueprint.girlswritenow",
"softwareKeyboardLayoutMode": "pan",
"adaptiveIcon": {
"foregroundImage": "./assets/adaptive-icon.png",
"backgroundColor": "#ffffff"
},
"softwareKeyboardLayoutMode": "pan"
}
},
"web": {
"favicon": "./assets/favicon.png"
},
"plugins": ["expo-router"]
"plugins": ["expo-router"],
"extra": {
"router": {
"origin": false
},
"eas": {
"projectId": "12e1580c-e57a-466e-bc0d-c7a051565998"
}
}
}
}
Binary file modified assets/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/save_story.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/saved_story.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit ca3fd58

Please sign in to comment.