diff --git a/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java b/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java index 27c1d5af4..ababb7f48 100644 --- a/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java +++ b/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java @@ -64,7 +64,7 @@ public class PreferenceActivity extends ZLPreferenceActivity { final PageTurningOptions pageTurningOptions = new PageTurningOptions(); final ImageOptions imageOptions = new ImageOptions(); final ColorProfile profile = viewOptions.getColorProfile(); - final ZLTextStyleCollection collection = fbReader.TextStyleCollection; + final ZLTextStyleCollection collection = viewOptions.getTextStyleCollection(); final ZLKeyBindings keyBindings = new ZLKeyBindings(); final ZLAndroidLibrary androidLibrary = (ZLAndroidLibrary)ZLAndroidLibrary.Instance(); diff --git a/src/org/geometerplus/fbreader/fbreader/ChangeFontSizeAction.java b/src/org/geometerplus/fbreader/fbreader/ChangeFontSizeAction.java index e83192c5b..514ec5528 100644 --- a/src/org/geometerplus/fbreader/fbreader/ChangeFontSizeAction.java +++ b/src/org/geometerplus/fbreader/fbreader/ChangeFontSizeAction.java @@ -32,7 +32,7 @@ class ChangeFontSizeAction extends FBAction { @Override protected void run(Object ... params) { final ZLIntegerRangeOption option = - Reader.TextStyleCollection.getBaseStyle().FontSizeOption; + Reader.ViewOptions.getTextStyleCollection().getBaseStyle().FontSizeOption; option.setValue(option.getValue() + myDelta); Reader.clearTextCaches(); Reader.getViewWidget().repaint(); diff --git a/src/org/geometerplus/fbreader/fbreader/FBReaderApp.java b/src/org/geometerplus/fbreader/fbreader/FBReaderApp.java index 52100482f..369b0d761 100644 --- a/src/org/geometerplus/fbreader/fbreader/FBReaderApp.java +++ b/src/org/geometerplus/fbreader/fbreader/FBReaderApp.java @@ -30,15 +30,12 @@ import org.geometerplus.zlibrary.core.util.*; import org.geometerplus.zlibrary.text.hyphenation.ZLTextHyphenator; import org.geometerplus.zlibrary.text.model.ZLTextModel; import org.geometerplus.zlibrary.text.view.*; -import org.geometerplus.zlibrary.text.view.style.ZLTextStyleCollection; import org.geometerplus.fbreader.book.*; import org.geometerplus.fbreader.bookmodel.*; import org.geometerplus.fbreader.fbreader.options.*; public final class FBReaderApp extends ZLApplication { - public final ZLTextStyleCollection TextStyleCollection; - public final MiscOptions MiscOptions; public final ImageOptions ImageOptions; public final ViewOptions ViewOptions; @@ -48,8 +45,6 @@ public final class FBReaderApp extends ZLApplication { private final ZLKeyBindings myBindings; { - TextStyleCollection = new ZLTextStyleCollection("Base"); - MiscOptions = new MiscOptions(); ImageOptions = new ImageOptions(); ViewOptions = new ViewOptions(); diff --git a/src/org/geometerplus/fbreader/fbreader/FBView.java b/src/org/geometerplus/fbreader/fbreader/FBView.java index fae2c71fd..520f770ad 100644 --- a/src/org/geometerplus/fbreader/fbreader/FBView.java +++ b/src/org/geometerplus/fbreader/fbreader/FBView.java @@ -340,7 +340,7 @@ public final class FBView extends ZLTextView { @Override public ZLTextStyleCollection getTextStyleCollection() { - return myReader.TextStyleCollection; + return myReader.ViewOptions.getTextStyleCollection(); } @Override diff --git a/src/org/geometerplus/fbreader/fbreader/options/ViewOptions.java b/src/org/geometerplus/fbreader/fbreader/options/ViewOptions.java index 34be97ea6..6ac9b6338 100644 --- a/src/org/geometerplus/fbreader/fbreader/options/ViewOptions.java +++ b/src/org/geometerplus/fbreader/fbreader/options/ViewOptions.java @@ -21,6 +21,7 @@ package org.geometerplus.fbreader.fbreader.options; import org.geometerplus.zlibrary.core.library.ZLibrary; import org.geometerplus.zlibrary.core.options.*; +import org.geometerplus.zlibrary.text.view.style.ZLTextStyleCollection; import org.geometerplus.fbreader.fbreader.FBView; @@ -36,6 +37,7 @@ public class ViewOptions { public final ZLStringOption ColorProfileName; private ColorProfile myColorProfile; + private ZLTextStyleCollection myTextStyleCollection; public ViewOptions() { final ZLibrary zlibrary = ZLibrary.Instance(); @@ -72,4 +74,11 @@ public class ViewOptions { } return myColorProfile; } + + public ZLTextStyleCollection getTextStyleCollection() { + if (myTextStyleCollection == null) { + myTextStyleCollection = new ZLTextStyleCollection("Base"); + } + return myTextStyleCollection; + } }