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.

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

Style and remove "Save" button for Default Room Settings #8164

Merged
merged 10 commits into from
Mar 16, 2022
Merged

Style and remove "Save" button for Default Room Settings #8164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
678c226
Add working button conditional
Mar 15, 2022
4be8e2b
Get rid of formLabel
Mar 15, 2022
5ca609e
Swap out with TextInput
Mar 15, 2022
4e9d148
Fix spacing + style
Mar 15, 2022
0e1f2d1
Adjust input spacing
Mar 15, 2022
6df8839
Add lowercase styel and use plain Text component
Mar 15, 2022
ddd9980
Line height spacing
Mar 15, 2022
66fe8ae
Get rid of unnecessary views
Mar 15, 2022
0852a2d
Review comments, rname variables
Mar 16, 2022
622aa0f
Update visibility label too
Mar 16, 2022
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
72 changes: 39 additions & 33 deletions src/pages/ReportSettingsPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ class ReportSettingsPage extends Component {
}

render() {
const shouldShowRename = !ReportUtils.isPolicyExpenseChat(this.props.report);
const shouldShowRoomName = !ReportUtils.isPolicyExpenseChat(this.props.report);
const shouldDisableRename = ReportUtils.isDefaultRoom(this.props.report)
|| ReportUtils.isArchivedRoom(this.props.report);
const linkedWorkspace = _.find(this.props.policies, policy => policy.id === this.props.report.policyID);
Expand All @@ -165,12 +165,7 @@ class ReportSettingsPage extends Component {
/>
<ScrollView style={styles.flex1} contentContainerStyle={styles.p5}>
<View>
<View>
<Text style={[styles.formLabel]} numberOfLines={1}>
{this.props.translate('common.notifications')}
</Text>
</View>
<View style={[styles.mb5, styles.mt2]}>
<View style={[styles.mt2]}>
<Picker
label={this.props.translate('notificationPreferences.label')}
onChange={(notificationPreference) => {
Expand All @@ -184,48 +179,59 @@ class ReportSettingsPage extends Component {
/>
</View>
</View>
{shouldShowRename && (
{shouldShowRoomName && (
<View style={styles.mt4}>
<Text style={[styles.formLabel]} numberOfLines={1}>
{this.props.translate('newRoomPage.roomName')}
</Text>
<View style={[styles.flexRow, styles.mb1]}>
<View style={[styles.flexRow]}>
<View style={[styles.flex3]}>
<RoomNameInput
initialValue={this.state.newRoomName}
policyID={linkedWorkspace && linkedWorkspace.id}
errorText={this.state.errors.newRoomName}
onChangeText={newRoomName => this.clearErrorAndSetValue('newRoomName', newRoomName)}
disabled={shouldDisableRename}
/>
{shouldDisableRename ? (
<View>
<Text style={[styles.textLabelSupporting, styles.lh16, styles.mb1]} numberOfLines={1}>
{this.props.translate('newRoomPage.roomName')}
</Text>
<Text numberOfLines={1} style={[styles.optionAlternateText]}>
{this.state.newRoomName}
</Text>
</View>
)
: (
<RoomNameInput
initialValue={this.state.newRoomName}
policyID={linkedWorkspace && linkedWorkspace.id}
errorText={this.state.errors.newRoomName}
onChangeText={newRoomName => this.clearErrorAndSetValue('newRoomName', newRoomName)}
disabled={shouldDisableRename}
/>
)}
</View>
<Button
large
success={!shouldDisableRename}
text={this.props.translate('common.save')}
onPress={this.validateAndRenameReport}
style={[styles.ml2, styles.flex1]}
textStyles={[styles.label]}
innerStyles={[styles.ph5]}
isLoading={this.props.isLoadingRenamePolicyRoom}
isDisabled={shouldDisableRename}
/>
{!shouldDisableRename && (
<Button
large
success={!shouldDisableRename}
text={this.props.translate('common.save')}
onPress={this.validateAndRenameReport}
style={[styles.ml2, styles.flex1]}
textStyles={[styles.label]}
innerStyles={[styles.ph5]}
isLoading={this.props.isLoadingRenamePolicyRoom}
isDisabled={shouldDisableRename}
/>
)}
</View>
</View>
)}
{linkedWorkspace && (
<View style={[styles.mt4]}>
<Text style={[styles.formLabel]} numberOfLines={1}>
<Text style={[styles.textLabelSupporting, styles.lh16, styles.mb1]} numberOfLines={1}>
{this.props.translate('workspace.common.workspace')}
</Text>
<Text numberOfLines={1}>
<Text numberOfLines={1} style={[styles.optionAlternateText]}>
{linkedWorkspace.name}
</Text>
</View>
)}
{this.props.report.visibility && (
<View style={[styles.mt4]}>
<Text style={[styles.formLabel]} numberOfLines={1}>
<Text style={[styles.textLabelSupporting, styles.lh16, styles.mb1]} numberOfLines={1}>
{this.props.translate('newRoomPage.visibility')}
</Text>
<Text numberOfLines={1} style={[styles.reportSettingsVisibilityText]}>{this.props.report.visibility}</Text>
Expand Down
4 changes: 4 additions & 0 deletions src/styles/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,6 +809,10 @@ const styles = {
color: themeColors.textSupporting,
},

lh16: {
lineHeight: 16,
},

formLabel: {
fontFamily: fontFamily.GTA_BOLD,
fontWeight: fontWeightBold,
Expand Down