diff --git a/TODO.network b/TODO.network
index e957fb94a..175844bbb 100644
--- a/TODO.network
+++ b/TODO.network
@@ -1,5 +1,5 @@
DONE сделать activity с подробной информацией о книжке (увеличенная обложка, аннотация, и кнопки для скачивания/покупки/...) и показывать ее по нажатию на книжку в network library
- ** съезжает скобка на кнопке Buy
+ DONE съезжает скобка на кнопке Buy: кнопки в 2 ряда
** поставить процессу скачивания приоритет пониже, чтобы не тормозить UI (?)
** пополнение счета в litres с помощью sms
** убрать иконку сетевого поиска из библиотеки --> перенести в NetworkLibrary
diff --git a/res/layout/network_book.xml b/res/layout/network_book.xml
index 5289fbcfd..ba0c8019b 100644
--- a/res/layout/network_book.xml
+++ b/res/layout/network_book.xml
@@ -5,19 +5,43 @@
android:layout_height="fill_parent"
>
+
+
+
+
-
actions = NetworkBookActions.getContextMenuActions(myBook);
+// debug code:
+/*if (actions.size() == 2) {
+ actions.clear();
+}*/
+/*actions.add(new NetworkBookActions.Action(NetworkBookActions.TREE_NO_ACTION, "buy", "0z"));
+actions.add(new NetworkBookActions.Action(NetworkBookActions.TREE_NO_ACTION, "buy", "1z"));
+actions.add(new NetworkBookActions.Action(NetworkBookActions.TREE_NO_ACTION, "buy", "2z"));*/
+ final boolean skipSecondButton = actions.size() < buttons.length && (actions.size() % 2) == 1;
int buttonNumber = 0;
- Set actions = NetworkBookActions.getContextMenuActions(myBook);
for (final NetworkBookActions.Action a: actions) {
+ if (skipSecondButton && buttonNumber == 1) {
+ ++buttonNumber;
+ }
if (buttonNumber >= buttons.length) {
break;
}
- ZLResource resource = ZLResource.resource("networkView");
final String text;
if (a.Arg == null) {
text = resource.getResource(a.Key).getValue();
@@ -162,9 +174,14 @@ public class NetworkBookInfoActivity extends Activity implements NetworkLibraryA
});
button.setEnabled(a.Id != NetworkTreeActions.TREE_NO_ACTION);
}
- boolean showSpacers = buttonNumber == 1;
- findViewById(R.id.network_book_left_spacer).setVisibility(showSpacers ? View.VISIBLE : View.GONE);
- findViewById(R.id.network_book_right_spacer).setVisibility(showSpacers ? View.VISIBLE : View.GONE);
+ findViewById(R.id.network_book_left_spacer).setVisibility(skipSecondButton ? View.VISIBLE : View.GONE);
+ findViewById(R.id.network_book_right_spacer).setVisibility(skipSecondButton ? View.VISIBLE : View.GONE);
+ if (skipSecondButton) {
+ final int buttonId = buttons[1];
+ View button = findViewById(buttonId);
+ button.setVisibility(View.GONE);
+ button.setOnClickListener(null);
+ }
while (buttonNumber < buttons.length) {
final int buttonId = buttons[buttonNumber++];
View button = findViewById(buttonId);