Skip to content

Initialize views #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mhotan wants to merge 43 commits into
base: master
Choose a base branch
from
Open

Initialize views #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
d11c5eb
initial commit from zenkig
zenkig Apr 15, 2014
ba4be13
Started skeleton views
mhotan Apr 15, 2014
f828504
trying to pull again, no major changes
zenkig Apr 17, 2014
3076115
Merge branch 'initialize-views' of https://github.com/mhotan/UbiShopp…
zenkig Apr 17, 2014
e63f485
Added pictures for icons.
zenkig Apr 17, 2014
566dafc
Connected some fragments and activities
mhotan Apr 17, 2014
9cc69c1
Added wall pics
zenkig Apr 17, 2014
7563e68
Merge branch 'initialize-views' of https://github.com/mhotan/UbiShopp…
zenkig Apr 17, 2014
e36e2c7
Added on April. 24th 2014, which contains the partial features for pr…
zenkig Apr 24, 2014
f77ad72
Refactored names removing "-" and replacing with "_"
mhotan Apr 24, 2014
7415cf4
Merge pull request #1 from mhotan/InintializedView-Gou
mhotan Apr 24, 2014
9d43c7f
Added Initial Support for OPENCV for Android
mhotan Apr 24, 2014
8590969
Added on April. 24th 2014, which contains the partial features for pr…
zenkig Apr 25, 2014
572e01c
Changed a little in Scanactivities and also added in slideview for th…
zenkig Apr 30, 2014
dd687f3
Removed OpenCV Support
mhotan Apr 30, 2014
f88646a
Removed OpenCV Support
mhotan Apr 30, 2014
4e8d738
Merge branch 'initialize-views' of https://github.com/mhotan/UbiShopp…
mhotan Apr 30, 2014
89b8252
Refactored Camera Preview into Login Activity.
mhotan Apr 30, 2014
6daa32e
Implemented Login and User Interest
mhotan May 1, 2014
61bd542
Started Moodstocks barcode scan, and removed some old grid view libra…
mhotan May 4, 2014
353d66a
Initial Broken Wikitude build for our application
mhotan May 4, 2014
186980b
Partially fixed Wikitude scanning implementation
mhotan May 4, 2014
0c4abd1
Wikitude Refactoring
mhotan May 4, 2014
de7428b
May. 4th. Changes in the layout, not yet fully redefined
zenkig May 4, 2014
72dc5d4
Merge branch 'initialize-views' of https://github.com/mhotan/UbiShopp…
zenkig May 4, 2014
9b9da65
Added base code for Moodstocks scanner
mhotan May 4, 2014
d827294
Completed initial MoodStocks Scanner and Initial Wikitude implementat…
mhotan May 8, 2014
2329c18
May. 4th. Changes in the layout, not yet fully redefined
zenkig May 8, 2014
a29e8b4
Started Spring Boot Actuator.
mhotan May 9, 2014
ca8f7bb
Merge branch 'initialize-views' of https://github.com/mhotan/UbiShopp…
zenkig May 10, 2014
133f2e1
The code contains problem with the recommendation fragment view ... f…
zenkig May 10, 2014
2cbc5f0
Hooked up activities to run together.
mhotan May 12, 2014
b295a72
Merge branch 'initialize-views' of https://github.com/mhotan/UbiShopp…
zenkig May 12, 2014
9ad5fb1
Merge branch 'initialize-views' of https://github.com/mhotan/UbiShopp…
zenkig May 12, 2014
f33bbc5
Update Wikitude Augmented Reality Portion
mhotan May 12, 2014
5de3d43
Merge branch 'initialize-views' of https://github.com/mhotan/UbiShopp…
zenkig May 12, 2014
579efff
Merge branch 'initialize-views' of https://github.com/mhotan/UbiShopp…
zenkig May 12, 2014
0ef76ad
Added small Products and Inmormation for wikitude POI view.
zenkig May 12, 2014
6fb10e3
Added small Products and Inmormation for wikitude POI view.
zenkig May 12, 2014
20fd45d
changes to the style...
zenkig May 12, 2014
1409f83
Updated Wikitude to updated by java code.
mhotan May 13, 2014
aae7866
Changes for the DEMO
mhotan May 14, 2014
123d16e
Changes for the DEMO
mhotan May 14, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .idea/dictionaries/zenkig.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/gradle.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/inspectionProfiles/profiles_settings.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/libraries/fx3d.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions .idea/libraries/log4j_1_2_17.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/libraries/moodstocks.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/libraries/moodstocks_native.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions .idea/libraries/slf4j_api_1_7_7.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions .idea/libraries/slf4j_log4j12_1_7_7.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions .idea/libraries/support_v13_19_0_1.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/libraries/support_v4_19_0_1.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/libraries/wikitudesdk.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

117 changes: 116 additions & 1 deletion .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading