From d39563e28dc22e5a4096e3fa05cacd3945c6fcc9 Mon Sep 17 00:00:00 2001 From: Vasiliy Bout Date: Mon, 2 Aug 2010 12:28:23 +0000 Subject: [PATCH] Network Dialogs layout changes + SignUp link background + Custom catalog examples git-svn-id: https://only.mawhrin.net/repos/FBReaderJ/trunk@1640 6a642e6f-84f6-412e-ac94-c4a38d5a04b0 --- TODO.network | 2 +- data/resources/application/de.xml | 3 + data/resources/application/en.xml | 3 + data/resources/application/fr.xml | 3 + data/resources/application/hu.xml | 3 + data/resources/application/it.xml | 3 + data/resources/application/ru.xml | 3 + data/resources/application/vi.xml | 3 + data/resources/application/zh.xml | 3 + icons/tree/link.xml | 6 + icons/tree/link_default.9.png | Bin 0 -> 2858 bytes icons/tree/link_pressed.9.png | Bin 0 -> 3911 bytes icons/tree/link_selected.9.png | Bin 0 -> 4457 bytes res/layout/network_authentication_dialog.xml | 77 +++----- res/layout/network_custom_catalog_dialog.xml | 177 +++++++++--------- res/layout/network_register_user_dialog.xml | 128 +++++-------- .../network/AuthenticationDialog.java | 4 +- .../fbreader/network/CustomCatalogDialog.java | 14 +- .../fbreader/network/NetworkDialog.java | 11 -- .../fbreader/network/RegisterUserDialog.java | 8 +- 20 files changed, 216 insertions(+), 235 deletions(-) create mode 100644 icons/tree/link.xml create mode 100644 icons/tree/link_default.9.png create mode 100644 icons/tree/link_pressed.9.png create mode 100644 icons/tree/link_selected.9.png diff --git a/TODO.network b/TODO.network index 54d83dae1..251aed152 100644 --- a/TODO.network +++ b/TODO.network @@ -7,7 +7,7 @@ DONE Комментарий к этому пункту = "Добавление O ** Какую-нибудь иконку к добавленным вручную каталогам DONE Звездочку к 2-м обязательным пунктам при добавлении каталога ?? Убрать 3-й пункт при добавлении???? -** Может быть сделать примеры мелким шрифтом под полями??? +DONE Может быть сделать примеры мелким шрифтом под полями ** Сразу (по нажатию Ok) проверять и говорить, верный ли URL (Ex: Это не OPDS-каталог) Это не должно мешать добавлению, но пользователь д.б. предупрежден (типа -- это не OPDS каталог -> Edit/Continue/Cancel) diff --git a/data/resources/application/de.xml b/data/resources/application/de.xml index 472261a3d..8500d4d78 100644 --- a/data/resources/application/de.xml +++ b/data/resources/application/de.xml @@ -316,6 +316,9 @@ + + + diff --git a/data/resources/application/en.xml b/data/resources/application/en.xml index 840305f43..ddefaa4e5 100644 --- a/data/resources/application/en.xml +++ b/data/resources/application/en.xml @@ -315,6 +315,9 @@ + + + diff --git a/data/resources/application/fr.xml b/data/resources/application/fr.xml index c4c010ba4..596b50ac7 100644 --- a/data/resources/application/fr.xml +++ b/data/resources/application/fr.xml @@ -316,6 +316,9 @@ + + + diff --git a/data/resources/application/hu.xml b/data/resources/application/hu.xml index 1fd1d645b..cdfe59816 100644 --- a/data/resources/application/hu.xml +++ b/data/resources/application/hu.xml @@ -316,6 +316,9 @@ + + + diff --git a/data/resources/application/it.xml b/data/resources/application/it.xml index 24ac7944b..d23ab0b70 100644 --- a/data/resources/application/it.xml +++ b/data/resources/application/it.xml @@ -316,6 +316,9 @@ + + + diff --git a/data/resources/application/ru.xml b/data/resources/application/ru.xml index f832d5507..112764c3e 100644 --- a/data/resources/application/ru.xml +++ b/data/resources/application/ru.xml @@ -315,6 +315,9 @@ + + + diff --git a/data/resources/application/vi.xml b/data/resources/application/vi.xml index 85431f2b4..4a6b1cd96 100644 --- a/data/resources/application/vi.xml +++ b/data/resources/application/vi.xml @@ -316,6 +316,9 @@ + + + diff --git a/data/resources/application/zh.xml b/data/resources/application/zh.xml index 094501848..7bafad212 100644 --- a/data/resources/application/zh.xml +++ b/data/resources/application/zh.xml @@ -316,6 +316,9 @@ + + + diff --git a/icons/tree/link.xml b/icons/tree/link.xml new file mode 100644 index 000000000..03463bc56 --- /dev/null +++ b/icons/tree/link.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/icons/tree/link_default.9.png b/icons/tree/link_default.9.png new file mode 100644 index 0000000000000000000000000000000000000000..7a486f6fcf0fcc0f3b2667c06238c0390442c9ce GIT binary patch literal 2858 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 VJNK~)Hg5m`002ovPDHLkV1m5ILjeE) literal 0 HcmV?d00001 diff --git a/icons/tree/link_selected.9.png b/icons/tree/link_selected.9.png new file mode 100644 index 0000000000000000000000000000000000000000..e5c46298c93ecdbd25e2ade84e77ab411c6cda05 GIT binary patch literal 4457 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 literal 0 HcmV?d00001 diff --git a/res/layout/network_authentication_dialog.xml b/res/layout/network_authentication_dialog.xml index e8ba3b004..0ec1f45ac 100644 --- a/res/layout/network_authentication_dialog.xml +++ b/res/layout/network_authentication_dialog.xml @@ -7,54 +7,32 @@ android:paddingRight="10dp" android:orientation="vertical" > - - - - - - - - - - + android:singleLine="true" + /> + + + diff --git a/res/layout/network_custom_catalog_dialog.xml b/res/layout/network_custom_catalog_dialog.xml index 873b299f6..4605066fb 100644 --- a/res/layout/network_custom_catalog_dialog.xml +++ b/res/layout/network_custom_catalog_dialog.xml @@ -11,101 +11,102 @@ android:paddingRight="10dp" android:orientation="vertical" > - + - - - - - - + - - - - - - - - - - - + android:singleLine="true" + android:layout_alignParentLeft="true" + android:layout_toLeftOf="@id/network_catalog_title_star" + /> + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + android:singleLine="true" + /> + + + + + + +