yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-05 19:42:17 +02:00
Code Issues Releases Wiki Activity

sync with premium version: utility method

Browse source
This commit is contained in:
Nikolay Pultsin 2015-06-12 19:00:02 +01:00
parent 5beb831a46
commit 2fbd643b25
2 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/org/geometerplus/android/fbreader/dict/Dictan.java
View file

@ -22,7 +22,6 @@ package org.geometerplus.android.fbreader.dict;
import com.github.johnpersano.supertoasts.SuperActivityToast; import com.github.johnpersano.supertoasts.SuperActivityToast;
import com.github.johnpersano.supertoasts.SuperToast; import com.github.johnpersano.supertoasts.SuperToast;
import com.github.johnpersano.supertoasts.util.OnClickWrapper; import com.github.johnpersano.supertoasts.util.OnClickWrapper;
import com.github.johnpersano.supertoasts.util.OnDismissWrapper;
import android.content.ActivityNotFoundException; import android.content.ActivityNotFoundException;
import android.content.Intent; import android.content.Intent;
@ -116,13 +115,7 @@ final class Dictan extends DictionaryUtil.PackageInfo {
} }
toast.setText(text); toast.setText(text);
toast.setDuration(20000); toast.setDuration(20000);
toast.setOnDismissWrapper(new OnDismissWrapper("dict", new SuperToast.OnDismissListener() { InternalUtil.showToast(toast, fbreader);
@Override
public void onDismiss(View view) {
fbreader.hideDictionarySelection();
}
}));
fbreader.showToast(toast);
} }
private static String trimArticle(String text) { private static String trimArticle(String text) {
@ -163,12 +156,6 @@ final class Dictan extends DictionaryUtil.PackageInfo {
final SuperActivityToast toast = new SuperActivityToast(fbreader, SuperToast.Type.STANDARD); final SuperActivityToast toast = new SuperActivityToast(fbreader, SuperToast.Type.STANDARD);
toast.setText("Dictan: " + message); toast.setText("Dictan: " + message);
toast.setDuration(5000); toast.setDuration(5000);
toast.setOnDismissWrapper(new OnDismissWrapper("dict", new SuperToast.OnDismissListener() { InternalUtil.showToast(toast, fbreader);
@Override
public void onDismiss(View view) {
fbreader.hideDictionarySelection();
}
}));
fbreader.showToast(toast);
} }
} }

15
src/org/geometerplus/android/fbreader/dict/InternalUtil.java
View file

@ -22,6 +22,11 @@ package org.geometerplus.android.fbreader.dict;
import android.app.Activity; import android.app.Activity;
import android.content.ActivityNotFoundException; import android.content.ActivityNotFoundException;
import android.content.Intent; import android.content.Intent;
import android.view.View;
import com.github.johnpersano.supertoasts.SuperActivityToast;
import com.github.johnpersano.supertoasts.SuperToast;
import com.github.johnpersano.supertoasts.util.OnDismissWrapper;
import org.geometerplus.android.fbreader.FBReaderMainActivity; import org.geometerplus.android.fbreader.FBReaderMainActivity;
import org.geometerplus.android.util.UIMessageUtil; import org.geometerplus.android.util.UIMessageUtil;
@ -49,4 +54,14 @@ abstract class InternalUtil {
installDictionaryIfNotInstalled(fbreader, info); installDictionaryIfNotInstalled(fbreader, info);
} }
} }
static void showToast(SuperActivityToast toast, final FBReaderMainActivity fbreader) {
toast.setOnDismissWrapper(new OnDismissWrapper("dict", new SuperToast.OnDismissListener() {
@Override
public void onDismiss(View view) {
fbreader.hideDictionarySelection();
}
}));
fbreader.showToast(toast);
}
} }