Merge remote-tracking branch 'origin/BeneLocalNewUI' into BeneLocalNewUI

# Conflicts:
#	.gradle/8.2/checksums/checksums.lock
#	.gradle/8.2/checksums/md5-checksums.bin
#	.gradle/8.2/checksums/sha1-checksums.bin
#	.gradle/8.2/executionHistory/executionHistory.bin
#	.gradle/8.2/executionHistory/executionHistory.lock
#	.gradle/8.2/fileHashes/fileHashes.bin
#	.gradle/8.2/fileHashes/fileHashes.lock
#	.gradle/8.2/fileHashes/resourceHashesCache.bin
#	.gradle/buildOutputCleanup/buildOutputCleanup.lock
#	.gradle/buildOutputCleanup/outputFiles.bin
#	.gradle/file-system.probe
#	app/src/main/java/com/nlinterface/activities/BarcodeSettingsActivity.kt
#	app/src/main/java/com/nlinterface/activities/GroceryListActivity.kt
#	app/src/main/java/com/nlinterface/activities/MainActivity.kt
#	app/src/main/java/com/nlinterface/activities/SettingsActivity.kt
#	app/src/main/java/com/nlinterface/activities/VoiceOnlyActivity.kt
#	app/src/main/java/com/nlinterface/adapters/BarcodeSettingsFragmentAdapter.kt
#	app/src/main/java/com/nlinterface/adapters/GroceryListFragmentAdapters.kt
#	app/src/main/java/com/nlinterface/adapters/SettingsFragmentAdapter.kt
#	app/src/main/java/com/nlinterface/fragments/BarcodeScannerScreen.kt
#	app/src/main/java/com/nlinterface/fragments/BarcodeSettingsScreen1.kt
#	app/src/main/java/com/nlinterface/fragments/BarcodeSettingsScreen2.kt
#	app/src/main/java/com/nlinterface/fragments/BarcodeSettingsScreen3.kt
#	app/src/main/java/com/nlinterface/fragments/GroceryListScreen1.kt
#	app/src/main/java/com/nlinterface/fragments/GroceryListScreen2.kt
#	app/src/main/java/com/nlinterface/fragments/GroceryListScreenBase.kt
#	app/src/main/java/com/nlinterface/fragments/GroceryListScreenListView.kt
#	app/src/main/java/com/nlinterface/fragments/MainScreen1.kt
#	app/src/main/java/com/nlinterface/fragments/MainScreen2.kt
#	app/src/main/java/com/nlinterface/fragments/SettingsScreen1.kt
#	app/src/main/java/com/nlinterface/fragments/SettingsScreen2.kt
#	app/src/main/java/com/nlinterface/fragments/SettingsScreen3.kt
#	app/src/main/java/com/nlinterface/utility/GestureListener.kt
#	app/src/main/java/com/nlinterface/utility/OnSwipeTouchInterceptor.kt
#	app/src/main/java/com/nlinterface/viewmodels/GroceryListViewModel.kt
#	app/src/main/res/layout/barcode_scanner.xml

Author: Bene0202