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

Fbr 548 delete book string to remove book #96

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

Fbr 548 delete book string to remove book #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3494 commits
Select commit Hold shift + click to select a range
8873d21
Moved string to strings.xml
nimbooce Dec 1, 2015
2405035
FBR-419: Removed app name from action bar
nimbooce Dec 1, 2015
c59eb9a
Incremented version code
nimbooce Dec 1, 2015
131bbf5
FBR-397: Added logo
nimbooce Dec 1, 2015
6c270d7
FBR-418: Navigation Drawer when open is now over toolbar.
nimbooce Dec 1, 2015
e10b36e
FBR-423: text change
nimbooce Dec 1, 2015
9b6edf5
FBR-416: Opening my books section. But before, open user guide, to c…
nimbooce Dec 1, 2015
9d36992
FBR-420: switching login and logout menu item depending if user is lo…
nimbooce Dec 2, 2015
1ffc2c1
Refactor reorganize imports
nimbooce Dec 2, 2015
a3721d6
FBR-424: text change
nimbooce Dec 2, 2015
e13cdbc
FBR-425: Removed sepia as default wallpaper.
nimbooce Dec 2, 2015
eb8b8ef
Incremented version code
nimbooce Dec 2, 2015
e901571
FBR-418: Changed icon and text color
nimbooce Dec 2, 2015
503b3fa
Changed overflow menu color to be black text on white background
nimbooce Dec 3, 2015
2fa9a29
Incremented version code
nimbooce Dec 3, 2015
9cab82f
FBR-405: latest User-Guide file
nimbooce Dec 3, 2015
1d13881
Incremented version code
nimbooce Dec 3, 2015
d53d2d2
FBR-405: updated Guick user guide
nimbooce Dec 3, 2015
48b8085
Incremented version code
nimbooce Dec 3, 2015
5f3a4ba
FBR-405: updated quick guide
nimbooce Dec 3, 2015
c741677
Incremented version code
nimbooce Dec 3, 2015
a1ddfd5
FBR-409: no longer skipping to last sentence if coming in from a paus…
nimbooce Dec 4, 2015
fd0b483
FBR-427: changed default setting for volume keys, volume keys will n…
nimbooce Dec 4, 2015
8086bec
Incremented version code
nimbooce Dec 8, 2015
6f98db7
Setting minifyEnabled to false, was causing release build to fail
nimbooce Dec 14, 2015
106180d
Avoid abording on lint errors for now to get release APK built on jen…
nimbooce Dec 14, 2015
cb0b04f
Moved lint options under release statement
nimbooce Dec 14, 2015
e62d0a3
turning lint off for release builds (Trying to fix release APK build …
nimbooce Dec 14, 2015
470fae0
updated gradle to sign release, has temp debug output.
nimbooce Dec 15, 2015
3fff417
matching sign.properties keys.
nimbooce Dec 15, 2015
cc68389
renamed keys
nimbooce Dec 15, 2015
77098b3
Including the ameabi so files and fixed gradle to include them as well.
nimbooce Dec 16, 2015
bf890fc
Added versioning to APK name
nimbooce Dec 16, 2015
88ef28f
Incremented version code
nimbooce Dec 16, 2015
ee7aae7
testing to see if gradle has access to jenkins build number
nimbooce Dec 16, 2015
8fc4a11
Updating apk name to possibly include jenkins build number
nimbooce Dec 16, 2015
0cf1735
Removed temp debugging output
nimbooce Dec 16, 2015
76d647b
Added note to beware of changing the app name
nimbooce Dec 16, 2015
b95bacf
SYS-1521: changed version mame
nimbooce Dec 22, 2015
10e23a4
Removed duplicate version name which is override by value in gradle. …
nimbooce Dec 22, 2015
674aefd
Fixed package name.
nimbooce Dec 23, 2015
51168a8
Incremented Version code
nimbooce Dec 23, 2015
63e6bc6
These files should not be in the repo. They need to be take out even…
nimbooce Feb 22, 2016
bee2d7a
this file allows local builds to happen.
nimbooce Feb 22, 2016
7b842a9
FBR-428: added content description to buttons.
nimbooce Feb 22, 2016
2947a0c
incremented version code
nimbooce Feb 22, 2016
7176552
FBR-448: increased image size
nimbooce Feb 25, 2016
32c9c4a
FBR-454: Added Roboelectric unit test. (this is a precursor to FBR-440)
nimbooce Mar 2, 2016
8ebf608
FBR-440: added pref to track if its the first time the GoRead app is …
nimbooce Mar 2, 2016
3e396e3
Reduced sleep time. Was too high.
nimbooce Mar 2, 2016
8fe8c5c
Refactor push down two sub classes of DB. Refactor rename class. Pr…
nimbooce Mar 3, 2016
39674a4
Refactor rename method
nimbooce Mar 3, 2016
7d6b59e
Refactor extract out method
nimbooce Mar 3, 2016
4cea36e
Refactored extracted out an abstract method then pushed down to leaf …
nimbooce Mar 3, 2016
e2d406a
This should have been part of last commit
nimbooce Mar 3, 2016
9a9847f
Merge pull request #171 from benetech/FBR-440-AutoSynch
nimbooce Mar 3, 2016
abcda40
Merge branch 'master' into FBR-440-AutoSynch
nimbooce Apr 7, 2016
03d0ba2
Incremented version code
nimbooce Apr 7, 2016
2ff9017
Incremented Version code (Testing google developer alpha user account)
nimbooce Apr 11, 2016
fbd2537
Refactor rename method
nimbooce Apr 20, 2016
6b2a051
Changed the flow of how reading lists are synced (downloaded) and ins…
nimbooce Apr 20, 2016
49bcb60
Refactor rename class and method
nimbooce Apr 20, 2016
9309732
FBR-457: Auto sync every time app opens if there is an internet conne…
nimbooce Apr 25, 2016
8547fb3
Refactor extract methods
nimbooce Apr 25, 2016
1da30b0
Refactor organize imports
nimbooce Apr 25, 2016
c59804d
FBR-459: Using user's login credentials to send requests to bookshare…
nimbooce Apr 25, 2016
67390f8
Extracted out vars
nimbooce Apr 25, 2016
779b658
Refactor extract out method to be used in other places
nimbooce Apr 27, 2016
c1f6981
Moved var init closer to where its used
nimbooce Apr 27, 2016
ab271d8
Moved var ini closer to where its used
nimbooce Apr 27, 2016
6aefc7d
FBR-444/FBR-462 added play holder tabs. Added functionality to GoRea…
nimbooce Apr 27, 2016
2fa8a2c
Reduced inner class and method visibility
nimbooce Apr 27, 2016
2109f8f
Refactor extract class
nimbooce Apr 28, 2016
e6d8ebf
Refactor organize imports
nimbooce Apr 30, 2016
fdbf2ef
FBR-460: Added recent tab with context menu for long hold on a title.
nimbooce Apr 30, 2016
0ace20b
Refactor pull up generic abstract class with context menu functionality.
nimbooce May 2, 2016
ac134b2
Removed blank space
nimbooce May 2, 2016
000408a
Refactor extract method
nimbooce May 2, 2016
1927d25
Increased method visibility
nimbooce May 2, 2016
a37eb19
FBR-461: Merged local list of favs with reading list favorites from API
nimbooce May 2, 2016
4136d40
Pulled up an abstract class
nimbooce May 2, 2016
6344428
Pulled out inner class into own file
nimbooce May 2, 2016
f25d601
Using generic class to access data
nimbooce May 2, 2016
95c93dd
Removed unused method
nimbooce May 2, 2016
e0af284
Refactor organize imports
nimbooce May 2, 2016
2954699
Populating reading list with two different row item types, one is for…
nimbooce May 2, 2016
048be41
FBR-461: added book details for reading list titles. These titles hav…
nimbooce May 2, 2016
231150e
Connecting to staging.
nimbooce May 2, 2016
a5ec347
incremented version code
nimbooce May 2, 2016
9feb608
Removing AndroidStudio project file, this is auto generated and shoul…
nimbooce May 23, 2016
22e96fa
Updated ignore file to remove FBReader.iml from commit view
nimbooce May 23, 2016
91215da
FBR-476: updated AndroidStudio and as a result its plugins its depend…
nimbooce May 23, 2016
e619a9e
Refactor rename class
nimbooce May 23, 2016
ebf26a2
Refactor rename class
nimbooce May 23, 2016
e9550d7
FBR-447: Sorting lists alphabetically
nimbooce May 23, 2016
47d7d55
FBR-449: Only playing earcon if the accessibility manager is turned on.
nimbooce May 24, 2016
df43a3a
FBR-472: Fixed hardware back button
nimbooce May 24, 2016
d67e78a
Refactor extract method
nimbooce May 24, 2016
8f1409b
Refactor partial duplication removed
nimbooce May 24, 2016
59e3b10
Replaced cascading ifs with contains. Created new tags list.
nimbooce May 24, 2016
e3dd5d2
Removed dev console output
nimbooce May 25, 2016
65e27c3
FBR-472: Completely redid the tab layout to fix back button issues, l…
nimbooce May 25, 2016
20d5abb
FBR-463: updated URL
nimbooce May 25, 2016
d53d694
FBR-455: Recents table is now made up of downloaded titles and title …
nimbooce May 26, 2016
84fc795
FBR-465: save current page index to restore next time
nimbooce May 26, 2016
115d62c
Sync progress dialog is now modal
nimbooce May 26, 2016
7fd7fe9
FBR-470: Going back to current open book
nimbooce May 31, 2016
f8f24fa
FBR-470: Reverted code since it was exposing a behavior that is incor…
nimbooce Jun 1, 2016
9235709
FBR-470: Only going back to title if the user logged in. Free logins…
nimbooce Jun 1, 2016
a01a728
Incremented version code
nimbooce Jun 1, 2016
1de2851
Updated localized messages in spanish
Jun 20, 2016
e150c52
Additional spanish localization strings
Jun 20, 2016
426bedd
Adding custom fonts
Jun 20, 2016
14bfaed
Merge branch 'master' of github.com:CodeAllianceOrg/FBReaderJ
Jun 20, 2016
54f9de9
Added more missing spanish localization strings and Hindi reference i…
Jun 20, 2016
b996b6a
Read books in the language that they are printed in.
Jun 21, 2016
2e882e8
Added fonts to Assets folder.
miguel-villalobos Jul 18, 2016
9aad79c
Added new line
nimbooce Jul 18, 2016
bb1bf1c
Merge pull request #175 from benetech/second_pull_request_branch
nimbooce Jul 18, 2016
4a04677
new lines for test
miguel-villalobos Jul 18, 2016
d4915cb
Line changes for test
miguel-villalobos Jul 18, 2016
afb9851
Merge pull request #176 from benetech/m_pull_request_test
nimbooce Jul 18, 2016
2026389
code changes from nima's code review
miguel-villalobos Jul 19, 2016
833716d
Merge pull request #177 from benetech/feature/OpenDyslexic_fonts
nimbooce Jul 19, 2016
1defde2
Merge pull request #178 from CodeAllianceOrg/master
nimbooce Jul 19, 2016
95229e6
Disabled inner options menu by deleting it from tap zones.
miguel-villalobos Jul 19, 2016
e713b1b
"fonts" folder NEEDS to be lower case. Git doesn't recognize the rena…
miguel-villalobos Jul 19, 2016
00059e8
no message
miguel-villalobos Jul 19, 2016
9d7e26c
Adding fonts again
miguel-villalobos Jul 19, 2016
1108e7f
Merge pull request #179 from benetech/feature/FBR-432_Screen_region_f…
nimbooce Jul 19, 2016
2ef6dd6
Merge pull request #180 from benetech/feature/OpenDyslexic_fonts
nimbooce Jul 19, 2016
873e022
work on FBR-472 The new Reading Lists view needs a back arrow from a …
miguel-villalobos Jul 20, 2016
c471af4
New icons for my books page
miguel-villalobos Jul 26, 2016
ae5119b
FBR481-The tab indicator should be bigger and orange
miguel-villalobos Jul 26, 2016
20828e8
Changed how and when syncing is done.
miguel-villalobos Jul 26, 2016
758935e
Last missing icon for mybooks tabs
miguel-villalobos Jul 27, 2016
73c0ffd
Merge pull request #183 from benetech/feature/FBR-472_The_new_Reading…
miguel-villalobos Jul 27, 2016
b1d7b03
Customization of sync dialog. Shorter/smaller version for user-activa…
miguel-villalobos Jul 27, 2016
168413e
Merge branch 'feature/FBR-484_Change_when_how_to_sync'
miguel-villalobos Jul 27, 2016
89f8c33
FBR-488
miguel-villalobos Aug 1, 2016
4efa9d3
FBR-491
miguel-villalobos Aug 1, 2016
477167a
Fix for FBR-490
miguel-villalobos Aug 3, 2016
3f2ab85
Updating version number
miguel-villalobos Aug 3, 2016
9db931d
Merge pull request #185 from benetech/feature/FBR-491-Favorites
miguel-villalobos Aug 3, 2016
0b013d6
Selected tab has orange selector, icon and text
miguel-villalobos Aug 3, 2016
3ab03a4
Fix for FBR-502
miguel-villalobos Aug 4, 2016
d10cef3
Fix for FBR-482 (same font size across all lists in my books)
miguel-villalobos Aug 4, 2016
ff1997d
Additional requirements for FBR-484
miguel-villalobos Aug 4, 2016
ee74505
Updating version number
miguel-villalobos Aug 4, 2016
0879e99
Merge pull request #186 from benetech/feature/503-Tab_icon_colors
miguel-villalobos Aug 8, 2016
47fb6e8
Text size on my books
miguel-villalobos Aug 10, 2016
4ae3e92
Work on sorting lists (FBR-446)
miguel-villalobos Aug 10, 2016
b425aaa
Almost done with sort. Missing inner reading list and date sort.
miguel-villalobos Aug 11, 2016
a6f628e
Sort ready. No sort by date as there is no data to work off of
miguel-villalobos Aug 11, 2016
c30add7
FBR-495-Sort. Added the right icon and the dismiss on touch outside
miguel-villalobos Aug 11, 2016
ac36f7a
FBR-492
miguel-villalobos Aug 12, 2016
6c26fe2
Updating version number
miguel-villalobos Aug 12, 2016
bb01f13
Merge pull request #187 from benetech/FBR-482_Consistent_font_size
miguel-villalobos Aug 12, 2016
fa004ee
Date sort for recent, favorites and reading list.
miguel-villalobos Aug 16, 2016
c7e1b70
Tracking books last accessed date in "bookstatus" table. Creating a s…
miguel-villalobos Aug 17, 2016
dfe918b
Delete book behavior, delete bookstatus entry, also fixed that it was…
miguel-villalobos Aug 17, 2016
e3cb023
Improved sort response on lists.
miguel-villalobos Aug 18, 2016
3780069
Fixed GoRead tab to show correct sort on first load.
miguel-villalobos Aug 18, 2016
8d0e43f
Updating version number
miguel-villalobos Aug 18, 2016
418ee7d
Updating gradle.
miguel-villalobos Aug 18, 2016
0bbc24d
FBR-513
miguel-villalobos Aug 18, 2016
7379e7a
FBR-514
miguel-villalobos Aug 18, 2016
afe3397
FBR-487 first scenario
miguel-villalobos Aug 18, 2016
31c004c
Book info using user selected font. Also made currently selected type…
miguel-villalobos Aug 18, 2016
82d2d4d
work in progress for opening book info screen instead of book detail …
miguel-villalobos Aug 19, 2016
de2b19c
Showing appropriate screen when not logged in and selecting a book fr…
miguel-villalobos Aug 19, 2016
ca245fb
Merge pull request #188 from benetech/Date_sort
miguel-villalobos Aug 19, 2016
6652dd5
Merge pull request #189 from benetech/UI_updated
miguel-villalobos Aug 19, 2016
dd66689
Finally over with FBR-487. Pending to verify that Database update wor…
miguel-villalobos Aug 19, 2016
f6723e2
upping version number
miguel-villalobos Aug 19, 2016
bbdbfb4
Tentative fix for icon size
miguel-villalobos Aug 19, 2016
2ad02dd
Fix for displaying Go Read tab orange if it's selected by default
miguel-villalobos Aug 19, 2016
e510655
Book detail now scrollable. Consider changing font size in a future r…
miguel-villalobos Aug 19, 2016
f282f2e
Merge pull request #190 from benetech/work_on_localstorage
miguel-villalobos Aug 19, 2016
a9c2181
Trying to get the build server back working
miguel-villalobos Aug 22, 2016
1391493
Upping version number on gradle to fire up a build with the reconfigu…
miguel-villalobos Aug 22, 2016
4c33d60
Reverting last commits. They were unsuccessful in restoring working o…
miguel-villalobos Aug 22, 2016
65843c9
FBR-483, 505
miguel-villalobos Aug 24, 2016
0faa849
FBR-451
miguel-villalobos Aug 24, 2016
1050b7d
FBR-517, 519, 520
miguel-villalobos Aug 25, 2016
e379f2a
Merge pull request #191 from benetech/5.3.9_requested_changes
miguel-villalobos Aug 25, 2016
8d4c59f
FBR-505 new requirement. Updating user guide
miguel-villalobos Aug 30, 2016
ea40673
fixing a bug where a Locale method that's only available for lollipop…
miguel-villalobos Sep 6, 2016
4716177
gradle version update
nimbooce Sep 21, 2016
e2a0f5b
Pointing to staging API v2
nimbooce Sep 21, 2016
105cb25
Incremented version code
nimbooce Sep 21, 2016
66ac41a
FBR-528: Start login activity if the user is not logged in when attem…
nimbooce Sep 23, 2016
45dbc25
Incremented version code
nimbooce Sep 23, 2016
cbf8cd4
FBR-534: pointing APK to bookshare live
nimbooce Oct 6, 2016
0ae825b
Incremented version code
nimbooce Oct 6, 2016
1deb791
Added FIXME to move url to gradle.
nimbooce Oct 6, 2016
03a0f51
Incremented revision
nimbooce Oct 6, 2016
485c007
FBR-536: updated gradle version
nimbooce Oct 6, 2016
7e9e576
update gradle to 2.2.2 and adding to flavors for alpha and live chang…
Oct 28, 2016
cfc7350
finish FBR-542 about adding blue header and left nav region and more …
Oct 31, 2016
7ed5075
fixed change bookstore Library icons
Nov 1, 2016
7c6e791
commented x86 and arm flavors
Nov 1, 2016
1e56d78
FBR-543 margin icons
Nov 3, 2016
d21a7d2
FBR-543 update gradle version 2.2.2
Nov 3, 2016
1c91dd4
FBR-543 adding margin functionality, adding new MarginPreference clas…
Nov 3, 2016
3aabf25
FBR-543 deleting 2 lines of testing
Nov 3, 2016
9fafc85
FBR-543 changing margins to 3 options, small, medium and large, also …
Nov 3, 2016
b3fc9e8
FBR-547- change Margins options to Text sub-menu
Nov 3, 2016
da1add5
FBR-544 Added a circle on color preference, displaying the current co…
Nov 4, 2016
d112fe4
FBR-541Adding icons to action menu
Nov 7, 2016
8fa5e48
FBR-546 added Header and Back Arrow to Settings Menu
Nov 7, 2016
1897f39
FBR-529 deleting comments
Nov 7, 2016
18f0e15
FBR-546 added sub_settings.xml to handle toolbar functionality on sub…
Nov 8, 2016
04115be
FBR-546 Adding functionality to action menu items
Nov 8, 2016
74301b1
Merge branch 'feature/FBR-540--Replace_Search_icons_with_Materials_st…
Nov 8, 2016
453771a
FBR-529- remove none used commented code
Nov 9, 2016
b2e45fe
Merge pull request #194 from benetech/feature/FBR-529--Change_gradle_…
nimbooce Nov 9, 2016
a404265
Merge branch 'master' into feature/FBR-524--Complete_the_Go_Read_UI_c…
Nov 9, 2016
72b6c9b
FBR-524 deleting using instanceOf, create a abstract method to setupA…
Nov 10, 2016
2f87a70
new class to contains creation of the action bar menu
Nov 11, 2016
0a96b92
changing extended class
Nov 11, 2016
70951a0
manually reverting previous change on the action bar for bookshare_menu
Nov 11, 2016
b3ecc9f
Refactor pull up methods and variables
Nov 11, 2016
4ae082b
delete character
Nov 11, 2016
d5bcbea
manual refactor deleting methods and variables no needed on bookshare…
Nov 11, 2016
cc617f1
optimize imports
Nov 11, 2016
56b8827
changing comment description for the class
Nov 11, 2016
47a58f4
FBR-546 create handler for action bar activities. Handler can we use …
Nov 14, 2016
a52a843
FBR-546 clean up tabbing
Nov 14, 2016
9d494c3
FBR-546 cleaning unused code
Nov 14, 2016
ac3e1b1
FBR-546 creating onCreateMenuOptionsWithoutPlugins for PreferenceActi…
Nov 15, 2016
34a6234
FBR-546 clean up commented code
Nov 15, 2016
d2349bd
FBR-546 propagating return value to callers
Nov 15, 2016
7da8139
FBR-546 clean up adding space line between returns
Nov 15, 2016
a11879a
FBR-546 clean up adding space line between returns
Nov 15, 2016
a5fb79a
Merge pull request #195 from benetech/feature/FBR-524--Complete_the_G…
nimbooce Nov 16, 2016
7e117a9
FBR-551: Changed version name to include buid
nimbooce Nov 16, 2016
da01ae7
FBR-551: Removed "_alpha" tag from version and added it to versionName
nimbooce Nov 16, 2016
32133b4
FBR-535: Added FIXME to examine this variable and remove it.
nimbooce Nov 17, 2016
f2fc688
FBR-535: Pulled bookshare api host value into gradle. Icluded host …
nimbooce Nov 17, 2016
5b3177b
FBR-535: Moved api host value to product flavor since jenkins only bu…
nimbooce Nov 17, 2016
c77b212
FBR-535: This should have been part of previous commit. Added api h…
nimbooce Nov 17, 2016
1c66933
Incremented version code
nimbooce Nov 17, 2016
730f47f
Undoing the host name pointed to staging since its breaking log in. …
nimbooce Nov 17, 2016
774594b
Incremented version code.
nimbooce Nov 17, 2016
f7fc6f6
Able to start playback at selected word. But the following playback g…
miguel-villalobos Dec 5, 2016
3bcacbe
Working. Need to ask if auto play was desired or just highlight
miguel-villalobos Dec 7, 2016
6ce9d88
Double tap to select sentence. Double two finger tap to play/pause
miguel-villalobos Dec 8, 2016
114455e
String changed
miguel-villalobos Dec 8, 2016
ef91075
Spanish
miguel-villalobos Dec 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
17 changes: 14 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,23 @@
default.properties
build.properties
local.properties
FBReader.iml
bin/
gen/
res/drawable/
res/raw/
libs/
obj/
FBReader/build/
build/
.idea/
.gradle
assets/developerSpecific/
.classpath
.settings
*~
src/org/geometerplus/android/fbreader/network/bookshare/BookshareDeveloperKey.java
src/org/geometerplus/android/fbreader/network/bookshare/socialnetworks/SocialNetworkKeys.java
project.properties
res/raw/data__help__minihelp_en_fb2



.DS_Store
33 changes: 0 additions & 33 deletions .project
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions .settings/org.eclipse.core.resources.prefs
View file
Open in desktop

This file was deleted.

154 changes: 0 additions & 154 deletions AndroidManifest.xml
View file
Open in desktop

This file was deleted.

Loading