Added a rust rating trait (up to 21 severity ratings)

Changed timestamp to ISO 8601 Updated counter trait layout (bigger + button) Stores last entry the user was on and automatically moves to it Added option to disable the automatic file sharing Added option to disable navigation if no data collected Updated tutorial Modified trait sample file Started work on a datagrid viewer (work in progress)
PhenoApps · May 7, 2015 · ddf1ac9 · ddf1ac9
1 parent cf1cd3c
commit ddf1ac9
Show file tree

Hide file tree

Showing 28 changed files with 1,387 additions and 261 deletions.
diff --git a/Field Book/AndroidManifest.xml b/Field Book/AndroidManifest.xml
@@ -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="234"
-    android:versionName="2.3.4" >
+    android:versionCode="235"
+    android:versionName="2.3.5">
 
     <uses-sdk
         android:minSdkVersion="14"
@@ -22,22 +22,21 @@
         android:largeScreens="true"
         android:normalScreens="false"
         android:smallScreens="false"
-        android:xlargeScreens="true" >
-    </supports-screens>
+        android:xlargeScreens="true"></supports-screens>
 
     <application
         android:hardwareAccelerated="true"
         android:icon="@drawable/icon"
         android:label="@string/app_name"
-        android:largeHeap="true" >
+        android:largeHeap="true">
         <activity
             android:name="MainActivity"
             android:configChanges="keyboardHidden|orientation|screenSize|locale|keyboard"
             android:label="@string/app_name"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Custom"
-            android:windowSoftInputMode="stateAlwaysHidden" >
+            android:windowSoftInputMode="stateAlwaysHidden">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -49,6 +48,12 @@
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Dialog" />
+        <activity
+            android:name="DatagridActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize|locale"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.Dialog" />
         <activity
             android:name="ConfigActivity"
             android:configChanges="orientation|keyboardHidden|screenSize|locale"
@@ -89,9 +94,9 @@
             android:theme="@style/Theme.Dialog" />
         <activity
             android:name="ChangelogActivity"
-            android:theme="@style/Theme.Dialog"
+            android:configChanges="orientation|keyboardHidden|screenSize|locale"
             android:screenOrientation="portrait"
-            android:configChanges="orientation|keyboardHidden|screenSize|locale"/>
+            android:theme="@style/Theme.Dialog" />
     </application>
 
 </manifest>
diff --git a/Field Book/assets/trait/severity.txt b/Field Book/assets/trait/severity.txt
@@ -0,0 +1,21 @@
+0
+5
+10
+15
+20
+25
+30
+35
+40
+45
+50
+55
+60
+65
+70
+75
+80
+85
+90
+95
+100
diff --git a/Field Book/assets/trait/trait_sample.trt b/Field Book/assets/trait/trait_sample.trt
@@ -1,14 +1,11 @@
 trait,format,defaultValue,minimum,maximum,details,categories,isVisible,realPosition
 height,numeric,,,,cM,,TRUE,1
-disease,categorical,,,,Color,Red/Orange/Yellow/Green/Blue/Purple/White/Black/Brown/Cyan/Magenta/Gray,TRUE,2
+color,categorical,,,,Color,Red/Orange/Yellow/Green/Blue/Purple/White/Black/Brown/Cyan/Magenta/Gray,TRUE,2
 lodging,percent,,0,100,,,TRUE,3
 flowering,date,,,,,,TRUE,4
-keep/trash,boolean,FALSE,,,,,TRUE,5
+insect damage,boolean,FALSE,,,,,TRUE,5
 notes,text,,,,,,TRUE,6
 picture,photo,,,,,,TRUE,7
-plants,numeric,,,,,,TRUE,8
-class,categorical,,,,,HRW/HWW/SRW/SWW,TRUE,9
-flowered,percent,,0,100,,,TRUE,10
-heading,date,,,,,,TRUE,11
-insect damage,boolean,,,,,,TRUE,12
-audio,audio,,,,,,TRUE,13
+plants,counter,,,,,,TRUE,8
+rust score,rust rating,,,,,,TRUE,9
+audio,audio,,,,,,TRUE,10
diff --git a/Field Book/res/drawable-hdpi/ic_action_grid.png b/Field Book/res/drawable-hdpi/ic_action_grid.png
diff --git a/Field Book/res/drawable-mdpi/ic_action_grid.png b/Field Book/res/drawable-mdpi/ic_action_grid.png
diff --git a/Field Book/res/drawable-xhdpi/ic_action_grid.png b/Field Book/res/drawable-xhdpi/ic_action_grid.png
diff --git a/Field Book/res/drawable/cell_shape.xml b/Field Book/res/drawable/cell_shape.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+  xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape= "rectangle"  >
+        <solid android:color="#fff"/>
+        <stroke android:width="1dp"  android:color="#000"/>
+</shape>
diff --git a/Field Book/res/layout/advanced.xml b/Field Book/res/layout/advanced.xml
@@ -86,6 +86,34 @@
                 android:layout_width="wrap_content"
                 android:layout_height="25dp" />
 
+            <CheckBox
+                android:id="@+id/disableShare"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:checked="false"
+                android:text="@string/disableshare"
+                android:textColor="#000000"
+                android:textSize="30dp"
+                android:textStyle="bold" />
+
+            <View
+                android:layout_width="wrap_content"
+                android:layout_height="25dp" />
+
+            <CheckBox
+                android:id="@+id/disableEntryNav"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:checked="false"
+                android:text="@string/disableentrynav"
+                android:textColor="#000000"
+                android:textSize="30dp"
+                android:textStyle="bold" />
+
+            <View
+                android:layout_width="wrap_content"
+                android:layout_height="25dp" />
+
             <CheckBox
                 android:id="@+id/cycle"
                 android:layout_width="wrap_content"

diff --git a/Field Book/res/layout/datagrid.xml b/Field Book/res/layout/datagrid.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <ScrollView
+        android:id="@+id/layout"
+        android:layout_height="500dp"
+        android:scrollbars="horizontal|vertical"
+        android:layout_width="match_parent"
+        android:layout_marginTop="5dip"
+        android:scrollbarStyle="outsideInset"
+        android:fillViewport="true">
+        <HorizontalScrollView
+            android:id="@+id/horizontalView"
+            android:layout_height="wrap_content"
+            android:scrollbars="horizontal|vertical"
+            android:layout_width="wrap_content"
+            android:layout_marginTop="5dip">
+            <TableLayout
+                android:id="@+id/tableLayout1"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:padding="10dp"
+                android:stretchColumns="*"></TableLayout>
+        </HorizontalScrollView>
+    </ScrollView>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:orientation="horizontal"
+        android:paddingTop="10dp">
+
+        <Button
+            android:id="@+id/closeBtn"
+            android:layout_width="wrap_content"
+            android:layout_height="60dp"
+            android:layout_gravity="center_horizontal"
+            android:background="@android:drawable/btn_default"
+            android:minWidth="150dp"
+            android:text="@string/close"
+            android:textColor="#000000"
+            android:textSize="30dp"
+            android:textStyle="bold" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/Field Book/res/layout/main.xml b/Field Book/res/layout/main.xml
@@ -423,6 +423,10 @@
                 layout="@layout/trait_counter"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content" />
+            <include
+                layout="@layout/trait_rustrating"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content" />
 
         </LinearLayout>
 

diff --git a/Field Book/res/layout/trait_counter.xml b/Field Book/res/layout/trait_counter.xml
@@ -3,8 +3,8 @@
     android:id="@+id/counterLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:visibility="gone"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:visibility="visible">
 
     <LinearLayout
         android:id="@+id/counter"
@@ -36,14 +36,15 @@
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:orientation="horizontal"
+            android:paddingTop="10dp">
+
 
             <LinearLayout
-                android:layout_width="wrap_content"
+                android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center_horizontal"
-                android:orientation="horizontal"
-                android:paddingTop="30dp">
+                android:orientation="vertical">
 
                 <Button
                     android:id="@+id/minusBtn"
@@ -56,31 +57,6 @@
                     android:textSize="30dp"
                     android:textStyle="bold" />
 
-                <View
-                    android:layout_width="10dp"
-                    android:layout_height="wrap_content" />
-
-                <Button
-                    android:id="@+id/addBtn"
-                    android:layout_width="130dp"
-                    android:layout_height="60dp"
-                    android:background="@android:drawable/btn_default"
-                    android:gravity="center"
-                    android:minWidth="130dp"
-                    android:text="@string/plusday"
-                    android:textColor="#000000"
-                    android:textSize="30dp"
-                    android:textStyle="bold" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
-                android:orientation="horizontal"
-                android:paddingTop="10dp">
-
                 <Button
                     android:id="@+id/clearCounterBtn"
                     android:layout_width="wrap_content"
@@ -92,10 +68,22 @@
                     android:textColor="#000000"
                     android:textSize="30dp"
                     android:textStyle="bold" />
-
             </LinearLayout>
+
+
+            <Button
+                android:id="@+id/addBtn"
+                android:layout_width="130dp"
+                android:layout_height="120dp"
+                android:background="@android:drawable/btn_default"
+                android:gravity="center"
+                android:minWidth="130dp"
+                android:text="@string/plusday"
+                android:textColor="#000000"
+                android:textSize="60dp"
+                android:textStyle="bold" />
+
         </LinearLayout>
     </LinearLayout>
-
 </LinearLayout>