Skip to content

Commit

Permalink
Long press InfoBar text for a toast containing the same text
Browse files Browse the repository at this point in the history 
Fixed a bug in Lollipop with MediaContentScanner
Quick GoTo is disabled by default (toggled in Advanced Settings)
Press and hold to scroll is now delayed by 750ms before scrolling at 100ms
Only first photo name is exported in table mode
Fixed some issues with search layout
Updated summary dialog
Reworked location code
Updated sample files
  • Loading branch information
trife committed Apr 22, 2015
1 parent 407bf89 commit a1071c6
Show file tree
Hide file tree
Showing 26 changed files with 1,518 additions and 422 deletions.
4 changes: 2 additions & 2 deletions Field Book/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="233"
android:versionName="2.3.3" >
android:versionCode="234"
android:versionName="2.3.4" >

<uses-sdk
android:minSdkVersion="14"
Expand Down
400 changes: 200 additions & 200 deletions Field Book/assets/field_import/field_sample.csv
View file

Large diffs are not rendered by default.

Binary file modified Field Book/assets/field_import/field_sample.xls
View file
Binary file not shown.
Binary file added Field Book/res/drawable-hdpi/ic_action_camera.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Field Book/res/drawable-mdpi/ic_action_camera.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Field Book/res/drawable-xhdpi/ic_action_camera.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
53 changes: 8 additions & 45 deletions Field Book/res/layout/about.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
android:layout_height="wrap_content"
android:paddingBottom="10dp"
android:paddingLeft="10dp"
android:text="Version: "
android:text="@string/versiontitle"
android:textColor="#38c0f4"
android:textSize="25dp"
android:clickable="true"
Expand All @@ -37,7 +37,7 @@
android:layout_marginLeft="15dip"
android:paddingBottom="10dp"
android:paddingLeft="10dp"
android:text="Trevor Rife, Kansas State University"
android:text="@string/devr"
android:textColor="#000000"
android:textSize="20dp"
android:textStyle="bold" />
Expand All @@ -50,7 +50,7 @@
android:autoLink="email"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:text="trife@ksu.edu"
android:text="@string/devremail"
android:textColor="#000000"
android:textSize="15dp"
android:textStyle="bold" />
Expand All @@ -63,7 +63,7 @@
android:autoLink="web"
android:paddingBottom="10dp"
android:paddingLeft="10dp"
android:text="https://github.com/trife/Field-Book"
android:text="@string/devrsite"
android:textColor="#000000"
android:textSize="15dp"
android:textStyle="bold" />
Expand All @@ -75,7 +75,7 @@
android:layout_marginLeft="15dip"
android:paddingBottom="10dp"
android:paddingLeft="10dp"
android:text="Jesse Poland, Kansas State University"
android:text="@string/devp"
android:textColor="#000000"
android:textSize="20dp"
android:textStyle="bold" />
Expand All @@ -88,7 +88,7 @@
android:autoLink="email"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:text="jpoland@ksu.edu"
android:text="@string/devpemail"
android:textColor="#000000"
android:textSize="15dp"
android:textStyle="bold" />
Expand All @@ -101,44 +101,7 @@
android:autoLink="web"
android:paddingBottom="10dp"
android:paddingLeft="10dp"
android:text="http://wheatgenetics.org"
android:textColor="#000000"
android:textSize="15dp"
android:textStyle="bold" />

<TextView
android:id="@+id/developerTp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dip"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:text="Technology Projects"
android:textColor="#000000"
android:textSize="20dp"
android:textStyle="bold" />

<TextView
android:id="@+id/developerTpMsg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="25dip"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:text="Solutions for mobile clients, server, and cloud-based computing."
android:textColor="#000000"
android:textSize="15dp"
android:textStyle="bold" />

<TextView
android:id="@+id/developerTpEmail"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="25dip"
android:autoLink="email"
android:paddingBottom="10dp"
android:paddingLeft="10dp"
android:text="technologyprojects@gmail.com"
android:text="@string/devpsite"
android:textColor="#000000"
android:textSize="15dp"
android:textStyle="bold" />
Expand All @@ -161,7 +124,7 @@
android:layout_marginLeft="15dip"
android:paddingBottom="10dp"
android:paddingLeft="10dp"
android:text="Irazema Fuentes-Bueno, Sandra Dunckel, Shuangye Wu, Narinder Singh, Daljit Singh, Erena Edae, Tatiana Danilova, Rodrigo Pedrozo, Cristiano Lemes da Silva, Sophie Bouchet, Hiroyoshi Iwata, Goro Ishikawa, Khaled El-Shamaa"
android:text="@string/translist"
android:textColor="#000000"
android:textSize="20dp"
android:textStyle="bold" />
Expand Down
46 changes: 32 additions & 14 deletions Field Book/res/layout/advanced.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
android:layout_height="25dp" />

<CheckBox
android:id="@+id/cycle"
android:id="@+id/nextEmptyPlot"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="false"
android:text="@string/cycle"
android:text="@string/nextmissingenable"
android:textColor="#000000"
android:textSize="30dp"
android:textStyle="bold" />
Expand All @@ -45,11 +45,25 @@
android:layout_height="25dp" />

<CheckBox
android:id="@+id/enableMap"
android:id="@+id/quickGoTo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true"
android:text="@string/quickgoto"
android:textColor="#000000"
android:textSize="30dp"
android:textStyle="bold" />

<View
android:layout_width="wrap_content"
android:layout_height="25dp" />

<CheckBox
android:id="@+id/rangeSound"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="false"
android:text="@string/enablemap"
android:text="@string/rangechime"
android:textColor="#000000"
android:textSize="30dp"
android:textStyle="bold" />
Expand All @@ -59,11 +73,11 @@
android:layout_height="25dp" />

<CheckBox
android:id="@+id/ignoreExisting"
android:id="@+id/jumpToPlot"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="false"
android:text="@string/ignoreentries"
android:text="@string/jumptoplotid"
android:textColor="#000000"
android:textSize="30dp"
android:textStyle="bold" />
Expand All @@ -73,11 +87,11 @@
android:layout_height="25dp" />

<CheckBox
android:id="@+id/useDay"
android:id="@+id/cycle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="false"
android:text="@string/useday"
android:text="@string/cycle"
android:textColor="#000000"
android:textSize="30dp"
android:textStyle="bold" />
Expand All @@ -87,11 +101,11 @@
android:layout_height="25dp" />

<CheckBox
android:id="@+id/rangeSound"
android:id="@+id/ignoreExisting"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="false"
android:text="@string/rangechime"
android:text="@string/ignoreentries"
android:textColor="#000000"
android:textSize="30dp"
android:textStyle="bold" />
Expand All @@ -101,11 +115,11 @@
android:layout_height="25dp" />

<CheckBox
android:id="@+id/jumpToPlot"
android:id="@+id/useDay"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="false"
android:text="@string/jumptoplotid"
android:text="@string/useday"
android:textColor="#000000"
android:textSize="30dp"
android:textStyle="bold" />
Expand All @@ -115,15 +129,19 @@
android:layout_height="25dp" />

<CheckBox
android:id="@+id/nextEmptyPlot"
android:id="@+id/enableMap"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="false"
android:text="@string/nextmissingenable"
android:text="@string/enablemap"
android:textColor="#000000"
android:textSize="30dp"
android:textStyle="bold" />

<View
android:layout_width="wrap_content"
android:layout_height="25dp" />

</LinearLayout>
</ScrollView>

Expand Down
75 changes: 75 additions & 0 deletions Field Book/res/layout/gotobarcode.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="#FFFFFF"
android:orientation="vertical"
android:padding="5dp">

<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:paddingTop="10dp"
android:orientation="horizontal">

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">

<Button
android:id="@+id/camBtn"
android:layout_width="45dp"
android:layout_height="45dp"
android:background="@android:drawable/btn_default"
android:drawableTop="@drawable/ic_action_camera"
android:focusable="false"
android:minWidth="30dp"
android:text="" />
</LinearLayout>

<EditText
android:id="@+id/barcodeid"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:maxLength="200"
android:singleLine="true"
android:textColor="#000000"
android:textSize="20dp" />

</LinearLayout>

<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:paddingTop="10dp"
android:orientation="horizontal">

<Button
android:id="@+id/closeBtn"
android:layout_width="wrap_content"
android:layout_height="60dp"
android:background="@android:drawable/btn_default"
android:layout_gravity="center"
android:minWidth="150dp"
android:text="@string/close"
android:textColor="#000000"
android:textSize="30dp"
android:textStyle="bold" />

<Button
android:id="@+id/saveBtn"
android:layout_width="wrap_content"
android:layout_height="60dp"
android:layout_gravity="center"
android:background="@android:drawable/btn_default"
android:minWidth="150dp"
android:text="@string/okay"
android:textColor="#000000"
android:textSize="30dp"
android:textStyle="bold" />

</LinearLayout>

</LinearLayout>
29 changes: 26 additions & 3 deletions Field Book/res/layout/main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,16 +96,15 @@

<com.fieldbook.tracker.AutoResizeTextView
android:id="@+id/drop3"
android:layout_width="fill_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left|center_vertical"
android:ellipsize="none"
android:paddingLeft="10dp"
android:singleLine="true"
android:textColor="#000000"
android:textSize="30dp"
android:textStyle="bold" />

android:textStyle="bold"/>
</TableRow>
</TableLayout>

Expand Down Expand Up @@ -233,6 +232,18 @@
android:textColor="#000000"
android:textSize="35dp"
android:textStyle="bold" />

<TextView
android:id="@+id/tvRange"
android:layout_width="120dp"
android:layout_height="wrap_content"
android:gravity="center"
android:singleLine="true"
android:text=""
android:textColor="#000000"
android:textSize="35dp"
android:textStyle="bold"
android:visibility="gone"/>
</LinearLayout>

<LinearLayout
Expand Down Expand Up @@ -266,6 +277,18 @@
android:textColor="#000000"
android:textSize="35dp"
android:textStyle="bold" />

<TextView
android:id="@+id/tvPlot"
android:layout_width="120dp"
android:layout_height="wrap_content"
android:gravity="center"
android:singleLine="true"
android:text=""
android:textColor="#000000"
android:textSize="35dp"
android:textStyle="bold"
android:visibility="gone"/>
</LinearLayout>
</LinearLayout>

Expand Down
Loading

0 comments on commit a1071c6

Please sign in to comment.