yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add GalleryActivity keep screen on

Browse Source
This commit is contained in:
seven332 committed 2016-02-23 17:07:02 +08:00
1 parent e0e040aace
commit 50fd63e0d8
7 files changed
+83 -38
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/hippo/ehviewer/Settings.java
+11
View File
@@ -170,6 +170,17 @@ public class Settings {
putIntToStr(KEY_START_POSITION, value);
}
private static final String KEY_KEEP_SCREEN_ON = "keep_screen_on";
private static final boolean DEFAULT_KEEP_SCREEN_ON = false;
public static boolean getKeepScreenOn() {
return getBoolean(KEY_KEEP_SCREEN_ON, DEFAULT_KEEP_SCREEN_ON);
}
public static void putKeepScreenOn(boolean value) {
putBoolean(KEY_KEEP_SCREEN_ON, value);
}
private static final String KEY_SHOW_CLOCK = "gallery_show_clock";
private static final boolean DEFAULT_SHOW_CLOCK = true;
app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java
+18
View File
@@ -29,6 +29,7 @@ import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.SwitchCompat;
import android.view.KeyEvent;
import android.view.View;
import android.view.WindowManager;
import android.widget.Spinner;
import android.widget.TextView;
@@ -241,6 +242,13 @@ public class GalleryActivity extends AppCompatActivity
mCurrentIndex = mGalleryView.getCurrentIndex();
mLayoutMode = mGalleryView.getLayoutMode();
updateSlider();
// Update keep screen on
if (Settings.getKeepScreenOn()) {
getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
} else {
getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
}
}
@Override
@@ -543,6 +551,7 @@ public class GalleryActivity extends AppCompatActivity
private final Spinner mReadingDirection;
private final Spinner mScaleMode;
private final Spinner mStartPosition;
private final SwitchCompat mKeepScreenOn;
private final SwitchCompat mShowClock;
private final SwitchCompat mShowBattery;
private final SwitchCompat mVolumePage;
@@ -553,6 +562,7 @@ public class GalleryActivity extends AppCompatActivity
mReadingDirection = (Spinner) mView.findViewById(R.id.reading_direction);
mScaleMode = (Spinner) mView.findViewById(R.id.page_scaling);
mStartPosition = (Spinner) mView.findViewById(R.id.start_position);
mKeepScreenOn = (SwitchCompat) mView.findViewById(R.id.keep_screen_on);
mShowClock = (SwitchCompat) mView.findViewById(R.id.show_clock);
mShowBattery = (SwitchCompat) mView.findViewById(R.id.show_battery);
mVolumePage = (SwitchCompat) mView.findViewById(R.id.volume_page);
@@ -560,6 +570,7 @@ public class GalleryActivity extends AppCompatActivity
mReadingDirection.setSelection(Settings.getReadingDirection());
mScaleMode.setSelection(Settings.getPageScaling());
mStartPosition.setSelection(Settings.getStartPosition());
mKeepScreenOn.setChecked(Settings.getKeepScreenOn());
mShowClock.setChecked(Settings.getShowClock());
mShowBattery.setChecked(Settings.getShowBattery());
mVolumePage.setChecked(Settings.getVolumePage());
@@ -574,6 +585,7 @@ public class GalleryActivity extends AppCompatActivity
int layoutMode = GalleryView.sanitizeLayoutMode(mReadingDirection.getSelectedItemPosition());
int scaleMode = ImageView.sanitizeScaleMode(mScaleMode.getSelectedItemPosition());
int startPosition = ImageView.sanitizeStartPosition(mStartPosition.getSelectedItemPosition());
boolean keepScreenOn = mKeepScreenOn.isChecked();
boolean showClock = mShowClock.isChecked();
boolean showBattery = mShowBattery.isChecked();
boolean volumePage = mVolumePage.isChecked();
@@ -581,6 +593,7 @@ public class GalleryActivity extends AppCompatActivity
Settings.putReadingDirection(layoutMode);
Settings.putPageScaling(scaleMode);
Settings.putStartPosition(startPosition);
Settings.putKeepScreenOn(keepScreenOn);
Settings.putShowClock(showClock);
Settings.putShowBattery(showBattery);
Settings.putVolumePage(volumePage);
@@ -590,6 +603,11 @@ public class GalleryActivity extends AppCompatActivity
mGalleryView.setScaleMode(scaleMode);
mGalleryView.setStartPosition(startPosition);
}
if (keepScreenOn) {
getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
} else {
getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
}
if (mClock != null) {
mClock.setVisibility(showClock ? View.VISIBLE : View.GONE);
}
app/src/main/res/layout/dialog_gallery_menu.xml
+9 -2
View File
@@ -63,7 +63,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center_vertical"
android:text="@string/settings_read_reading_page_scaling_title"
android:text="@string/settings_read_page_scaling_title"
android:textColor="@color/primary_text_dark"/>
<Spinner
@@ -86,7 +86,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center_vertical"
android:text="@string/settings_read_reading_start_position_title"
android:text="@string/settings_read_start_position_title"
android:textColor="@color/primary_text_dark"/>
<Spinner
@@ -99,6 +99,13 @@
</LinearLayout>
<android.support.v7.widget.SwitchCompat
android:id="@+id/keep_screen_on"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/settings_read_keep_screen_on_title"
android:textColor="@color/primary_text_dark"/>
<android.support.v7.widget.SwitchCompat
android:id="@+id/show_clock"
android:layout_width="match_parent"
app/src/main/res/values-zh-rCN/strings.xml
+13 -12
View File
@@ -191,18 +191,19 @@
<string name="settings_read_reading_direction_left_to_right">从左至右</string>
<string name="settings_read_reading_direction_right_to_Left">从右至左</string>
<string name="settings_read_reading_direction_top_to_bottom">从上至下</string>
<string name="settings_read_reading_page_scaling_title">页面缩放</string>
<string name="settings_read_reading_page_scaling_actual_size">原始尺寸</string>
<string name="settings_read_reading_page_scaling_fit_to_width">匹配宽度</string>
<string name="settings_read_reading_page_scaling_fit_to_height">匹配长度</string>
<string name="settings_read_reading_page_scaling_fit_to_screen">匹配屏幕</string>
<string name="settings_read_reading_page_scaling_fixed_scale">固定缩放</string>
<string name="settings_read_reading_start_position_title">开页位置</string>
<string name="settings_read_reading_start_position_top_left">左上角</string>
<string name="settings_read_reading_start_position_top_right">右上角</string>
<string name="settings_read_reading_start_position_bottom_left">左下角</string>
<string name="settings_read_reading_start_position_bottom_right">右下角</string>
<string name="settings_read_reading_start_position_center">中心</string>
<string name="settings_read_page_scaling_title">页面缩放</string>
<string name="settings_read_page_scaling_actual_size">原始尺寸</string>
<string name="settings_read_page_scaling_fit_to_width">匹配宽度</string>
<string name="settings_read_page_scaling_fit_to_height">匹配长度</string>
<string name="settings_read_page_scaling_fit_to_screen">匹配屏幕</string>
<string name="settings_read_page_scaling_fixed_scale">固定缩放</string>
<string name="settings_read_start_position_title">开页位置</string>
<string name="settings_read_start_position_top_left">左上角</string>
<string name="settings_read_start_position_top_right">右上角</string>
<string name="settings_read_start_position_bottom_left">左下角</string>
<string name="settings_read_start_position_bottom_right">右下角</string>
<string name="settings_read_start_position_center">中心</string>
<string name="settings_read_keep_screen_on_title">屏幕常亮</string>
<string name="settings_read_show_clock_title">显示时钟</string>
<string name="settings_read_show_battery_title">显示电量</string>
<string name="settings_read_volume_page_title">使用音量键翻页</string>
app/src/main/res/values/arrays.xml
+10 -10
View File
@@ -37,11 +37,11 @@
</string-array>
<string-array name="page_scaling_entries">
<item>@string/settings_read_reading_page_scaling_actual_size</item>
<item>@string/settings_read_reading_page_scaling_fit_to_width</item>
<item>@string/settings_read_reading_page_scaling_fit_to_height</item>
<item>@string/settings_read_reading_page_scaling_fit_to_screen</item>
<item>@string/settings_read_reading_page_scaling_fixed_scale</item>
<item>@string/settings_read_page_scaling_actual_size</item>
<item>@string/settings_read_page_scaling_fit_to_width</item>
<item>@string/settings_read_page_scaling_fit_to_height</item>
<item>@string/settings_read_page_scaling_fit_to_screen</item>
<item>@string/settings_read_page_scaling_fixed_scale</item>
</string-array>
<string-array name="page_scaling_entry_values" translatable="false">
@@ -53,11 +53,11 @@
</string-array>
<string-array name="start_position_entries">
<item>@string/settings_read_reading_start_position_top_left</item>
<item>@string/settings_read_reading_start_position_top_right</item>
<item>@string/settings_read_reading_start_position_bottom_left</item>
<item>@string/settings_read_reading_start_position_bottom_right</item>
<item>@string/settings_read_reading_start_position_center</item>
<item>@string/settings_read_start_position_top_left</item>
<item>@string/settings_read_start_position_top_right</item>
<item>@string/settings_read_start_position_bottom_left</item>
<item>@string/settings_read_start_position_bottom_right</item>
<item>@string/settings_read_start_position_center</item>
</string-array>
<string-array name="start_position_values" translatable="false">
app/src/main/res/values/strings.xml
+13 -12
View File
@@ -230,18 +230,19 @@
<string name="settings_read_reading_direction_left_to_right">Left to right</string>
<string name="settings_read_reading_direction_right_to_Left">Right to left</string>
<string name="settings_read_reading_direction_top_to_bottom">Top to bottom</string>
<string name="settings_read_reading_page_scaling_title">Page scaling</string>
<string name="settings_read_reading_page_scaling_actual_size">Actual size</string>
<string name="settings_read_reading_page_scaling_fit_to_width">Fit to width</string>
<string name="settings_read_reading_page_scaling_fit_to_height">Fit to height</string>
<string name="settings_read_reading_page_scaling_fit_to_screen">Fit to screen</string>
<string name="settings_read_reading_page_scaling_fixed_scale">Fixed scale</string>
<string name="settings_read_reading_start_position_title">Start position</string>
<string name="settings_read_reading_start_position_top_left">Top left</string>
<string name="settings_read_reading_start_position_top_right">Top right</string>
<string name="settings_read_reading_start_position_bottom_left">Bottom left</string>
<string name="settings_read_reading_start_position_bottom_right">Bottom right</string>
<string name="settings_read_reading_start_position_center">Center</string>
<string name="settings_read_page_scaling_title">Page scaling</string>
<string name="settings_read_page_scaling_actual_size">Actual size</string>
<string name="settings_read_page_scaling_fit_to_width">Fit to width</string>
<string name="settings_read_page_scaling_fit_to_height">Fit to height</string>
<string name="settings_read_page_scaling_fit_to_screen">Fit to screen</string>
<string name="settings_read_page_scaling_fixed_scale">Fixed scale</string>
<string name="settings_read_start_position_title">Start position</string>
<string name="settings_read_start_position_top_left">Top left</string>
<string name="settings_read_start_position_top_right">Top right</string>
<string name="settings_read_start_position_bottom_left">Bottom left</string>
<string name="settings_read_start_position_bottom_right">Bottom right</string>
<string name="settings_read_start_position_center">Center</string>
<string name="settings_read_keep_screen_on_title">Keep screen on</string>
<string name="settings_read_show_clock_title">Show clock</string>
<string name="settings_read_show_battery_title">Show battery</string>
<string name="settings_read_volume_page_title">Use volume key to turn pages</string>
app/src/main/res/xml/read_settings.xml
+9 -2
View File
@@ -28,7 +28,7 @@
<ListPreference
android:key="page_scaling"
android:title="@string/settings_read_reading_page_scaling_title"
android:title="@string/settings_read_page_scaling_title"
android:summary="%s"
android:entries="@array/page_scaling_entries"
android:entryValues="@array/page_scaling_entry_values"
@@ -36,12 +36,19 @@
<ListPreference
android:key="start_position"
android:title="@string/settings_read_reading_start_position_title"
android:title="@string/settings_read_start_position_title"
android:summary="%s"
android:entries="@array/start_position_entries"
android:entryValues="@array/start_position_values"
android:defaultValue="1"/>
<com.hippo.preference.FixedSwitchPreference
style="?android:attr/preferenceStyle"
android:widgetLayout="@layout/preference_widget_fixed_switch"
android:key="keep_screen_on"
android:title="@string/settings_read_keep_screen_on_title"
android:defaultValue="false" />
<com.hippo.preference.FixedSwitchPreference
style="?android:attr/preferenceStyle"
android:widgetLayout="@layout/preference_widget_fixed_switch"