Merge pull request #823 from PhenoApps/field_detail_activity

SURFBIRD fields activity alpha implementation
PhenoApps · Mar 27, 2024 · 8af2341 · 8af2341
2 parents 4af4f1c + eb20096
commit 8af2341
Show file tree

Hide file tree

Showing 60 changed files with 4,219 additions and 1,380 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -43,7 +43,17 @@
             android:configChanges="keyboardHidden|orientation"
             android:finishOnTaskLaunch="true"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" /> <!-- Trait manager, for importing .trt files -->
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".activities.FieldEditorActivityOld"
+            android:alwaysRetainTaskState="false"
+            android:configChanges="keyboardHidden|orientation"
+            android:finishOnTaskLaunch="true"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait" />
+
+        <!-- Trait manager, for importing .trt files -->
         <activity
             android:name=".activities.TraitEditorActivity"
             android:alwaysRetainTaskState="false"

diff --git a/app/src/main/java/com/fieldbook/tracker/activities/CollectActivity.java b/app/src/main/java/com/fieldbook/tracker/activities/CollectActivity.java
@@ -883,6 +883,8 @@ public boolean isFieldAudioRecording(){
     @Override
     public void onPause() {
 
+        database.updateEditDate(preferences.getInt(GeneralKeys.SELECTED_FIELD_ID, 0));
+
         guiThread.quit();
 
         // Backup database
@@ -1853,7 +1855,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                         if (found && studyObj.getExp_name() != null && studyObj.getExp_id() != -1) {
 
                             int studyId = studyObj.getExp_id();
-                            String fieldName = studyObj.getExp_name();
+                            String fieldName = studyObj.getExp_alias();
 
                             String msg = getString(R.string.act_collect_barcode_search_exists_in_other_field, fieldName);
 
@@ -2303,7 +2305,7 @@ public String queryForLabelValue(
         if (isAttribute) {
 
             if (label.equals(context.getString(R.string.field_name_attribute))) {
-                String fieldName = ((CollectActivity) context).getPreferences().getString(GeneralKeys.FIELD_FILE, "");
+                String fieldName = ((CollectActivity) context).getPreferences().getString(GeneralKeys.FIELD_ALIAS, "");
                 return (fieldName == null || fieldName.isEmpty()) ? dataMissingString : fieldName;
             }