Skip to content

Commit

Permalink
Add test landscape mode
Browse files Browse the repository at this point in the history 
Extend quick goto edittext
Adjust field name size in nav drawer
Fix a bug that crashed the app if spaces were included in column names
Include app manual in git
Update strings
Add 720dp dimens
Fix bug with min/max numeric
Change all dialogs to alertdialogs
Update all buttons to use default material theme
Update trait layouts
Fix bug with dragsortlistview (in trait list)
Added person and location to usertraits table in database
  • Loading branch information
@trife
trife authored and trife committed Apr 4, 2016
1 parent d826fdb commit f7d6585
Show file tree
Hide file tree
Showing 96 changed files with 3,805 additions and 4,395 deletions.
6 changes: 5 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
# Field Book [![Google Play](http://developer.android.com/images/brand/en_generic_rgb_wo_45.png)](https://play.google.com/store/apps/details?id=com.fieldbook.tracker)
# Field Book
<a href="https://play.google.com/store/apps/details?id=com.fieldbook.tracker">
<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png" height="60">
</a>

Field Book is an Android application that can be used to collect field data. It uses a novel collection system that only displays a single cell to be collected at a time.

### Acknowledgements
Expand Down
19 changes: 6 additions & 13 deletions app/app.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,38 +65,31 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/22.2.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
<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/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="log4j-1.2.14" level="project" />
<orderEntry type="library" exported="" name="design-22.2.0" level="project" />
<orderEntry type="library" exported="" name="jsoup-1.8.1" level="project" />
<orderEntry type="library" exported="" name="jxl-2.6.10" level="project" />
<orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
<orderEntry type="library" exported="" name="design-22.2.0" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
<orderEntry type="library" exported="" name="jsoup-1.8.1" level="project" />
<orderEntry type="library" exported="" name="log4j-1.2.14" level="project" />
</component>
</module>
Binary file added app/org.apache.http.legacy.jar
View file
Binary file not shown.
20 changes: 14 additions & 6 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.fieldbook.tracker"
android:versionCode="311"
android:versionName="3.1.1">
android:versionCode="320"
android:versionName="3.2.0">

<uses-permission android:name="android.permission.WRITE_SETTINGS" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
Expand Down Expand Up @@ -45,14 +45,14 @@
android:configChanges="orientation|keyboardHidden|screenSize|locale"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/AppDialog" />
android:theme="@style/ActivityDialog" />

<activity
android:name="DatagridActivity"
android:configChanges="orientation|keyboardHidden|screenSize|locale"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/AppDialog" />
android:theme="@style/ActivityDialog" />

<activity
android:name="ConfigActivity"
Expand All @@ -73,7 +73,7 @@
android:configChanges="orientation|keyboardHidden|screenSize|locale"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/AppDialog" />
android:theme="@style/ActivityDialog" />

<activity
android:name=".Trait.TraitEditorActivity"
Expand All @@ -84,6 +84,12 @@
android:screenOrientation="portrait"
android:theme="@style/AppTheme" />

<activity
android:name="ChangelogActivity"
android:configChanges="orientation|keyboardHidden|screenSize|locale"
android:screenOrientation="portrait"
android:theme="@style/ActivityDialog" />

<activity
android:name=".Tutorial.TutorialMainActivity"
android:configChanges="orientation|keyboardHidden|screenSize|locale"
Expand All @@ -106,9 +112,11 @@
android:theme="@style/AppDialog" />

<activity
android:name="ChangelogActivity"
android:name=".Tutorial.TutorialFieldActivity"
android:configChanges="orientation|keyboardHidden|screenSize|locale"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/AppDialog" />

</application>
</manifest>
Binary file modified app/src/main/assets/database/sample.db
View file
Binary file not shown.
5 changes: 3 additions & 2 deletions app/src/main/assets/database/sample.db_sharedpref.xml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
<map>
<string name="ImportSecondName">plot</string>
<int name="UpdateVersion" value="310" />
<string name="DROP3">column</string>
<int name="UpdateVersion" value="320" />
<string name="DROP3">pedigree</string>
<boolean name="ImportFieldFinished" value="true" />
<string name="FieldFile">field_sample</string>
<string name="ImportFirstName">row</string>
<string name="DROP1">plot_id</string>
<boolean name="TipsConfigured" value="true" />
<string name="lastplot">13RPN00001</string>
<boolean name="CreateTraitFinished" value="true" />
<string name="ImportUniqueName">plot_id</string>
<string name="DROP2">seed_name</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/assets/field_import/field_sample.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ plot_id,row,column,plot,tray_row,tray_id,seed_id,seed_name,pedigree
13RPN00009,1,9,9,1,13RPN_TRAY003,11ASH90002B,Kharkof,Kharkof
13RPN00010,1,10,10,3,13RPN_TRAY003,11ASH90002B,Harding,Harding
13RPN00011,1,11,11,4,13RPN_TRAY003,11ASH90002B,Nuplains,Nuplains
13RPN00012,1,12,12,6,13RPN_TRAY003,11ASH90002B,Nekota,Nekota
13RPN00012,1,12,12,6,13RPN_TRAY003,11ASH90002B,Nekouta,Nekouta
13RPN00013,1,13,13,1,13RPN_TRAY004,11ASH90002B,Trego,Trego
13RPN00014,1,14,14,3,13RPN_TRAY004,11ASH90002B,T140,93WGRC27/T811
13RPN00015,1,15,15,4,13RPN_TRAY004,11ASH90002B,T141,T441/T13
Expand Down
Binary file removed app/src/main/assets/field_import/field_sample.xls
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion ...java/com/fieldbook/tracker/CSVReader.java → .../com/fieldbook/tracker/CSV/CSVReader.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.fieldbook.tracker;
package com.fieldbook.tracker.CSV;

import java.io.BufferedReader;
import java.io.IOException;
Expand Down
26 changes: 5 additions & 21 deletions ...java/com/fieldbook/tracker/CSVWriter.java → .../com/fieldbook/tracker/CSV/CSVWriter.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.fieldbook.tracker;
package com.fieldbook.tracker.CSV;

import android.database.Cursor;

Expand Down Expand Up @@ -79,15 +79,16 @@ public CSVWriter(Writer writer, char separator, char quotechar,
* database, and so is passed in as a parameter
* V2 - Range added, columns selectable
*/
public void writeDatabaseFormat(ArrayList<String> range, String person, String location) throws Exception {
public void writeDatabaseFormat(ArrayList<String> range) throws Exception {
// Simply loop through all items
if (curCSV.getCount() > 0) {

range.add("trait");
range.add("value");
range.add("person");
range.add("timestamp");
range.add("person");
range.add("location");
range.add("number");

String[] labels = range.toArray(new String[range.size()]);

Expand All @@ -98,27 +99,10 @@ public void writeDatabaseFormat(ArrayList<String> range, String person, String l
while (curCSV.moveToNext()) {
String arrStr[] = new String[labels.length];

for (int i = 0; i < labels.length - 5; i++) {
for (int i = 0; i < labels.length; i++) {
arrStr[i] = curCSV.getString(i);
}

int count = 0;

for (int i = labels.length - 5; i < labels.length; i++) {
if (count == 0) {
arrStr[i] = curCSV.getString(i);
} else if (count == 1) {
arrStr[i] = curCSV.getString(i);
} else if (count == 2)
arrStr[i] = person;
else if (count == 4)
arrStr[i] = location;
else
arrStr[i] = curCSV.getString(curCSV.getColumnCount() - 1);

count += 1;
}

writeNext(arrStr);
}
}
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/fieldbook/tracker/ChangelogActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
Expand All @@ -20,7 +21,7 @@
import java.util.Locale;


public class ChangelogActivity extends Activity {
public class ChangelogActivity extends AppCompatActivity {

private static String TAG = "Field Book";

Expand Down
13 changes: 0 additions & 13 deletions app/src/main/java/com/fieldbook/tracker/ColumnData.java
View file

This file was deleted.

Loading

0 comments on commit f7d6585

Please sign in to comment.