Skip to content

Bug treatment #5

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

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Bug treatment #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bb82830
Sync ordered and SeaBioData tab removed
BrunoBarros21 Feb 12, 2018
0d87653
Where there are no bookmarks, a message is displayed
BrunoBarros21 Feb 12, 2018
e93ec94
refresh button on file browser working
BrunoBarros21 Feb 14, 2018
95835c1
back button kinda working
BrunoBarros21 Feb 14, 2018
a2f7a5e
Sync Long press handling
BrunoBarros21 Feb 14, 2018
3fb16c0
Creating folder before sending to dendro
BrunoBarros21 Feb 23, 2018
962e688
creating folder before the sending to dendro and explorer with a bett…
BrunoBarros21 Mar 9, 2018
4187d68
UI and export updated
BrunoBarros21 Apr 20, 2018
9ac1574
Metadata can be canceled now
BrunoBarros21 Apr 27, 2018
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
/.idea/*
.DS_Store
/build
.idea/*
1 change: 0 additions & 1 deletion .idea/.name
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions .idea/compiler.xml
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions .idea/copyright/profiles_settings.xml
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions .idea/gradle.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

95 changes: 47 additions & 48 deletions app/app.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,20 +49,20 @@
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
Expand All @@ -84,8 +84,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/.DS_Store" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/.DS_Store" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
Expand All @@ -96,64 +94,65 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/multi-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 26 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="com.android.support:multidex-1.0.2" level="project" />
<orderEntry type="library" name="com.android.support:support-media-compat-26.1.0" level="project" />
<orderEntry type="library" name="__local_aars__:/Users/joaorocha/Desktop/Dendro/labtablet/app/libs/opencsv-3.1.jar:unspecified@jar" level="project" />
<orderEntry type="library" name="com.android.support:recyclerview-v7-26.1.0" level="project" />
<orderEntry type="library" name="android.arch.lifecycle:common:1.0.0@jar" level="project" />
<orderEntry type="library" name="ch.acra:acra-4.8.2" level="project" />
<orderEntry type="library" name="com.android.support:support-fragment-26.1.0" level="project" />
<orderEntry type="library" name="com.squareup.okhttp:okhttp:2.5.0@jar" level="project" />
<orderEntry type="library" name="com.android.support:support-vector-drawable-26.1.0" level="project" />
<orderEntry type="library" name="android.arch.lifecycle:runtime-1.0.0" level="project" />
<orderEntry type="library" name="com.android.support:appcompat-v7-26.1.0" level="project" />
<orderEntry type="library" name="org.jdom:jdom:2.0.2@jar" level="project" />
<orderEntry type="library" name="com.android.support:support-annotations:26.1.0@jar" level="project" />
<orderEntry type="library" name="android.arch.persistence.room:runtime-1.0.0" level="project" />
<orderEntry type="library" name="android.arch.persistence:db-1.0.0" level="project" />
<orderEntry type="library" name="__local_aars__:/Users/joaorocha/Desktop/Dendro/labtablet/app/libs/itextpdf-5.5.3.jar:unspecified@jar" level="project" />
<orderEntry type="library" name="com.android.support:support-core-utils-26.1.0" level="project" />
<orderEntry type="library" name="com.android.support:support-core-ui-26.1.0" level="project" />
<orderEntry type="library" name="eu.the4thfloor.volley:com.android.volley:2015.05.28@jar" level="project" />
<orderEntry type="library" name="com.google.code.gson:gson:2.8.2@jar" level="project" />
<orderEntry type="library" name="__local_aars__:/Users/joaorocha/Desktop/Dendro/labtablet/app/libs/httpmime-4.3.4.jar:unspecified@jar" level="project" />
<orderEntry type="library" name="com.android.support:support-compat-26.1.0" level="project" />
<orderEntry type="library" name="android.arch.core:common:1.0.0@jar" level="project" />
<orderEntry type="library" name="android.arch.persistence:db-framework-1.0.0" level="project" />
<orderEntry type="library" name="com.android.support:support-v4-26.1.0" level="project" />
<orderEntry type="library" name="com.squareup.okio:okio:1.6.0@jar" level="project" />
<orderEntry type="library" name="org.apache.httpcomponents:httpclient-android:4.3.5.1@jar" level="project" />
<orderEntry type="library" name="__local_aars__:/Users/joaorocha/Desktop/Dendro/labtablet/app/libs/pocketsphinx-android-5prealpha-nolib.jar:unspecified@jar" level="project" />
<orderEntry type="library" name="com.android.support:animated-vector-drawable-26.1.0" level="project" />
<orderEntry type="library" scope="TEST" name="com.android.support:multidex-instrumentation-1.0.2" level="project" />
<orderEntry type="library" name="com.android.support:support-v13-26.1.0" level="project" />
<orderEntry type="library" name="android.arch.persistence.room:common:1.0.0@jar" level="project" />
<orderEntry type="library" name="com.android.support:design-26.1.0" level="project" />
<orderEntry type="library" name="com.android.support:transition-26.1.0" level="project" />
<orderEntry type="library" name="com.android.support:cardview-v7-26.1.0" level="project" />
<orderEntry type="library" name="android.arch.core:runtime-1.0.0" level="project" />
<orderEntry type="library" name="org.apache.http.legacy-android-26" level="project" />
<orderEntry type="library" name="Gradle: __local_aars__:/home/bruno/Documentos/InfoLab/labtablet/app/libs/httpmime-4.3.4.jar:unspecified@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-26.1.0" level="project" />
<orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpclient-android:4.3.5.1@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:transition-26.1.0" level="project" />
<orderEntry type="library" name="Gradle: com.squareup.okhttp:okhttp:2.5.0@jar" level="project" />
<orderEntry type="library" name="Gradle: eu.the4thfloor.volley:com.android.volley:2015.05.28@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-26.1.0" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-fragment-26.1.0" level="project" />
<orderEntry type="library" name="Gradle: android.arch.core:common:1.0.0@jar" level="project" />
<orderEntry type="library" name="Gradle: org.jdom:jdom:2.0.2@jar" level="project" />
<orderEntry type="library" name="Gradle: ch.acra:acra-4.8.2" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:multidex-1.0.2" level="project" />
<orderEntry type="library" name="Gradle: __local_aars__:/home/bruno/Documentos/InfoLab/labtablet/app/libs/itextpdf-5.5.3.jar:unspecified@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-media-compat-26.1.0" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:26.1.0@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-v4-26.1.0" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-compat-26.1.0" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7-26.1.0" level="project" />
<orderEntry type="library" name="Gradle: android.arch.persistence:db-framework-1.0.0" level="project" />
<orderEntry type="library" name="Gradle: __local_aars__:/home/bruno/Documentos/InfoLab/labtablet/app/libs/opencsv-3.1.jar:unspecified@jar" level="project" />
<orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.0.0@jar" level="project" />
<orderEntry type="library" name="Gradle: android.arch.persistence:db-1.0.0" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-26.1.0" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-core-ui-26.1.0" level="project" />
<orderEntry type="library" name="Gradle: android.arch.persistence.room:runtime-1.0.0" level="project" />
<orderEntry type="library" name="Gradle: android.arch.core:runtime-1.0.0" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support:multidex-instrumentation-1.0.2" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-core-utils-26.1.0" level="project" />
<orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.2@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-v13-26.1.0" level="project" />
<orderEntry type="library" name="Gradle: android.arch.persistence.room:common:1.0.0@jar" level="project" />
<orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.6.0@jar" level="project" />
<orderEntry type="library" name="Gradle: __local_aars__:/home/bruno/Documentos/InfoLab/labtablet/app/libs/pocketsphinx-android-5prealpha-nolib.jar:unspecified@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:cardview-v7-26.1.0" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:design-26.1.0" level="project" />
<orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.0.0" level="project" />
<orderEntry type="library" name="Gradle: org.apache.http.legacy-android-26" level="project" />
</component>
</module>
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
android {
//compileSdkVersion 24
compileSdkVersion 26
buildToolsVersion '26.0.2'
buildToolsVersion '27.0.3'
useLibrary 'org.apache.http.legacy'

packagingOptions {
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/pt/up/fe/beta/labtablet/activities/FavoriteDetailsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,8 +405,8 @@ public boolean onOptionsItemSelected(final MenuItem item) {
finish();
break;
case R.id.action_favorite_upload:

final String options[] = {"SeaBioData", "Dendro"};
dispatchDendroUpload();
/*final String options[] = {"SeaBioData", "Dendro"};
android.support.v7.app.AlertDialog.Builder builder = new android.support.v7.app.AlertDialog.Builder(FavoriteDetailsActivity.this);
builder.setTitle(getString(R.string.dialog_pick_context_title));
builder.setItems(options, new DialogInterface.OnClickListener() {
Expand All @@ -429,7 +429,7 @@ public void onClick(DialogInterface dialog, int which) {
}
});
builder.show();

*/
break;
case R.id.action_favorite_delete:
//remove this favorite
Expand Down
13 changes: 9 additions & 4 deletions app/src/main/java/pt/up/fe/beta/labtablet/activities/FieldModeActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,11 +558,16 @@ protected void onActivityResult(int requestCode, int resultCode, final Intent da
if (!data.getExtras().containsKey("favorite")) {
Toast.makeText(this, "No descriptors received", Toast.LENGTH_SHORT).show();
return;
}
} else if (data.getExtras().get("favorite").equals("cancelled")){
Toast.makeText(this, "Recolha de Metadados cancelada", Toast.LENGTH_SHORT).show();
finish();
break;
} else {

Toast.makeText(this, getResources().getString(R.string.metadata_added_success), Toast.LENGTH_SHORT).show();
finish();
break;
Toast.makeText(this, getResources().getString(R.string.metadata_added_success), Toast.LENGTH_SHORT).show();
finish();
break;
}

case Utils.SOLVE_FORM:
if (data == null) {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/pt/up/fe/beta/labtablet/activities/SubmissionValidationActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public class SubmissionValidationActivity extends AppCompatActivity implements S
* The {@link ViewPager} that will host the section contents.
*/
private ViewPager mViewPager;
private FloatingActionButton pb_submission_state;
//private FloatingActionButton pb_submission_state;

public static String getProjectName() {
return projectName;
Expand Down Expand Up @@ -85,7 +85,7 @@ protected void onCreate(Bundle savedInstanceState) {
getSupportActionBar().setHomeButtonEnabled(true);

}
pb_submission_state = (FloatingActionButton) findViewById(R.id.pb_submission);
//pb_submission_state = (FloatingActionButton) findViewById(R.id.pb_submission);

favoriteName = getIntent().getStringExtra("favorite_name");

Expand Down
Loading