yutou/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Remove old orientation lock. Add orientation types to preferences

Browse Source
This commit is contained in:
inorichi 2016-02-12 21:22:54 +01:00
parent 140bf8caee
commit a90a4bf80c
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.java
View File

@ -56,10 +56,6 @@ public class PreferencesHelper {
prefs.edit().clear().apply(); prefs.edit().clear().apply();
} }
public Preference<Boolean> lockOrientation() {
return rxPrefs.getBoolean(getKey(R.string.pref_lock_orientation_key), true);
}
public Preference<Integer> rotation() { public Preference<Integer> rotation() {
return rxPrefs.getInteger(getKey(R.string.pref_rotation_type_key), 1); return rxPrefs.getInteger(getKey(R.string.pref_rotation_type_key), 1);
} }

6
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderMenu.java
View File

@ -182,11 +182,11 @@ public class ReaderMenu {
@SuppressWarnings("ConstantConditions") @SuppressWarnings("ConstantConditions")
private void initializeMenu() { private void initializeMenu() {
// Orientation selector // Orientation selector
add(preferences.lockOrientation().asObservable() add(preferences.rotation().asObservable()
.subscribe(locked -> { .subscribe(value -> {
boolean isPortrait = activity.getResources().getConfiguration() boolean isPortrait = activity.getResources().getConfiguration()
.orientation == Configuration.ORIENTATION_PORTRAIT; .orientation == Configuration.ORIENTATION_PORTRAIT;
int resourceId = !locked ? R.drawable.ic_screen_rotation : isPortrait ? int resourceId = value == 1 ? R.drawable.ic_screen_rotation : isPortrait ?
R.drawable.ic_screen_lock_portrait : R.drawable.ic_screen_lock_portrait :
R.drawable.ic_screen_lock_landscape; R.drawable.ic_screen_lock_landscape;

1
app/src/main/res/values/keys.xml
View File

@ -19,7 +19,6 @@
<string name="pref_image_scale_type_key">pref_image_scale_type_key</string> <string name="pref_image_scale_type_key">pref_image_scale_type_key</string>
<string name="pref_zoom_start_key">pref_zoom_start_key</string> <string name="pref_zoom_start_key">pref_zoom_start_key</string>
<string name="pref_hide_status_bar_key">pref_hide_status_bar_key</string> <string name="pref_hide_status_bar_key">pref_hide_status_bar_key</string>
<string name="pref_lock_orientation_key">pref_lock_orientation_key</string>
<string name="pref_rotation_type_key">pref_rotation_type_key</string> <string name="pref_rotation_type_key">pref_rotation_type_key</string>
<string name="pref_enable_transitions_key">pref_enable_transitions_key</string> <string name="pref_enable_transitions_key">pref_enable_transitions_key</string>
<string name="pref_show_page_number_key">pref_show_page_number_key</string> <string name="pref_show_page_number_key">pref_show_page_number_key</string>

12
app/src/main/res/xml/pref_reader.xml
View File

@ -5,10 +5,6 @@
android:key="@string/pref_hide_status_bar_key" android:key="@string/pref_hide_status_bar_key"
android:defaultValue="true" /> android:defaultValue="true" />
<SwitchPreference android:title="@string/pref_lock_orientation"
android:key="@string/pref_lock_orientation_key"
android:defaultValue="true" />
<SwitchPreference android:title="@string/pref_enable_transitions" <SwitchPreference android:title="@string/pref_enable_transitions"
android:key="@string/pref_enable_transitions_key" android:key="@string/pref_enable_transitions_key"
android:defaultValue="true" /> android:defaultValue="true" />
@ -49,6 +45,14 @@
android:defaultValue="1" android:defaultValue="1"
android:summary="%s"/> android:summary="%s"/>
<eu.kanade.tachiyomi.widget.preference.IntListPreference
android:title="@string/pref_rotation_type"
android:key="@string/pref_rotation_type_key"
android:entries="@array/rotation_type"
android:entryValues="@array/rotation_type_values"
android:defaultValue="1"
android:summary="%s"/>
<eu.kanade.tachiyomi.widget.preference.IntListPreference <eu.kanade.tachiyomi.widget.preference.IntListPreference
android:title="@string/pref_reader_theme" android:title="@string/pref_reader_theme"
android:key="@string/pref_reader_theme_key" android:key="@string/pref_reader_theme_key"