From defeff9f78ce8c9c1ae16bbf2c9a871c0fc9fb78 Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Sun, 8 Dec 2013 10:50:51 +0000 Subject: [PATCH] code simplification --- src/org/geometerplus/android/fbreader/FBReader.java | 6 +----- .../android/fbreader/network/NetworkBookInfoActivity.java | 8 +------- .../zlibrary/ui/android/library/ZLAndroidLibrary.java | 4 ---- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/org/geometerplus/android/fbreader/FBReader.java b/src/org/geometerplus/android/fbreader/FBReader.java index e0a8938a2..26aee7729 100644 --- a/src/org/geometerplus/android/fbreader/FBReader.java +++ b/src/org/geometerplus/android/fbreader/FBReader.java @@ -277,10 +277,6 @@ public final class FBReader extends Activity implements ZLApplicationWindow { return super.onOptionsItemSelected(item); } - public ZLAndroidWidget getMainView() { - return myMainView; - } - @Override protected void onNewIntent(final Intent intent) { final String action = intent.getAction(); @@ -776,7 +772,7 @@ public final class FBReader extends Activity implements ZLApplicationWindow { @Override public ZLViewWidget getViewWidget() { - return ((ZLAndroidLibrary)ZLAndroidLibrary.Instance()).getWidget(); + return myMainView; } private final HashMap myMenuItemMap = new HashMap(); diff --git a/src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java b/src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java index 14850f7ce..43d619ec3 100644 --- a/src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java +++ b/src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java @@ -56,7 +56,6 @@ import org.geometerplus.android.util.UIUtil; public class NetworkBookInfoActivity extends Activity implements NetworkLibrary.ChangeListener { private NetworkBookTree myTree; private NetworkBookItem myBook; - private View myMainView; private final ZLResource myResource = ZLResource.resource("bookInfo"); private final BookDownloaderServiceConnection myConnection = new BookDownloaderServiceConnection(); @@ -68,8 +67,7 @@ public class NetworkBookInfoActivity extends Activity implements NetworkLibrary. SQLiteCookieDatabase.init(this); - myMainView = getLayoutInflater().inflate(R.layout.network_book, null, false); - setContentView(myMainView); + setContentView(R.layout.network_book); } @Override @@ -157,10 +155,6 @@ public class NetworkBookInfoActivity extends Activity implements NetworkLibrary. } }; - View getMainView() { - return myMainView; - } - private void setTextById(int id, CharSequence text) { ((TextView)findViewById(id)).setText(text); } diff --git a/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java index d5e2371c0..1dda08f00 100644 --- a/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java +++ b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java @@ -91,10 +91,6 @@ public final class ZLAndroidLibrary extends ZLibrary { } } - public ZLAndroidWidget getWidget() { - return myActivity.getMainView(); - } - public AssetManager getAssets() { return myApplication.getAssets(); }