Skip to content

Commit 7eddb35

Browse files
zoontekzoontek
committed
Add expo doc
1 parent 20e90d2 commit 7eddb35

File tree

7 files changed

+53
-49
lines changed

7 files changed

+53
-49
lines changed

‎README.md‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,20 +47,20 @@ $ yarn add react-native-edge-to-edge
4747

4848
This library requires you to update the parent of your Android `AppTheme` to an edge-to-edge version. Don't worry, it's very easy to understand! You just need to choose a theme based on the current value:
4949

50-
| If you currently have… | …you should use |
51-
| :-------------------------------------------------------------- | :---------------------------------------------------- |
52-
| `Theme.AppCompat.DayNight.NoActionBar` | `Theme.EdgeToEdge` |
53-
| `Theme.MaterialComponents.DayNight.NoActionBar` | `Theme.EdgeToEdge.Material2` |
54-
| `Theme.Material3.DayNight.NoActionBar` | `Theme.EdgeToEdge.Material3` |
55-
| `Theme.Material3.DynamicColors.DayNight.NoActionBar` | `Theme.EdgeToEdge.Material3.Dynamic` |
56-
| `Theme.Material3.Expressive.DayNight.NoActionBar` | `Theme.EdgeToEdge.Material3.Expressive` |
57-
| `Theme.Material3.Expressive.DynamicColors.DayNight.NoActionBar` | `Theme.EdgeToEdge.Material3.Expressive.Dynamic` |
58-
| `Theme.AppCompat.Light.NoActionBar` | `Theme.EdgeToEdge.Light` |
59-
| `Theme.MaterialComponents.Light.NoActionBar` | `Theme.EdgeToEdge.Material2.Light` |
60-
| `Theme.Material3.Light.NoActionBar` | `Theme.EdgeToEdge.Material3.Light` |
61-
| `Theme.Material3.DynamicColors.Light.NoActionBar` | `Theme.EdgeToEdge.Material3.Dynamic.Light` |
62-
| `Theme.Material3.Expressive.Light.NoActionBar` | `Theme.EdgeToEdge.Material3.Expressive.Light` |
63-
| `Theme.Material3.Expressive.DynamicColors.Light.NoActionBar` | `Theme.EdgeToEdge.Material3.Expressive.Dynamic.Light` |
50+
| If you currently have… | …you should use |
51+
| :------------------------------------------------------------- | :--------------------------------------------------- |
52+
| `Theme.AppCompat.DayNight.NoActionBar` | `Theme.EdgeToEdge` |
53+
| `Theme.MaterialComponents.DayNight.NoActionBar` | `Theme.EdgeToEdge.Material2` |
54+
| `Theme.Material3.DayNight.NoActionBar` | `Theme.EdgeToEdge.Material3` |
55+
| `Theme.Material3.DynamicColors.DayNight.NoActionBar` | `Theme.EdgeToEdge.Material3.Dynamic` |
56+
| `Theme.Material3Expressive.DayNight.NoActionBar` | `Theme.EdgeToEdge.Material3Expressive` |
57+
| `Theme.Material3Expressive.DynamicColors.DayNight.NoActionBar` | `Theme.EdgeToEdge.Material3Expressive.Dynamic` |
58+
| `Theme.AppCompat.Light.NoActionBar` | `Theme.EdgeToEdge.Light` |
59+
| `Theme.MaterialComponents.Light.NoActionBar` | `Theme.EdgeToEdge.Material2.Light` |
60+
| `Theme.Material3.Light.NoActionBar` | `Theme.EdgeToEdge.Material3.Light` |
61+
| `Theme.Material3.DynamicColors.Light.NoActionBar` | `Theme.EdgeToEdge.Material3.Dynamic.Light` |
62+
| `Theme.Material3Expressive.Light.NoActionBar` | `Theme.EdgeToEdge.Material3Expressive.Light` |
63+
| `Theme.Material3Expressive.DynamicColors.Light.NoActionBar` | `Theme.EdgeToEdge.Material3Expressive.Dynamic.Light` |
6464

6565
### Expo
6666

@@ -92,10 +92,14 @@ type ParentTheme =
9292
| "Material2" // uses `Theme.EdgeToEdge.Material2`
9393
| "Material3" // uses `Theme.EdgeToEdge.Material3`
9494
| "Material3.Dynamic" // uses `Theme.EdgeToEdge.Material3.Dynamic`
95+
| "Material3Expressive" // uses `Theme.EdgeToEdge.Material3Expressive`
96+
| "Material3Expressive.Dynamic" // uses `Theme.EdgeToEdge.Material3Expressive.Dynamic`
9597
| "Light" // uses `Theme.EdgeToEdge.Light`
9698
| "Material2.Light" // uses `Theme.EdgeToEdge.Material2.Light`
9799
| "Material3.Light" // uses `Theme.EdgeToEdge.Material3.Light`
98-
| "Material3.Dynamic.Light"; // uses `Theme.EdgeToEdge.Material3.Dynamic.Light`
100+
| "Material3.Dynamic.Light" // uses `Theme.EdgeToEdge.Material3.Dynamic.Light`
101+
| "Material3Expressive.Light" // uses `Theme.EdgeToEdge.Material3Expressive.Light`
102+
| "Material3Expressive.Dynamic.Light"; // uses `Theme.EdgeToEdge.Material3Expressive.Dynamic.Light`
99103

100104
type Options = {
101105
android?: {

‎android/src/main/res/values-v27/styles.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
2121
</style>
2222

23-
<style name="Theme.EdgeToEdge.Material3.Expressive" parent="Theme.EdgeToEdge.Material3.Expressive.DayNight.Common">
23+
<style name="Theme.EdgeToEdge.Material3Expressive" parent="Theme.EdgeToEdge.Material3Expressive.DayNight.Common">
2424
<item name="android:windowLightNavigationBar">@bool/windowLightSystemBars</item>
2525
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
2626
</style>
2727

28-
<style name="Theme.EdgeToEdge.Material3.Expressive.Dynamic" parent="Theme.EdgeToEdge.Material3.Expressive.Dynamic.DayNight.Common">
28+
<style name="Theme.EdgeToEdge.Material3Expressive.Dynamic" parent="Theme.EdgeToEdge.Material3Expressive.Dynamic.DayNight.Common">
2929
<item name="android:windowLightNavigationBar">@bool/windowLightSystemBars</item>
3030
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
3131
</style>
@@ -50,12 +50,12 @@
5050
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
5151
</style>
5252

53-
<style name="Theme.EdgeToEdge.Material3.Expressive.Light" parent="Theme.EdgeToEdge.Material3.Expressive.Light.Common">
53+
<style name="Theme.EdgeToEdge.Material3Expressive.Light" parent="Theme.EdgeToEdge.Material3Expressive.Light.Common">
5454
<item name="android:windowLightNavigationBar">true</item>
5555
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
5656
</style>
5757

58-
<style name="Theme.EdgeToEdge.Material3.Expressive.Dynamic.Light" parent="Theme.EdgeToEdge.Material3.Expressive.Dynamic.Light.Common">
58+
<style name="Theme.EdgeToEdge.Material3Expressive.Dynamic.Light" parent="Theme.EdgeToEdge.Material3Expressive.Dynamic.Light.Common">
5959
<item name="android:windowLightNavigationBar">true</item>
6060
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
6161
</style>

‎android/src/main/res/values-v29/styles.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@
2828
<item name="android:enforceNavigationBarContrast">?enforceNavigationBarContrast</item>
2929
</style>
3030

31-
<style name="Theme.EdgeToEdge.Material3.Expressive" parent="Theme.EdgeToEdge.Material3.Expressive.DayNight.Common">
31+
<style name="Theme.EdgeToEdge.Material3Expressive" parent="Theme.EdgeToEdge.Material3Expressive.DayNight.Common">
3232
<item name="android:windowLightNavigationBar">@bool/windowLightSystemBars</item>
3333
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
3434
<item name="android:enforceStatusBarContrast">false</item>
3535
<item name="android:enforceNavigationBarContrast">?enforceNavigationBarContrast</item>
3636
</style>
3737

38-
<style name="Theme.EdgeToEdge.Material3.Expressive.Dynamic" parent="Theme.EdgeToEdge.Material3.Expressive.Dynamic.DayNight.Common">
38+
<style name="Theme.EdgeToEdge.Material3Expressive.Dynamic" parent="Theme.EdgeToEdge.Material3Expressive.Dynamic.DayNight.Common">
3939
<item name="android:windowLightNavigationBar">@bool/windowLightSystemBars</item>
4040
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
4141
<item name="android:enforceStatusBarContrast">false</item>
@@ -70,14 +70,14 @@
7070
<item name="android:enforceNavigationBarContrast">?enforceNavigationBarContrast</item>
7171
</style>
7272

73-
<style name="Theme.EdgeToEdge.Material3.Expressive.Light" parent="Theme.EdgeToEdge.Material3.Expressive.Light.Common">
73+
<style name="Theme.EdgeToEdge.Material3Expressive.Light" parent="Theme.EdgeToEdge.Material3Expressive.Light.Common">
7474
<item name="android:windowLightNavigationBar">true</item>
7575
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
7676
<item name="android:enforceStatusBarContrast">false</item>
7777
<item name="android:enforceNavigationBarContrast">?enforceNavigationBarContrast</item>
7878
</style>
7979

80-
<style name="Theme.EdgeToEdge.Material3.Expressive.Dynamic.Light" parent="Theme.EdgeToEdge.Material3.Expressive.Dynamic.Light.Common">
80+
<style name="Theme.EdgeToEdge.Material3Expressive.Dynamic.Light" parent="Theme.EdgeToEdge.Material3Expressive.Dynamic.Light.Common">
8181
<item name="android:windowLightNavigationBar">true</item>
8282
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
8383
<item name="android:enforceStatusBarContrast">false</item>

‎android/src/main/res/values-v30/styles.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@
2828
<item name="android:enforceNavigationBarContrast">?enforceNavigationBarContrast</item>
2929
</style>
3030

31-
<style name="Theme.EdgeToEdge.Material3.Expressive" parent="Theme.EdgeToEdge.Material3.Expressive.DayNight.Common">
31+
<style name="Theme.EdgeToEdge.Material3Expressive" parent="Theme.EdgeToEdge.Material3Expressive.DayNight.Common">
3232
<item name="android:windowLightNavigationBar">@bool/windowLightSystemBars</item>
3333
<item name="android:windowLayoutInDisplayCutoutMode">always</item>
3434
<item name="android:enforceStatusBarContrast">false</item>
3535
<item name="android:enforceNavigationBarContrast">?enforceNavigationBarContrast</item>
3636
</style>
3737

38-
<style name="Theme.EdgeToEdge.Material3.Expressive.Dynamic" parent="Theme.EdgeToEdge.Material3.Expressive.Dynamic.DayNight.Common">
38+
<style name="Theme.EdgeToEdge.Material3Expressive.Dynamic" parent="Theme.EdgeToEdge.Material3Expressive.Dynamic.DayNight.Common">
3939
<item name="android:windowLightNavigationBar">@bool/windowLightSystemBars</item>
4040
<item name="android:windowLayoutInDisplayCutoutMode">always</item>
4141
<item name="android:enforceStatusBarContrast">false</item>
@@ -70,14 +70,14 @@
7070
<item name="android:enforceNavigationBarContrast">?enforceNavigationBarContrast</item>
7171
</style>
7272

73-
<style name="Theme.EdgeToEdge.Material3.Expressive.Light" parent="Theme.EdgeToEdge.Material3.Expressive.Light.Common">
73+
<style name="Theme.EdgeToEdge.Material3Expressive.Light" parent="Theme.EdgeToEdge.Material3Expressive.Light.Common">
7474
<item name="android:windowLightNavigationBar">true</item>
7575
<item name="android:windowLayoutInDisplayCutoutMode">always</item>
7676
<item name="android:enforceStatusBarContrast">false</item>
7777
<item name="android:enforceNavigationBarContrast">?enforceNavigationBarContrast</item>
7878
</style>
7979

80-
<style name="Theme.EdgeToEdge.Material3.Expressive.Dynamic.Light" parent="Theme.EdgeToEdge.Material3.Expressive.Dynamic.Light.Common">
80+
<style name="Theme.EdgeToEdge.Material3Expressive.Dynamic.Light" parent="Theme.EdgeToEdge.Material3Expressive.Dynamic.Light.Common">
8181
<item name="android:windowLightNavigationBar">true</item>
8282
<item name="android:windowLayoutInDisplayCutoutMode">always</item>
8383
<item name="android:enforceStatusBarContrast">false</item>

‎android/src/main/res/values/public.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
<public name="Theme.EdgeToEdge.Material2" type="style" />
77
<public name="Theme.EdgeToEdge.Material3" type="style" />
88
<public name="Theme.EdgeToEdge.Material3.Dynamic" type="style" />
9-
<public name="Theme.EdgeToEdge.Material3.Expressive" type="style" />
10-
<public name="Theme.EdgeToEdge.Material3.Expressive.Dynamic" type="style" />
9+
<public name="Theme.EdgeToEdge.Material3Expressive" type="style" />
10+
<public name="Theme.EdgeToEdge.Material3Expressive.Dynamic" type="style" />
1111

1212
<public name="Theme.EdgeToEdge.Light" type="style" />
1313
<public name="Theme.EdgeToEdge.Material2.Light" type="style" />
1414
<public name="Theme.EdgeToEdge.Material3.Light" type="style" />
1515
<public name="Theme.EdgeToEdge.Material3.Dynamic.Light" type="style" />
16-
<public name="Theme.EdgeToEdge.Material3.Expressive.Light" type="style" />
17-
<public name="Theme.EdgeToEdge.Material3.Expressive.Dynamic.Light" type="style" />
16+
<public name="Theme.EdgeToEdge.Material3Expressive.Light" type="style" />
17+
<public name="Theme.EdgeToEdge.Material3Expressive.Dynamic.Light" type="style" />
1818
</resources>

‎android/src/main/res/values/styles.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<item name="android:windowLightStatusBar">@bool/windowLightSystemBars</item>
4545
</style>
4646

47-
<style name="Theme.EdgeToEdge.Material3.Expressive.DayNight.Common" parent="Theme.Material3.Expressive.DayNight.NoActionBar">
47+
<style name="Theme.EdgeToEdge.Material3Expressive.DayNight.Common" parent="Theme.Material3Expressive.DayNight.NoActionBar">
4848
<item name="enforceNavigationBarContrast">true</item>
4949
<item name="enforceSystemBarsLightTheme">false</item>
5050

@@ -55,7 +55,7 @@
5555
<item name="android:windowLightStatusBar">@bool/windowLightSystemBars</item>
5656
</style>
5757

58-
<style name="Theme.EdgeToEdge.Material3.Expressive.Dynamic.DayNight.Common" parent="Theme.Material3.Expressive.DynamicColors.DayNight.NoActionBar">
58+
<style name="Theme.EdgeToEdge.Material3Expressive.Dynamic.DayNight.Common" parent="Theme.Material3Expressive.DynamicColors.DayNight.NoActionBar">
5959
<item name="enforceNavigationBarContrast">true</item>
6060
<item name="enforceSystemBarsLightTheme">false</item>
6161

@@ -110,7 +110,7 @@
110110
<item name="android:windowLightStatusBar">true</item>
111111
</style>
112112

113-
<style name="Theme.EdgeToEdge.Material3.Expressive.Light.Common" parent="Theme.Material3.Expressive.Light.NoActionBar">
113+
<style name="Theme.EdgeToEdge.Material3Expressive.Light.Common" parent="Theme.Material3Expressive.Light.NoActionBar">
114114
<item name="enforceNavigationBarContrast">true</item>
115115
<item name="enforceSystemBarsLightTheme">false</item>
116116

@@ -121,7 +121,7 @@
121121
<item name="android:windowLightStatusBar">@bool/windowLightSystemBars</item>
122122
</style>
123123

124-
<style name="Theme.EdgeToEdge.Material3.Expressive.Dynamic.Light.Common" parent="Theme.Material3.Expressive.DynamicColors.Light.NoActionBar">
124+
<style name="Theme.EdgeToEdge.Material3Expressive.Dynamic.Light.Common" parent="Theme.Material3Expressive.DynamicColors.Light.NoActionBar">
125125
<item name="enforceNavigationBarContrast">true</item>
126126
<item name="enforceSystemBarsLightTheme">false</item>
127127

@@ -136,13 +136,13 @@
136136
<style name="Theme.EdgeToEdge.Material2" parent="Theme.EdgeToEdge.Material2.DayNight.Common" />
137137
<style name="Theme.EdgeToEdge.Material3" parent="Theme.EdgeToEdge.Material3.DayNight.Common" />
138138
<style name="Theme.EdgeToEdge.Material3.Dynamic" parent="Theme.EdgeToEdge.Material3.Dynamic.DayNight.Common" />
139-
<style name="Theme.EdgeToEdge.Material3.Expressive" parent="Theme.EdgeToEdge.Material3.Expressive.DayNight.Common" />
140-
<style name="Theme.EdgeToEdge.Material3.Expressive.Dynamic" parent="Theme.EdgeToEdge.Material3.Expressive.Dynamic.DayNight.Common" />
139+
<style name="Theme.EdgeToEdge.Material3Expressive" parent="Theme.EdgeToEdge.Material3Expressive.DayNight.Common" />
140+
<style name="Theme.EdgeToEdge.Material3Expressive.Dynamic" parent="Theme.EdgeToEdge.Material3Expressive.Dynamic.DayNight.Common" />
141141

142142
<style name="Theme.EdgeToEdge.Light" parent="Theme.EdgeToEdge.Light.Common" />
143143
<style name="Theme.EdgeToEdge.Material2.Light" parent="Theme.EdgeToEdge.Material2.Light.Common" />
144144
<style name="Theme.EdgeToEdge.Material3.Light" parent="Theme.EdgeToEdge.Material3.Light.Common" />
145145
<style name="Theme.EdgeToEdge.Material3.Dynamic.Light" parent="Theme.EdgeToEdge.Material3.Dynamic.Light.Common" />
146-
<style name="Theme.EdgeToEdge.Material3.Expressive.Light" parent="Theme.EdgeToEdge.Material3.Expressive.Light.Common" />
147-
<style name="Theme.EdgeToEdge.Material3.Expressive.Dynamic.Light" parent="Theme.EdgeToEdge.Material3.Expressive.Dynamic.Light.Common" />
146+
<style name="Theme.EdgeToEdge.Material3Expressive.Light" parent="Theme.EdgeToEdge.Material3Expressive.Light.Common" />
147+
<style name="Theme.EdgeToEdge.Material3Expressive.Dynamic.Light" parent="Theme.EdgeToEdge.Material3Expressive.Dynamic.Light.Common" />
148148
</resources>

‎src/expo.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ type ParentTheme =
99
| "Material2"
1010
| "Material3"
1111
| "Material3.Dynamic"
12-
| "Material3.Expressive"
13-
| "Material3.Expressive.Dynamic"
12+
| "Material3Expressive"
13+
| "Material3Expressive.Dynamic"
1414
| "Light"
1515
| "Material2.Light"
1616
| "Material3.Light"
1717
| "Material3.Dynamic.Light"
18-
| "Material3.Expressive.Light"
19-
| "Material3.Expressive.Dynamic.Light";
18+
| "Material3Expressive.Light"
19+
| "Material3Expressive.Dynamic.Light";
2020

2121
type AndroidProps = {
2222
enforceNavigationBarContrast?: boolean;
@@ -34,17 +34,17 @@ const withAndroidEdgeToEdgeTheme: ConfigPlugin<Props> = (
3434
Material2: "Theme.EdgeToEdge.Material2",
3535
Material3: "Theme.EdgeToEdge.Material3",
3636
"Material3.Dynamic": "Theme.EdgeToEdge.Material3.Dynamic",
37-
"Material3.Expressive": "Theme.EdgeToEdge.Material3.Expressive",
38-
"Material3.Expressive.Dynamic":
39-
"Theme.EdgeToEdge.Material3.Expressive.Dynamic",
37+
Material3Expressive: "Theme.EdgeToEdge.Material3Expressive",
38+
"Material3Expressive.Dynamic":
39+
"Theme.EdgeToEdge.Material3Expressive.Dynamic",
4040

4141
Light: "Theme.EdgeToEdge.Light",
4242
"Material2.Light": "Theme.EdgeToEdge.Material2.Light",
4343
"Material3.Light": "Theme.EdgeToEdge.Material3.Light",
4444
"Material3.Dynamic.Light": "Theme.EdgeToEdge.Material3.Dynamic.Light",
45-
"Material3.Expressive.Light": "Theme.EdgeToEdge.Material3.Expressive.Light",
46-
"Material3.Expressive.Dynamic.Light":
47-
"Theme.EdgeToEdge.Material3.Expressive.Dynamic.Light",
45+
"Material3Expressive.Light": "Theme.EdgeToEdge.Material3Expressive.Light",
46+
"Material3Expressive.Dynamic.Light":
47+
"Theme.EdgeToEdge.Material3Expressive.Dynamic.Light",
4848
};
4949

5050
const cleanupList = new Set([

0 commit comments

Comments
 (0)