Open
Conversation
… into UbiCom-zenkig
Changed recommendation fragment layout.
… into UbiCom-zenkig Conflicts: app/src/main/java/se/kth/csc/ubicomp/ubishopper/LoginActivity.java
…oductActivity, and with the productInform.xml changed a little bit.
Inintialized view gou
- After having ADT generate the Gradle files for standard OpenCV for Android Library, I copied and pasted the contents of the library into an application module called opencv-android
…oductActivity, and with the productInform.xml changed a little bit.
…e NavigationDrawerFragment.April, 30th,2014
… into intialize-views-mh Conflicts: app/src/main/java/se/kth/csc/ubicomp/ubishopper/login/LoginActivity.java app/src/main/res/layout/fragment_login.xml app/src/main/res/layout/fragment_user_interest.xml
Login can detect but not recognize faces. Login social does not work yet. User Interest. Views can be clicked on and highlighted as selected. However the user interest
… into initialize-views-wikitude # By Michael Hotan # Via Michael Hotan * 'initialize-views' of https://github.com/mhotan/UbiShopper: Wikitude Refactoring Partially fixed Wikitude scanning implementation
Have an issue with releasing the camera. I forget to do it in Log In Activity.
… into initialize-views-wikitude # By Michael Hotan # Via Michael Hotan * 'initialize-views' of https://github.com/mhotan/UbiShopper: Completed initial MoodStocks Scanner and Initial Wikitude implementation. Added base code for Moodstocks scanner Conflicts: app/build.gradle app/src/main/AndroidManifest.xml app/src/main/java/se/kth/csc/ubicomp/ubishopper/scan/SearchFragment.java app/src/main/res/values/strings.xml
…lipgage would not show. Also, added local mockup POI file : SamplePois.html. fix the postfix ?
… into initialize-views-wikitude # By Michael Hotan # Via Michael Hotan * 'initialize-views' of https://github.com/mhotan/UbiShopper: Completed initial MoodStocks Scanner and Initial Wikitude implementation. Added base code for Moodstocks scanner Conflicts: app/build.gradle app/src/main/AndroidManifest.xml app/src/main/java/se/kth/csc/ubicomp/ubishopper/scan/SearchFragment.java app/src/main/res/values/strings.xml
… into initialize-views-wikitude # By Michael Hotan # Via Michael Hotan * 'initialize-views' of https://github.com/mhotan/UbiShopper: Hooked up activities to run together. Started Spring Boot Actuator. Conflicts: app/src/main/java/se/kth/csc/ubicomp/ubishopper/ProductActivity.java app/src/main/java/se/kth/csc/ubicomp/ubishopper/model/MockModel.java app/src/main/java/se/kth/csc/ubicomp/ubishopper/model/Product.java app/src/main/res/layout/fragment_search.xml
Now loads local data that is automatically located near the users current location no matter the user is currently at.
… into initialize-views-wikitude # By Michael Hotan # Via Michael Hotan * 'initialize-views' of https://github.com/mhotan/UbiShopper: Completed initial MoodStocks Scanner and Initial Wikitude implementation. Added base code for Moodstocks scanner Conflicts: app/build.gradle app/src/main/AndroidManifest.xml app/src/main/java/se/kth/csc/ubicomp/ubishopper/scan/SearchFragment.java app/src/main/res/values/strings.xml
… into initialize-views-wikitude # By Michael Hotan # Via Michael Hotan * 'initialize-views' of https://github.com/mhotan/UbiShopper: Update Wikitude Augmented Reality Portion Conflicts: .idea/libraries/support_v13_19_1_0.xml .idea/libraries/support_v4_19_1_0.xml app/src/main/assets/wikitude/js/nativePoiDetail.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Intialized for the DEMO