V6.1

app/build.gradle

@@ -226,7 +226,10 @@ dependencies {
     implementation "androidx.exifinterface:exifinterface:1.3.6"
 
     //camerax
-    def camerax_version = "1.3.3"
+    def camerax_version = "1.4.1"
+
+    implementation "androidx.camera:camera-effects:$camerax_version"
+
     implementation "androidx.camera:camera-camera2:$camerax_version"
     implementation "androidx.camera:camera-lifecycle:$camerax_version"
     implementation "androidx.camera:camera-view:$camerax_version"

app/src/main/AndroidManifest.xml

@@ -206,6 +206,10 @@
                     android:scheme="fieldbook" />
             </intent-filter>
         </activity>
+        <activity android:name=".activities.CropImageActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize|locale"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".activities.brapi.BrapiExportActivity"
             android:configChanges="orientation|keyboardHidden|screenSize|locale"

app/src/main/java/com/fieldbook/tracker/activities/CameraActivity.kt

@@ -1,6 +1,8 @@
 package com.fieldbook.tracker.activities
 
 import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
 import android.util.Size
 import android.widget.ImageButton
 import android.widget.TextView
@@ -31,16 +33,21 @@ class CameraActivity : ThemedActivity() {
 
     private var supportedResolutions: List<Size> = listOf()
 
+    private var traitId: String? = null
+
     companion object {
 
         val TAG = CameraActivity::class.simpleName
         const val EXTRA_TITLE = "title"
-
+        const val EXTRA_TRAIT_ID = "trait_id"
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        //get trait id from extras
+        traitId = intent.getStringExtra(EXTRA_TRAIT_ID)
+
         setContentView(R.layout.activity_camera)
 
         previewView = findViewById(R.id.act_camera_pv)
@@ -117,7 +124,9 @@ class CameraActivity : ThemedActivity() {
             val resolution = getSupportedResolutionByPreferences()
 
             cameraXFacade.bindPreview(
-                previewView, resolution
+                previewView, resolution,
+                traitId,
+                Handler(Looper.getMainLooper())
             ) { camera, executor, capture ->
 
                 setupCaptureUi(camera, executor, capture)
@@ -141,8 +150,10 @@ class CameraActivity : ThemedActivity() {
                     object : ImageCapture.OnImageSavedCallback {
                         override fun onError(error: ImageCaptureException) {}
                         override fun onImageSaved(outputFileResults: ImageCapture.OutputFileResults) {
-                            setResult(RESULT_OK)
-                            finish()
+                            runOnUiThread {
+                                setResult(RESULT_OK)
+                                finish()
+                            }
                         }
                     })
             }

app/src/main/java/com/fieldbook/tracker/activities/CollectActivity.java

@@ -55,6 +55,7 @@
 import com.fieldbook.tracker.dialogs.GeoNavCollectDialog;
 import com.fieldbook.tracker.dialogs.ObservationMetadataFragment;
 import com.fieldbook.tracker.dialogs.SearchDialog;
+import com.fieldbook.tracker.fragments.CropImageFragment;
 import com.fieldbook.tracker.interfaces.FieldSwitcher;
 import com.fieldbook.tracker.location.GPSTracker;
 import com.fieldbook.tracker.objects.FieldObject;
@@ -117,6 +118,7 @@
 import org.phenoapps.utils.TextToSpeechHelper;
 import org.threeten.bp.OffsetDateTime;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
@@ -153,6 +155,7 @@ public class CollectActivity extends ThemedActivity
         SensorHelper.RelativeRotationListener {
 
     public static final int REQUEST_FILE_EXPLORER_CODE = 1;
+    public static final int REQUEST_CROP_IMAGE_CODE = 101;
     public static final int BARCODE_COLLECT_CODE = 99;
     public static final int BARCODE_SEARCH_CODE = 98;
 
@@ -483,7 +486,7 @@ public String getStudyId() {
     }
 
     public String getObservationUnit() {
-        return getCRange().plot_id;
+        return getCRange().uniqueId;
     }
 
     public String getPerson() {
@@ -842,11 +845,11 @@ public void initWidgets(final boolean rangeSuppress) {
 
         traitBox.initTraitDetails();
 
+        String currentSortOrder = preferences.getString(GeneralKeys.TRAITS_LIST_SORT_ORDER, "position");
         // trait is unique, format is not
-        String[] traits = database.getVisibleTrait();
+        String[] traits = database.getVisibleTrait(currentSortOrder);
         if (traits != null) {
             traitBox.initTraitType(traits, rangeSuppress);
-
         }
     }
 
@@ -881,7 +884,7 @@ public boolean moveToSearch(
                 RangeObject ro = rangeBox.getCRange();
 
                 //issue #634 fix for now to check the search query by plot_id which should be the unique id
-                if (Objects.equals(ro.plot_id, searchUnique)) {
+                if (Objects.equals(ro.uniqueId, searchUnique)) {
                     moveToResultCore(j);
                     return true;
                 }
@@ -893,7 +896,7 @@ public boolean moveToSearch(
             for (int j = 1; j <= plotIndices.length; j++) {
                 rangeBox.setRangeByIndex(j - 1);
 
-                if (rangeBox.getCRange().range.equals(range) & rangeBox.getCRange().plot.equals(plot)) {
+                if (rangeBox.getCRange().primaryId.equals(range) & rangeBox.getCRange().secondaryId.equals(plot)) {
                     moveToResultCore(j);
                     return true;
                 }
@@ -905,7 +908,7 @@ public boolean moveToSearch(
             for (int j = 1; j <= plotIndices.length; j++) {
                 rangeBox.setRangeByIndex(j - 1);
 
-                if (rangeBox.getCRange().plot.equals(data)) {
+                if (rangeBox.getCRange().secondaryId.equals(data)) {
                     moveToResultCore(j);
                     return true;
                 }
@@ -917,7 +920,7 @@ public boolean moveToSearch(
             for (int j = 1; j <= plotIndices.length; j++) {
                 rangeBox.setRangeByIndex(j - 1);
 
-                if (rangeBox.getCRange().range.equals(data)) {
+                if (rangeBox.getCRange().primaryId.equals(data)) {
                     moveToResultCore(j);
                     return true;
                 }
@@ -930,7 +933,7 @@ public boolean moveToSearch(
             for (int j = 1; j <= rangeSize; j++) {
                 rangeBox.setRangeByIndex(j - 1);
 
-                if (rangeBox.getCRange().plot_id.equals(data)) {
+                if (rangeBox.getCRange().uniqueId.equals(data)) {
 
                     if (trait == -1) {
                         moveToResultCore(j);
@@ -1186,8 +1189,9 @@ public void navigateToTrait(String trait) {
 
         if (trait != null) {
 
+            String currentSortOrder = preferences.getString(GeneralKeys.TRAITS_LIST_SORT_ORDER, "position");
             //get all traits, filter the preference trait and check it's visibility
-            String[] traits = database.getVisibleTrait();
+            String[] traits = database.getVisibleTrait(currentSortOrder);
 
             try {
 
@@ -1453,7 +1457,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
                             collectDataTapTargetView(R.id.traitLeft, getString(R.string.tutorial_main_traits_title), getString(R.string.tutorial_main_traits_description), 60),
                             collectDataTapTargetView(R.id.traitTypeTv, getString(R.string.tutorial_main_traitlist_title), getString(R.string.tutorial_main_traitlist_description), 80),
                             collectDataTapTargetView(R.id.rangeLeft, getString(R.string.tutorial_main_entries_title), getString(R.string.tutorial_main_entries_description), 60),
-                            collectDataTapTargetView(R.id.valuesPlotRangeHolder, getString(R.string.tutorial_main_navinfo_title), getString(R.string.tutorial_main_navinfo_description), 60),
+                            collectDataTapTargetView(R.id.namesHolderLayout, getString(R.string.tutorial_main_navinfo_title), getString(R.string.tutorial_main_navinfo_description), 60),
                             collectDataTapTargetView(R.id.traitHolder, getString(R.string.tutorial_main_datacollect_title), getString(R.string.tutorial_main_datacollect_description), 200),
                             collectDataTapTargetView(R.id.missingValue, getString(R.string.tutorial_main_na_title), getString(R.string.tutorial_main_na_description), 60),
                             collectDataTapTargetView(R.id.deleteValue, getString(R.string.tutorial_main_delete_title), getString(R.string.tutorial_main_delete_description), 60)
@@ -2115,6 +2119,13 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 
                 } else triggerTts(fail);
                 break;
+            case REQUEST_CROP_IMAGE_CODE:
+                if (resultCode == RESULT_OK) {
+                    File f = new File(getContext().getCacheDir(), AbstractCameraTrait.TEMPORARY_IMAGE_NAME);
+                    Uri uri = Uri.fromFile(f);
+                    startCropActivity(getCurrentTrait().getId(), uri);
+                }
+                break;
         }
     }
 
@@ -2281,7 +2292,8 @@ public boolean existsTrait(final int plotId) {
      */
     @Override
     public int existsAllTraits(final int traitIndex, final int plotId) {
-        final ArrayList<TraitObject> traits = database.getVisibleTraitObjects();
+        String sortOrder = preferences.getString(GeneralKeys.TRAITS_LIST_SORT_ORDER, "position");
+        final ArrayList<TraitObject> traits = database.getVisibleTraitObjects(sortOrder);
         for (int i = 0; i < traits.size(); i++) {
             if (i != traitIndex
                     && !database.getTraitExists(plotId, traits.get(i).getId())) return i;
@@ -2292,7 +2304,8 @@ public int existsAllTraits(final int traitIndex, final int plotId) {
     @NonNull
     @Override
     public List<Integer> getNonExistingTraits(final int plotId) {
-        final ArrayList<TraitObject> traits = database.getVisibleTraitObjects();
+        String sortOrder = preferences.getString(GeneralKeys.TRAITS_LIST_SORT_ORDER, "position");
+        final ArrayList<TraitObject> traits = database.getVisibleTraitObjects(sortOrder);
         final ArrayList<Integer> indices = new ArrayList<>();
         for (int i = 0; i < traits.size(); i++) {
             if (!database.getTraitExists(plotId, traits.get(i).getId()))
@@ -2882,4 +2895,50 @@ private void sendCrashReport(Exception e) {
 
         }
     }
+
+    /**
+     * a function that starts the crop activity and sends it required intent data
+     */
+    public void startCropActivity(String traitId, Uri uri) {
+        try {
+            Intent intent = new Intent(this, CropImageActivity.class);
+            intent.putExtra(CropImageFragment.EXTRA_TRAIT_ID, Integer.parseInt(traitId));
+            intent.putExtra(CropImageFragment.EXTRA_IMAGE_URI, uri.toString());
+            cameraXFacade.unbind();
+            startActivity(intent);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void requestAndCropImage() {
+        try {
+            Intent intent = new Intent(this, CameraActivity.class);
+            intent.putExtra(CropImageFragment.EXTRA_TRAIT_ID, Integer.parseInt(getCurrentTrait().getId()));
+            cameraXFacade.unbind();
+            startActivityForResult(intent, REQUEST_CROP_IMAGE_CODE);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * shows an alert dialog that asks user to define a crop region
+     */
+    public void showCropDialog(String traitId, Uri uri) {
+        try {
+            AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.AppAlertDialog);
+            builder.setTitle(R.string.dialog_crop_title);
+            builder.setMessage(R.string.dialog_crop_message);
+            builder.setPositiveButton(android.R.string.ok, (dialog, which) -> {
+                startCropActivity(traitId, uri);
+            });
+            builder.setNegativeButton(android.R.string.no, (dialog, which) -> {
+                dialog.dismiss();
+            });
+            builder.create().show();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }

app/src/main/java/com/fieldbook/tracker/activities/ConfigActivity.java

@@ -378,7 +378,8 @@ private void loadScreen() {
      */
     private int checkTraitsExist() {
 
-        String[] traits = database.getVisibleTrait();
+        String currentSortOrder = preferences.getString(GeneralKeys.TRAITS_LIST_SORT_ORDER, "position");
+        String[] traits = database.getVisibleTrait(currentSortOrder);
 
         if (!preferences.getBoolean(GeneralKeys.IMPORT_FIELD_FINISHED, false)
                 || preferences.getInt(GeneralKeys.SELECTED_FIELD_ID, -1) == -1) {

app/src/main/java/com/fieldbook/tracker/activities/CropImageActivity.kt

@@ -0,0 +1,34 @@
+package com.fieldbook.tracker.activities
+
+import android.os.Bundle
+import androidx.core.os.bundleOf
+import androidx.fragment.app.add
+import androidx.fragment.app.commit
+import com.fieldbook.tracker.R
+import com.fieldbook.tracker.fragments.CropImageFragment
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class CropImageActivity: ThemedActivity() {
+
+    companion object {
+        const val TAG = "CropImageActivity"
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_crop_image)
+        if (savedInstanceState == null) {
+
+            val bundle = bundleOf(
+                CropImageFragment.EXTRA_TRAIT_ID to intent.getIntExtra(CropImageFragment.EXTRA_TRAIT_ID, -1),
+                CropImageFragment.EXTRA_IMAGE_URI to intent.getStringExtra(CropImageFragment.EXTRA_IMAGE_URI),
+            )
+
+            supportFragmentManager.commit {
+                setReorderingAllowed(true)
+                add<CropImageFragment>(R.id.fragment_container_view, args = bundle)
+            }
+        }
+    }
+}

app/src/main/java/com/fieldbook/tracker/activities/FieldDetailFragment.kt

@@ -456,7 +456,11 @@ class FieldDetailFragment : Fragment(), FieldSyncController {
     }
 
     fun checkTraitsExist(): Int {
-        val traits = database.getVisibleTrait()
+
+        val currentSortOrder: String =
+            preferences.getString(GeneralKeys.TRAITS_LIST_SORT_ORDER, "position") ?: ""
+
+        val traits = database.getVisibleTrait(currentSortOrder)
 
         return when {
             traits.isEmpty() -> {