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.

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

Jump to bottom

Fbr 560 remove from reading list #98

Open
wants to merge 3,575 commits into
base: master
Choose a base branch
from
Open

Fbr 560 remove from reading list #98

wants to merge 3,575 commits into from

Conversation

nimbooce
Copy link

@nimbooce nimbooce commented Jan 9, 2017

No description provided.

nimbooce and others added 30 commits May 2, 2016 11:21
@nimbooce
Pulled out inner class into own file
6344428
@nimbooce
Using generic class to access data
f25d601
@nimbooce
Removed unused method
95c93dd
@nimbooce
Refactor organize imports
e0af284
@nimbooce
Populating reading list with two different row item types, one is for…
2954699 
… titles that have been downloaded, the other is titles that have not been downloaded
@nimbooce
FBR-461: added book details for reading list titles. These titles hav…
048be41 
…e not been downloaded.
@nimbooce
Connecting to staging.
231150e
@nimbooce
incremented version code
a5ec347
@nimbooce
Removing AndroidStudio project file, this is auto generated and shoul…
9feb608 
…d not be in repo
@nimbooce
Updated ignore file to remove FBReader.iml from commit view
22e96fa
@nimbooce
FBR-476: updated AndroidStudio and as a result its plugins its depend…
91215da 
…encies.
@nimbooce
Refactor rename class
e619a9e
@nimbooce
Refactor rename class
ebf26a2
@nimbooce
FBR-447: Sorting lists alphabetically
e9550d7
@nimbooce
FBR-449: Only playing earcon if the accessibility manager is turned on.
47d7d55
@nimbooce
FBR-472: Fixed hardware back button
df43a3a
@nimbooce
Refactor extract method
d67e78a
@nimbooce
Refactor partial duplication removed
8f1409b
@nimbooce
Replaced cascading ifs with contains. Created new tags list.
59e3b10
@nimbooce
Removed dev console output
e3dd5d2
@nimbooce
FBR-472: Completely redid the tab layout to fix back button issues, l…
65e27c3 
…ayout, home button.
@nimbooce
FBR-463: updated URL
20d5abb
@nimbooce
FBR-455: Recents table is now made up of downloaded titles and title …
d53d694 
…names retrieved from bookshare api's history list
@nimbooce
FBR-465: save current page index to restore next time
84fc795
@nimbooce
Sync progress dialog is now modal
115d62c
@nimbooce
FBR-470: Going back to current open book
7fd7fe9
@nimbooce
FBR-470: Reverted code since it was exposing a behavior that is incor…
f8f24fa 
…rect. A free account will not be able to search bookshare.
@nimbooce
FBR-470: Only going back to title if the user logged in. Free logins …
9235709 
…are directed to the bookshare search view
@nimbooce
Incremented version code
a01a728
Updated localized messages in spanish
1de2851
miguel-villalobos and others added 30 commits January 3, 2017 15:25
@miguel-villalobos
Merge branch 'master' into FBR-560-Remove_from_reading_list
0d81bd2 
# Conflicts:
#	FBReader/src/main/res/values-es/strings.xml
@miguel-villalobos
Work in progress
2c896dd
@miguel-villalobos
working. Need to add more dialogs and hide add button if not logged
c10b039
@miguel-villalobos
Working. However UI is not 1:1 with mockup
2ed8645
@miguel-villalobos
Swipe view
9e282b1
@miguel-villalobos
Merge branch 'FBR-561-CreateReadingList' into FBR-560-Remove_from_rea…
11a0f33 
…ding_list

Conflicts:
	FBReader/src/main/java/org/bookshare/net/BookshareHttpOauth2Client.java
@miguel-villalobos
Working
efa2501
@miguel-villalobos
Moving request code to helper for better order & efficiency. Work on …
b2024c5 
…flow for delete
@nimbooce
Merge pull request #208 from benetech/FBR-561-CreateReadingList
a1dad18 
Fbr 561 create reading list
@nimbooce
Merge pull request #209 from benetech/FBR-471-Default_to_login_on_fir…
1074c4b 
…st_run

Working
@nimbooce
Merge branch 'master' into FBR-562-AddToListBug
5794906
@nimbooce
Merge pull request #210 from benetech/FBR-562-AddToListBug
3cedc92 
Added some defensive options in case user has no reading lists
@nimbooce
Incremented version code
39a8a58
@nimbooce
FBR-566: Change which bookshare API v2 alpha points to
90865b4
@nimbooce
Incremented version code
6a7645d
@miguel-villalobos
Merge branch 'master' into FBR-560-Remove_from_reading_list
1d5c936 
Conflicts:
	FBReader/src/main/res/values/strings.xml
@miguel-villalobos
Delete is working, however due to using swipe layout onItemSelected i…
afc1bd8 
…s not
@miguel-villalobos
Mostly working. Can refine touch events a bit more.
5b1b804 
Also need to do the talkback bit
@miguel-villalobos
Done.
d365f45 
Need to ask if we really want to disable pager scroll
@miguel-villalobos
Changed the hardcoded strings to resources.
cdf3fd2 
Need to ask how to tell if a user can remove titles from lists
@nimbooce
Merge pull request #211 from benetech/FBR-560-Remove_from_reading_list
3f2b98f 
Fbr 560 remove from reading list
@miguel-villalobos
Some Ui improvements and role management
bc54f42
@miguel-villalobos
Merge branch 'master' into FBR-560-Remove_from_reading_list
d944dc6
@nimbooce
incremented version code
acd7bc5
@miguel-villalobos
Removing unwanted buttons
68c0381
@miguel-villalobos
Play bar size
7d1c29c
@nimbooce
Merge pull request #214 from benetech/FBR-571-Play_bar_size
80bbdde 
Play bar size
@nimbooce
Merge pull request #213 from benetech/FBR-531-Remove_book_button_on_i…
5e5699d 
…nfo_screen

Removing unwanted buttons
@miguel-villalobos
Merge branch 'master' into FBR-560-Remove_from_reading_list
9d2321c
@miguel-villalobos
Refactor recomended on code review.
d435f6e
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@nimbooce @miguel-villalobos