mirror/Anki-Android
0
0
Fork 0
mirror of https://github.com/ankidroid/Anki-Android.git synced 2024-09-20 20:03:05 +02:00
Code

Merge pull request #3872 from timrae/rename-pref

Browse Source 
Give integer preference a new name to prevent crash
This commit is contained in:
Tim Rae 2015-11-26 02:43:50 +09:00
commit d6afdb4262
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.java
View File

@ -1669,7 +1669,7 @@ public abstract class AbstractFlashcardViewer extends NavigationDrawerActivity {
mLongClickWorkaround = preferences.getBoolean("textSelectionLongclickWorkaround", false);
// mDeckFilename = preferences.getString("deckFilename", "");
mNightMode = preferences.getBoolean("invertedColors", false);
mPrefFullscreenReview = Integer.parseInt(preferences.getString("fullscreenReview", "0")) >0;
mPrefFullscreenReview = Integer.parseInt(preferences.getString("fullscreenMode", "0")) >0;
mCardZoom = preferences.getInt("cardZoom", 100);
mImageZoom = preferences.getInt("imageZoom", 100);
mRelativeButtonSize = preferences.getInt("answerButtonSize", 100);

2
AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.java
View File

@ -907,7 +907,7 @@ public class DeckPicker extends NavigationDrawerActivity implements
if (previousVersionCode < 20500219) {
// clear fullscreen flag as we use a integer
boolean old =preferences.getBoolean("fullscreenReview", false);
preferences.edit().putString("fullscreenReview", old ? "1": "0").commit();
preferences.edit().putString("fullscreenMode", old ? "1": "0").commit();
}
}

2
AnkiDroid/src/main/java/com/ichi2/anki/Preferences.java
View File

@ -242,7 +242,7 @@ public class Preferences extends AppCompatPreferenceActivity implements Preferen
screen = listener.getPreferenceScreen();
// Show error toast if the user tries to disable answer button without gestures on
ListPreference fullscreenPreference = (ListPreference)
screen.findPreference("fullscreenReview");
screen.findPreference("fullscreenMode");
fullscreenPreference.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
public boolean onPreferenceChange(Preference preference, final Object newValue) {
SharedPreferences prefs = AnkiDroidApp.getSharedPrefs(Preferences.this);

2
AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.java
View File

@ -320,7 +320,7 @@ public class Reviewer extends AbstractFlashcardViewer {
super.restorePreferences();
SharedPreferences preferences = AnkiDroidApp.getSharedPrefs(getBaseContext());
mBlackWhiteboard = preferences.getBoolean("blackWhiteboard", true);
mPrefFullscreenReview = Integer.parseInt(preferences.getString("fullscreenReview", "0")) >0;
mPrefFullscreenReview = Integer.parseInt(preferences.getString("fullscreenMode", "0")) >0;
return preferences;
}

2
AnkiDroid/src/main/java/com/ichi2/compat/CompatV19.java
View File

@ -45,7 +45,7 @@ public class CompatV19 extends CompatV16 implements Compat {
// Show / hide the Action bar together with the status bar
SharedPreferences prefs = AnkiDroidApp.getSharedPrefs(a);
final int fullscreenMode = Integer.parseInt(prefs.getString("fullscreenReview", "0"));
final int fullscreenMode = Integer.parseInt(prefs.getString("fullscreenMode", "0"));
View decorView = a.getWindow().getDecorView();
decorView.setOnSystemUiVisibilityChangeListener
(new View.OnSystemUiVisibilityChangeListener() {

2
AnkiDroid/src/main/res/xml/preferences_reviewing.xml
View File

@ -61,7 +61,7 @@
android:title="@string/pref_keep_screen_on" />
<ListPreference
android:defaultValue="false"
android:key="fullscreenReview"
android:key="fullscreenMode"
android:summary=""
android:entries="@array/full_screen_mode_labels"
android:entryValues="@array/full_screen_mode_values"