Skip to content

[IMPROVE] Pull down to refresh read receipts #3427

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 7 commits into from
Oct 20, 2021
Merged

[IMPROVE] Pull down to refresh read receipts #3427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f7f3c12
[FEATURE] Pull down to refresh read receipts
wreiske Oct 5, 2021
c43f501
Support pull down to refresh when we renderEmpty
wreiske Oct 5, 2021
a18e951
Removed extra new lines added while debugging.
wreiske Oct 5, 2021
77d0b53
Merge branch 'develop' into patch-1
wreiske Oct 7, 2021
6361fd7
Merge branch 'develop' into patch-1
wreiske Oct 8, 2021
fa8e45c
Minor polishing
diegolmello Oct 8, 2021
03765f1
Merge branch 'develop' into patch-1
diegolmello Oct 20, 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
56 changes: 30 additions & 26 deletions app/views/ReadReceiptView/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import React from 'react';
import PropTypes from 'prop-types';
import { FlatList, Text, View } from 'react-native';
import { FlatList, Text, View, RefreshControl } from 'react-native';
import { dequal } from 'dequal';
import moment from 'moment';
import { connect } from 'react-redux';

import * as List from '../../containers/List';
import Avatar from '../../containers/Avatar';
import ActivityIndicator from '../../containers/ActivityIndicator';
import * as HeaderButton from '../../containers/HeaderButton';
import I18n from '../../i18n';
import RocketChat from '../../lib/rocketchat';
Expand Down Expand Up @@ -85,12 +84,16 @@ class ReadReceiptView extends React.Component {
};

renderEmpty = () => {
const { loading } = this.state;
const { theme } = this.props;
if (loading) {
return null;
}
return (
<View
style={[styles.listEmptyContainer, { backgroundColor: themes[theme].chatComponentBackground }]}
testID='read-receipt-view'>
<Text style={{ color: themes[theme].titleText }}>{I18n.t('No_Read_Receipts')}</Text>
<Text style={[styles.emptyText, { color: themes[theme].auxiliaryTintColor }]}>{I18n.t('No_Read_Receipts')}</Text>
</View>
);
};
Expand All @@ -107,9 +110,15 @@ class ReadReceiptView extends React.Component {
<View style={styles.infoContainer}>
<View style={styles.item}>
<Text style={[styles.name, { color: themes[theme].titleText }]}>{item?.user?.name}</Text>
<Text style={{ color: themes[theme].auxiliaryText }}>{time}</Text>
<Text style={[styles.time, { color: themes[theme].auxiliaryText }]}>{time}</Text>
</View>
<Text style={{ color: themes[theme].auxiliaryText }}>{`@${item.user.username}`}</Text>
<Text
style={[
styles.username,
{
color: themes[theme].auxiliaryText
}
]}>{`@${item.user.username}`}</Text>
</View>
</View>
);
Expand All @@ -119,30 +128,25 @@ class ReadReceiptView extends React.Component {
const { receipts, loading } = this.state;
const { theme } = this.props;

if (!loading && receipts.length === 0) {
return this.renderEmpty();
}

return (
<SafeAreaView testID='read-receipt-view'>
<StatusBar />
{loading ? (
<ActivityIndicator theme={theme} />
) : (
<FlatList
data={receipts}
renderItem={this.renderItem}
ItemSeparatorComponent={List.Separator}
style={[
styles.list,
{
backgroundColor: themes[theme].chatComponentBackground,
borderColor: themes[theme].separatorColor
}
]}
keyExtractor={item => item._id}
/>
)}
<FlatList
data={receipts}
renderItem={this.renderItem}
ItemSeparatorComponent={List.Separator}
ListEmptyComponent={this.renderEmpty}
contentContainerStyle={List.styles.contentContainerStyleFlatList}
style={[
styles.list,
{
backgroundColor: themes[theme].chatComponentBackground,
borderColor: themes[theme].separatorColor
}
]}
refreshControl={<RefreshControl refreshing={loading} onRefresh={this.load} tintColor={themes[theme].auxiliaryText} />}
keyExtractor={item => item._id}
/>
</SafeAreaView>
);
}
Expand Down
13 changes: 13 additions & 0 deletions app/views/ReadReceiptView/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,14 @@ export default StyleSheet.create({
alignItems: 'center',
justifyContent: 'center'
},
emptyText: {
fontSize: 16,
...sharedStyles.textRegular
},
item: {
flex: 1,
flexDirection: 'row',
alignItems: 'center',
justifyContent: 'space-between'
},
separator: {
Expand All @@ -20,6 +25,14 @@ export default StyleSheet.create({
...sharedStyles.textRegular,
fontSize: 17
},
username: {
...sharedStyles.textMedium,
fontSize: 14
},
time: {
...sharedStyles.textRegular,
fontSize: 12
},
infoContainer: {
flex: 1,
marginLeft: 10
Expand Down