Skip to content

Commit

Permalink
2.1.0
Browse files Browse the repository at this point in the history 
Option to reset database
Replace text on ActionBar with appropriate icons
Files listed alphabetically in Fields dialog
Added support for folders in the Fields dialog
  • Loading branch information
trife committed Aug 19, 2014
1 parent f502df3 commit 29592dc
Show file tree
Hide file tree
Showing 18 changed files with 833 additions and 375 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="12"
android:versionName="2.0" >
android:versionCode="210"
android:versionName="2.1.0" >

<uses-sdk
android:minSdkVersion="7"
Expand Down
72 changes: 31 additions & 41 deletions Field Book/res/layout/about.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,87 +6,89 @@
android:orientation="vertical"
android:padding="20dp" >

<TextView
android:id="@+id/version"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="10dp"
android:paddingLeft="10dp"
android:text="Version"
android:textColor="@color/s_text"
android:textSize="25dp"
android:textStyle="bold" />

<TextView
android:id="@+id/developerMsg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="10dp"
android:paddingLeft="10dp"
android:text="Developers"
android:text="@string/developers"
android:textColor="#000000"
android:textSize="25dp"
android:textStyle="bold" />

<TextView
android:id="@+id/developerJesse"
android:id="@+id/developerTrevor"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dip"
android:paddingBottom="10dp"
android:paddingLeft="10dp"
android:text="Jesse Poland, USDA-ARS"
android:text="Trevor Rife, Kansas State University"
android:textColor="#000000"
android:textSize="20dp"
android:textStyle="bold" />

<TextView
android:id="@+id/developerJesseEmail"
android:id="@+id/developerTrevorEmail"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="25dip"
android:autoLink="email"
android:paddingBottom="5dp"
android:paddingBottom="10dp"
android:paddingLeft="10dp"
android:text="Email: jpoland@ksu.edu"
android:text="trife@ksu.edu"
android:textColor="#000000"
android:textSize="15dp"
android:textStyle="bold" />

<TextView
android:id="@+id/developerJesseSite"
android:id="@+id/developerTrevorSite"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="25dip"
android:autoLink="web"
android:paddingBottom="10dp"
android:paddingLeft="10dp"
android:text="Site: http://wheatgenetics.org"
android:text="https://github.com/trife/Field-Book"
android:textColor="#000000"
android:textSize="15dp"
android:textStyle="bold" />

<TextView
android:id="@+id/developerTrevor"
android:id="@+id/developerJesse"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dip"
android:paddingBottom="10dp"
android:paddingLeft="10dp"
android:text="Trevor Rife, Kansas State University"
android:text="Jesse Poland, Kansas State University"
android:textColor="#000000"
android:textSize="20dp"
android:textStyle="bold" />

<TextView
android:id="@+id/developerTrevorEmail"
android:id="@+id/developerJesseEmail"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="25dip"
android:autoLink="email"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:text="[email protected]"
android:textColor="#000000"
android:textSize="15dp"
android:textStyle="bold" />

<TextView
android:id="@+id/developerJesseSite"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="25dip"
android:autoLink="web"
android:paddingBottom="10dp"
android:paddingLeft="10dp"
android:text="Email: [email protected]"
android:text="http://wheatgenetics.org"
android:textColor="#000000"
android:textSize="15dp"
android:textStyle="bold" />
Expand All @@ -96,7 +98,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dip"
android:paddingBottom="10dp"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:text="Technology Projects"
android:textColor="#000000"
Expand All @@ -110,7 +112,7 @@
android:layout_marginLeft="25dip"
android:paddingBottom="10dp"
android:paddingLeft="10dp"
android:text="Solutions for mobile clients (Android, iOS, Blackberry, Windows Phone), server (Microsoft / Enterprise Java) as well as cloud based computing (Google / Amazon)."
android:text="Solutions for mobile clients, server, and cloud-based computing."
android:textColor="#000000"
android:textSize="15dp"
android:textStyle="bold" />
Expand All @@ -123,7 +125,7 @@
android:autoLink="email"
android:paddingBottom="10dp"
android:paddingLeft="10dp"
android:text="Email: [email protected]"
android:text="[email protected]"
android:textColor="#000000"
android:textSize="15dp"
android:textStyle="bold" />
Expand All @@ -134,31 +136,19 @@
android:layout_height="wrap_content"
android:paddingBottom="10dp"
android:paddingLeft="10dp"
android:text="Translators"
android:text="@string/translators"
android:textColor="#000000"
android:textSize="25dp"
android:textStyle="bold" />

<TextView
android:id="@+id/translatorIFB"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dip"
android:paddingBottom="10dp"
android:paddingLeft="10dp"
android:text="Irazema Fuentes-Bueno (Spanish)"
android:textColor="#000000"
android:textSize="20dp"
android:textStyle="bold" />

<TextView
android:id="@+id/translatorSD"
android:id="@+id/translatorList"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dip"
android:paddingBottom="10dp"
android:paddingLeft="10dp"
android:text="Sandra Dunckel (German)"
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:textColor="#000000"
android:textSize="20dp"
android:textStyle="bold" />
Expand Down
65 changes: 65 additions & 0 deletions Field Book/res/layout/backupdb.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
<?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" >

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/filename"
android:textColor="@color/s_text"
android:textStyle="bold" />

<EditText
android:id="@+id/fileName"
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_width="450dp"
android:layout_height="wrap_content"
android:maxLength="200"
android:singleLine="true"
android:textColor="#000000"
/>

<TextView
android:layout_width="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_height="wrap_content"
android:text="@string/filename"
android:textStyle="bold"
android:visibility="invisible" />

<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/saveBtn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:minWidth="100dp"
android:text="@string/okay"
android:textColor="#000000"
android:textSize="30dp"
android:textStyle="bold" />

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

</LinearLayout>
</LinearLayout>
42 changes: 42 additions & 0 deletions Field Book/res/layout/importdb.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?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" >

<ListView
android:id="@+id/myList"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1" />

<TextView
android:layout_width="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_height="wrap_content"
android:text="@string/filename"
android:textStyle="bold"
android:visibility="invisible" />

<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="wrap_content"
android:layout_gravity="center"
android:minWidth="100dp"
android:text="@string/close"
android:textColor="#000000"
android:textSize="30dp"
android:textStyle="bold" />

</LinearLayout>
</LinearLayout>
14 changes: 14 additions & 0 deletions Field Book/res/layout/listitem_a2.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView
android:id="@+id/spinnerTarget"
xmlns:android="http://schemas.android.com/apk/res/android"
android:background="@drawable/listmimic"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:paddingBottom="10dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:paddingTop="10dp"
android:ellipsize="end"
android:textSize="30dp"
android:textStyle="bold" />
16 changes: 9 additions & 7 deletions Field Book/res/layout/traitline.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,22 +40,24 @@
android:id="@+id/copyBtn"
android:focusable="false"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:minWidth="70dp"
android:text="@string/copy"
android:layout_height="45dp"
android:minWidth="30dp"
android:text=""
android:textColor="#000000"
android:textSize="16dp"
android:drawableTop="@drawable/ic_action_copy"
android:textStyle="bold" />

<Button
android:id="@+id/delBtn"
android:focusable="false"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:minWidth="40dp"
android:text="@string/del"
android:layout_height="45dp"
android:minWidth="30dp"
android:text=""
android:textColor="#000000"
android:textSize="16dp"
android:drawableTop="@drawable/ic_action_discard"
android:textStyle="bold" />

<TextView android:id="@+id/text2"
Expand Down
20 changes: 18 additions & 2 deletions Field Book/res/menu/configmenu.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:id="@+id/help" android:title="@string/help" android:showAsAction="always" />
<item android:id="@+id/about" android:title="@string/about" android:showAsAction="never" />"
<item
android:id="@+id/help"
android:title="@string/help"
android:icon="@drawable/ic_action_help"
android:showAsAction="always" />

<item
android:id="@+id/database"
android:title="@string/dbformat"
android:icon="@drawable/ic_action_storage"
android:showAsAction="ifRoom|withText" />"

<item
android:id="@+id/about"
android:title="@string/about"
android:icon="@drawable/ic_action_about"
android:showAsAction="ifRoom|withText" />"

</menu>

Loading

0 comments on commit 29592dc

Please sign in to comment.