Skip to content

Commit c128f9c

Browse files
authored
Merge pull request #149 from adaptui/upgrade-expo
2 parents b65eaf6 + e653da2 commit c128f9c

101 files changed

Lines changed: 2269 additions & 5089 deletions

File tree

Some content is hidden

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

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- uses: actions/checkout@v3
1414
- uses: actions/setup-node@v3
1515
with:
16-
node-version: "14.x"
16+
node-version: "16.x"
1717

1818
- name: Get yarn cache directory path
1919
id: yarn-cache-dir-path

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- uses: actions/checkout@v3
1414
- uses: actions/setup-node@v3
1515
with:
16-
node-version: "14.x"
16+
node-version: "16.x"
1717

1818
- name: Get yarn cache directory path
1919
id: yarn-cache-dir-path

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,4 @@ android/keystores/debug.keystore
6060
.expo/*
6161

6262
# generated by bob
63-
lib/
63+
lib/

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@
2828
"theme",
2929
"components"
3030
],
31-
"git.branchProtection": ["main"]
31+
"typescript.tsdk": "node_modules/typescript/lib"
3232
}

docs/getting-started.md

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,28 +26,38 @@ import React from "react";
2626
import { SafeAreaView, StatusBar } from "react-native";
2727
import { GestureHandlerRootView } from "react-native-gesture-handler";
2828
import { AdaptUIProvider } from "@adaptui/react-native-tailwind";
29-
import tailwind from "twrnc";
3029

31-
const App = () => {
30+
const AppContainer = () => {
31+
const tailwind = useTheme();
32+
3233
return (
3334
<GestureHandlerRootView style={tailwind.style("flex-1")}>
34-
<SafeAreaView style={tailwind.style(`flex-1 android:mt-[${StatusBar.currentHeight || 0}px]`)}>
35-
<AdaptUIProvider>
36-
// Your App Root here
37-
</AdaptUIProvider>
38-
</SafeAreaView>
35+
<NavigationContainer>
36+
<SafeAreaProvider>
37+
// your app here
38+
</SafeAreaProvider>
39+
</NavigationContainer>
3940
</GestureHandlerRootView>
4041
);
4142
};
4243

44+
const App = () => {
45+
return (
46+
<AdaptUIProvider>
47+
<AppContainer />
48+
</AdaptUIProvider>
49+
);
50+
};
51+
4352
export default App;
4453

4554
```
4655

4756
## Further Instructions
4857

4958
### Fonts Loading (Android)
50-
Our components look well with the Inter font on Android.
59+
60+
Our components look well with the Inter font on Android.
5161

5262
You can pick the fonts from [here](../font-assets/)
5363

@@ -63,11 +73,10 @@ Haptics is a technology that allows devices to provide tactile feedback to users
6373

6474
In AdaptUI we have enabled the Haptics to all our Tappable components (Button, Tag, Radio, Checkbox and Switch) through [expo-haptics](https://docs.expo.dev/versions/latest/sdk/haptics/).
6575

66-
You will have to install this as a dependency to get your haptics working on our Tappable components.
76+
You will have to install this as a dependency to get your haptics working on our Tappable components.
6777

6878
You can use the haptics through our hook [`useHaptics`](../src//utils//useHaptic.ts)
6979

70-
7180
## Simple Usage
7281

7382
Code below will render an [Avatar](./Avatar.md)

example/.expo-shared/README.md

Lines changed: 0 additions & 14 deletions
This file was deleted.

example/.expo-shared/assets.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

example/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.vercel

example/android/.gitignore

Lines changed: 0 additions & 15 deletions
This file was deleted.

example/android/app/build.gradle

Lines changed: 0 additions & 236 deletions
This file was deleted.

0 commit comments

Comments
 (0)