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

Screen rotation changes

Browse source 
git-svn-id: https://only.mawhrin.net/repos/FBReaderJ/trunk@1409 6a642e6f-84f6-412e-ac94-c4a38d5a04b0
This commit is contained in:
Vasiliy Bout 2010-05-18 10:20:23 +00:00
parent b0dd06d998
commit 1fc957ff7f
2 changed files with 46 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

3
TODO.network
View file

@ -1,7 +1,8 @@
** Записать изменения в ChangeLog
** ZLAndroidActivity -- переделать вращение
DONE ZLAndroidActivity -- переделать вращение
DONE BUG с красной кнопкой
** отключить пункт Rotate Screen при включенном autorotate
** Menu->More->Settings->toggle "Show status bar" => приложение уходит в фон. Когда-то так не было.
** Добавить поддержку custom каталогов -- как в Aldiko
** Объединить общие части двух Base64EncodedImage

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

@ -39,11 +39,26 @@ import org.geometerplus.zlibrary.ui.android.application.ZLAndroidApplicationWind
public abstract class ZLAndroidActivity extends Activity {
protected abstract ZLApplication createApplication(String fileName);
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
private static final String REQUESTED_ORIENTATION_KEY = "org.geometerplus.zlibrary.ui.android.library.androidActiviy.RequestedOrientation";
private static final String ORIENTATION_CHANGE_COUNTER_KEY = "org.geometerplus.zlibrary.ui.android.library.androidActiviy.ChangeCounter";
@Override
protected void onSaveInstanceState(Bundle state) {
super.onSaveInstanceState(state);
state.putInt(REQUESTED_ORIENTATION_KEY, myOrientation);
state.putInt(ORIENTATION_CHANGE_COUNTER_KEY, myChangeCounter);
}
@Override
public void onCreate(Bundle state) {
super.onCreate(state);
Thread.setDefaultUncaughtExceptionHandler(new UncaughtExceptionHandler(this));
if (state != null) {
myOrientation = state.getInt(REQUESTED_ORIENTATION_KEY, ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
myChangeCounter = state.getInt(ORIENTATION_CHANGE_COUNTER_KEY);
}
requestWindowFeature(Window.FEATURE_NO_TITLE);
setContentView(R.layout.main);
setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL);
@ -73,15 +88,22 @@ public abstract class ZLAndroidActivity extends Activity {
@Override
public void onStart() {
super.onStart();
switch (ourOrientation) {
case ActivityInfo.SCREEN_ORIENTATION_PORTRAIT:
case ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE:
setRequestedOrientation(ourOrientation);
myChangeCounter = 0;
break;
default:
setAutoRotationMode();
break;
if (ZLAndroidApplication.Instance().AutoOrientationOption.getValue()) {
setAutoRotationMode();
} else {
switch (myOrientation) {
case ActivityInfo.SCREEN_ORIENTATION_PORTRAIT:
case ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE:
if (getRequestedOrientation() != myOrientation) {
setRequestedOrientation(myOrientation);
myChangeCounter = 0;
}
break;
default:
setAutoRotationMode();
break;
}
}
}
@ -133,16 +155,13 @@ public abstract class ZLAndroidActivity extends Activity {
return ((view != null) && view.onKeyUp(keyCode, event)) || super.onKeyUp(keyCode, event);
}
private int myChangeCounter = 0;
private static int ourOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
private int myChangeCounter;
private int myOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
private void setAutoRotationMode() {
System.err.println("FBREADER -- setAutoRotationMode");
final ZLAndroidApplication application = ZLAndroidApplication.Instance();
setRequestedOrientation(
application.AutoOrientationOption.getValue() ?
ActivityInfo.SCREEN_ORIENTATION_SENSOR :
ActivityInfo.SCREEN_ORIENTATION_NOSENSOR
);
myOrientation = application.AutoOrientationOption.getValue() ?
ActivityInfo.SCREEN_ORIENTATION_SENSOR : ActivityInfo.SCREEN_ORIENTATION_NOSENSOR;
setRequestedOrientation(myOrientation);
myChangeCounter = 0;
}
@ -150,15 +169,10 @@ System.err.println("FBREADER -- setAutoRotationMode");
public void onConfigurationChanged(Configuration config) {
super.onConfigurationChanged(config);
System.err.println("FBREADER -- onConfigurationChanged: myChangeCounter = " + myChangeCounter);
System.err.println("FBREADER -- onConfigurationChanged: config.orientation = " + config.orientation);
switch (getRequestedOrientation()) {
default:
System.err.println("FBREADER -- onConfigurationChanged: default");
break;
case ActivityInfo.SCREEN_ORIENTATION_PORTRAIT:
System.err.println("FBREADER -- onConfigurationChanged: ActivityInfo.SCREEN_ORIENTATION_PORTRAIT");
if (config.orientation != Configuration.ORIENTATION_PORTRAIT) {
myChangeCounter = 0;
} else if (myChangeCounter++ > 0) {
@ -166,7 +180,6 @@ System.err.println("FBREADER -- onConfigurationChanged: ActivityInfo.SCREEN_ORIE
}
break;
case ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE:
System.err.println("FBREADER -- onConfigurationChanged: ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE");
if (config.orientation != Configuration.ORIENTATION_LANDSCAPE) {
myChangeCounter = 0;
} else if (myChangeCounter++ > 0) {
@ -177,27 +190,23 @@ System.err.println("FBREADER -- onConfigurationChanged: ActivityInfo.SCREEN_ORIE
}
void rotate() {
System.err.println("FBREADER -- rotate");
View view = findViewById(R.id.main_view);
if (view != null) {
switch (getRequestedOrientation()) {
case ActivityInfo.SCREEN_ORIENTATION_PORTRAIT:
System.err.println("FBREADER -- rotate: ActivityInfo.SCREEN_ORIENTATION_PORTRAIT");
ourOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
myOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
break;
case ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE:
System.err.println("FBREADER -- rotate: ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE");
ourOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
myOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
break;
default:
System.err.println("FBREADER -- rotate: default");
if (view.getWidth() > view.getHeight()) {
ourOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
myOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
} else {
ourOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
myOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
}
}
setRequestedOrientation(ourOrientation);
setRequestedOrientation(myOrientation);
myChangeCounter = 0;
}
}