yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-03 09:49:19 +02:00
Code Issues Releases Wiki Activity

Merge branch '2.6-yota2' into 2.6-kindle

Browse source
This commit is contained in:
Nikolay Pultsin 2015-10-01 02:01:15 +01:00
commit 63d1530087
3 changed files with 4 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

25
fbreader/app/src/main/java/org/geometerplus/android/fbreader/library/BookInfoActivity.java
View file

@ -206,16 +206,7 @@ public class BookInfoActivity extends Activity implements MenuItem.OnMenuItemCli
((TextView)findViewById(R.id.book_info_title)).setText(myResource.getResource("bookInfo").getValue()); ((TextView)findViewById(R.id.book_info_title)).setText(myResource.getResource("bookInfo").getValue());
setupInfoPair(R.id.book_title, "title", book.getTitle()); setupInfoPair(R.id.book_title, "title", book.getTitle());
setupInfoPair(R.id.book_authors, "authors", book.authorsString(", "), book.authors().size());
final StringBuilder buffer = new StringBuilder();
final List<Author> authors = book.authors();
for (Author a : authors) {
if (buffer.length() > 0) {
buffer.append(", ");
}
buffer.append(a.DisplayName);
}
setupInfoPair(R.id.book_authors, "authors", buffer, authors.size());
final SeriesInfo series = book.getSeriesInfo(); final SeriesInfo series = book.getSeriesInfo();
setupInfoPair(R.id.book_series, "series", series == null ? null : series.Series.getTitle()); setupInfoPair(R.id.book_series, "series", series == null ? null : series.Series.getTitle());
@ -224,19 +215,7 @@ public class BookInfoActivity extends Activity implements MenuItem.OnMenuItemCli
seriesIndexString = series.Index.toPlainString(); seriesIndexString = series.Index.toPlainString();
} }
setupInfoPair(R.id.book_series_index, "indexInSeries", seriesIndexString); setupInfoPair(R.id.book_series_index, "indexInSeries", seriesIndexString);
setupInfoPair(R.id.book_tags, "tags", book.tagsString(", "), book.tags().size());
buffer.delete(0, buffer.length());
final HashSet<String> tagNames = new HashSet<String>();
for (Tag tag : book.tags()) {
if (!tagNames.contains(tag.Name)) {
if (buffer.length() > 0) {
buffer.append(", ");
}
buffer.append(tag.Name);
tagNames.add(tag.Name);
}
}
setupInfoPair(R.id.book_tags, "tags", buffer, tagNames.size());
String language = book.getLanguage(); String language = book.getLanguage();
if (!ZLLanguageUtil.languageCodes().contains(language)) { if (!ZLLanguageUtil.languageCodes().contains(language)) {
language = Language.OTHER_CODE; language = Language.OTHER_CODE;

2
fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/view/MainView.java
View file

@ -76,7 +76,7 @@ public abstract class MainView extends View {
activity.getZLibrary().ScreenBrightnessLevelOption.setValue(percent); activity.getZLibrary().ScreenBrightnessLevelOption.setValue(percent);
if (showPercent) { if (showPercent) {
if (myInfoView == null) { if (myInfoView == null) {
myInfoView = (TextView)activity.findViewById(R.id.percent_view); myInfoView = (TextView)activity.findViewById(R.id.main_view_info);
} }
if (myInfoView != null) { if (myInfoView != null) {
synchronized (myInfoTimer) { synchronized (myInfoTimer) {

2
res/layout/main.xml
View file

@ -20,7 +20,7 @@
android:fadeScrollbars="false" android:fadeScrollbars="false"
/> />
<TextView <TextView
android:id="@+id/percent_view" android:id="@+id/main_view_info"
android:visibility="gone" android:visibility="gone"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"