Skip to content
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.

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

Develop #59

Open
wants to merge 404 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
404 commits
Select commit Hold shift + click to select a range
d58060f
Added refresh when notification pane is opened
harshit211997 Jul 19, 2016
5a065e1
Changed my profile activity to add edit profile options
harshit211997 Jul 21, 2016
245d9e2
1. Resolved issue : BDA scrolls to bottom on start
harshit211997 Jul 24, 2016
b2ea50a
Minor improvements made
harshit211997 Jul 30, 2016
69469c6
Merge pull request #36 from harshit211997/improvement
abhisheksachdeva Jul 31, 2016
dd62be8
Added UserSearchActivity
harshit211997 Aug 2, 2016
c46873d
changed project directory
harshit211997 Aug 2, 2016
f96ecb1
Changed directory and implemented user search
harshit211997 Aug 3, 2016
3ee6bfd
Added BookDescription
ajayrahul97 Aug 6, 2016
db08707
Added progress Bar
ajayrahul97 Aug 6, 2016
6d06d3e
Modified ProgressBar : Added cancel button
ajayrahul97 Aug 13, 2016
e35bbc1
UI-Modifications : Buttons color changed
ajayrahul97 Aug 13, 2016
f274b0e
Added progress bar to SearchActivity
ajayrahul97 Aug 13, 2016
590e0cc
Merge pull request #37 from ajayrahul97/bdesigns
abhisheksachdeva Aug 13, 2016
9894908
Dimming error in main activity resolved
ajayrahul97 Aug 14, 2016
cb0fba0
Merge conflicts resolved
harshit211997 Aug 14, 2016
8e55aac
bfix: Crash on emptry user result
harshit211997 Aug 15, 2016
f66016f
bfix: search should be invisible when notifications drawer is open
harshit211997 Aug 15, 2016
e1f2e1b
bfix: font problem with notifications bar
harshit211997 Aug 15, 2016
bc5ced2
bfix: unusual bug in guest mode
harshit211997 Aug 15, 2016
3f99dbb
Merge pull request #39 from harshit211997/improvement
abhisheksachdeva Aug 15, 2016
32f15e1
Added Request feature in UserProfile and Changed login progress dialog
ajayrahul97 Aug 15, 2016
07060a6
Merge pull request #40 from ajayrahul97/bdesigns
abhisheksachdeva Aug 15, 2016
5247601
Changed progress bar to progress dialog
ajayrahul97 Aug 17, 2016
f593edb
Changed book image size
ajayrahul97 Aug 17, 2016
a103d24
Merge pull request #41 from ajayrahul97/bdesigns
abhisheksachdeva Aug 18, 2016
350a18f
Minor UI changes and bug fixes
abhisheksachdeva Aug 19, 2016
1dcc509
Solved merge conflicts
abhisheksachdeva Aug 19, 2016
f1e18c2
Added keyboars search button
abhisheksachdeva Aug 20, 2016
41bd9a3
Minor UI changes, Changed application ID, Added keyboard search button
abhisheksachdeva Aug 20, 2016
77ef3f0
Added *time* ago in notifications
ajayrahul97 Aug 20, 2016
f573bec
Merge Conflict resolved
ajayrahul97 Aug 20, 2016
bcd17fe
Minor ui-bug fix , still more to come
ajayrahul97 Aug 20, 2016
7f6efde
Search layout changed
ajayrahul97 Aug 21, 2016
65dbdbc
Added Retrofit Service Generator class,
ajayrahul97 Aug 26, 2016
6562605
Added the xml files
ajayrahul97 Aug 26, 2016
757f4d1
deleted loading.xml
harshit211997 Aug 27, 2016
b96a937
feat:Added alternative to swipe to delete in mybooks
harshit211997 Aug 27, 2016
5711ae9
Added Goodreads Oauth class
ajayrahul97 Aug 27, 2016
5f9fa7f
Extracted user id using OAuth
ajayrahul97 Aug 28, 2016
1848189
bfix: book gets removed even on no Internet connection, and returns b…
harshit211997 Aug 31, 2016
dd381a8
feat: add last two email suggestions in login activity
harshit211997 Aug 31, 2016
228dc5d
feat: add spinner to user search layout
harshit211997 Aug 31, 2016
ac2cd7d
:art: Change dialog interface
harshit211997 Aug 31, 2016
f23bdbd
rfac: change dialog interface in other activities
harshit211997 Sep 2, 2016
ceb0911
rfac: change format of row for user
harshit211997 Sep 2, 2016
cc153d6
Further progress
ajayrahul97 Sep 20, 2016
353181b
TimeOut Bug fixed
ajayrahul97 Sep 21, 2016
3aafa59
changed confirm dialog interface
harshit211997 Sep 26, 2016
460e9f6
remove snackbar while loading pages in main activity
harshit211997 Sep 26, 2016
d439a18
Merge pull request #42 from harshit211997/improvement
abhisheksachdeva Sep 26, 2016
3db2e92
To Read completed
ajayrahul97 Sep 26, 2016
818638f
Merge conflicts solved
ajayrahul97 Sep 27, 2016
e32d93c
Merged Mybooks and MyProfile
ajayrahul97 Oct 1, 2016
8d526d2
ui changes
harshit211997 Oct 1, 2016
1f8a724
Merge conflict solved
ajayrahul97 Oct 1, 2016
5ebac25
Merge pull request #2 from ajayrahul97/designmerge
harshit211997 Oct 1, 2016
3852bab
Minor UI changes
abhisheksachdeva Oct 2, 2016
8dcd947
Solved merge conflicts
abhisheksachdeva Oct 2, 2016
81b6036
Merge pull request #43 from harshit211997/designs
abhisheksachdeva Oct 3, 2016
3cbccd8
bfix: runtime exception while opening LoginActivity
harshit211997 Oct 3, 2016
99ace37
Added barcode activity
ajayrahul97 Oct 12, 2016
55eee57
feat :Barcode Activity
ajayrahul97 Oct 14, 2016
119f897
bfix: Notification error
ajayrahul97 Oct 15, 2016
390a045
rfac: renamed row_books_add
ajayrahul97 Oct 15, 2016
7b1faf7
Request card changed
ajayrahul97 Oct 15, 2016
5e93c3c
Merge pull request #44 from ajayrahul97/designmerge
harshit211997 Oct 15, 2016
4fa4d9c
Merge branch 'designs' of https://github.com/abhisheksachdeva/BookSha…
harshit211997 Oct 15, 2016
ce8d1ee
:art: change search ange search icon and remove divider above communi…
harshit211997 Oct 15, 2016
2f654d9
:art: change layout of row_user
harshit211997 Oct 15, 2016
9f5fd77
:art: change book row layouts
harshit211997 Oct 15, 2016
f21d614
:art: change layout of search results activity
harshit211997 Oct 15, 2016
e3b180f
rfac: remove search button from search results activity
harshit211997 Oct 15, 2016
f0d1443
rfac: delete unused layouts
harshit211997 Oct 15, 2016
1244b15
rfac: change version to 0.7.0
harshit211997 Oct 15, 2016
ec35124
change layout of my profile and other layout changes
harshit211997 Oct 15, 2016
b6767f8
bfix: login email sugession shows wrong emails or no emails at all
harshit211997 Oct 15, 2016
054ddc1
rfac: unselect nav view items when returning to MainActivity
harshit211997 Oct 15, 2016
507a32e
bfix: small typo in notification adapter
harshit211997 Oct 15, 2016
2716d41
ptch : Ui changes
ajayrahul97 Oct 15, 2016
15a1321
Merge pull request #3 from harshit211997/designs
ajayrahul97 Oct 15, 2016
b239136
ptch : Merge conflict solved
ajayrahul97 Oct 15, 2016
aa59f00
rfac: change login acitivity layout
harshit211997 Oct 15, 2016
6e32dc4
:art: minor ui changes to signup activity
harshit211997 Oct 15, 2016
f595826
rfac: add visibility button in password fied in signup and change tex…
harshit211997 Oct 15, 2016
c0d368f
:art:Added space below recycler view in my profile and user profile
harshit211997 Oct 15, 2016
97ab3c8
:art:Replaced view of height 1dp with elevation of cards, looks bette…
harshit211997 Oct 15, 2016
514a62c
:art:Remove minute difference in layouts of user profile and my profile
harshit211997 Oct 15, 2016
0156e75
ptch : User Search Activity
ajayrahul97 Oct 15, 2016
424ac73
feat: Added pagenation for notifications
ajayrahul97 Oct 16, 2016
f8432f8
bfix : Try-catch added for book-addition
ajayrahul97 Oct 16, 2016
5da11c3
conflict resolved
harshit211997 Oct 17, 2016
5dbd3f6
Merge pull request #4 from harshit211997/designs
ajayrahul97 Oct 17, 2016
69713d7
Merge branch 'designmerge' of https://github.com/ajayrahul97/BookShar…
ajayrahul97 Oct 17, 2016
46f8ca4
Minor UI chnges
ajayrahul97 Oct 25, 2016
8e6aff4
Minor UI changes
ajayrahul97 Oct 26, 2016
35e0744
bfix: changed ratingCount to long for easy conversion to #,### format
harshit211997 Dec 1, 2016
c74aeac
bfix: changed max length of email to 19
harshit211997 Dec 1, 2016
63319aa
Merge pull request #45 from harshit211997/designs
abhisheksachdeva Dec 1, 2016
827b5e2
Merge conflicts solved
ajayrahul97 Dec 1, 2016
1db1fbd
FCM update
ajayrahul97 Dec 8, 2016
22120ac
rfac: Modifies gradle fies to support android version and set up real…
harshit211997 Dec 13, 2016
0ef352d
feat: Adds offline mode
harshit211997 Dec 13, 2016
3ace975
rfac: some modifications for offline mode to work properly, removes s…
harshit211997 Dec 13, 2016
a3c30d5
feat: Adds retry buttoutton to snackbars
harshit211997 Dec 13, 2016
584b63b
FCM update
ajayrahul97 Dec 17, 2016
15b344b
Search bar shifted to title bar
ajayrahul97 Dec 19, 2016
8b4093c
rfac : Removed unused class
ajayrahul97 Dec 19, 2016
7464e63
Merge pull request #5 from harshit211997/dec1_fcm
ajayrahul97 Dec 19, 2016
1964fbe
Merge conflict solved
ajayrahul97 Dec 19, 2016
86c41df
minor addition
ajayrahul97 Dec 19, 2016
b55f369
minor ui change
ajayrahul97 Dec 19, 2016
8f9fba7
Unused files removed
ajayrahul97 Dec 20, 2016
51faa63
Version no changed to 0.80
ajayrahul97 Dec 20, 2016
e67a890
feat: Adds otp part
harshit211997 Jan 31, 2017
5793769
bfix: send the otp first then signup
harshit211997 Feb 8, 2017
8ea626e
rfac: Makes the otp dialog non cancellable
harshit211997 Feb 9, 2017
c0bfa06
Adds cancel feature
ajayrahul97 Feb 10, 2017
581e02d
Nullifies myprofile error
ajayrahul97 Feb 10, 2017
53e4f37
Adds OTP
ajayrahul97 Feb 10, 2017
fe8bf02
Merge pull request #4 from ajayrahul97/offlinemode
harshit211997 Feb 10, 2017
b8ac307
rfac: Re-formats all the files
ajayrahul97 Feb 11, 2017
4ad1626
Removes extra button in login_activity
ajayrahul97 Feb 11, 2017
c0bdb7c
Minor UI changes in search bars
ajayrahul97 Feb 12, 2017
392f33f
UI changes
ajayrahul97 Feb 12, 2017
522313e
updates time string in notif adapter
ajayrahul97 Feb 12, 2017
17e2a21
:art: changes login screen to show errors properly
harshit211997 Feb 13, 2017
1ce9303
Adds cancel feature for user adapter
ajayrahul97 Feb 13, 2017
35ec279
Merge pull request #5 from ajayrahul97/offlinemode
harshit211997 Feb 13, 2017
1cf218c
Adds cancel feature
harshit211997 Feb 13, 2017
b0a8072
Nullifies error
ajayrahul97 Feb 13, 2017
96a9d9f
Merge pull request #6 from ajayrahul97/offlinemode
harshit211997 Feb 13, 2017
3571a36
adds a missing classMerge branch 'dec1_fcm' of https://github.com/har…
harshit211997 Feb 13, 2017
9aad370
bfix: adds cancel request feature
harshit211997 Feb 13, 2017
8745d24
bfix: the cancel button works just after request button is clicked
harshit211997 Feb 13, 2017
0d02be8
rfac: Changes user model
harshit211997 Feb 13, 2017
28e6b6e
bfix: makes the cursor move to next field
harshit211997 Feb 14, 2017
6eace00
rfac: removes extra logs and toasts
harshit211997 Feb 24, 2017
cdf69db
rfac: Removes extra logs and toast from Adapters and fragments
harshit211997 Feb 24, 2017
a6e3d9b
bfix: fixes camera runtime permissions bug
harshit211997 Feb 24, 2017
1c69870
Merge pull request #7 from harshit211997/develop
ajayrahul97 Feb 25, 2017
1c69cd6
Nullifies error in useradapter
ajayrahul97 Feb 25, 2017
8f36eb4
Adds and implements Lotte library
ajayrahul97 Feb 25, 2017
cfc864e
Adds Progress bar , using lotte
ajayrahul97 Mar 6, 2017
05d3e09
Merge pull request #7 from ajayrahul97/offlinemode
harshit211997 Mar 6, 2017
c99555e
bfix: On clicking next on keyboard from first name, now cursor moves …
harshit211997 Mar 6, 2017
b6f4109
feat: Adds progress bar at the bottom of recyclerview
harshit211997 Mar 6, 2017
c02565b
bfix: Adds up button in to read activity
harshit211997 Mar 6, 2017
aa7bca1
feat: Adds other apps other than whatsapp in share option
harshit211997 Mar 6, 2017
3959ae8
bfix: Fixes the bug: search icon gets hidden after deselecting
harshit211997 Mar 6, 2017
36ae047
bfix: fixed crash on visibility toggle in sign up
harshit211997 Mar 6, 2017
e8a78a3
feat: Changes notification icon
harshit211997 Mar 6, 2017
a1da193
bfix: change button color to gray, when disabled in GR search
harshit211997 Mar 6, 2017
b3ec686
bfix: Search field accepts only non empty queries
harshit211997 Mar 6, 2017
76ede83
rfac: Reduced time for which undo button is shown
harshit211997 Mar 6, 2017
1e3af8d
Merge pull request #8 from harshit211997/develop
ajayrahul97 Mar 8, 2017
f4efb09
Merge pull request #9 from ajayrahul97/offlinemode
ajayrahul97 Mar 20, 2017
f83b5df
Create Button
jaskirat18 Mar 27, 2017
3b42155
:art: Changes custom dialog ui
harshit211997 Apr 1, 2017
edbd4e5
Merge pull request #10 from harshit211997/progress_bar
ajayrahul97 Apr 1, 2017
eb13751
Add CustomTab for CHROME
jaskirat18 Apr 9, 2017
6c4c29b
Finalise inner CHROME customTab
jaskirat18 Apr 9, 2017
2582f46
Add toReads to search link
jaskirat18 May 26, 2017
4f12f17
Add progBar to last search feature
jaskirat18 May 28, 2017
69e26aa
multi college changes in signup
harshitbansal05 Aug 11, 2017
9e12bd6
changes due to implementation of multi college
harshitbansal05 Aug 11, 2017
8a49852
forgot password activity changes
harshitbansal05 Aug 14, 2017
e0ce14d
basic model for confirm password
harshitbansal05 Aug 14, 2017
e46768f
Merge branch 'forgot-password' of https://github.com/iamharsshit/Book…
ajayrahul97 Aug 15, 2017
fa9417f
basic ui changes
harshitbansal05 Aug 16, 2017
801f6aa
modified forget password layout
harshitbansal05 Aug 16, 2017
7a7f5e8
confirm password activity view modified
harshitbansal05 Aug 16, 2017
ebea2e0
add hardcoded strings to xml resources
harshitbansal05 Aug 16, 2017
50c7768
add progress dialog and some minor bugs
harshitbansal05 Aug 17, 2017
d9a8c13
resolved merge conflict by forgot_password
harshitbansal05 Aug 20, 2017
becb2d3
Merge pull request #48 from iamharsshit/multi_college_forgot_password
ajayrahul97 Aug 21, 2017
e7d6a6b
bug fixes-1
harshitbansal05 Aug 23, 2017
8d574a9
remove unused file
harshitbansal05 Aug 23, 2017
9253e11
Merge pull request #12 from iamharsshit/bug1
ajayrahul97 Aug 24, 2017
e2fcbb7
add vector files for images
harshitbansal05 Aug 25, 2017
808f657
make tutorial fragment
harshitbansal05 Aug 25, 2017
3f172d9
make welcome activity for tutorial
harshitbansal05 Aug 25, 2017
0f4f166
resolve minor bugs and add new features
harshitbansal05 Aug 25, 2017
1f06888
Merge branch 'forgot-password' into tutorial_screen
harshitbansal05 Aug 28, 2017
2e79559
Merge pull request #13 from iamharsshit/tutorial_screen
ajayrahul97 Aug 28, 2017
8e2fd03
Merge branch 'forgot-password' into chromeRead
jaskirat18 Aug 28, 2017
d09011d
Merge pull request #11 from jaskirat18/chromeRead
ajayrahul97 Aug 28, 2017
6a2d665
Adds License File
ajayrahul97 Aug 29, 2017
a361daf
Rename LICENSE to LICENSE.md
ajayrahul97 Aug 29, 2017
99ad757
bug-fix: no book found remains after empty search
harshit211997 Aug 29, 2017
4dbbfd4
bug-fix: checking if to read book is in campus wasn't working properly
harshit211997 Aug 29, 2017
7beb3a1
Merge pull request #14 from harshit211997/forgot-password
ajayrahul97 Aug 30, 2017
16189af
Resolves OTP bug
ajayrahul97 Aug 30, 2017
7ec2661
Merge pull request #15 from ajayrahul97/forgot-password
ajayrahul97 Aug 30, 2017
90c7031
Merge pull request #51 from ajayrahul97/develop
ajayrahul97 Aug 30, 2017
94b0d03
make activity for sending mails
harshitbansal05 Sep 1, 2017
1b71b19
send email fragment
harshitbansal05 Sep 1, 2017
b795cce
solve minor bugs
harshitbansal05 Sep 1, 2017
29076d5
dialog, deep linking and response bugs
harshitbansal05 Sep 1, 2017
fb9cfeb
Merge pull request #52 from harshitbansal05/bug2
ajayrahul97 Sep 1, 2017
b9ef767
nullifies error in verifyotpfragment
ajayrahul97 Sep 6, 2017
929fa70
validate signup and camera pic
harshitbansal05 Sep 7, 2017
78103d4
refactor signup and related changes
harshitbansal05 Sep 7, 2017
8eed48e
Merge branch 'develop' of https://github.com/abhisheksachdeva/BookSha…
ajayrahul97 Sep 7, 2017
1229238
Merge pull request #53 from harshitbansal05/bug3
ajayrahul97 Sep 7, 2017
45e07b2
Modifies proguard file
ajayrahul97 Sep 8, 2017
bfc2012
Updates gradle files
ajayrahul97 Sep 8, 2017
c876a9b
Updates gradle files
ajayrahul97 Sep 8, 2017
2b5e99c
aligns hostel spinner and room no et
ajayrahul97 Sep 8, 2017
89fbf1d
Adds BSAApplication class
ajayrahul97 Oct 2, 2017
977dad3
activity layout for verify otp
harshitbansal05 Oct 3, 2017
09d6dca
activity logic for pin input
harshitbansal05 Oct 3, 2017
c6817a3
auto read otp listeners
harshitbansal05 Oct 4, 2017
bfcfb71
make changes for requests and auto read otp
harshitbansal05 Oct 4, 2017
a20c826
make requests and change flow
harshitbansal05 Oct 4, 2017
9c81429
register in manifests and changes in urls
harshitbansal05 Oct 4, 2017
1612c24
Merge pull request #54 from harshitbansal05/otp_verification
ajayrahul97 Oct 10, 2017
70bbbd1
updates otp method
ajayrahul97 Oct 10, 2017
185fb59
Merge pull request #55 from ajayrahul97/develop
ajayrahul97 Oct 11, 2017
3c71365
resend otp and solve minor bugs
harshitbansal05 Oct 12, 2017
3077e8c
add idea to gitignore
harshitbansal05 Oct 12, 2017
58f8b67
Merge pull request #56 from harshitbansal05/bug1
ajayrahul97 Oct 12, 2017
6d93dd3
contact no and image changes
harshitbansal05 Oct 31, 2017
6bc18d4
Merge pull request #57 from harshitbansal05/bug1
ajayrahul97 Oct 31, 2017
d47836b
aws setup and bug fixes
harshitbansal05 Jan 16, 2018
a14e2a3
minor ui fixes
harshitbansal05 Jan 16, 2018
c556351
trello ui fixes
harshitbansal05 Jan 17, 2018
e61ce18
add search functionality using rxjava
harshitbansal05 Jan 17, 2018
0b1ddf9
aws boto s3 changes
harshitbansal05 Jan 18, 2018
5332686
display unread notif count on bell icon
harshitbansal05 Jan 19, 2018
404df3f
add multi delete books feature in my-profile
harshitbansal05 Jan 19, 2018
4366df3
change flow for contact number change
harshitbansal05 Jan 27, 2018
e64e113
actually logout the user on clicking logout
harshitbansal05 Jan 27, 2018
d4c2b95
remove annoying progress dialogs
harshitbansal05 Jan 28, 2018
926a1cd
create change password screen
harshitbansal05 Jan 28, 2018
113851d
solve multi delete books bug
harshitbansal05 Feb 2, 2018
31a0bf5
Merge branch 'edit-contact-no' into bugs
harshitbansal05 Feb 2, 2018
2b78777
solve minor bugs and delete unused classes
harshitbansal05 Feb 8, 2018
ad07867
implement search using switch map in user search
harshitbansal05 Feb 8, 2018
3a04953
implement search using switch map in main activity
harshitbansal05 Mar 7, 2018
f99188c
refactor files ans increase compile sdk version
harshitbansal05 Mar 15, 2018
86916bf
remove notif count feature
harshitbansal05 Mar 16, 2018
fb54b6c
Merge pull request #1 from harshitbansal05/bugs
harshitbansal05 Mar 16, 2018
ec3955e
make base url changes
harshitbansal05 Mar 17, 2018
b7894fc
minor corrections
harshitbansal05 Mar 17, 2018
1288b6a
solve search view conflicts with proguard
harshitbansal05 Mar 17, 2018
f712b40
add proguard for simplexmlconverter
harshitbansal05 Mar 17, 2018
c4c49c5
change url scheme
harshitbansal05 Mar 18, 2018
2e1bd7b
Merge pull request #2 from harshitbansal05/bugs
harshitbansal05 Mar 23, 2018
c8a9ca9
Merge pull request #58 from harshitbansal05/develop
ajayrahul97 Mar 24, 2018
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
45 changes: 45 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,51 @@
/local.properties
/.idea/workspace.xml
/.idea/libraries
/.idea/misc.xml
/.idea/vcs.xml
.DS_Store
/build
/captures
/.idea
# Added by abhishek sachdeva
# Built application files
*.apk
*.ap_

# Files for the Dalvik VM
*.dex

# Java class files
*.class

# Generated files
bin/
gen/
out/

# Gradle files
.gradle/
build/

# Local configuration file (sdk path, etc)
local.properties

# Proguard folder generated by Eclipse
proguard/

# Log Files
*.log

# Android Studio Navigation editor temp files
.navigation/

# Android Studio captures folder
captures/

# Intellij
*.iml

# Keystore files
*.jks

sentry.properties
1 change: 0 additions & 1 deletion .idea/.name

This file was deleted.

4 changes: 2 additions & 2 deletions .idea/vcs.xml → .idea/encodings.xml

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

5 changes: 2 additions & 3 deletions .idea/gradle.xml

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

46 changes: 0 additions & 46 deletions .idea/misc.xml

This file was deleted.

Loading