Skip to content

Commit e9eb10f

Browse files
authored
Merge pull request #49 from troberts-28/release/v2.1.0
Release/v2.1.0
2 parents cb95c1d + 9dca3ff commit e9eb10f

File tree

17 files changed

+6182
-5882
lines changed

17 files changed

+6182
-5882
lines changed

.yarn/releases/yarn-3.6.4.cjs

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

.yarn/releases/yarn-4.6.0.cjs

Lines changed: 934 additions & 0 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
nodeLinker: node-modules
22

3-
yarnPath: .yarn/releases/yarn-3.6.4.cjs
3+
yarnPath: .yarn/releases/yarn-4.6.0.cjs
44

55
nmHoistingLimits: workspaces # disable hoisting for all workspaces (causes issues with bare example)
66

README.md

Lines changed: 30 additions & 16 deletions
Large diffs are not rendered by default.

demos/example1.gif

-343 KB
Loading

demos/example2.gif

670 KB
Loading

demos/example3.gif

-906 KB
Loading

demos/example4.gif

-678 KB
Loading

examples/example-expo/App.tsx

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@ import React, {
77
} from "react";
88

99
import Ionicons from "@expo/vector-icons/Ionicons";
10+
import MaskedView from "@react-native-masked-view/masked-view";
1011
import { Audio } from "expo-av";
1112
import * as Haptics from "expo-haptics";
1213
import { LinearGradient } from "expo-linear-gradient";
1314
import {
15+
Image,
1416
LayoutAnimation,
1517
Platform,
1618
Pressable,
@@ -98,7 +100,7 @@ export default function App() {
98100
<View style={styles.buttonContainer}>
99101
<Text
100102
style={[styles.button, styles.buttonDark]}>
101-
Set Alarm 🔔
103+
{"Set Alarm 🔔"}
102104
</Text>
103105
</View>
104106
</TouchableOpacity>
@@ -156,7 +158,7 @@ export default function App() {
156158
<View style={styles.buttonContainer}>
157159
<Text
158160
style={[styles.button, styles.buttonLight]}>
159-
Set Alarm 🔔
161+
{"Set Alarm 🔔"}
160162
</Text>
161163
</View>
162164
</TouchableOpacity>
@@ -187,7 +189,10 @@ export default function App() {
187189

188190
const renderExample3 = useMemo(() => {
189191
return (
190-
<View
192+
<LinearGradient
193+
colors={["#202020", "#220578"]}
194+
start={{ x: 0, y: 0 }}
195+
end={{ x: 1, y: 1 }}
191196
style={[
192197
styles.container,
193198
styles.page3Container,
@@ -198,12 +203,13 @@ export default function App() {
198203
Haptics={Haptics}
199204
hourLabel=":"
200205
LinearGradient={LinearGradient}
206+
MaskedView={MaskedView}
201207
minuteLabel=":"
202208
padWithNItems={2}
203209
secondLabel=""
204210
styles={{
205211
theme: "dark",
206-
backgroundColor: "#202020",
212+
backgroundColor: "transparent",
207213
pickerItem: {
208214
fontSize: 34,
209215
},
@@ -221,12 +227,12 @@ export default function App() {
221227
right: -20,
222228
top: 0,
223229
bottom: 6,
224-
width: 40,
230+
width: 46,
225231
alignItems: "center",
226232
},
227233
}}
228234
/>
229-
</View>
235+
</LinearGradient>
230236
);
231237
}, [screenWidth]);
232238

@@ -363,7 +369,7 @@ const styles = StyleSheet.create({
363369
backgroundColor: "#F1F1F1",
364370
},
365371
page3Container: {
366-
backgroundColor: "#202020",
372+
flex: 1,
367373
},
368374
page4Container: {
369375
backgroundColor: "#F1F1F1",

examples/example-expo/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
},
1111
"dependencies": {
1212
"@expo/vector-icons": "^14.0.3",
13+
"@react-native-masked-view/masked-view": "0.3.2",
1314
"expo": "~52.0.31",
1415
"expo-av": "~15.0.2",
1516
"expo-haptics": "~14.0.1",

0 commit comments

Comments
 (0)