Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
0519567
Basics of Audio block working
etoledom Dec 1, 2020
690224d
Add audio support to MediaUpload
etoledom Dec 1, 2020
b7965fd
Add handling of file uploads and replace
etoledom Dec 1, 2020
f2ccb18
WPMediaLibrary support for Audio block
etoledom Dec 1, 2020
2a02b83
Avoid removing media info on error state
etoledom Dec 1, 2020
276b07d
Linting
etoledom Dec 1, 2020
8a8b550
Added an AUDIO file to the test requestMediaPickFromMediaLibrary func
jd-alexander Dec 9, 2020
9e03e63
Fixed typo in ToolbarButton of Audio Block.
jd-alexander Dec 9, 2020
349aa19
Removed auto help behavior present on web that's not used on mobile.
jd-alexander Dec 9, 2020
04a39b4
Merge branch 'master' into rnmobile/audio-block-I-b
jd-alexander Dec 9, 2020
32029e0
[Android] Wired the click of the Audio Media Library button.
jd-alexander Dec 16, 2020
a18b8ac
Added Audio media options for choosing audio file locally.
jd-alexander Dec 16, 2020
af6cb99
[RNMobile] Audio Block: Proper caption field (#27689)
ceyhun Dec 17, 2020
43019d6
Audio Player UI for audio block
etoledom Dec 3, 2020
4d634b3
Add extension to styles import
etoledom Dec 3, 2020
ba23b8a
Show file name while loading and retry message on error
ceyhun Dec 17, 2020
d9a6041
Merge branch 'master' into rnmobile/audio-block-I-b
jd-alexander Jan 7, 2021
1a46994
Merge branch 'master' into rnmobile/audio-block-I-b
jd-alexander Jan 14, 2021
f09c955
Merge branch 'master' into rnmobile/audio-block-I-b
jd-alexander Jan 18, 2021
98f20e0
Pass state props to audio player component
ceyhun Jan 19, 2021
1810a7a
Implement placeholder-ish player UI structure
ceyhun Jan 19, 2021
ae50b5b
Merge branch 'master' into rnmobile/audio-block-I-b
jd-alexander Jan 21, 2021
a04d4a4
Merge remote-tracking branch 'origin/rnmobile/audio-block-I-b' into r…
jd-alexander Jan 21, 2021
40d73ec
added styles for icon, title and subtitle
jd-alexander Jan 22, 2021
9ba5548
added blue-wordpress as link color.
jd-alexander Jan 22, 2021
56ae978
added sizing based on design specs.
jd-alexander Jan 22, 2021
2c527b5
Fixed object destructuring error.
jd-alexander Jan 22, 2021
8126f1e
added icon styling state for upload in progress or upload failed.
jd-alexander Jan 22, 2021
cc6e523
implemented error style and behavior.
jd-alexander Jan 22, 2021
e1f9552
added styling for upload failed text.
jd-alexander Jan 22, 2021
4dd5baa
Override MediaUploadProgress styles
ceyhun Jan 22, 2021
3795a6e
Update filename extension spseration to handle two dots
ceyhun Jan 22, 2021
f6cd5c1
Update UI structure and styles
ceyhun Jan 22, 2021
0e4f746
Make retry message translateable
ceyhun Jan 22, 2021
39947fc
Update snaphots
ceyhun Jan 22, 2021
c9e368d
Fix lint error
ceyhun Jan 22, 2021
736a550
Set initial file name
ceyhun Jan 25, 2021
899d4eb
Merge branch 'master' into rnmobile/audio-block-II-audio-player-ui
ceyhun Jan 25, 2021
e6b5b6d
Remove devOnly flag from audio block
ceyhun Jan 25, 2021
fde5a71
Increase tap target of button
ceyhun Jan 26, 2021
9d29735
Add 1px between title and subtitle
ceyhun Jan 26, 2021
15162c6
Align title, subtitle and button vertically
ceyhun Jan 26, 2021
63a4199
Merge branch 'master' into rnmobile/audio-block-II-audio-player-ui
ceyhun Jan 27, 2021
b1eb8dd
On iOS use VideoPlayer to play audio files in-app
ceyhun Jan 28, 2021
844cff9
Revert "On iOS use VideoPlayer to play audio files in-app"
ceyhun Jan 29, 2021
8ba4565
[RNMobile] Audio Block - Cancel and Retry Dialog (#28540)
jd-alexander Jan 29, 2021
e12d1c6
Merge branch 'master' into rnmobile/audio-block-II-audio-player-ui
ceyhun Jan 29, 2021
277fbee
Rename button title
ceyhun Jan 29, 2021
b34fdbc
Add pill-shaped background to button
ceyhun Jan 29, 2021
c3f7dea
Add padding to title
ceyhun Jan 29, 2021
190b141
Fix file title being empty when selecting from media library
ceyhun Jan 29, 2021
8c5669a
Use safeDecodeURI
ceyhun Jan 29, 2021
fdb64c3
On iOS use VideoPlayer to play audio files in-app
ceyhun Jan 28, 2021
5ce695e
Decrease button font size
ceyhun Jan 29, 2021
bb4cf85
Revert "Remove devOnly flag from audio block"
ceyhun Jan 29, 2021
ebf8a2f
Add right padding to title container to fix error state
ceyhun Jan 29, 2021
409635d
Merge branch 'master' into rnmobile/audio-block-II-audio-player-ui
ceyhun Feb 1, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add pill-shaped background to button
  • Loading branch information
ceyhun committed Jan 29, 2021
commit b34fdbc34ab195f8449e7458dd8a3a6b5a052228
14 changes: 9 additions & 5 deletions packages/components/src/mobile/audio-player/index.native.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,10 @@ function Player( {
...( isUploadFailed && uploadFailedStyle ),
};

const buttonTextStyle = {
...styles.buttonText,
...( isIOS ? styles.buttonTextIOS : styles.buttonTextAndroid ),
};
const buttonBackgroundStyle = getStylesFromColorScheme(
styles.buttonBackground,
styles.buttonBackgroundDark
);

let title = '';
let extension = '';
Expand Down Expand Up @@ -184,7 +184,11 @@ function Player( {
) }
onPress={ onPressListen }
>
<Text style={ buttonTextStyle }>{ __( 'OPEN' ) }</Text>
<View style={ buttonBackgroundStyle }>
<Text style={ styles.buttonText }>
{ __( 'OPEN' ) }
</Text>
</View>
</TouchableWithoutFeedback>
) }
</View>
Expand Down
20 changes: 11 additions & 9 deletions packages/components/src/mobile/audio-player/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -84,19 +84,21 @@
color: $dark-secondary;
}

.buttonText {
padding: 16px;
font-size: 17;
font-weight: 500;
color: $blue-wordpress;
.buttonBackground {
margin: 12px 16px;
padding: 8px 16px;
border-radius: 500px;
background-color: $light-ultra-dim;
}

.buttonTextIOS {
margin-top: 1px;
.buttonBackgroundDark {
background-color: $dark-ultra-dim;
}

.buttonTextAndroid {
margin-top: -2px;
.buttonText {
font-size: 17;
font-weight: 500;
color: $blue-wordpress;
}

.errorIcon {
Expand Down