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

code style cleanup

Browse source
This commit is contained in:
Nikolay Pultsin 2012-11-20 11:07:51 +04:00
parent ea0ca1eba2
commit dd0a49a7ee
2 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java
View file

@ -205,14 +205,14 @@ public abstract class ZLAndroidActivity extends Activity {
@Override @Override
public boolean onKeyDown(int keyCode, KeyEvent event) { public boolean onKeyDown(int keyCode, KeyEvent event) {
View view = findViewById(R.id.main_view); final View view = findViewById(R.id.main_view);
return ((view != null) && view.onKeyDown(keyCode, event)) || super.onKeyDown(keyCode, event); return (view != null && view.onKeyDown(keyCode, event)) || super.onKeyDown(keyCode, event);
} }
@Override @Override
public boolean onKeyUp(int keyCode, KeyEvent event) { public boolean onKeyUp(int keyCode, KeyEvent event) {
View view = findViewById(R.id.main_view); final View view = findViewById(R.id.main_view);
return ((view != null) && view.onKeyUp(keyCode, event)) || super.onKeyUp(keyCode, event); return (view != null && view.onKeyUp(keyCode, event)) || super.onKeyUp(keyCode, event);
} }
BroadcastReceiver myBatteryInfoReceiver = new BroadcastReceiver() { BroadcastReceiver myBatteryInfoReceiver = new BroadcastReceiver() {

9
src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java
View file

@ -75,7 +75,6 @@ public final class ZLAndroidLibrary extends ZLibrary {
private ZLAndroidActivity myActivity; private ZLAndroidActivity myActivity;
private final Application myApplication; private final Application myApplication;
private ZLAndroidWidget myWidget;
ZLAndroidLibrary(Application application) { ZLAndroidLibrary(Application application) {
myApplication = application; myApplication = application;
@ -83,11 +82,10 @@ public final class ZLAndroidLibrary extends ZLibrary {
void setActivity(ZLAndroidActivity activity) { void setActivity(ZLAndroidActivity activity) {
myActivity = activity; myActivity = activity;
myWidget = null;
} }
public void finish() { public void finish() {
if ((myActivity != null) && !myActivity.isFinishing()) { if (myActivity != null && !myActivity.isFinishing()) {
myActivity.finish(); myActivity.finish();
} }
} }
@ -97,10 +95,7 @@ public final class ZLAndroidLibrary extends ZLibrary {
} }
public ZLAndroidWidget getWidget() { public ZLAndroidWidget getWidget() {
if (myWidget == null) { return (ZLAndroidWidget)myActivity.findViewById(R.id.main_view);
myWidget = (ZLAndroidWidget)myActivity.findViewById(R.id.main_view);
}
return myWidget;
} }
@Override @Override