Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Split track selection to video and audio selection #1230

Merged
merged 27 commits into from
Jan 16, 2025
Merged
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
b6c0b9e
Split track selection to video and audio selection
Arnei Dec 14, 2023
01b3cdb
Merge remote-tracking branch 'upstream/main' into tracks-select-audio
Arnei Jan 18, 2024
a453936
Change frontend of track selection according to the mockups.
May 31, 2024
c097585
Add styles to enhance responsive design for small devices.
Jun 4, 2024
f4dc833
Transmit `customizedTrackSelection` to backend.
Jun 4, 2024
aa240ff
Fix case of `customized_track_selection`.
Jun 4, 2024
9c948d8
Merge branch 'main' into tracks-select-audio
Arnei Jun 4, 2024
4c255df
Fix build error
Arnei Jun 6, 2024
24124db
Fix variable name
Arnei Jun 6, 2024
3c1987f
New placeholder for no audio tracks
Arnei Jun 7, 2024
4506bde
Fix "No audio" tracks in track selection being selected
Arnei Jun 7, 2024
eb84d90
Align audio tracks and add descriptive text when missing the audio.
Jun 14, 2024
fa1e503
Import placeholder png as URL
Arnei Jun 19, 2024
48dcc3a
Merge remote-tracking branch 'upstream/main' into tracks-select-audio
Arnei Jun 21, 2024
682d862
Merge remote-tracking branch 'upstream/main' into tracks-select-audio
Arnei Jun 26, 2024
5314aee
Add config "atLeastOneVideo" to track selection
Arnei Jun 27, 2024
6700626
Add config "atMostTwoVideos" to track selection
Arnei Jun 27, 2024
a705bb9
Change track selection wording for audio tracks
Arnei Jun 27, 2024
18b11a3
Merge branch 'main' into tracks-select-audio
Arnei Dec 6, 2024
873a01f
Merge branch 'main' into tracks-select-audio
Arnei Dec 10, 2024
3ae8f0e
Fix BREAKPOINTS import
Arnei Dec 12, 2024
5c38fe9
Merge branch 'main' into tracks-select-audio
Arnei Dec 17, 2024
3154b20
Merge branch 'main' into tracks-select-audio
Arnei Dec 17, 2024
41084fa
Merge remote-tracking branch 'origin/main' into tracks-select-audio
marwyg Jan 8, 2025
1fa9386
Fix GitHub warnings
marwyg Jan 8, 2025
e9b22fe
Fix all test warnings
marwyg Jan 15, 2025
ef1f81a
Merge pull request #271 from marwyg/tracks-select-audio
Arnei Jan 15, 2025
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
Fix BREAKPOINTS import
As suggest by @JulianKniephoff. Fixes import
of appkit css styles.
Arnei committed Dec 12, 2024
commit 3ae8f0eb8684d2b088c4abbf5b7f46a581a1838e
6 changes: 3 additions & 3 deletions src/main/TrackSelection.tsx
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
setVideoEnabled,
} from "../redux/videoSlice";
import {
BREAKPOINT_MEDIUM,
BREAKPOINTS,
backgroundBoxStyle,
checkboxStyle,
titleStyle,
@@ -103,7 +103,7 @@
return true;
}
return false;
}

Check warning on line 106 in src/main/TrackSelection.tsx

GitHub Actions / test

Missing semicolon

const styles = {
trackSelection: css({
@@ -122,7 +122,7 @@
flexWrap: "wrap",
justifyContent: "center",
alignItems: "stretch",
"& > *" : {

Check warning on line 125 in src/main/TrackSelection.tsx

GitHub Actions / test

Extra space after key '& > *'
flex: "1 1 0px",
},
gap: "10px",
@@ -163,7 +163,7 @@
</Alert>
</section>
</div>
)

Check warning on line 166 in src/main/TrackSelection.tsx

GitHub Actions / test

Missing semicolon
}

return (
@@ -243,7 +243,7 @@
width: "100%",
opacity: track.video_stream.enabled ? "1" : "0.5",
maxWidth: `${imagesMaxWidthMedium}px`,
[`@media (min-width: ${BREAKPOINT_MEDIUM}px)`]: {
[`@media (min-width: ${BREAKPOINTS.medium}px)`]: {
"&": { maxWidth: `${imagesMaxWidth}px` },
},
});
@@ -304,7 +304,7 @@
filter: `${theme.invert_wave}`,
color: `${theme.inverted_text}`,
maxWidth: `${imagesMaxWidthMedium}px`,
[`@media (min-width: ${BREAKPOINT_MEDIUM}px)`]: {
[`@media (min-width: ${BREAKPOINTS.medium}px)`]: {
"&": { maxWidth: `${imagesMaxWidth}px` },
},
});
Loading