From b3790dfcad1494682f7b4d85886c331e792d8633 Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Fri, 23 Oct 2015 21:52:24 +0100 Subject: [PATCH] popup menus element descriptions --- assets/resources/application/ar.xml | 17 ++++++++++++++--- assets/resources/application/be.xml | 17 ++++++++++++++--- assets/resources/application/bg.xml | 17 ++++++++++++++--- assets/resources/application/ca.xml | 17 ++++++++++++++--- assets/resources/application/cs.xml | 17 ++++++++++++++--- assets/resources/application/da.xml | 17 ++++++++++++++--- assets/resources/application/de.xml | 17 ++++++++++++++--- assets/resources/application/el.xml | 17 ++++++++++++++--- assets/resources/application/en.xml | 17 ++++++++++++++--- assets/resources/application/en_US.xml | 16 +++++++++++++--- assets/resources/application/es.xml | 17 ++++++++++++++--- assets/resources/application/eu.xml | 18 ++++++++++++++---- assets/resources/application/fa.xml | 17 ++++++++++++++--- assets/resources/application/fr.xml | 17 ++++++++++++++--- assets/resources/application/gl.xml | 17 ++++++++++++++--- assets/resources/application/hu.xml | 17 ++++++++++++++--- assets/resources/application/hy.xml | 17 ++++++++++++++--- assets/resources/application/it.xml | 17 ++++++++++++++--- assets/resources/application/ja.xml | 17 ++++++++++++++--- assets/resources/application/ka.xml | 17 ++++++++++++++--- assets/resources/application/ko.xml | 17 ++++++++++++++--- assets/resources/application/nb.xml | 17 ++++++++++++++--- assets/resources/application/nl.xml | 17 ++++++++++++++--- assets/resources/application/pl.xml | 17 ++++++++++++++--- assets/resources/application/pt.xml | 17 ++++++++++++++--- assets/resources/application/ro.xml | 17 ++++++++++++++--- assets/resources/application/ru.xml | 16 +++++++++++++--- assets/resources/application/sr.xml | 17 ++++++++++++++--- assets/resources/application/th.xml | 17 ++++++++++++++--- assets/resources/application/tr.xml | 17 ++++++++++++++--- assets/resources/application/uk.xml | 17 ++++++++++++++--- assets/resources/application/vi.xml | 17 ++++++++++++++--- assets/resources/application/zh.xml | 17 ++++++++++++++--- assets/resources/application/zh_TW.xml | 17 ++++++++++++++--- .../android/fbreader/SelectionPopup.java | 18 +++++++++++------- .../android/fbreader/TextSearchPopup.java | 14 +++++++++----- 36 files changed, 494 insertions(+), 115 deletions(-) diff --git a/assets/resources/application/ar.xml b/assets/resources/application/ar.xml index e2567f0f5..29fabbb22 100644 --- a/assets/resources/application/ar.xml +++ b/assets/resources/application/ar.xml @@ -280,11 +280,8 @@ - - - @@ -1199,6 +1196,20 @@ + + + + + + + + + + + + + + diff --git a/assets/resources/application/be.xml b/assets/resources/application/be.xml index 3a5c32942..54fef4728 100644 --- a/assets/resources/application/be.xml +++ b/assets/resources/application/be.xml @@ -282,11 +282,8 @@ - - - @@ -1201,6 +1198,20 @@ + + + + + + + + + + + + + + diff --git a/assets/resources/application/bg.xml b/assets/resources/application/bg.xml index fd634ade7..b1f0d1395 100644 --- a/assets/resources/application/bg.xml +++ b/assets/resources/application/bg.xml @@ -288,11 +288,8 @@ - - - @@ -1207,6 +1204,20 @@ + + + + + + + + + + + + + + diff --git a/assets/resources/application/ca.xml b/assets/resources/application/ca.xml index 34977dfd1..9ba7fd907 100644 --- a/assets/resources/application/ca.xml +++ b/assets/resources/application/ca.xml @@ -288,11 +288,8 @@ - - - @@ -1207,6 +1204,20 @@ + + + + + + + + + + + + + + diff --git a/assets/resources/application/cs.xml b/assets/resources/application/cs.xml index bd85e5db6..ab8c0ed5e 100644 --- a/assets/resources/application/cs.xml +++ b/assets/resources/application/cs.xml @@ -291,11 +291,8 @@ - - - @@ -1210,6 +1207,20 @@ + + + + + + + + + + + + + + diff --git a/assets/resources/application/da.xml b/assets/resources/application/da.xml index 56222ba43..5daf246be 100644 --- a/assets/resources/application/da.xml +++ b/assets/resources/application/da.xml @@ -281,11 +281,8 @@ - - - @@ -1200,6 +1197,20 @@ + + + + + + + + + + + + + + diff --git a/assets/resources/application/de.xml b/assets/resources/application/de.xml index 113ddefa6..6c8678715 100644 --- a/assets/resources/application/de.xml +++ b/assets/resources/application/de.xml @@ -287,11 +287,8 @@ - - - @@ -1206,6 +1203,20 @@ + + + + + + + + + + + + + + diff --git a/assets/resources/application/el.xml b/assets/resources/application/el.xml index f5793948d..946b3df1d 100644 --- a/assets/resources/application/el.xml +++ b/assets/resources/application/el.xml @@ -272,11 +272,8 @@ - - - @@ -1199,6 +1196,20 @@ + + + + + + + + + + + + + + diff --git a/assets/resources/application/en.xml b/assets/resources/application/en.xml index a0f365a41..5e541f049 100644 --- a/assets/resources/application/en.xml +++ b/assets/resources/application/en.xml @@ -282,11 +282,8 @@ - - - @@ -1201,6 +1198,20 @@ + + + + + + + + + + + + + + diff --git a/assets/resources/application/en_US.xml b/assets/resources/application/en_US.xml index aa6f50f7b..c9b313853 100644 --- a/assets/resources/application/en_US.xml +++ b/assets/resources/application/en_US.xml @@ -282,11 +282,8 @@ - - - @@ -1201,6 +1198,19 @@ + + + + + + + + + + + + + diff --git a/assets/resources/application/es.xml b/assets/resources/application/es.xml index 239dd6b21..a02cc7987 100644 --- a/assets/resources/application/es.xml +++ b/assets/resources/application/es.xml @@ -288,11 +288,8 @@ - - - @@ -1207,6 +1204,20 @@ + + + + + + + + + + + + + + diff --git a/assets/resources/application/eu.xml b/assets/resources/application/eu.xml index 1cdd141a4..def0b48d1 100644 --- a/assets/resources/application/eu.xml +++ b/assets/resources/application/eu.xml @@ -282,11 +282,8 @@ - - - @@ -916,7 +913,6 @@ - @@ -1202,6 +1198,20 @@ + + + + + + + + + + + + + + diff --git a/assets/resources/application/fa.xml b/assets/resources/application/fa.xml index 5b6f36c08..cee46ad7f 100644 --- a/assets/resources/application/fa.xml +++ b/assets/resources/application/fa.xml @@ -281,11 +281,8 @@ - - - @@ -1200,6 +1197,20 @@ + + + + + + + + + + + + + + diff --git a/assets/resources/application/fr.xml b/assets/resources/application/fr.xml index c785627ff..a0dcf692d 100644 --- a/assets/resources/application/fr.xml +++ b/assets/resources/application/fr.xml @@ -275,11 +275,8 @@ - - - @@ -1194,6 +1191,20 @@ + + + + + + + + + + + + + + diff --git a/assets/resources/application/gl.xml b/assets/resources/application/gl.xml index 1d2ca96c5..93e94fffb 100644 --- a/assets/resources/application/gl.xml +++ b/assets/resources/application/gl.xml @@ -272,11 +272,8 @@ - - - @@ -1191,6 +1188,20 @@ + + + + + + + + + + + + + + diff --git a/assets/resources/application/hu.xml b/assets/resources/application/hu.xml index 0c2404dd4..0d066ec97 100644 --- a/assets/resources/application/hu.xml +++ b/assets/resources/application/hu.xml @@ -272,11 +272,8 @@ - - - @@ -1191,6 +1188,20 @@ + + + + + + + + + + + + + + diff --git a/assets/resources/application/hy.xml b/assets/resources/application/hy.xml index 39b978723..8fd3296e5 100644 --- a/assets/resources/application/hy.xml +++ b/assets/resources/application/hy.xml @@ -288,11 +288,8 @@ - - - @@ -1207,6 +1204,20 @@ + + + + + + + + + + + + + + diff --git a/assets/resources/application/it.xml b/assets/resources/application/it.xml index 7f45ce5b6..93c27b4fa 100644 --- a/assets/resources/application/it.xml +++ b/assets/resources/application/it.xml @@ -274,11 +274,8 @@ - - - @@ -1193,6 +1190,20 @@ + + + + + + + + + + + + + + diff --git a/assets/resources/application/ja.xml b/assets/resources/application/ja.xml index c65c634b1..9145ed4f1 100644 --- a/assets/resources/application/ja.xml +++ b/assets/resources/application/ja.xml @@ -282,11 +282,8 @@ - - - @@ -1201,6 +1198,20 @@ + + + + + + + + + + + + + + diff --git a/assets/resources/application/ka.xml b/assets/resources/application/ka.xml index 585d68105..c13b7acd7 100644 --- a/assets/resources/application/ka.xml +++ b/assets/resources/application/ka.xml @@ -287,11 +287,8 @@ - - - @@ -1206,6 +1203,20 @@ + + + + + + + + + + + + + + diff --git a/assets/resources/application/ko.xml b/assets/resources/application/ko.xml index 762bb5b00..eb71acfa8 100644 --- a/assets/resources/application/ko.xml +++ b/assets/resources/application/ko.xml @@ -282,11 +282,8 @@ - - - @@ -1201,6 +1198,20 @@ + + + + + + + + + + + + + + diff --git a/assets/resources/application/nb.xml b/assets/resources/application/nb.xml index 8a6afa677..cf1ff4631 100644 --- a/assets/resources/application/nb.xml +++ b/assets/resources/application/nb.xml @@ -282,11 +282,8 @@ - - - @@ -1201,6 +1198,20 @@ + + + + + + + + + + + + + + diff --git a/assets/resources/application/nl.xml b/assets/resources/application/nl.xml index 13005e6dd..c7edc6a08 100644 --- a/assets/resources/application/nl.xml +++ b/assets/resources/application/nl.xml @@ -282,11 +282,8 @@ - - - @@ -1201,6 +1198,20 @@ + + + + + + + + + + + + + + diff --git a/assets/resources/application/pl.xml b/assets/resources/application/pl.xml index 46424e67e..83d2e3036 100644 --- a/assets/resources/application/pl.xml +++ b/assets/resources/application/pl.xml @@ -272,11 +272,8 @@ - - - @@ -1191,6 +1188,20 @@ + + + + + + + + + + + + + + diff --git a/assets/resources/application/pt.xml b/assets/resources/application/pt.xml index ebd7ad534..422ef6770 100755 --- a/assets/resources/application/pt.xml +++ b/assets/resources/application/pt.xml @@ -286,11 +286,8 @@ - - - @@ -1205,6 +1202,20 @@ + + + + + + + + + + + + + + diff --git a/assets/resources/application/ro.xml b/assets/resources/application/ro.xml index da8645682..4fcedea3c 100644 --- a/assets/resources/application/ro.xml +++ b/assets/resources/application/ro.xml @@ -275,11 +275,8 @@ - - - @@ -1194,6 +1191,20 @@ + + + + + + + + + + + + + + diff --git a/assets/resources/application/ru.xml b/assets/resources/application/ru.xml index edeb69475..0a1a02cbc 100644 --- a/assets/resources/application/ru.xml +++ b/assets/resources/application/ru.xml @@ -287,11 +287,8 @@ - - - @@ -1210,6 +1207,19 @@ + + + + + + + + + + + + + diff --git a/assets/resources/application/sr.xml b/assets/resources/application/sr.xml index acb5666f4..ae679e4fe 100644 --- a/assets/resources/application/sr.xml +++ b/assets/resources/application/sr.xml @@ -282,11 +282,8 @@ - - - @@ -1201,6 +1198,20 @@ + + + + + + + + + + + + + + diff --git a/assets/resources/application/th.xml b/assets/resources/application/th.xml index 2077d7745..d1f476256 100644 --- a/assets/resources/application/th.xml +++ b/assets/resources/application/th.xml @@ -272,11 +272,8 @@ - - - @@ -1191,6 +1188,20 @@ + + + + + + + + + + + + + + diff --git a/assets/resources/application/tr.xml b/assets/resources/application/tr.xml index d2a81917d..c740bd6d1 100644 --- a/assets/resources/application/tr.xml +++ b/assets/resources/application/tr.xml @@ -282,11 +282,8 @@ - - - @@ -1201,6 +1198,20 @@ + + + + + + + + + + + + + + diff --git a/assets/resources/application/uk.xml b/assets/resources/application/uk.xml index 89e9c36bb..53b43d00f 100644 --- a/assets/resources/application/uk.xml +++ b/assets/resources/application/uk.xml @@ -272,11 +272,8 @@ - - - @@ -1191,6 +1188,20 @@ + + + + + + + + + + + + + + diff --git a/assets/resources/application/vi.xml b/assets/resources/application/vi.xml index 5ebca1095..271045df6 100644 --- a/assets/resources/application/vi.xml +++ b/assets/resources/application/vi.xml @@ -273,11 +273,8 @@ - - - @@ -1192,6 +1189,20 @@ + + + + + + + + + + + + + + diff --git a/assets/resources/application/zh.xml b/assets/resources/application/zh.xml index 511c1f39b..08702720a 100644 --- a/assets/resources/application/zh.xml +++ b/assets/resources/application/zh.xml @@ -272,11 +272,8 @@ - - - @@ -1191,6 +1188,20 @@ + + + + + + + + + + + + + + diff --git a/assets/resources/application/zh_TW.xml b/assets/resources/application/zh_TW.xml index 2e8ec65ec..b66612808 100644 --- a/assets/resources/application/zh_TW.xml +++ b/assets/resources/application/zh_TW.xml @@ -272,11 +272,8 @@ - - - @@ -1191,6 +1188,20 @@ + + + + + + + + + + + + + + diff --git a/fbreader/app/src/main/java/org/geometerplus/android/fbreader/SelectionPopup.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/SelectionPopup.java index 1d990b34b..9e27813ac 100644 --- a/fbreader/app/src/main/java/org/geometerplus/android/fbreader/SelectionPopup.java +++ b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/SelectionPopup.java @@ -22,6 +22,7 @@ package org.geometerplus.android.fbreader; import android.view.View; import android.widget.RelativeLayout; +import org.geometerplus.zlibrary.core.resources.ZLResource; import org.geometerplus.fbreader.fbreader.ActionCode; import org.geometerplus.fbreader.fbreader.FBReaderApp; import org.geometerplus.zlibrary.ui.android.R; @@ -47,15 +48,18 @@ class SelectionPopup extends PopupPanel implements View.OnClickListener { activity.getLayoutInflater().inflate(R.layout.selection_panel, root); myWindow = (SimplePopupWindow)root.findViewById(R.id.selection_panel); - setupButton(R.id.selection_panel_copy); - setupButton(R.id.selection_panel_share); - setupButton(R.id.selection_panel_translate); - setupButton(R.id.selection_panel_bookmark); - setupButton(R.id.selection_panel_close); + final ZLResource resource = ZLResource.resource("selectionPopup"); + setupButton(R.id.selection_panel_copy, resource.getResource("copyToClipboard").getValue()); + setupButton(R.id.selection_panel_share, resource.getResource("share").getValue()); + setupButton(R.id.selection_panel_translate, resource.getResource("translate").getValue()); + setupButton(R.id.selection_panel_bookmark, resource.getResource("bookmark").getValue()); + setupButton(R.id.selection_panel_close, resource.getResource("close").getValue()); } - private void setupButton(int buttonId) { - myWindow.findViewById(buttonId).setOnClickListener(this); + private void setupButton(int buttonId, String description) { + final View button = myWindow.findViewById(buttonId); + button.setOnClickListener(this); + button.setContentDescription(description); } public void move(int selectionStartY, int selectionEndY) { diff --git a/fbreader/app/src/main/java/org/geometerplus/android/fbreader/TextSearchPopup.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/TextSearchPopup.java index f97c578d7..edae24259 100644 --- a/fbreader/app/src/main/java/org/geometerplus/android/fbreader/TextSearchPopup.java +++ b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/TextSearchPopup.java @@ -24,6 +24,7 @@ import android.widget.RelativeLayout; import org.geometerplus.zlibrary.ui.android.R; +import org.geometerplus.zlibrary.core.resources.ZLResource; import org.geometerplus.fbreader.fbreader.ActionCode; import org.geometerplus.fbreader.fbreader.FBReaderApp; @@ -54,13 +55,16 @@ final class TextSearchPopup extends PopupPanel implements View.OnClickListener { activity.getLayoutInflater().inflate(R.layout.search_panel, root); myWindow = (SimplePopupWindow)root.findViewById(R.id.search_panel); - setupButton(R.id.search_panel_previous); - setupButton(R.id.search_panel_next); - setupButton(R.id.search_panel_close); + final ZLResource resource = ZLResource.resource("textSearchPopup"); + setupButton(R.id.search_panel_previous, resource.getResource("findPrevious").getValue()); + setupButton(R.id.search_panel_next, resource.getResource("findNext").getValue()); + setupButton(R.id.search_panel_close, resource.getResource("close").getValue()); } - private void setupButton(int buttonId) { - myWindow.findViewById(buttonId).setOnClickListener(this); + private void setupButton(int buttonId, String description) { + final View button = myWindow.findViewById(buttonId); + button.setOnClickListener(this); + button.setContentDescription(description); } @Override