') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); C-4894 Make edit track/edit collection use same buttons by rickyrombo · Pull Request #9321 · AudiusProject/apps · GitHub
Skip to content

C-4894 Make edit track/edit collection use same buttons#9321

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.

Sign up for GitHub

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

Merged
rickyrombo merged 2 commits into from
Jul 30, 2024
Merged

C-4894 Make edit track/edit collection use same buttons #9321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55b5927
C-4894 Make edit track/edit collection use same buttons
rickyrombo Jul 30, 2024
fcb2972
Foiled by Reed's eagle eyes
rickyrombo Jul 30, 2024
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
22 changes: 17 additions & 5 deletions packages/mobile/src/screens/edit-collection-screen/EditCollectionForm.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ import { capitalize } from 'lodash'
import { View } from 'react-native'
import { useDispatch } from 'react-redux'

import { IconClose, IconTrash } from '@audius/harmony-native'
import { Flex, IconClose, IconTrash, Button } from '@audius/harmony-native'
import {
Divider,
TextButton,
Expand All@@ -25,7 +25,7 @@ import { makeStyles } from 'app/styles'

import { TopBarIconButton } from '../app-screen'
import { ConfirmPublishTrackDrawer } from '../edit-track-screen/components/ConfirmPublishDrawer'
import { FormScreen } from '../page-form-screen'
import { FormScreen } from '../form-screen'

import { AdvancedAlbumField } from './AdvancedAlbumField'
import { CollectionDescriptionField } from './CollectionDescriptionField'
Expand DownExpand Up@@ -137,17 +137,29 @@ export const EditCollectionForm = (
submitAndGoBack
])

const handleCancel = useCallback(() => {
handleReset()
navigation.goBack()
}, [handleReset, navigation])

return (
<>
<FormScreen
onSubmit={handleSubmit}
onReset={handleReset}
cancelText={messages.cancel}
submitText={messages.save}
title={messages.screenTitle}
topbarLeft={
<TopBarIconButton icon={IconClose} onPress={navigation.goBack} />
}
bottomSection={
<Flex direction='row' gap='s'>
<Button fullWidth variant='secondary' onPress={handleCancel}>
{messages.cancel}
</Button>
<Button variant='primary' fullWidth onPress={handleSubmit}>
{messages.save}
</Button>
</Flex>
}
>
<VirtualizedKeyboardAwareScrollView>
<Tile style={styles.tile}>
Expand Down
31 changes: 17 additions & 14 deletions packages/mobile/src/screens/edit-track-screen/EditTrackForm.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,10 +9,10 @@ import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view
import { useDispatch } from 'react-redux'

import {
IconArrowRight,
IconCaretLeft,
IconCloudUpload,
Button
Button,
Flex
} from '@audius/harmony-native'
import { Tile } from 'app/components/core'
import { InputErrorMessage } from 'app/components/core/InputErrorMessage'
Expand DownExpand Up@@ -45,7 +45,8 @@ import type { EditTrackFormProps } from './types'
const messages = {
trackName: 'Track Name',
trackNameError: 'Track Name Required',
fixErrors: 'Fix Errors To Continue'
fixErrors: 'Fix Errors To Continue',
cancel: 'Cancel'
}

const GATED_CONTENT_UPLOAD_PROMPT_DRAWER_SEEN_KEY =
Expand DownExpand Up@@ -164,17 +165,19 @@ export const EditTrackForm = (props: EditTrackFormProps) => {
style={styles.errorText}
/>
) : null}
<Button
variant='primary'
iconRight={IconArrowRight}
fullWidth
onPress={() => {
handleSubmit()
}}
disabled={isSubmitting || hasErrors}
>
{doneText}
</Button>
<Flex direction='row' gap='s'>
<Button fullWidth variant='secondary' onPress={handlePressBack}>
{messages.cancel}
</Button>
<Button
variant='primary'
fullWidth
onPress={handleSubmit}
disabled={isSubmitting || hasErrors}
>
{doneText}
</Button>
</Flex>
</>
}
>
Expand Down
2 changes: 1 addition & 1 deletion packages/mobile/src/screens/edit-track-screen/EditTrackModalScreen.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ const { editTrack } = cacheTracksActions

const messages = {
title: 'Edit Track',
save: 'Save Changes'
save: 'Save'
}

export const EditTrackModalScreen = () => {
Expand Down