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 bug with red button has been fixed

Browse source 
git-svn-id: https://only.mawhrin.net/repos/FBReaderJ/trunk@1408 6a642e6f-84f6-412e-ac94-c4a38d5a04b0
This commit is contained in:
Vasiliy Bout 2010-05-18 09:01:16 +00:00
parent 4826f1eda7
commit b0dd06d998
2 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
TODO.network
View file

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

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

@ -136,6 +136,7 @@ public abstract class ZLAndroidActivity extends Activity {
private int myChangeCounter = 0;
private static int ourOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
private void setAutoRotationMode() {
System.err.println("FBREADER -- setAutoRotationMode");
final ZLAndroidApplication application = ZLAndroidApplication.Instance();
setRequestedOrientation(
application.AutoOrientationOption.getValue() ?
@ -149,16 +150,26 @@ public abstract class ZLAndroidActivity extends Activity {
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:
if (config.orientation == Configuration.ORIENTATION_PORTRAIT && myChangeCounter++ > 0) {
System.err.println("FBREADER -- onConfigurationChanged: ActivityInfo.SCREEN_ORIENTATION_PORTRAIT");
if (config.orientation != Configuration.ORIENTATION_PORTRAIT) {
myChangeCounter = 0;
} else if (myChangeCounter++ > 0) {
setAutoRotationMode();
}
break;
case ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE:
if (config.orientation == Configuration.ORIENTATION_LANDSCAPE && myChangeCounter++ > 0) {
System.err.println("FBREADER -- onConfigurationChanged: ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE");
if (config.orientation != Configuration.ORIENTATION_LANDSCAPE) {
myChangeCounter = 0;
} else if (myChangeCounter++ > 0) {
setAutoRotationMode();
}
break;
@ -166,16 +177,20 @@ public abstract class ZLAndroidActivity extends Activity {
}
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;
break;
case ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE:
System.err.println("FBREADER -- rotate: ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE");
ourOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
break;
default:
System.err.println("FBREADER -- rotate: default");
if (view.getWidth() > view.getHeight()) {
ourOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
} else {