Skip to content

[IMPROVEMENT] Respect "Hide counter" preference #1306

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
diegolmello merged 4 commits into from
Oct 28, 2019
Merged

[IMPROVEMENT] Respect "Hide counter" preference #1306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4a79c14
Verify hideUnreadStatus to show alert or not
CalebeRios Oct 15, 2019
c90554e
Fix LastMessage
diegolmello Oct 28, 2019
c3ff3b9
Fix chat query when showUnread is set
diegolmello Oct 28, 2019
ed2363e
Merge branch 'develop' into fix.hideCounter
diegolmello Oct 28, 2019
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
2 changes: 2 additions & 0 deletions app/lib/database/model/Subscription.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,6 @@ export default class Subscription extends Model {
@children('threads') threads;

@children('thread_messages') threadMessages;

@field('hide_unread_status') hideUnreadStatus;
}
11 changes: 11 additions & 0 deletions app/lib/database/model/migrations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,17 @@ export default schemaMigrations({
]
})
]
},
{
toVersion: 3,
steps: [
addColumns({
table: 'subscriptions',
columns: [
{ name: 'hide_unread_status', type: 'boolean', isOptional: true }
]
})
]
}
]
});
5 changes: 3 additions & 2 deletions app/lib/database/schema/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { appSchema, tableSchema } from '@nozbe/watermelondb';

export default appSchema({
version: 2,
version: 3,
tables: [
tableSchema({
name: 'subscriptions',
Expand Down Expand Up @@ -38,7 +38,8 @@ export default appSchema({
{ name: 'last_thread_sync', type: 'number', isOptional: true },
{ name: 'jitsi_timeout', type: 'number', isOptional: true },
{ name: 'auto_translate', type: 'boolean', isOptional: true },
{ name: 'auto_translate_language', type: 'string' }
{ name: 'auto_translate_language', type: 'string' },
{ name: 'hide_unread_status', type: 'boolean', isOptional: true }
]
}),
tableSchema({
Expand Down
11 changes: 6 additions & 5 deletions app/presentation/RoomItem/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ class RoomItem extends React.Component {
toggleFav: PropTypes.func,
toggleRead: PropTypes.func,
hideChannel: PropTypes.func,
avatar: PropTypes.bool
avatar: PropTypes.bool,
hideUnreadStatus: PropTypes.bool
}

static defaultProps = {
Expand Down Expand Up @@ -218,7 +219,7 @@ class RoomItem extends React.Component {

render() {
const {
unread, userMentions, name, _updatedAt, alert, testID, type, avatarSize, baseUrl, userId, username, token, id, prid, showLastMessage, lastMessage, isRead, width, favorite, status, avatar
unread, userMentions, name, _updatedAt, alert, testID, type, avatarSize, baseUrl, userId, username, token, id, prid, showLastMessage, lastMessage, isRead, width, favorite, status, avatar, hideUnreadStatus
} = this.props;

const date = formatDate(_updatedAt);
Expand Down Expand Up @@ -294,7 +295,7 @@ class RoomItem extends React.Component {
<Text
style={[
styles.title,
alert && styles.alert
alert && !hideUnreadStatus && styles.alert
]}
ellipsizeMode='tail'
numberOfLines={1}
Expand All @@ -305,7 +306,7 @@ class RoomItem extends React.Component {
<Text
style={[
styles.date,
alert && styles.updateAlert
alert && !hideUnreadStatus && styles.updateAlert
]}
ellipsizeMode='tail'
numberOfLines={1}
Expand All @@ -320,7 +321,7 @@ class RoomItem extends React.Component {
type={type}
showLastMessage={showLastMessage}
username={username}
alert={alert}
alert={alert && !hideUnreadStatus}
/>
<UnreadBadge
unread={unread}
Expand Down
5 changes: 3 additions & 2 deletions app/views/RoomsListView/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ class RoomsListView extends React.Component {

// unread
if (showUnread) {
unread = chats.filter(s => s.unread > 0 || s.alert);
unread = chats.filter(s => (s.unread > 0 || s.alert) && !s.hideUnreadStatus);
} else {
unread = [];
}
Expand All @@ -391,7 +391,7 @@ class RoomsListView extends React.Component {
privateGroup = chats.filter(s => s.t === 'p' && !s.prid);
direct = chats.filter(s => s.t === 'd' && !s.prid);
} else if (showUnread) {
chats = chats.filter(s => !s.unread && !s.alert);
chats = chats.filter(s => (!s.unread && !s.alert) || s.hideUnreadStatus);
}

this.internalSetState({
Expand Down Expand Up @@ -606,6 +606,7 @@ class RoomsListView extends React.Component {
<RoomItem
alert={item.alert}
unread={item.unread}
hideUnreadStatus={item.hideUnreadStatus}
userMentions={item.userMentions}
isRead={this.getIsRead(item)}
favorite={item.f}
Expand Down