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

Support default image answers #3579

Merged
merged 12 commits into from
Feb 12, 2020
Merged

Support default image answers #3579

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
35c51a0
Support default image files
grzesiek2010 Jan 9, 2020
f997fd0
Display ImageView only if the file it should contain really exists
grzesiek2010 Jan 10, 2020
d605097
Added automated tests
grzesiek2010 Jan 10, 2020
e74b3cc
Removed redundant supporitng defaults without prefix
grzesiek2010 Feb 3, 2020
fc8bc9a
Fixed test
grzesiek2010 Feb 3, 2020
8133db6
Fixed bugs
grzesiek2010 Feb 3, 2020
b7d1760
Don't save default images automatically
grzesiek2010 Feb 4, 2020
e159dcb
Remoced redundant comment
grzesiek2010 Feb 4, 2020
cdfc3ab
Naming improvement
grzesiek2010 Feb 4, 2020
c855970
Added unit tests
grzesiek2010 Feb 4, 2020
a536708
Improced test form
grzesiek2010 Feb 4, 2020
7fecf80
Removed redundant file
grzesiek2010 Feb 4, 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
4 changes: 2 additions & 2 deletions collect_app/src/main/java/org/odk/collect/android/widgets/BaseImageWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ protected void launchActivityForResult(Intent intent, final int resourceCode, fi
}
}

private File getFile() {
File getFile() {
lognaturel marked this conversation as resolved.
Show resolved Hide resolved
File file = new File(getInstanceFolder() + File.separator + binaryName);
if (!file.exists() && doesSupportDefaultValues()) {
file = new File(getDefaultFilePath());
Expand All @@ -318,7 +318,7 @@ private File getFile() {
return file;
}

private String getDefaultFilePath() {
String getDefaultFilePath() {
try {
return referenceManager.deriveReference(binaryName).getLocalURI();
} catch (InvalidReferenceException e) {
Expand Down
9 changes: 9 additions & 0 deletions collect_app/src/test/java/org/odk/collect/android/widgets/AnnotateWidgetTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,13 @@ public void usingReadOnlyOptionShouldMakeAllClickableElementsDisabled() {
assertThat(getWidget().chooseButton.getVisibility(), is(View.GONE));
assertThat(getWidget().annotateButton.getVisibility(), is(View.GONE));
}

@Test
public void defaultValuesShouldBeSupported() {
when(formEntryPrompt.getAnswerText()).thenReturn("jr://images/doc.png");
when(getWidget().getDefaultFilePath()).thenReturn("/samplePath/doc.png");

assertThat(getWidget().doesSupportDefaultValues(), is(true));
assertThat(getWidget().getFile().getPath(), is("/samplePath/doc.png"));
}
}
9 changes: 9 additions & 0 deletions collect_app/src/test/java/org/odk/collect/android/widgets/DrawWidgetTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,13 @@ public void usingReadOnlyOptionShouldMakeAllClickableElementsDisabled() {

assertThat(getWidget().drawButton.getVisibility(), is(View.GONE));
}

@Test
public void defaultValuesShouldBeSupported() {
when(formEntryPrompt.getAnswerText()).thenReturn("jr://images/doc.png");
when(getWidget().getDefaultFilePath()).thenReturn("/samplePath/doc.png");

assertThat(getWidget().doesSupportDefaultValues(), is(true));
assertThat(getWidget().getFile().getPath(), is("/samplePath/doc.png"));
}
}
8 changes: 8 additions & 0 deletions collect_app/src/test/java/org/odk/collect/android/widgets/ImageWidgetTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,4 +89,12 @@ public void usingReadOnlyOptionShouldMakeAllClickableElementsDisabled() {
assertThat(getWidget().captureButton.getVisibility(), is(View.GONE));
assertThat(getWidget().chooseButton.getVisibility(), is(View.GONE));
}

@Test
public void defaultValuesShouldNotBeSupported() {
when(formEntryPrompt.getAnswerText()).thenReturn("jr://images/doc.png");

assertThat(getWidget().doesSupportDefaultValues(), is(false));
assertThat(getWidget().getFile().getPath(), is("/jr:/images/doc.png"));
}
}
9 changes: 9 additions & 0 deletions collect_app/src/test/java/org/odk/collect/android/widgets/SignatureWidgetTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,13 @@ public void usingReadOnlyOptionShouldMakeAllClickableElementsDisabled() {

assertThat(getWidget().signButton.getVisibility(), is(View.GONE));
}

@Test
public void defaultValuesShouldBeSupported() {
when(formEntryPrompt.getAnswerText()).thenReturn("jr://images/doc.png");
when(getWidget().getDefaultFilePath()).thenReturn("/samplePath/doc.png");

assertThat(getWidget().doesSupportDefaultValues(), is(true));
assertThat(getWidget().getFile().getPath(), is("/samplePath/doc.png"));
}
}