diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a01e6e5..c039a6e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -22,7 +22,8 @@ android:label="@string/app_name" android:supportsRtl="true" android:theme="@style/AppTheme"> - + @@ -31,22 +32,26 @@ - + + android:screenOrientation="portrait" android:label="@string/settings" /> + android:name=".ui.PictureViewerActivity" android:screenOrientation="portrait" /> - + = Build.VERSION_CODES.LOLLIPOP) { getWindow().setStatusBarColor(getResources().getColor(R.color.toolbar)); } diff --git a/app/src/main/java/org/houxg/leamonax/ui/NotePreviewActivity.java b/app/src/main/java/org/houxg/leamonax/ui/NotePreviewActivity.java index 09713d6..673d083 100644 --- a/app/src/main/java/org/houxg/leamonax/ui/NotePreviewActivity.java +++ b/app/src/main/java/org/houxg/leamonax/ui/NotePreviewActivity.java @@ -2,6 +2,7 @@ package org.houxg.leamonax.ui; import android.content.Context; import android.content.Intent; +import android.content.pm.ActivityInfo; import android.net.Uri; import android.os.Bundle; import android.support.v7.widget.Toolbar; @@ -35,6 +36,8 @@ import rx.functions.Action0; import rx.functions.Action1; import rx.schedulers.Schedulers; +import static android.content.res.Configuration.ORIENTATION_PORTRAIT; + public class NotePreviewActivity extends BaseActivity implements EditorFragment.EditorFragmentListener { private static final String TAG = "NotePreviewActivity:"; @@ -84,6 +87,13 @@ public class NotePreviewActivity extends BaseActivity implements EditorFragment. @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { + case R.id.action_rotate: + if (ORIENTATION_PORTRAIT == getResources().getConfiguration().orientation) { + setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); + } else { + setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); + } + return true; case R.id.action_edit: startActivityForResult(NoteEditActivity.getOpenIntent(this, mNote.getId(), false), REQ_EDIT); return true; diff --git a/app/src/main/res/menu/preview.xml b/app/src/main/res/menu/preview.xml index a49bede..93c908c 100644 --- a/app/src/main/res/menu/preview.xml +++ b/app/src/main/res/menu/preview.xml @@ -2,6 +2,11 @@ + + 删除笔记 删除笔记失败 编辑 + 旋转 编辑器 邮箱 邮箱或密码错误 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8e1faa0..a9e3678 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -8,6 +8,7 @@ Revert Reverting Edit + Rotate Link Confirm Cancel