AR-Reshare Final Release
Latest
AR-Reshare Final Release (#198)
* basic structure
* basic product page with images slider working
* added favorite button
* added location attibute
* added image attribute to product class
* added image attribute to product class 2.0
* Merge Map with Develop (#36)
* Add Google Map snippet
* Add basic markers and temporary product class for development
* Add Map API Research Document
* Comments and TODOs added
* Add locating device functionality to map
* Debug info window
* Add Product Summary on marker click
* Associate Markers with Products and Show Custom Product Summary
* Code cleanup
* Remove redundant imports and clean comments
* Merge Category Class and Updated Map with Develop (#47)
* Add Google Map snippet
* Add basic markers and temporary product class for development
* Add Map API Research Document
* Comments and TODOs added
* Add locating device functionality to map
* Debug info window
* Add Product Summary on marker click
* Associate Markers with Products and Show Custom Product Summary
* Code cleanup
* Remove redundant imports and clean comments
* Create Category Class and Customise Map Markers depending on Product Category
* Update Category class
* Merge Messaging with develop (#48)
* implement sender messaging part
* add sendMessage fuction on send button and fix bug with recyclerView size
* fix the static inner class with non-static class
* achieve receive part
* make public class user and message
* add imageUrl attribute to Message class
* change nickname to name in user class
* prepare to merge
* make changes according the approval comments
* Added static map to product page (#50)
* fix scroll view issue
* added static map to show product's location
Co-authored-by: Hellin <sun>
* create account class (#57)
* create account class
* changes atrributes in account class and add getter setter for user atrributes
* remove setter of user
* add dateOfBirth and address to the constructor of account
* Merge feed with develop (#60)
* Updated ETHICS.md with successful approval message
* Added code for basic feed functionality (scrolling, image display and product description)
* Added contributor attribute and a custom border so every product is self contained
* Added resized test images - display is not clean though
* Photo now stretches the whole screen
* Added functioning bookmark button
* Added message button and refined layout
* Cleaned layout, still needs changes'
* Changed margin
* Third merge with develop
* Removed redundant assignment
* Merge Camera with Develop (#61)
* Add camera functionality to MainActivity
* Add permission checking for Camera
* Merge Swiping With Develop (#62)
* Swiping now changes between views to offer a seamless experience
* Made floats private and removed static attribute from OFFSET
* Add Set Up and Build Instructions to README (#63)
* Add Set Up and Build Instructions to README
* Update Set Up Instructions
Change the order of instructions.
* Link Map, Product and Messaging Views and Create Example Data (#64)
* fix scroll view issue
* added static map to show product's location
* added more methods
* added basic links
* added example products
* Rename class to ExampleData and make it a Singleton
* Change MapView to use ExampleData
* Add support for ExampleData to Map
* Add support for ExampleData in Feed
* add lingtao profile image
* added links to messaging page
* pass objects to messaging
* pfp working now
* added more pics
* fixed issues
* change some names
* fixed stuff
Co-authored-by: Hellin <sun>
Co-authored-by: Artur Varosyan <artur.varosyan1@gmail.com>
Co-authored-by: Lingtao Cai <lingtaocai@gmail.com>
* profile page update
* Merge messagelinks to develop (#65)
* fix scroll view issue
* added static map to show product's location
* added more methods
* added basic links
* added example products
* Rename class to ExampleData and make it a Singleton
* Change MapView to use ExampleData
* Add support for ExampleData to Map
* Add support for ExampleData in Feed
* add lingtao profile image
* added links to messaging page
* pass objects to messaging
* add profile image in messages
* complete the messaging profile pictures
* remove redundant comments
Co-authored-by: Hellin <sun>
Co-authored-by: Artur Varosyan <artur.varosyan1@gmail.com>
* Added to the last one, crated the profile page with implemented around half of the function at the stage. A back ImageButton to the MainPage, all shown images set as centerCrop in scaleType to make sure it not looking strange Hardcoded the. Waiting to for user data or example data for page information.
* Added all the example pics we need and make displayProductPics work (#67)
* fix scroll view issue
* added static map to show product's location
* added more methods
* added basic links
* added example products
* Rename class to ExampleData and make it a Singleton
* Change MapView to use ExampleData
* Add support for ExampleData to Map
* Add support for ExampleData in Feed
* add lingtao profile image
* added links to messaging page
* pass objects to messaging
* pfp working now
* added more pics
* fixed issues
* change some names
* fixed stuff
* added all the example pics we need and display product pics
Co-authored-by: Hellin <sun>
Co-authored-by: Artur Varosyan <artur.varosyan1@gmail.com>
Co-authored-by: Lingtao Cai <lingtaocai@gmail.com>
* Add return arrow from Map (#68)
* Small change, added profilePicId as argument - all working
* Coneected with everybody, change the page view when there is no pictures.
* change the outlook of my page. tested everything runs without bugs in my own phone.
* changed the name of those buttons to make sure they are not meaningless to other people. Thanks for Artur
* Merge Profile with Develop (#66)
* profile page update
* Added to the last one, crated the profile page with implemented around half of the function at the stage. A back ImageButton to the MainPage, all shown images set as centerCrop in scaleType to make sure it not looking strange Hardcoded the. Waiting to for user data or example data for page information.
* Coneected with everybody, change the page view when there is no pictures.
* change the outlook of my page. tested everything runs without bugs in my own phone.
* changed the name of those buttons to make sure they are not meaningless to other people. Thanks for Artur
* Make Main Activity the default (#71)
* change the link from Main to my page.
* fix changes
* Merge feedlinks to develop (#72)
* Links from feed should be working
* Feed links working again
* changed descriptions
* Hellin's changes and script change
* changed typo in umbrella description
* Fix map to pass CI tests
* Testing CI
* deleted decrepated stuff
* Develop should be fixed now after CI failing yesterday
* Revert to stable version
* fix send message button bugs and change sendMessage method to java method (#82)
* static maps now showing each product's location with a marker (#83)
* static maps now showing each product's location with a marker
* added api keys to string xml
Co-authored-by: Hellin Sun <hellinsunwork@gmail.com>
* Fix Continuous Integration (#84)
* Remove xml onlick event code from Map
* Configure Android SDK root before starting Building and Testing
* added slider dots panel to the product page (#88)
* added dots pics and implemented slider dots panel to indicate the product pictures position
* set layout orientation to horizontal
Co-authored-by: Hellin Sun <hellinsunwork@gmail.com>
* Fixed MVP Bugs (see desc) (#93)
* testing:
* Fixed massive bug with linking to product and message page - done right now
* Link to message page now works as intended
* Bookmark button functionality added to adapter and onClick events removed from XML
* merge multiChats branch to the develop with fuctionality implemented (#98)
* implement the multi-chats page with the previous messages shown in the chats
* fix the main activity in AndroidManifest.xml file
* Merge profilefix with develop (#101)
* Some progress
* Profile page links and links to all other pages now working
* Removed duplicate user pic
* fix self messaging problem (#102)
Co-authored-by: Hellin Sun <hellinsunwork@gmail.com>
* Add links from messaging to profile (#106)
* add links from messaging to profile
* add links from profile to multi-chats
* Splash page (#107)
* added app logo and implemented a splash page
* clean unused files
Co-authored-by: Hellin Sun <hellinsunwork@gmail.com>
* Merge AR with Develop (#109)
* Add ARCore dependencies
* Add required assets and adapt code to our implementation
* Add basic spawning product objects functionality
* Add prototype regenerate button to AR Activity
* Add Compass to AR (#94)
* Add Compass class
* Change sensors to accelerometer and magnetometer
* Use compass from AR activity
* Use compass to place objects directly in front user in AR
* Replace literal by constant PI
* Dynamically Generate AR Objects in AR Activity (#97)
* Add live location data to AR
* Add the ability to detect if user is pointing at a product in distance
* Fix bug where multiple AR objects are generated for the same product
* Reset product objects when regenerate pressed
* Delete unused prototype class
* AR 3D models (#104)
* added obj models and added modelLocation attribute to Category
* added object models and colors
* 3d object should danamically change
* 3D objects now dynamically change its color
* delete unused files
Co-authored-by: Hellin Sun <hellinsunwork@gmail.com>
* Add Product Boxes and Animated Compass Button to AR (#108)
* Add static product box to AR
* Clean up code and adjust angle limit constant
* Add a rotating compass button
* Make Product Box changes more swift, fix resetting bug
* Attempt adding swiping to AR activity
* Rollback to stable version for release
Co-authored-by: HellinSun <78479948+HellinSun@users.noreply.github.com>
Co-authored-by: Hellin Sun <hellinsunwork@gmail.com>
* Removed .idea folder and added it to .gitignore
* Add Swiping to AR View (#123)
* Add swiping to AR Activity
* Add Transition Animation to Swiping
* Add transitions to Map and Profile
* Edit touch constants
* Add exit animation to Map
* Add Swiping Clues
* Add movement to clues and exit animations to other activities
* Add improved swiping to fallback main page when AR not supported
* Rename MainActivity to FallbackActivity
* Fixed the bug where error message overlapped with swiping clue in the Fallback Activity
* Restructured Feed (#124)
* tried to change background
* Added background colour to parts of card and changed map activity to convert RGB to HSV
* Replaced coloured background text with coloured icons representing categories
* Fixed colours not showing up on map
* Restructured feed layout
* Renamed icons to aid clarity
* Add Filtering to Map (#126)
* Add filter button to Map
* Add filter pop up window to Map
* Finish filter window UI
* Restructure map filtering code
* Remove redundant print statement and add comments
* Remove unecessary import statements
* Change button size
* Update Maps Key
* Feed Location and Visual Rehaul (#128)
* Added location pin icon and location text view to feed XML
* Buggy code for location - still throwing null exceptions
* Fix null pointer bug when accessing location
* Location code now working. Cleaned up other code and added comments for clarity
* Made electronics icon a darker colour to aid visibility
* Removed action bar. Feed spacing, text font and style, as well as colours have been updated for a cleaner look
* Tweaked margins
* Changed background
Co-authored-by: Artur Varosyan <artur.varosyan1@gmail.com>
* Add product page (#132)
* added basic Add_Product page
* implemented recycle view to display product pics users uploaded
Co-authored-by: Hellin Sun <hellinsunwork@gmail.com>
* Merge Messaging features to Develop (#134)
* split the chats with products and add product name to every single chat in the multichats page
* add trash bin png image file and implement swiping to delete function
* add some padding to left and right sides
* modify the wrong spell mistake in ChatListActicity
* Modify page and improved and added more info to product page UI (#135)
* added basic Add_Product page
* implemented recycle view to display product pics users uploaded
* added product condition and category to product page / changed ui design
* added a modify button and added modify product functionality
* added return and tick event listener & clean some code
* added return and tick event listener & clean some code
* fixed conflicts
Co-authored-by: Hellin Sun <hellinsunwork@gmail.com>
* Allow users to add pics through camera or from image gallery (#141)
* added basic Add_Product page
* implemented recycle view to display product pics users uploaded
* added product condition and category to product page / changed ui design
* added a modify button and added modify product functionality
* added return and tick event listener & clean some code
* added return and tick event listener & clean some code
* fixed conflicts
* add image popup window
* implemented camera functionality to capture product pics
* users now can access their image gallery to select product pictures
* added visibility specifiers
Co-authored-by: Hellin Sun <hellinsunwork@gmail.com>
* Add instructions popup (#142)
Great thanks for your reviews!
* Added Refresh and Filtering on Feed (#140)
* Added location pin icon and location text view to feed XML
* Buggy code for location - still throwing null exceptions
* Fix null pointer bug when accessing location
* Location code now working. Cleaned up other code and added comments for clarity
* Made electronics icon a darker colour to aid visibility
* Removed action bar. Feed spacing, text font and style, as well as colours have been updated for a cleaner look
* Tweaked margins
* Changed background
* Added navigation bar, refresh functionality
* Removed redundant dependency
* Test
* Fixed merge conflicts
* Unfinished progress on filtering
* Wonky code
* Filter is now working correctly
* Renamed common view IDs, added refresh animation
* Added link to and return from add product page
* minor tweak
Co-authored-by: Artur Varosyan <artur.varosyan1@gmail.com>
* Create a Login Page, Account Authentication and Backend Service (#139)
* Set up swipable log in page
* Add UI elements to login and signup pages
* Add password, email and date of birth validation
* Add missing fragment
* Finish verification of Sign Up page user input
* Add successful dialog to sign up and link to AR
* Implement login button
* Add encryption and decryption algorithms
* Add Authenticator class and service for Android Account Manager
* Restructure functionality to separate classes
* Implement successful login call to backend and setup callback interface
* Implement automatic login
* Add registration backend request. Code clean up
* Connect to postcode API to map postcodes to coordinates (#145)
Thank you for your comments.
* Created Settings page, and add a new feature in profile (#136)
* Created Settings Page, with most of the popups done. Changed a little bit in Profile page to clarify default user(now) ith other users visit the page. Gonna change the detailed exteriors after.
* Changed things teammates suggested. Thx for all those tips
* Changed some typos with homeaddress dialog stucture. Changed the location of +add product button
* drawable gobackqrrow to gobackarrow, typo file
* Change Settings page button title home address to postcode, deleted typo gobackqrrow
* Update README (#146)
* Add Badges and Table of Contents to README
* Change HTML to Markdown and test gifs
* Add more structure to README
* Add License, Backend and Contact information to README
* Update project description
* Remove redundant sentence
* Finish Connecting AR-Reshare app to the Backend (#169)
* Added searchListings functionality
* Connection to server now working correctly for searchListings
* Feed is no longer reliant on ExampleData
* Connect Map and AR to Backend (#147)
* Force searchListings to wait on postcode mappings and connect Map
* Implement URL to Bitmap conversion and clean up BackendController
* Add AR Backend support and add comments
* Make searchResults() create a new thread when called
* Add logged in userID
* Connect Add Product to Backend (#148)
* added connections to firebase cloud and implemented functions that upload user pictures to the cloud
* added a helper class to convert picture URI to dataURI for backend use
* Add Product page now checks if user input is valid before adding
* now AddProduct page accepts user pictures and would successfully pass datauri to backend
* changed modify product page
* Delete google-services.json
* Delete StorageActivity.java
* changed buffer size
Co-authored-by: Hellin Sun <hellinsunwork@gmail.com>
* Add Profile Picture to Registration Process and Fix Bugs (#151)
* Do not allow the user to dismiss popup after login
* Add app description to sign up page
* Make back button return to option fragment
* Add camera as an option to take selfie
* Add ability to choose profile picture from gallery
* Successfully implement modify account and fix bug where registration would not override previous account
* Generalise modifyAccount in controller to take a map of changes
* Force the user to provide password when attempting to modify email or password
* Change implementations to use JsonObject and remove redundant plugin preventing successful build
* Remove redundant print statements
* Change integer literal to constant
* Implement getProfileById and Other Changes (#155)
* Changed food to household
* Colour tweaks
* Fixed reload button animation bug
* Product location progress
* Category icons work, progress on image
* Changed product to now use contributor ID, which is then used by getProfileByID for the contributor name and pic
* Trying to fix null pointer bug
* Added waitCondition()
* Migrated changes from stale branch tempFeedConn
* Added better error handling and a new setter as per PR suggestions
* Implement getListingByID (#156)
* added connections to firebase cloud and implemented functions that upload user pictures to the cloud
* added a helper class to convert picture URI to dataURI for backend use
* Changed food to household
* Add Product page now checks if user input is valid before adding
* Colour tweaks
* Fixed reload button animation bug
* now AddProduct page accepts user pictures and would successfully pass datauri to backend
* changed modify product page
* Product location progress
* Delete google-services.json
* Delete StorageActivity.java
* changed buffer size
* connected and implemented backend method getListingByID
* Category icons work, progress on image
* Changed product to now use contributor ID, which is then used by getProfileByID for the contributor name and pic
* Trying to fix null pointer bug
* the pictures and the map image are successfully showing
* Added waitCondition()
* Migrated changes from stale branch tempFeedConn
* Added better error handling and a new setter as per PR suggestions
* change product condition and category options according to backend
* pass contributor ID from feed to product
* add condition attribute to Product and enable product page to also show the product condition and category icon
* delete unused plugin and change the first letter of the condition to be capitalised
* clean the code
* clean code in case of confusion
* added link from AR to product page
Co-authored-by: Hellin Sun <hellinsunwork@gmail.com>
Co-authored-by: arfi2212 <uj20898@bristol.ac.uk>
* Add the User Name and Category from Backend to Map and AR (#157)
* Show user name in AR Product Box
* Add contibutor's name to Map's product info boxes
* Fix filtering in map with backend
* Remove repeated line of code
* Message and MultiChats link to backend (#158)
* exchange send button with imagebutton and add icon for button
* implement getConversationDescriptors and creatConversation
* implement sendMessage functionnality without picture in it
* fix some bugs
* add current user id to messaging
* fix some bugs with close conversation
* fix the null pointer exception of chatBody and chatTime
* implement and get the profile icon for multichat
* implement showing profile icon in messaging and a coverter of date
* delete some comments
* fix comments
* fix a bug
* delete some redundant commented lines of code and fix some bugs due to PR comments
* Implement CloseListing and ModifyListing and some other changes (#166)
* Implemented createSavedListing and deleteSavedListing, along with other changes! (#167)
* exchange send button with imagebutton and add icon for button
* implement getConversationDescriptors and creatConversation
* Changed food to household
* Colour tweaks
* Fixed reload button animation bug
* Product location progress
* Category icons work, progress on image
* implement sendMessage functionnality without picture in it
* Changed product to now use contributor ID, which is then used by getProfileByID for the contributor name and pic
* Trying to fix null pointer bug
* fix some bugs
* add current user id to messaging
* Added waitCondition()
* Migrated changes from stale branch tempFeedConn
* Added better error handling and a new setter as per PR suggestions
* fix some bugs with close conversation
* fix the null pointer exception of chatBody and chatTime
* implement and get the profile icon for multichat
* implement showing profile icon in messaging and a coverter of date
* delete some comments
* fix comments
* fix a bug
* delete some redundant commented lines of code and fix some bugs due to PR comments
* Null pointer location bug is now fixed
* Filter is now correctly working again
* Refresh is now working correctly
* fix the messaging activity
* Merging with other pages in progress
* Link to message works, but that page is buggy
* Link to messages now working as intended
* Profile link should work now - waiting on updated code
* Feed functionality bar adjust to make space for future nav bar
* Progress on bookmarks
* Progress on createSavedListing
* createSavedListing progress
* createSavedListing is now working :)
* deleteSavedListing is now working :D
* searchListings has been changed to correctly show user's saved listings
* Changed activity as per PR suggestion
Co-authored-by: Lingtao Cai <lingtaocai@gmail.com>
Co-authored-by: arfi2212 <uj20898@bristol.ac.uk>
Co-authored-by: HellinSun <78479948+HellinSun@users.noreply.github.com>
Co-authored-by: Hellin Sun <hellinsunwork@gmail.com>
Co-authored-by: arfi2212 <78547206+arfi2212@users.noreply.github.com>
Co-authored-by: Lingtao-Cai <78472848+Lingtao-Cai@users.noreply.github.com>
Co-authored-by: Lingtao Cai <lingtaocai@gmail.com>
* Add chats feature holding to delete to develop (#171)
* fix bugs with data converter in messaging
* fix bugs with multiChat page, set the default profile icon
* implement holding to delete in multiChats page
* fix the activity name in splash
* Filter window now has a working unselect all button (#172)
* Add Navigation bar (#173)
* fix bugs with data converter in messaging
* fix bugs with multiChat page, set the default profile icon
* implement holding to delete in multiChats page
* add basic static navigation bar
* add navigation bar and related icons, implement message fragment convert
* add more icons and implement profile navigation bar
* implement navigation bar on map fragment
* add swipeActivity as host, convert rest of activities to fragments
* Moved permission checking to host activity
* Add a return view statement to AR
* try to convert feed to fragment
* Finish changing all activities to fragments
* add default setting for swipeActivity
* Add swiping without animation and support for fallback
* fix bugs with checkAR
* delete non-activity activities in Manifest
Co-authored-by: Artur Varosyan <artur.varosyan1@gmail.com>
* Change product activity to fragment and sync bookmark functionality with feed (#175)
* changed product activity to fragment
* sync product and feed bookmark button
* changed transition from AR/Maps to product page
* deleted product page activity in androidManifest
* added AddProduct to androidmanifest
Co-authored-by: Hellin Sun <hellinsunwork@gmail.com>
* Changes of navijgation bar to develop (#176)
* fix bugs with data converter in messaging
* fix bugs with multiChat page, set the default profile icon
* implement holding to delete in multiChats page
* add basic static navigation bar
* add navigation bar and related icons, implement message fragment convert
* add more icons and implement profile navigation bar
* implement navigation bar on map fragment
* add swipeActivity as host, convert rest of activities to fragments
* Moved permission checking to host activity
* Add a return view statement to AR
* try to convert feed to fragment
* Finish changing all activities to fragments
* add default setting for swipeActivity
* Add swiping without animation and support for fallback
* fix bugs with checkAR
* delete non-activity activities in Manifest
* fix bugs with multichat when there is a chat without any messages
* change the tint color of icon and text in navigation bar
* change the the change of navigation bar with blue and fix bugs with multichat
* add extra text to differetiate contributor and customer in multiChats page
* change the all navigation bar item with new object
* change isArSupported atrribute static
Co-authored-by: Artur Varosyan <artur.varosyan1@gmail.com>
* Profile connect (#178)
* Fix bugs for profile
* test go from feed to profile
* New splash page and app icon (#177)
* added themes for splash page
* made a new splash page and set it to show in full screen
* new icon
* change beaver icon
* added app icons
* deleted stuff
* changed image in signup page
* deleted badger file
* added link from product page to message activity
* changed themes value
Co-authored-by: Hellin Sun <hellinsunwork@gmail.com>
* Feed Visual Update Inline With Agreed Design Scheme (#179)
* AddProduct added to manifest to fix feed link
* Added toast messages for saving and deleting listings
* Tweaked padding to accommodate nav bar
* Feed visual update to be consistent with product page
* Stabilise, Add Instructions, Prevent Crashing and Improve Accuracy of AR (#180)
* Add background to compass
* Make the AR not full screen
* Smooth out compass animation
* Prevent jumping compass animation
* Add support for pointing at multiple products
* Add a scroll view of products
* Somewhat working multi-product sliding view
* Remove uncessary additions to stabilise
* Add the ability to point at and browse through multiple products simultaneously
* Delete duplicating boxes
* Fix compass rotation by reversing direction
* Stabilise compass readings by taking median
* Add back the spawning of product objects
* Add category dependent 3d objects
* Remove redundant code
* Inflate instructions popup successfully
* Create a sequence of message-like instructions
* Add instructions button
* Finish implementing instructions
* AR crash after several moments
* Make the compass and stabilisation another separate thread
* Try changing spawning
* Further experimentation
* Add the old ar activity
* Fix crash by having just one texture
* Improve object placement
* Fix AR to Product page crash
* Fix spawning of AR objects
* Remove redundant comments from Manifest
* Profile Update (#183)
* Fix bug on profile page. Make profile page dynamic.
* Unsafe commit - links fail
* Link to message page fixed:
* Created Settings Page, with most of the popups done. Changed a little bit in Profile page to clarify default user(now) ith other users visit the page. Gonna change the detailed exteriors after.
* Added searchListings functionality
* Connection to server now working correctly for searchListings
* Changed things teammates suggested. Thx for all those tips
* Changed some typos with homeaddress dialog stucture. Changed the location of +add product button
* Feed is no longer reliant on ExampleData
* drawable gobackqrrow to gobackarrow, typo file
* Change Settings page button title home address to postcode, deleted typo gobackqrrow
* trying to connect to backend
* Connect Map and AR to Backend (#147)
* Force searchListings to wait on postcode mappings and connect Map
* Implement URL to Bitmap conversion and clean up BackendController
* Add AR Backend support and add comments
* Make searchResults() create a new thread when called
* Add logged in userID
* Connect Add Product to Backend (#148)
* added connections to firebase cloud and implemented functions that upload user pictures to the cloud
* added a helper class to convert picture URI to dataURI for backend use
* Add Product page now checks if user input is valid before adding
* now AddProduct page accepts user pictures and would successfully pass datauri to backend
* changed modify product page
* Delete google-services.json
* Delete StorageActivity.java
* changed buffer size
Co-authored-by: Hellin Sun <hellinsunwork@gmail.com>
* Add Profile Picture to Registration Process and Fix Bugs (#151)
* Do not allow the user to dismiss popup after login
* Add app description to sign up page
* Make back button return to option fragment
* Add camera as an option to take selfie
* Add ability to choose profile picture from gallery
* Successfully implement modify account and fix bug where registration would not override previous account
* Generalise modifyAccount in controller to take a map of changes
* Force the user to provide password when attempting to modify email or password
* Change implementations to use JsonObject and remove redundant plugin preventing successful build
* Remove redundant print statements
* Change integer literal to constant
* Implement getProfileById and Other Changes (#155)
* Changed food to household
* Colour tweaks
* Fixed reload button animation bug
* Product location progress
* Category icons work, progress on image
* Changed product to now use contributor ID, which is then used by getProfileByID for the contributor name and pic
* Trying to fix null pointer bug
* Added waitCondition()
* Migrated changes from stale branch tempFeedConn
* Added better error handling and a new setter as per PR suggestions
* Implement getListingByID (#156)
* added connections to firebase cloud and implemented functions that upload user pictures to the cloud
* added a helper class to convert picture URI to dataURI for backend use
* Changed food to household
* Add Product page now checks if user input is valid before adding
* Colour tweaks
* Fixed reload button animation bug
* now AddProduct page accepts user pictures and would successfully pass datauri to backend
* changed modify product page
* Product location progress
* Delete google-services.json
* Delete StorageActivity.java
* changed buffer size
* connected and implemented backend method getListingByID
* Category icons work, progress on image
* Changed product to now use contributor ID, which is then used by getProfileByID for the contributor name and pic
* Trying to fix null pointer bug
* the pictures and the map image are successfully showing
* Added waitCondition()
* Migrated changes from stale branch tempFeedConn
* Added better error handling and a new setter as per PR suggestions
* change product condition and category options according to backend
* pass contributor ID from feed to product
* add condition attribute to Product and enable product page to also show the product condition and category icon
* delete unused plugin and change the first letter of the condition to be capitalised
* clean the code
* clean code in case of confusion
* added link from AR to product page
Co-authored-by: Hellin Sun <hellinsunwork@gmail.com>
Co-authored-by: arfi2212 <uj20898@bristol.ac.uk>
* Add the User Name and Category from Backend to Map and AR (#157)
* Show user name in AR Product Box
* Add contibutor's name to Map's product info boxes
* Fix filtering in map with backend
* Remove repeated line of code
* Message and MultiChats link to backend (#158)
* exchange send button with imagebutton and add icon for button
* implement getConversationDescriptors and creatConversation
* implement sendMessage functionnality without picture in it
* fix some bugs
* add current user id to messaging
* fix some bugs with close conversation
* fix the null pointer exception of chatBody and chatTime
* implement and get the profile icon for multichat
* implement showing profile icon in messaging and a coverter of date
* delete some comments
* fix comments
* fix a bug
* delete some redundant commented lines of code and fix some bugs due to PR comments
* Connect to Backend, fix some bugs
* fixed bugs in product image
* fix shared product bugs
* Fix saved product bugs
* implement show other user's profile
* fix some bugs on access other's profile, change a bit on profile format
* imporve profile format
* connect Settings to backend 1/3
* Link form product page to profile
* change the format of profile
* Fix bugs for profile
* test go from feed to profile
* Change Profile Format a bit
* change format of Settings
* Change some links from page to page, implement some of the function for Settings
* Fix bugs on links
* Profile xml update
* Cleaned up profile
* profile progress
* progress
* progress
* Change product page to get contributor id after listing backedn call
* Fix back arrow
* profile link from feed progress
* Fixed feed links to profile
* Change how Profile is opened
* Fix showing other people's profiles
* profile to product bookmark now correct
* Slight visual tweaks
* Prevent AR from crashing when fragment changed
Co-authored-by: Manoutofpower <ysfeihao@163.com>
Co-authored-by: Artur Varosyan <76631146+artur-varosyan@users.noreply.github.com>
Co-authored-by: Artur Varosyan <artur.varosyan1@gmail.com>
Co-authored-by: HellinSun <78479948+HellinSun@users.noreply.github.com>
Co-authored-by: Hellin Sun <hellinsunwork@gmail.com>
Co-authored-by: Lingtao-Cai <78472848+Lingtao-Cai@users.noreply.github.com>
* using deque to keep track of fragment clicked (#184)
Co-authored-by: Hellin Sun <hellinsunwork@gmail.com>
* fixed modify image bug (#185)
Co-authored-by: Hellin Sun <hellinsunwork@gmail.com>
* Increase the Speed and Accuracy of AR and Fix All Related Bugs (#186)
* Fix placement of AR objects
* Download profiles together with products in AR
* Change compass stabilisation constants
* Fix accurate spawning of objects
* Create different colour AR objects based on category
* Add chip layout to fix theme-related, filter window bug
* Fix bug where changing fragment would cause returning callbacks from crashing
* Clean up AR file
* Implement Close Account and Cosmetic Changes to Settings (#193)
* Add close account to settings, add password formatting and delete change postcode
* Add a date picker dialog when changing date of birth
* Add animation on back button press
* Remove question marks from profile
* Add architecture diagrams
* Add fallback mechanism for incorrect postcodes
* Fix default postcode
* Implemented changing profile pics functionality (#194)
* implemented changing profile pics functionality
* deleted some unused resources
Co-authored-by: Hellin Sun <hellinsunwork@gmail.com>
* Fix Bug in Message (#195)
* fix the wrong profile image display in message page
* fix bugs of overlong message display in multiChat page
* add empty chatList message in multiChat page
* fix bugs with hidden message in multiChat
* fix bugs with current id and contributor id in message page
* add arrows for to distinguish product of current User and contributor
* delete the click function of the icon fix the width of the product name
* Message bug fix (#197)
* fix the wrong profile image display in message page
* fix bugs of overlong message display in multiChat page
* add empty chatList message in multiChat page
* fix bugs with hidden message in multiChat
* fix bugs with current id and contributor id in message page
* add arrows for to distinguish product of current User and contributor
* delete the click function of the icon fix the width of the product name
* fix the bug with icon in message page
* fix bugs with display message in multiChat
* fix bugs with id
* Changed README and Added Architecture File (#196)
* Created Architecture File
* Updated architecture
* Rename architecture to architecture.md
* Added new versions of the diagrams
* Change gifs
* Add splash screen gif
* Add files via upload
* Update README.md
* Update architecture.md
* Update architecture.md
* Update README.md
* Delete ar-reshare.gif
* Delete messaging.gif
* Update README.md
* Update architecture.md
* Add Profile and Messaging Gif
* Update README.md
* cleaned test files
* Fix permission checking
Co-authored-by: Artur Varosyan <artur.varosyan1@gmail.com>
Co-authored-by: HellinSun <78479948+HellinSun@users.noreply.github.com>
Co-authored-by: Artur Varosyan <76631146+artur-varosyan@users.noreply.github.com>
Co-authored-by: Hellin Sun <hellinsunwork@gmail.com>
Co-authored-by: Hellin <sun>
Co-authored-by: artur-varosyan <76631146+artur-varosyan@users.noreply.github.com>
Co-authored-by: Lingtao-Cai <78472848+Lingtao-Cai@users.noreply.github.com>
Co-authored-by: arfi2212 <78547206+arfi2212@users.noreply.github.com>
Co-authored-by: Artur Varosyan <artur.varosyan1@gmail.com>
Co-authored-by: Lingtao Cai <lingtaocai@gmail.com>
Co-authored-by: Manoutofpower <ysfeihao@163.com>
Co-authored-by: arfi2212 <uj20898@bristol.ac.uk>
Co-authored-by: Manoutofpower <91735921+Manoutofpower@users.noreply.github.com>
Co-authored-by: Hellin Sun <hellinsunwork@gmail.com>
