Skip to content

Commit bb8f68b

Browse files
committed
chore: fix rebase
1 parent c0f4eab commit bb8f68b

File tree

3 files changed

+25
-38
lines changed

3 files changed

+25
-38
lines changed

example/src/App.tsx

Lines changed: 19 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -356,9 +356,25 @@ const AppContainer = () => {
356356
/>
357357
</Pressable>
358358
{showAdvancedOptions && (
359-
<>
359+
<View style={styles.advancedOptionsContainer}>
360360
<Pressable
361-
style={styles.stopAllRecordingContainer}
361+
style={[
362+
styles.advancedOptionItem,
363+
{ opacity: nbOfRecording ? 1 : 0.5 },
364+
]}
365+
onPress={handleDeleteRecordings}
366+
disabled={!nbOfRecording}>
367+
<Image
368+
source={Icons.delete}
369+
style={styles.pinkButtonImage}
370+
resizeMode="contain"
371+
/>
372+
<Text style={styles.deleteRecordingTitle}>
373+
{'Delete recorded audio files'}
374+
</Text>
375+
</Pressable>
376+
<Pressable
377+
style={styles.advancedOptionItem}
362378
onPress={handleStopPlayersAndExtractors}>
363379
<Image
364380
source={Icons.stop}
@@ -369,35 +385,8 @@ const AppContainer = () => {
369385
{'Stop all players and extractors'}
370386
</Text>
371387
</Pressable>
372-
</>
388+
</View>
373389
)}
374-
<Pressable
375-
style={[
376-
styles.deleteRecordingContainer,
377-
{ opacity: nbOfRecording ? 1 : 0.5 },
378-
]}
379-
onPress={handleDeleteRecordings}
380-
disabled={!nbOfRecording}>
381-
<Image
382-
source={Icons.delete}
383-
style={styles.pinkButtonImage}
384-
resizeMode="contain"
385-
/>
386-
<Text style={styles.deleteRecordingTitle}>
387-
{'Delete recorded audio files'}
388-
</Text>
389-
</Pressable>
390-
<Pressable
391-
style={styles.playBackControlPressable}
392-
onPress={handleStopPlayersAndExtractors}>
393-
<FastImage
394-
source={Icons.stop}
395-
style={styles.stopAllButton}
396-
resizeMode="contain"
397-
tintColor={Colors.pink}
398-
/>
399-
</Pressable>
400-
</View>
401390
<ScrollView scrollEnabled={shouldScroll}>
402391
{list.map(item => (
403392
<RenderListItem

example/src/constants/Audios.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ const copyFilesToNativeResources = async (): Promise<string[]> => {
5656
);
5757

5858
// Filter out unsuccessful file copies
59-
return successfulCopies?.filter?.(value => value !== null);
59+
return successfulCopies?.filter?.((value): value is string => value !== null);
6060
}
6161

6262
// On iOS, return all files without copying

example/src/styles.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -107,22 +107,20 @@ const styles = (params: StyleSheetParams = {}) =>
107107
width: '100%',
108108
tintColor: Colors.pink,
109109
},
110-
headerContainer: {
110+
simformImageContainer: {
111111
alignItems: 'center',
112112
},
113-
deleteRecordingContainer: {
114-
alignItems: 'center',
115-
flexDirection: 'row',
116-
},
117113
deleteRecordingTitle: {
118114
fontSize: scale(20),
119115
fontWeight: 'bold',
120116
color: Colors.pink,
121117
paddingLeft: scale(8),
122118
},
123-
stopAllRecordingContainer: {
119+
advancedOptionsContainer: {
120+
gap: scale(8),
121+
},
122+
advancedOptionItem: {
124123
alignItems: 'center',
125-
justifyContent: 'center',
126124
flexDirection: 'row',
127125
},
128126
stopAllRecordingTitle: {

0 commit comments

Comments
 (0)