diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c30317de6..4b7a628fc 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -131,9 +131,18 @@ - + + + + + + + + + + diff --git a/AndroidManifest.xml.pattern b/AndroidManifest.xml.pattern index b86275398..482ff9aca 100644 --- a/AndroidManifest.xml.pattern +++ b/AndroidManifest.xml.pattern @@ -131,9 +131,18 @@ - + + + + + + + + + + diff --git a/ChangeLog b/ChangeLog index 897575fef..bd1047a2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ -===== 0.99.14 (??? ??, 2011) ===== +===== 0.99.14 (Mar ??, 2011) ===== * Thai localization (by Samphan Pojanasophanakul) * Fixed TTF font style detection +* opds:// URLs support has been implemented +* Unexpected search call has been fixed +* Ignore case comparison for zip entry names +* Fixed custom OPDS link search +* Periodical update of custom links information has been added ===== 0.99.13 (Feb 13, 2011) ===== * Fixed book/position forgetting bug diff --git a/TODO.CustomCatalog b/TODO.CustomCatalog new file mode 100644 index 000000000..47360a95c --- /dev/null +++ b/TODO.CustomCatalog @@ -0,0 +1 @@ +* start FBReader in new task diff --git a/TODO.network b/TODO.network index 088b8dd55..131e829d9 100644 --- a/TODO.network +++ b/TODO.network @@ -1,3 +1,27 @@ +DONE show 'empty basket' message without opening of catalog +* update basket view if basket content is changed +* basket summary +DONE show recommendation item if basket is not empty +* new actions in main menu: clear; buy all +* update recommendations list after each basket updating/purchasing +* update recommendations list visibility after each basket updating/purchasing +* remove book from basket on purchasing + +* search item behaviour like search item in local library +* separate search for each catalog (if search URL is presented) +* menu search button should be available for all catalog levels + +* float point numbers as series index +* replace AuthenticationCatalog by AuthenticationActivity +* 'recently visited catalogs' item +* load search URL for catalogs from these catalogs, not from our generic file +DONE show library name in network book activity + +* litres: credit card top up +* litres: terminal (?) top up +* litres: similar books link + +------------------------------ NP: оповещение об изменениях в namespace'ах происходит после того, как был обработан тег, объявляющий эти namespace'ы... Нужно сделать: @@ -5,22 +29,8 @@ NP: оповещение об изменениях в namespace'ах проис 2) вызов namespaceMapChangedHandler после вызова endElementHandler 3) вызов namespaceMapChangedHandler для пустых тегов -** Записать изменения в ChangeLog - -DONE Network library: Объединять книги по сериям - ** в сериях книги нужно сортировать по индексу - NP: а где это происходит??? - -DONE Возможность открывать локальные файлы из всяких файл-менеджеров -DONE На этой странице есть ссылка на epub-файл "для ПК". http://www.zone4iphone.ru/index.php?p_id=7&b_id=18413 - Проверить скачивание книги браузером и возможность чтения из папки, куда файл был скачан. - DONE добавлять в библиотеку (сделать таблицу добавленных вручную книг) - ------------------------------ -** пополнение счета в litres с помощью sms - ** сделать как "подкаталог" для элемента "пополнить счет" - ** восстановление пароля (use default e-mail) ** сделать отдельную ветку (?) для скачанных samples ** (?) удалять sample при покупке/скачивании полного варианта @@ -57,5 +67,4 @@ DELAYED что делать, когда мало памяти??? ----------------------------- другое: -DONE layout для китайских текстов * поддержка hufdic в mobipocket diff --git a/assets/resources/application/cs.xml b/assets/resources/application/cs.xml index a3eba2f15..7a7f4d190 100644 --- a/assets/resources/application/cs.xml +++ b/assets/resources/application/cs.xml @@ -47,6 +47,18 @@ + + + + + + + + + + + + @@ -57,6 +69,8 @@ + + @@ -109,6 +123,7 @@ + @@ -559,10 +574,6 @@ - - - - @@ -576,7 +587,7 @@ - + @@ -610,6 +621,8 @@ + + diff --git a/assets/resources/application/de.xml b/assets/resources/application/de.xml index a5f4ef6ae..2a27a143a 100644 --- a/assets/resources/application/de.xml +++ b/assets/resources/application/de.xml @@ -48,6 +48,18 @@ + + + + + + + + + + + + @@ -58,6 +70,8 @@ + + @@ -110,6 +124,7 @@ + @@ -560,10 +575,6 @@ - - - - @@ -577,7 +588,7 @@ - + @@ -611,6 +622,8 @@ + + diff --git a/assets/resources/application/en.xml b/assets/resources/application/en.xml index 3bbcc3115..ef99c9fd1 100644 --- a/assets/resources/application/en.xml +++ b/assets/resources/application/en.xml @@ -46,6 +46,18 @@ + + + + + + + + + + + + @@ -56,6 +68,8 @@ + + @@ -66,6 +80,8 @@ + + @@ -97,6 +113,8 @@ + + @@ -108,6 +126,7 @@ + @@ -568,10 +587,6 @@ - - - - @@ -585,7 +600,7 @@ - + @@ -619,6 +634,8 @@ + + diff --git a/assets/resources/application/fr.xml b/assets/resources/application/fr.xml index f9bd3390f..d3a53d408 100644 --- a/assets/resources/application/fr.xml +++ b/assets/resources/application/fr.xml @@ -50,6 +50,18 @@ + + + + + + + + + + + + @@ -60,6 +72,8 @@ + + @@ -112,6 +126,7 @@ + @@ -562,10 +577,6 @@ - - - - @@ -579,7 +590,7 @@ - + @@ -613,6 +624,8 @@ + + diff --git a/assets/resources/application/gl.xml b/assets/resources/application/gl.xml index 9fabc7324..9692dba8d 100644 --- a/assets/resources/application/gl.xml +++ b/assets/resources/application/gl.xml @@ -47,6 +47,18 @@ + + + + + + + + + + + + @@ -57,6 +69,8 @@ + + @@ -109,6 +123,7 @@ + @@ -559,10 +574,6 @@ - - - - @@ -576,7 +587,7 @@ - + @@ -610,6 +621,8 @@ + + diff --git a/assets/resources/application/hu.xml b/assets/resources/application/hu.xml index 9a514b903..2728284d9 100644 --- a/assets/resources/application/hu.xml +++ b/assets/resources/application/hu.xml @@ -47,6 +47,18 @@ + + + + + + + + + + + + @@ -57,6 +69,8 @@ + + @@ -109,6 +123,7 @@ + @@ -559,10 +574,6 @@ - - - - @@ -576,7 +587,7 @@ - + @@ -610,6 +621,8 @@ + + diff --git a/assets/resources/application/it.xml b/assets/resources/application/it.xml index 677225789..1a886d7d4 100644 --- a/assets/resources/application/it.xml +++ b/assets/resources/application/it.xml @@ -47,6 +47,18 @@ + + + + + + + + + + + + @@ -57,6 +69,8 @@ + + @@ -109,6 +123,7 @@ + @@ -559,10 +574,6 @@ - - - - @@ -576,7 +587,7 @@ - + @@ -610,6 +621,8 @@ + + diff --git a/assets/resources/application/nl.xml b/assets/resources/application/nl.xml index 937e00481..eb64c7c63 100644 --- a/assets/resources/application/nl.xml +++ b/assets/resources/application/nl.xml @@ -47,6 +47,18 @@ + + + + + + + + + + + + @@ -57,6 +69,8 @@ + + @@ -109,6 +123,7 @@ + @@ -559,10 +574,6 @@ - - - - @@ -576,7 +587,7 @@ - + @@ -610,6 +621,8 @@ + + diff --git a/assets/resources/application/ru.xml b/assets/resources/application/ru.xml index b6b34d4da..e6e5b7b36 100644 --- a/assets/resources/application/ru.xml +++ b/assets/resources/application/ru.xml @@ -46,6 +46,18 @@ + + + + + + + + + + + + @@ -56,6 +68,8 @@ + + @@ -108,6 +122,7 @@ + @@ -558,10 +573,6 @@ - - - - @@ -575,7 +586,7 @@ - + @@ -609,6 +620,8 @@ + + diff --git a/assets/resources/application/th.xml b/assets/resources/application/th.xml index bcb0e5941..315cbb2e2 100644 --- a/assets/resources/application/th.xml +++ b/assets/resources/application/th.xml @@ -47,6 +47,18 @@ + + + + + + + + + + + + @@ -57,6 +69,8 @@ + + @@ -109,6 +123,7 @@ + @@ -237,12 +252,12 @@ - - + + - - - + + + @@ -559,10 +574,6 @@ - - - - @@ -576,7 +587,7 @@ - + @@ -610,6 +621,8 @@ + + diff --git a/assets/resources/application/uk.xml b/assets/resources/application/uk.xml index cd76fe5b3..69b79ffa3 100644 --- a/assets/resources/application/uk.xml +++ b/assets/resources/application/uk.xml @@ -47,6 +47,18 @@ + + + + + + + + + + + + @@ -57,6 +69,8 @@ + + @@ -109,6 +123,7 @@ + @@ -559,10 +574,6 @@ - - - - @@ -576,7 +587,7 @@ - + @@ -610,6 +621,8 @@ + + diff --git a/assets/resources/application/vi.xml b/assets/resources/application/vi.xml index c4ecfcbbf..aaa724007 100644 --- a/assets/resources/application/vi.xml +++ b/assets/resources/application/vi.xml @@ -47,6 +47,18 @@ + + + + + + + + + + + + @@ -57,6 +69,8 @@ + + @@ -109,6 +123,7 @@ + @@ -559,10 +574,6 @@ - - - - @@ -576,7 +587,7 @@ - + @@ -610,6 +621,8 @@ + + diff --git a/assets/resources/application/zh.xml b/assets/resources/application/zh.xml index 67be67fbd..f58b8e38f 100644 --- a/assets/resources/application/zh.xml +++ b/assets/resources/application/zh.xml @@ -47,6 +47,18 @@ + + + + + + + + + + + + @@ -57,6 +69,8 @@ + + @@ -109,6 +123,7 @@ + @@ -559,10 +574,6 @@ - - - - @@ -576,7 +587,7 @@ - + @@ -610,6 +621,8 @@ + + diff --git a/assets/resources/zlibrary/th.xml b/assets/resources/zlibrary/th.xml index 21594c60b..16a07e026 100644 --- a/assets/resources/zlibrary/th.xml +++ b/assets/resources/zlibrary/th.xml @@ -75,7 +75,7 @@ - + diff --git a/icons/library/ic_list_library_wallet.png b/icons/library/ic_list_library_wallet.png deleted file mode 100644 index 020dbc4ba..000000000 Binary files a/icons/library/ic_list_library_wallet.png and /dev/null differ diff --git a/res/layout/network_custom_catalog_dialog.xml b/res/layout/add_custom_catalog.xml similarity index 60% rename from res/layout/network_custom_catalog_dialog.xml rename to res/layout/add_custom_catalog.xml index 29d9592be..40823bcfa 100644 --- a/res/layout/network_custom_catalog_dialog.xml +++ b/res/layout/add_custom_catalog.xml @@ -1,6 +1,5 @@ @@ -12,124 +11,124 @@ android:orientation="vertical" > + +