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

Added feedback for trace overlap if it comes back with no results #190

Merged
merged 5 commits into from
Mar 25, 2020
Merged

Added feedback for trace overlap if it comes back with no results #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3511d58
quality of life improvements
SamMakesThings Mar 24, 2020
a192b17
Add dynamic button text for trace overlap results
SamMakesThings Mar 24, 2020
e8cdb05
Merge pull request #1 from StartupSam/StartupSam/overlap-feedback
SamMakesThings Mar 24, 2020
3b9a88d
Reenabled Prettier in Overlap.js but didn't format
SamMakesThings Mar 24, 2020
5809b54
Add translation for overlap button text and title
SamMakesThings Mar 24, 2020
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
6 changes: 3 additions & 3 deletions app/locales/en/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import intro from './intro.json';
import locationTracking from './locationTracking.json';
import importFile from './import.json'
import exportFile from './exportscreen.json'
import importFile from './import.json';
import exportFile from './exportscreen.json';
import licensesFile from './licensesscreen.json';
import overlapFile from './overlap.json'
import overlapFile from './overlap.json';

export default {
...intro,
Expand Down
7 changes: 5 additions & 2 deletions app/locales/en/overlap.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"overlap_para_1":"This map shows where your private location trail overlaps with public data from a variety of sources, including official reports from WHO, Ministries of Health, and Chinese local, provincial, and national health authorities. If additional data are available from reliable online reports, they are included.",
"show_overlap": "SHOW ME TRACE OVERLAP",
"overlap_title": "Check Overlap",
"overlap_para_1": "This map shows where your private location trail overlaps with public data from a variety of sources, including official reports from WHO, Ministries of Health, and Chinese local, provincial, and national health authorities. If additional data are available from reliable online reports, they are included.",
"show_overlap": "Show Me Trace Overlap",
"overlap_no_results_button_label": "No Trace Overlap Found",
"overlap_found_button_label": "Trace Overlap Found"
}
12 changes: 8 additions & 4 deletions app/views/LocationTracking.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ class LocationTracking extends Component {
}

overlap() {
this.props.navigation.navigate('OverlapScreen', {})
}
this.props.navigation.navigate('OverlapScreen', {});
}

willParticipate = () => {
SetStoreData('PARTICIPATE', 'true').then(() => LocationServices.start());
Expand Down Expand Up @@ -175,8 +175,12 @@ class LocationTracking extends Component {
{languages.t('label.stop_logging')}
</Text>
</TouchableOpacity>
<TouchableOpacity onPress={() => this.overlap()} style={styles.startLoggingButtonTouchable} >
<Text style={styles.startLoggingButtonText}>{languages.t('label.overlap')}</Text>
<TouchableOpacity
onPress={() => this.overlap()}
style={styles.startLoggingButtonTouchable}>
<Text style={styles.startLoggingButtonText}>
{languages.t('label.overlap')}
</Text>
</TouchableOpacity>
</>
) : (
Expand Down
32 changes: 17 additions & 15 deletions app/views/Overlap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ const width = Dimensions.get('window').width;
const base64 = RNFetchBlob.base64

const public_data = "https://docs.google.com/spreadsheets/d/1itaohdPiAeniCXNlntNztZ_oRvjh0HsGuJXUJWET008/export?format=csv"
const show_button_text = "Show Me Trace Overlap";
const show_button_text = languages.t('label.show_overlap');
const overlap_true_button_text = languages.t('label.overlap_found_button_label');
const no_overlap_button_text = languages.t('label.overlap_no_results_button_label');
const INITIAL_REGION = {
latitude: 36.56,
longitude: 20.39,
Expand Down Expand Up @@ -151,8 +153,7 @@ class OverlapScreen extends Component {
downloadAndPlot = async () => {
// Downloads the file on the disk and loads it into memory
try {
this.setState({'showButton': {'disabled': true,
'text': 'Loading Public Trace'}});
this.setState({'showButton': {'disabled': true, 'text': 'Loading Public Trace'}});
RNFetchBlob
.config({
// add this option that makes response data to be stored as a file,
Expand All @@ -176,8 +177,15 @@ class OverlapScreen extends Component {
console.log(Object.keys(parsedRecords).length);
this.plotCircles(parsedRecords)
.then(() => {
this.setState({'showButton': {'disabled': false,
'text': show_button_text}});
// if no overlap, alert user via button text
// this is a temporary fix, make it more robust later
if (Object.keys(parsedRecords).length !== 0) {
this.setState({'showButton': {'disabled': false,
'text': overlap_true_button_text}});
} else {
this.setState({'showButton': {'disabled': false,
'text': no_overlap_button_text}});
}
});
});
})
Expand Down Expand Up @@ -274,7 +282,7 @@ class OverlapScreen extends Component {
<TouchableOpacity style={styles.backArrowTouchable} onPress={() => this.backToMain()}>
<Image style={styles.backArrow} source={backArrow} />
</TouchableOpacity>
<Text style={styles.headerTitle}>{languages.t('label.overlap')}</Text>
<Text style={styles.headerTitle}>{languages.t('label.overlap_title')}</Text>
</View>
<MapView
provider={PROVIDER_GOOGLE}
Expand Down Expand Up @@ -302,6 +310,7 @@ class OverlapScreen extends Component {
<View style={styles.main}>
<TouchableOpacity style={styles.buttonTouchable} onPress={() => this.downloadAndPlot()}
disabled={this.state.showButton.disabled}>
{/* If no overlap found, change button text to say so. Temporary solution, replace with something more robust */}
<Text style={styles.buttonText}>{languages.t(this.state.showButton.text)}</Text>
</TouchableOpacity>
<Text style={styles.sectionDescription}>{languages.t('label.overlap_para_1')}</Text>
Expand All @@ -321,11 +330,8 @@ const styles = StyleSheet.create({
backgroundColor: colors.WHITE
},
headerTitle: {
textAlign: 'center',
fontWeight: "bold",
fontSize: 38,

padding: 0
fontSize: 24,
fontFamily:'OpenSans-Bold',
},
subHeaderTitle: {
textAlign: 'center',
Expand Down Expand Up @@ -392,10 +398,6 @@ const styles = StyleSheet.create({
height: 18,
width: 18.48
},
headerTitle:{
fontSize: 24,
fontFamily:'OpenSans-Bold'
},
sectionDescription: {
fontSize: 16,
lineHeight: 24,
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
"eslint": "^6.8.0",
"jest": "^25.1.0",
"metro-react-native-babel-preset": "^0.58.0",
"prettier": "1.17.0",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this and the package-json intentional in this PR? If not, let's remove these files.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was intentional - realized I should've included it in the primary Prettier PR, since different versions of Prettier have slightly different rules. I can make it a separate PR if you need

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm OK with it, but we should add a comment in the PR notes.

"react-native-version": "^4.0.0",
"react-test-renderer": "16.9.0"
},
Expand Down
Loading