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

Proposal for an Android Studio branch; a trial migration to Android Studio project, Gradle. #279

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

Proposal for an Android Studio branch; a trial migration to Android Studio project, Gradle. #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
a837c97
Imported and converted the original Eclipse project into an Android
liquiddandruff Jan 5, 2015
15a7661
Updated .gitignore
liquiddandruff Jan 5, 2015
932c1e3
Removed erroneous digit from project name (remnant from auto-conversion)
liquiddandruff Jan 5, 2015
bb9e1fe
Tell lint not to check release builds.
liquiddandruff Jan 6, 2015
a9ae8ba
Ignore apk and txt files
liquiddandruff Jan 6, 2015
e5db27f
Append port to path when downloading books from
liquiddandruff Jan 6, 2015
c32425b
Assured .idea/ was not needed for successfull build, ignored more gra…
liquiddandruff Jan 6, 2015
7adf1f7
Cleaned ignored files
liquiddandruff Jan 6, 2015
b8bd2d4
Re-add TODOs from upstream
liquiddandruff Jan 7, 2015
ae19456
Re-add help/ from upstream
liquiddandruff Jan 7, 2015
99228ff
Ignore the generated help epubs
liquiddandruff Jan 7, 2015
26aee8a
Make note for help epub generation
liquiddandruff Jan 7, 2015
3528745
Add README, show import-summary
liquiddandruff Jan 7, 2015
0d3cc2f
SYNCED with upstream/master 446ab1e7add90723f99eae2a8b17c013a01bb754
liquiddandruff Jan 7, 2015
0b6d16c
Updated README with build instructions, removed comments from build.g…
liquiddandruff Jan 8, 2015
3e47275
Updated README
liquiddandruff Jan 8, 2015
1c2f147
Fixes #140, needs cleanup
liquiddandruff Jan 8, 2015
b9d04fd
Double-checking
liquiddandruff Jan 8, 2015
5d071e3
Cleanup, comments
liquiddandruff Jan 8, 2015
076d2c3
More cleanup
liquiddandruff Jan 8, 2015
b987e1e
Fluid backbutton longpress #269
liquiddandruff Jan 9, 2015
445bd77
Implement go to previous book action #269
liquiddandruff Jan 9, 2015
8910503
Clean up
liquiddandruff Jan 9, 2015
5cb2e40
Implement go to library actions, cleanup
liquiddandruff Jan 9, 2015
2f7d0d0
Correct indentation, cleanup
liquiddandruff Jan 9, 2015
96b044c
Update README.md
liquiddandruff Jan 9, 2015
ec02a98
Merged back_button_long_perss_269, preference action
liquiddandruff Jan 10, 2015
596bc3e
Merge branch 'android_studio' of github.com:liquiddandruff/FBReaderJ …
liquiddandruff Jan 10, 2015
7e0292a
SYNCED with upstream/master ea88a4e582c8f
liquiddandruff Jan 10, 2015
36ae6c9
SYNCED with upstream/master f1291f2d6eed112
liquiddandruff Jan 13, 2015
8418e67
SYNCED with upstream/master a0361de61f8e38aa578bdd55918581d57f99c52f
liquiddandruff Feb 16, 2015
77d668d
Add utility script to convert diffs from upstream/master to Android S…
liquiddandruff Feb 16, 2015
94ceca5
add docs
liquiddandruff Feb 5, 2016
7ddccff
attempt to update converter script
liquiddandruff Feb 5, 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
  •  
  •  
  •  
19 changes: 19 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,22 @@ READY/
.settings
*.so
*~

# Android Studio
.idea/
*.apk
*.txt

# Gradle files
*.bin
*.iml
*.iws
*.ipr
.gradle/
*/build/

# FBReader help books
intro/

# Windows VIM
*.swp
337 changes: 0 additions & 337 deletions AndroidManifest.xml.pattern
View file
Open in desktop

This file was deleted.

4 changes: 3 additions & 1 deletion ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@
* (planned) CSS selectors priority

===== 2.2.2 (Jan ??, 2015) =====
* Added French introduction translation
* Added French, German, Greek, Polish, and Ukrainian intro translations
* Updated Dutch localisation + Dutch intro (by Frank Fesevur)
* Updated German localisation (by Matthias Dill)
* added IBookCollection.getDescription(book) method

===== 2.2.1 (Jan 03, 2015) =====
* Fixed English mistakes (thanks to Sahak Petrosyan)
Expand Down
33 changes: 0 additions & 33 deletions HowToBuild
View file
Open in desktop

This file was deleted.

Loading