Skip to content

Conversation

@RillJ
Copy link
Member

@RillJ RillJ commented Nov 19, 2024

Work from last semester within the study project 'Spatial Navigation supported by AI (Part I) by Benedikt.

Bene0202 added 16 commits July 18, 2024 16:19
# 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
@RillJ RillJ merged commit 3e5e68f into main Nov 19, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants