Merge pull request #897 from PhenoApps/bug_fixes

Bug fixes
PhenoApps · Mar 6, 2024 · be107fe · be107fe
2 parents f61bb0b + d00a331
commit be107fe
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/app/src/main/java/com/fieldbook/tracker/activities/ThemedActivity.kt b/app/src/main/java/com/fieldbook/tracker/activities/ThemedActivity.kt
@@ -10,6 +10,7 @@ import android.util.Log
 import android.view.WindowManager
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
+import androidx.preference.PreferenceManager
 import com.fieldbook.tracker.R
 import com.fieldbook.tracker.preferences.GeneralKeys
 import com.fieldbook.tracker.utilities.SharedPreferenceUtils
@@ -36,10 +37,7 @@ open class ThemedActivity: AppCompatActivity() {
 
         fun applyTheme(activity: Activity) {
 
-            val prefs = activity.getSharedPreferences(
-                GeneralKeys.SHARED_PREF_FILE_NAME,
-                Context.MODE_PRIVATE
-            )
+            val prefs = PreferenceManager.getDefaultSharedPreferences(activity);
 
             //set the theme
             val (themeIndex, textIndex) = with(prefs) {

diff --git a/app/src/main/java/com/fieldbook/tracker/storage/StorageDefinerFragment.kt b/app/src/main/java/com/fieldbook/tracker/storage/StorageDefinerFragment.kt
@@ -33,6 +33,8 @@ class StorageDefinerFragment: PhenoLibStorageDefinerFragment() {
         AssetSample("field_import", "field_sample3.csv") to R.string.dir_field_import,
         AssetSample("field_import", "rtk_sample.csv") to R.string.dir_field_import,
         AssetSample("field_import", "training_sample.csv") to R.string.dir_field_import,
+        AssetSample("resources", "feekes_sample.jpg") to R.string.dir_resources,
+        AssetSample("resources", "stem_rust_sample.jpg") to R.string.dir_resources,
         AssetSample("trait", "trait_sample.trt") to R.string.dir_trait,
         AssetSample("trait", "severity.txt") to R.string.dir_trait,
         AssetSample("database", "sample.db") to R.string.dir_database,

diff --git a/app/src/main/java/com/fieldbook/tracker/views/RangeBoxView.kt b/app/src/main/java/com/fieldbook/tracker/views/RangeBoxView.kt
@@ -586,7 +586,7 @@ class RangeBoxView : ConstraintLayout {
         } else {
             if (rangeID.isNotEmpty()) {
                 //index.setEnabled(true);
-                // In addtion to advancing the entry, return to the first trait in the trait order if the preference is enabled
+                // In addition to advancing the entry, return to the first trait in the trait order if the preference is enabled
                 if (controller.isReturnFirstTrait()) {
                     traitBox.returnFirst()
                 }

diff --git a/app/src/main/java/com/fieldbook/tracker/views/TraitBoxView.kt b/app/src/main/java/com/fieldbook/tracker/views/TraitBoxView.kt
@@ -184,6 +184,8 @@ class TraitBoxView : ConstraintLayout {
                 .toString()
         )
 
+        // Update last used trait so it is preserved when entry moves
+        controller.getPreferences().edit().putString(GeneralKeys.LAST_USED_TRAIT,traitTypeTv.text.toString()).apply()
         traitTypeTv.text = currentTrait?.name
 
 
@@ -431,8 +433,9 @@ class TraitBoxView : ConstraintLayout {
         if (controller.getPreferences().getBoolean(GeneralKeys.CYCLE_TRAITS_SOUND, false)) {
             controller.getSoundHelper().playCycle()
         }
-//        traitType.setSelection(0)
         setSelection(0)
+        rangeSuppress?.let { loadLayout(it) }
+        controller.refreshLock()
         controller.getCollectInputView().resetInitialIndex()
     }