Fixed a bug with the new multicat trait

Fixed the trait creation layout
PhenoApps · Dec 12, 2015 · d826fdb · d826fdb
1 parent 2ea5b19
commit d826fdb
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 133 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/Field Book.iml b/Field Book.iml
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/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="310"
-    android:versionName="3.1.0">
+    android:versionCode="311"
+    android:versionName="3.1.1">
 
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

diff --git a/app/src/main/java/com/fieldbook/tracker/MainActivity.java b/app/src/main/java/com/fieldbook/tracker/MainActivity.java
@@ -2833,7 +2833,10 @@ public void onItemClick(AdapterView<?> arg0,
                         pNum.setVisibility(EditText.GONE);
 
                         if (!newTraits.containsKey(currentTrait.trait)) {
+                            eNum.removeTextChangedListener(eNumUpdate);
                             eNum.setText("");
+                            eNum.setTextColor(Color.BLACK);
+                            eNum.addTextChangedListener(eNumUpdate);
                         } else {
                             eNum.removeTextChangedListener(eNumUpdate);
                             eNum.setText(newTraits.get(currentTrait.trait).toString());
@@ -3006,7 +3009,7 @@ public void onCompletion(MediaPlayer mp) {
                 }
             });
         } catch (NullPointerException e) {
-            Log.w(TAG,e.getMessage());
+            Log.w(TAG, e.getMessage());
         }
     }
 
@@ -3238,9 +3241,11 @@ public void onPause() {
 
         //save last plot id
         if (ep.getBoolean("ImportFieldFinished", false)) {
-            Editor ed = ep.edit();
-            ed.putString("lastplot", cRange.plot_id);
-            ed.apply();
+            if(cRange!=null) {
+                Editor ed = ep.edit();
+                ed.putString("lastplot", cRange.plot_id);
+                ed.apply();
+            }
         }
 
         // Backup database

diff --git a/app/src/main/res/layout/trait.xml b/app/src/main/res/layout/trait.xml
@@ -14,14 +14,16 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
+        android:paddingBottom="5dp"
         android:paddingLeft="10dp"
         android:paddingRight="10dp"
         android:paddingTop="5dp">
 
         <TextView
-            android:layout_width="250dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="right"
+            android:layout_gravity="left|center_vertical"
+            android:layout_weight=".2"
             android:paddingRight="10dp"
             android:text="@string/format"
             android:textColor="#000000"
@@ -30,8 +32,9 @@
 
         <Spinner
             android:id="@+id/format"
-            android:layout_width="fill_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_weight=".8"
             android:textColor="#FFFFFF"
             android:textSize="@dimen/text_size_small"
             android:textStyle="bold" />
@@ -45,12 +48,12 @@
         android:orientation="horizontal"
         android:paddingLeft="10dp"
         android:paddingRight="10dp"
-        android:paddingTop="10dp">
+        android:paddingTop="5dp">
 
         <TextView
-            android:layout_width="200dp"
+            android:layout_width="100dp"
             android:layout_height="wrap_content"
-            android:layout_gravity="right"
+            android:layout_gravity="left|center_vertical"
             android:paddingRight="10dp"
             android:text="@string/trait"
             android:textColor="#000000"
@@ -62,8 +65,6 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="right"
-            android:layout_weight=".8"
-            android:imeOptions="actionNext"
             android:inputType="textCapWords"
             android:paddingRight="10dp"
             android:textColor="#000000"
@@ -82,9 +83,9 @@
 
         <TextView
             android:id="@+id/defTv"
-            android:layout_width="200dp"
+            android:layout_width="100dp"
             android:layout_height="wrap_content"
-            android:layout_gravity="right"
+            android:layout_gravity="left|center_vertical"
             android:paddingRight="10dp"
             android:text="@string/def"
             android:textColor="#000000"
@@ -104,7 +105,7 @@
 
         <ToggleButton
             android:id="@+id/boolBtn"
-            android:layout_width="wrap_content"
+            android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:background="@android:drawable/btn_default"
             android:textOff="@string/falsevalue"
@@ -124,9 +125,9 @@
         android:paddingTop="5dp">
 
         <TextView
-            android:layout_width="200dp"
+            android:layout_width="100dp"
             android:layout_height="wrap_content"
-            android:layout_gravity="right"
+            android:layout_gravity="left|center_vertical"
             android:paddingRight="10dp"
             android:text="@string/minimum"
             android:textColor="#000000"
@@ -156,9 +157,9 @@
         android:paddingTop="5dp">
 
         <TextView
-            android:layout_width="200dp"
+            android:layout_width="100dp"
             android:layout_height="wrap_content"
-            android:layout_gravity="right"
+            android:layout_gravity="left|center_vertical"
             android:paddingRight="10dp"
             android:text="@string/maximum"
             android:textColor="#000000"
@@ -189,9 +190,9 @@
         android:paddingTop="5dp">
 
         <TextView
-            android:layout_width="200dp"
+            android:layout_width="100dp"
             android:layout_height="wrap_content"
-            android:layout_gravity="right"
+            android:layout_gravity="left|center_vertical"
             android:paddingRight="10dp"
             android:text="@string/details"
             android:textColor="#000000"
@@ -221,9 +222,9 @@
         android:paddingTop="5dp">
 
         <TextView
-            android:layout_width="200dp"
+            android:layout_width="100dp"
             android:layout_height="wrap_content"
-            android:layout_gravity="right"
+            android:layout_gravity="left|center_vertical"
             android:paddingRight="10dp"
             android:text="@string/categories"
             android:textColor="#000000"

diff --git a/app/src/main/res/raw/changelog_releases.txt b/app/src/main/res/raw/changelog_releases.txt
@@ -1,3 +1,7 @@
+23/3.1.1
+Fixed a bug with the new multicat trait
+Fixed the trait creation layout
+
 22/3.1.0
 New multicategorical trait format
 Added option to overwrite preivously exported files

diff --git a/app/src/main/res/raw/dev_changelog.txt b/app/src/main/res/raw/dev_changelog.txt
@@ -1,3 +1,8 @@
+42
+Fixed a bug causing crashes in onPause
+Fixed a bug causing multicat data not to save
+Fixed the trait creation screen
+
 41
 Updated sample files
 Changed multicat to three columns

diff --git a/import-summary.txt b/import-summary.txt