Nikolay Pultsin
|
5e1aa208dc
|
Merge branch 'master' into library-service
Conflicts:
src/org/geometerplus/android/fbreader/FBReader.java
src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java
|
2013-01-20 00:30:25 +04:00 |
|
Nikolay Pultsin
|
896316b023
|
empty ZLAndroidActivity
|
2013-01-20 00:17:20 +04:00 |
|
Nikolay Pultsin
|
71342597d7
|
Merge branch 'master' into library-service
Conflicts:
src/org/geometerplus/android/fbreader/FBReader.java
src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java
|
2013-01-19 23:52:16 +04:00 |
|
Nikolay Pultsin
|
5f428e149a
|
more methods moved from ZLAndroidActivity to FBReader
|
2013-01-19 22:59:46 +04:00 |
|
Nikolay Pultsin
|
9f7c945f2b
|
Merge branch 'master' into library-service
|
2013-01-19 22:39:52 +04:00 |
|
Nikolay Pultsin
|
8d227b4400
|
formatting
|
2013-01-19 22:38:59 +04:00 |
|
Nikolay Pultsin
|
3e2f6bbef8
|
Merge branch 'master' into library-service
Conflicts:
src/org/geometerplus/android/fbreader/FBReader.java
|
2013-01-19 22:37:51 +04:00 |
|
Nikolay Pultsin
|
97293852d4
|
onKey{Down,Up} => FBReader
|
2013-01-19 22:34:14 +04:00 |
|
Nikolay Pultsin
|
1d00d8bd5e
|
Merge branch 'master' into library-service
Conflicts:
src/org/geometerplus/android/fbreader/FBReader.java
src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java
|
2013-01-19 22:23:26 +04:00 |
|
Nikolay Pultsin
|
86439a18d7
|
onCreate moved from ZLAndroidActivity to FBReader
|
2013-01-19 21:52:02 +04:00 |
|
Nikolay Pultsin
|
6b78cb1895
|
Merge branch 'master' into library-service
|
2013-01-19 21:07:04 +04:00 |
|
Nikolay Pultsin
|
2e3a9d8de3
|
unused constants
|
2013-01-19 21:05:35 +04:00 |
|
Nikolay Pultsin
|
9dcef30885
|
compilation issue
|
2013-01-19 21:05:09 +04:00 |
|
Nikolay Pultsin
|
e8b6c001ff
|
library initialization
Conflicts:
src/org/geometerplus/fbreader/book/BookCollection.java
|
2013-01-15 06:19:00 +04:00 |
|
Nikolay Pultsin
|
42a38f3ab9
|
LibraryActivity uses BookCollectionShadow
|
2013-01-15 05:51:41 +04:00 |
|
Nikolay Pultsin
|
b8d50dc537
|
KillerCallback has gone
|
2013-01-15 05:30:01 +04:00 |
|
Nikolay Pultsin
|
8736d24595
|
unused field
|
2013-01-15 05:27:15 +04:00 |
|
Nikolay Pultsin
|
f725f70c03
|
files from library-service branch
|
2013-01-14 08:10:16 +04:00 |
|
Nikolay Pultsin
|
7d4b17b635
|
imports cleanup
|
2013-01-14 08:02:01 +04:00 |
|
Nikolay Pultsin
|
351a105f67
|
toString() method optimization (?)
|
2013-01-14 08:00:06 +04:00 |
|
Nikolay Pultsin
|
4bb8132427
|
public Collection field
|
2013-01-14 07:16:10 +04:00 |
|
Nikolay Pultsin
|
370e99c34a
|
LibraryUtil => BookUtil
|
2013-01-14 07:10:50 +04:00 |
|
Nikolay Pultsin
|
e588c37b3b
|
database parameter in FileInfoSet constructors
|
2013-01-14 07:05:09 +04:00 |
|
Nikolay Pultsin
|
d9b061117a
|
cleanup
|
2013-01-14 06:22:13 +04:00 |
|
Nikolay Pultsin
|
621c259a68
|
RunActivityAction has gone
|
2013-01-14 06:10:20 +04:00 |
|
Nikolay Pultsin
|
eb59ff7ccb
|
synchronization with library-service branch
|
2013-01-14 06:00:37 +04:00 |
|
Nikolay Pultsin
|
9198de8ab8
|
Merge branch 'master' into library-service
Conflicts:
src/org/geometerplus/android/fbreader/FBReader.java
src/org/geometerplus/android/fbreader/libraryService/LibraryService.java
src/org/geometerplus/android/fbreader/preferences/EditBookInfoActivity.java
|
2013-01-14 05:49:56 +04:00 |
|
Nikolay Pultsin
|
f172477537
|
SQLiteBooksDatabase moved to libraryService package
|
2013-01-14 05:43:07 +04:00 |
|
Nikolay Pultsin
|
576a903da6
|
int constants => enum
|
2013-01-14 05:36:16 +04:00 |
|
Nikolay Pultsin
|
cf6927246d
|
deleted unused methods
|
2013-01-14 05:19:23 +04:00 |
|
Nikolay Pultsin
|
64911efecf
|
AbstractLibrary has gone
|
2013-01-14 05:12:07 +04:00 |
|
Nikolay Pultsin
|
6bf29e3bd3
|
Merge branch 'master' into library-service
Conflicts:
src/org/geometerplus/android/fbreader/libraryService/LibraryService.java
src/org/geometerplus/fbreader/library/AbstractLibrary.java
src/org/geometerplus/fbreader/library/Library.java
|
2013-01-14 05:05:35 +04:00 |
|
Nikolay Pultsin
|
42b9345d5a
|
synchronization with library-service branch
|
2013-01-14 05:03:16 +04:00 |
|
Nikolay Pultsin
|
8b9530c36b
|
synchronization with library-service branch
|
2013-01-14 04:49:48 +04:00 |
|
Nikolay Pultsin
|
b0edbfe740
|
Merge branch 'master' into library-service
Conflicts:
src/org/geometerplus/android/fbreader/library/BookInfoActivity.java
src/org/geometerplus/android/fbreader/libraryService/SQLiteBooksDatabase.java
src/org/geometerplus/fbreader/book/Book.java
src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
src/org/geometerplus/fbreader/formats/fb2/FB2MetaInfoReader.java
src/org/geometerplus/fbreader/library/AuthorTree.java
src/org/geometerplus/fbreader/library/BookInSeriesTree.java
src/org/geometerplus/fbreader/library/BookTree.java
src/org/geometerplus/fbreader/library/Library.java
src/org/geometerplus/fbreader/library/SeriesTree.java
src/org/geometerplus/fbreader/library/TagTree.java
|
2013-01-14 04:44:34 +04:00 |
|
Nikolay Pultsin
|
fbec1dc704
|
repackaging: some classes moved to book package (synchronization with library-service branch)
|
2013-01-14 04:34:16 +04:00 |
|
Nikolay Pultsin
|
840b03f68e
|
SeriesInfo.Name => Title
|
2013-01-14 04:20:11 +04:00 |
|
Nikolay Pultsin
|
188f0b1c1b
|
new methods in xml & filesystem; from library-service branch
|
2013-01-14 04:12:32 +04:00 |
|
Nikolay Pultsin
|
315b75e241
|
event processing in BookCollectionShadow
|
2013-01-13 18:53:04 +04:00 |
|
Nikolay Pultsin
|
d17f318110
|
missing file
|
2013-01-13 18:52:39 +04:00 |
|
Nikolay Pultsin
|
19e02c015b
|
removed debug printing
|
2013-01-13 11:46:14 +04:00 |
|
Nikolay Pultsin
|
0ddf4550fd
|
fixed NPE
|
2013-01-13 11:01:55 +04:00 |
|
Nikolay Pultsin
|
6f6fdf6b12
|
Merge branch 'master' into library-service
Conflicts:
src/org/geometerplus/android/fbreader/BookmarksActivity.java
|
2013-01-13 10:19:30 +04:00 |
|
Nikolay Pultsin
|
1b6341a0a4
|
synchronization with beta branch
|
2013-01-13 10:16:47 +04:00 |
|
Nikolay Pultsin
|
1c20393098
|
SQLiteBooksDatabase moved to libraryService package
|
2013-01-13 09:59:34 +04:00 |
|
Nikolay Pultsin
|
903ffec9d4
|
BooksDatabase.Instance() should be never used
|
2013-01-13 09:40:24 +04:00 |
|
Nikolay Pultsin
|
bb451e9467
|
Book.save() is not public now
|
2013-01-13 08:31:54 +04:00 |
|
Nikolay Pultsin
|
8a78a11bd8
|
removed unused methods
|
2013-01-13 07:59:39 +04:00 |
|
Nikolay Pultsin
|
4b10755383
|
fbreader.library package splitted into fbreader.library & fbreader.book
|
2013-01-13 07:02:44 +04:00 |
|
Nikolay Pultsin
|
a787045fbf
|
no myDatabase field in LibraryActivity
|
2013-01-13 06:16:29 +04:00 |
|