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 #3878 from timrae/bugz

Browse Source 
Fix custom study and fullscreen bugs
This commit is contained in:
Tim Rae 2015-11-26 22:04:56 +09:00
commit 8714cc3c19
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
AnkiDroid/src/main/java/com/ichi2/anki/dialogs/CustomStudyDialog.java
View File

@ -95,6 +95,8 @@ public class CustomStudyDialog extends DialogFragment {
super.onCreate(savedInstanceState);
final int dialogId = getArguments().getInt("id");
if (dialogId < 100) {
// Select the specified deck
CollectionHelper.getInstance().getCol(getActivity()).getDecks().select(getArguments().getLong("did"));
return buildContextMenu(dialogId);
} else {
return buildInputDialog(dialogId);
@ -123,7 +125,7 @@ public class CustomStudyDialog extends DialogFragment {
case DECK_OPTIONS: {
// User asked to permanently change the deck options
Intent i = new Intent(activity, DeckOptions.class);
i.putExtra("did", activity.getCol().getDecks().selected());
i.putExtra("did", getArguments().getLong("did"));
getActivity().startActivity(i);
break;
}
@ -235,7 +237,7 @@ public class CustomStudyDialog extends DialogFragment {
JSONObject deck = col.getDecks().get(did);
deck.put("extendNew", n);
col.getDecks().save(deck);
col.getSched().extendLimitsForDeck(n, 0, did);
col.getSched().extendLimits(n, 0);
onLimitsExtended(jumpToReviewer);
} catch (JSONException e) {
throw new RuntimeException(e);
@ -247,7 +249,7 @@ public class CustomStudyDialog extends DialogFragment {
JSONObject deck = col.getDecks().get(did);
deck.put("extendRev", n);
col.getDecks().save(deck);
col.getSched().extendLimitsForDeck(0, n, did);
col.getSched().extendLimits(0, n);
onLimitsExtended(jumpToReviewer);
} catch (JSONException e) {
throw new RuntimeException(e);

15
AnkiDroid/src/main/java/com/ichi2/compat/CompatV10.java
View File

@ -4,6 +4,7 @@ package com.ichi2.compat;
import android.annotation.TargetApi;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.database.sqlite.SQLiteDatabase;
@ -12,10 +13,12 @@ import android.speech.tts.TextToSpeech;
import android.speech.tts.TextToSpeech.OnUtteranceCompletedListener;
import android.view.View;
import android.view.WindowManager;
import android.widget.LinearLayout;
import android.widget.RemoteViews;
import com.ichi2.anki.AbstractFlashcardViewer;
import com.ichi2.anki.AnkiActivity;
import com.ichi2.anki.AnkiDroidApp;
import com.ichi2.anki.DeckPicker;
import com.ichi2.anki.NavigationDrawerActivity;
import com.ichi2.anki.R;
@ -27,6 +30,8 @@ import timber.log.Timber;
/** Implementation of {@link Compat} for SDK level 7 */
@TargetApi(10)
public class CompatV10 implements Compat {
protected static final int FULLSCREEN_ALL_GONE = 2;
/*
* Return the input string in a form suitable for display on a HTML page. Replace “<”, “>”, “&”, “"” and “'” with
* HTML entities.
@ -88,9 +93,13 @@ public class CompatV10 implements Compat {
}
@Override
public void setFullScreen(AbstractFlashcardViewer activity) {
activity.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
WindowManager.LayoutParams.FLAG_FULLSCREEN);
public void setFullScreen(AbstractFlashcardViewer a) {
a.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
final int fullscreenMode = Integer.parseInt(AnkiDroidApp.getSharedPrefs(a).getString("fullscreenMode", "0"));
if (fullscreenMode >= FULLSCREEN_ALL_GONE) {
final LinearLayout answerButtons = (LinearLayout) a.findViewById(R.id.answer_options_layout);
answerButtons.setVisibility(View.GONE);
}
}

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

@ -21,7 +21,6 @@ import com.ichi2.anki.R;
@TargetApi(19)
public class CompatV19 extends CompatV16 implements Compat {
private static final int ANIMATION_DURATION = 200;
private static final int FULLSCREEN_ALL_GONE = 2;
@Override
public void setFullScreen(final AbstractFlashcardViewer a) {

10
AnkiDroid/src/main/java/com/ichi2/libanki/Sched.java
View File

@ -326,16 +326,6 @@ public class Sched {
}
}
/**
* NOT in libanki. Convenience method that calls extendLimits() using specified did
*/
public void extendLimitsForDeck(int newc, int rev, long did) {
long oldDid = mCol.getDecks().selected();
mCol.getDecks().select(did);
extendLimits(newc, rev);
mCol.getDecks().select(oldDid);
}
private int _walkingCount(Method limFn, Method cntFn) {
int tot = 0;