Skip to content

Commit 0fa78ae

Browse files
Abel13Abel13
committed
Merge branch 'develop' of https://github.com/Abel13/4dinha into animation-tests
2 parents 917df3a + 4a8432e commit 0fa78ae

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+3714
-2145
lines changed

‎.eslintrc.json‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
{
22
"env": {
3-
"es2021": true
3+
"es2021": true,
4+
"jest": true
45
},
56
"extends": [
67
"plugin:react/recommended",
78
"airbnb",
89
"plugin:@typescript-eslint/recommended",
9-
"plugin:prettier/recommended"
10+
"plugin:prettier/recommended",
11+
"plugin:jest/recommended"
1012
],
1113
"parser": "@typescript-eslint/parser",
1214
"parserOptions": {
@@ -17,7 +19,7 @@
1719
"ecmaVersion": "latest",
1820
"sourceType": "module"
1921
},
20-
"plugins": ["react", "@typescript-eslint", "react-hooks", "prettier"],
22+
"plugins": ["react", "@typescript-eslint", "react-hooks", "prettier", "jest"],
2123
"globals": {
2224
"__DEV__": "readonly"
2325
},
@@ -27,6 +29,7 @@
2729
"no-tabs": "error",
2830
"no-undef": "error",
2931
"no-console": 1,
32+
"no-plusplus": "off",
3033
"prettier/prettier": "error",
3134
"@typescript-eslint/ban-types": "off",
3235
"@typescript-eslint/no-redeclare": "error",
@@ -80,6 +83,7 @@
8083
"extensions": [".tsx"]
8184
}
8285
],
86+
"react/style-prop-object": "warn",
8387
"react/jsx-no-bind": "off",
8488
"react/require-default-props": "off",
8589
"react/react-in-jsx-scope": "off",

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
---
2+
name: Feature request
3+
about: user history
4+
title: ''
5+
labels: enhancement
6+
assignees: ''
7+
---
8+
9+
### 📖 Description
10+
11+
[...]
12+
13+
---
14+
15+
**Branch:** [...]
16+
17+
**Como um** [...]
18+
**Quero** [...]
19+
**Para que** [...]
20+
21+
---
22+
23+
### 🎯 Critérios de Aceitação:
24+
25+
- [ ] [...]
26+
27+
---
28+
29+
### 🔧 Tarefas Técnicas: (opcional)
30+
31+
- [ ] [...]

‎.github/workflows/expo-build-preview.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
on:
2+
push:
3+
branches:
4+
- 'develop'
5+
jobs:
6+
update:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- name: 🏗 Setup repo
10+
uses: actions/checkout@v3
11+
12+
- name: 🏗 Setup Node
13+
uses: actions/setup-node@v3
14+
with:
15+
node-version: 20.x
16+
cache: npm
17+
18+
- name: 🏗 Setup EAS
19+
uses: expo/expo-github-action@v8
20+
with:
21+
eas-version: latest
22+
token: ${{ secrets.EXPO_TOKEN }}
23+
24+
- name: 📦 Install dependencies
25+
run: npm install
26+
27+
- name: 🚀 Create build
28+
run: eas build --platform all --profile preview --non-interactive

‎.github/workflows/expo-update.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
on:
2+
push:
3+
branches:
4+
- '**'
5+
jobs:
6+
update:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- name: 🏗 Setup repo
10+
uses: actions/checkout@v3
11+
12+
- name: 🏗 Setup Node
13+
uses: actions/setup-node@v3
14+
with:
15+
node-version: 20.x
16+
cache: npm
17+
18+
- name: 🏗 Setup EAS
19+
uses: expo/expo-github-action@v8
20+
with:
21+
eas-version: latest
22+
token: ${{ secrets.EXPO_TOKEN }}
23+
24+
- name: 📦 Install dependencies
25+
run: npm install
26+
27+
- name: 🚀 Create update
28+
run: eas update --auto --non-interactive

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,7 @@ app-example
4141
ios
4242
android
4343

44+
# builds
45+
*.apk
46+
*.aab
47+
*.ipa

‎app.json‎

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"expo": {
3-
"owner": "abelb13",
3+
"owner": "b13soft",
44
"name": "4dinha",
55
"slug": "4dinha",
66
"version": "1.0.0",
@@ -13,14 +13,28 @@
1313
"supportsTablet": true,
1414
"bundleIdentifier": "com.abelb13.4dinha",
1515
"infoPlist": {
16-
"ITSAppUsesNonExemptEncryption": false
16+
"ITSAppUsesNonExemptEncryption": false,
17+
"UISupportsGameController": true,
18+
"UIViewControllerBasedStatusBarAppearance": true
1719
}
1820
},
21+
"androidStatusBar": {
22+
"backgroundColor": "#000000"
23+
},
1924
"android": {
2025
"package": "com.abelb13.x4dinha",
26+
"intentFilters": [
27+
{
28+
"action": "android.intent.action.MAIN",
29+
"category": [
30+
"android.intent.category.LAUNCHER",
31+
"android.intent.category.GAME"
32+
]
33+
}
34+
],
2135
"adaptiveIcon": {
2236
"foregroundImage": "./assets/images/adaptive-icon.png",
23-
"backgroundColor": "#000"
37+
"backgroundColor": "#ffffff"
2438
}
2539
},
2640
"plugins": [
@@ -31,7 +45,7 @@
3145
"image": "./assets/images/splash-icon.png",
3246
"imageWidth": 200,
3347
"resizeMode": "contain",
34-
"backgroundColor": "#000"
48+
"backgroundColor": "#000000"
3549
}
3650
],
3751
"expo-localization",
@@ -47,6 +61,12 @@
4761
"eas": {
4862
"projectId": "9d5a4b4c-abcd-4bc5-b859-3a48433a6ff5"
4963
}
64+
},
65+
"runtimeVersion": {
66+
"policy": "appVersion"
67+
},
68+
"updates": {
69+
"url": "https://u.expo.dev/9d5a4b4c-abcd-4bc5-b859-3a48433a6ff5"
5070
}
5171
}
5272
}

‎app/(game)/4dinha/_layout.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
import { Stack } from 'expo-router';
22

3-
export default function AuthLayout() {
3+
export default function GameLayout() {
44
return (
55
<Stack
66
screenOptions={{
77
headerShown: false,
8+
animationMatchesGesture: true,
9+
navigationBarHidden: true,
10+
statusBarHidden: true,
811
}}
912
>
1013
<Stack.Screen name='index' />

‎app/(game)/4dinha/end.tsx‎

Lines changed: 47 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,55 @@ import { usePlayer } from '@/hooks/usePlayer';
99
import { ThemedButton } from '@/components/ThemedButton';
1010
import { useUserSessionStore } from '@/hooks/useUserSessionStore';
1111
import { useMatch } from '@/hooks/useMatch';
12+
import { useKeepAwake } from 'expo-keep-awake';
13+
14+
const styles = StyleSheet.create({
15+
container: {
16+
flex: 1,
17+
justifyContent: 'space-around',
18+
alignItems: 'center',
19+
paddingHorizontal: 60,
20+
paddingVertical: 20,
21+
backgroundColor: Colors.dark.background,
22+
},
23+
title: {
24+
fontSize: 28,
25+
fontFamily: 'BarlowCondensedBold',
26+
textAlign: 'center',
27+
marginBottom: 20,
28+
color: Colors.dark.text,
29+
},
30+
message: {
31+
fontSize: 18,
32+
textAlign: 'center',
33+
color: Colors.dark.text,
34+
},
35+
card: {
36+
width: '80%',
37+
padding: 20,
38+
borderRadius: 10,
39+
backgroundColor: Colors.dark.info,
40+
shadowColor: Colors.dark.info,
41+
shadowOffset: { width: 0, height: 4 },
42+
shadowOpacity: 0.2,
43+
shadowRadius: 5,
44+
elevation: 5,
45+
gap: 10,
46+
alignItems: 'center',
47+
},
48+
winnerName: {
49+
fontSize: 24,
50+
fontFamily: 'BarlowCondensedBold',
51+
color: Colors.dark.text,
52+
marginBottom: 10,
53+
},
54+
stats: {
55+
color: Colors.dark.icon,
56+
},
57+
});
1258

1359
export default function End() {
60+
useKeepAwake();
1461
const { gameId } = useLocalSearchParams();
1562
const { session } = useUserSessionStore();
1663

@@ -76,48 +123,3 @@ export default function End() {
76123
</ThemedView>
77124
);
78125
}
79-
80-
const styles = StyleSheet.create({
81-
container: {
82-
flex: 1,
83-
justifyContent: 'space-around',
84-
alignItems: 'center',
85-
paddingHorizontal: 60,
86-
paddingVertical: 20,
87-
backgroundColor: Colors.dark.background,
88-
},
89-
title: {
90-
fontSize: 28,
91-
fontWeight: 'bold',
92-
textAlign: 'center',
93-
marginBottom: 20,
94-
color: Colors.dark.text,
95-
},
96-
message: {
97-
fontSize: 18,
98-
textAlign: 'center',
99-
color: Colors.dark.text,
100-
},
101-
card: {
102-
width: '80%',
103-
padding: 20,
104-
borderRadius: 10,
105-
backgroundColor: Colors.dark.info,
106-
shadowColor: Colors.dark.info,
107-
shadowOffset: { width: 0, height: 4 },
108-
shadowOpacity: 0.2,
109-
shadowRadius: 5,
110-
elevation: 5,
111-
gap: 10,
112-
alignItems: 'center',
113-
},
114-
winnerName: {
115-
fontSize: 24,
116-
fontWeight: 'bold',
117-
color: Colors.dark.text,
118-
marginBottom: 10,
119-
},
120-
stats: {
121-
color: Colors.dark.icon,
122-
},
123-
});

0 commit comments

Comments
 (0)