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

Use custom AssertUtils instead of Assert

Browse Source
This commit is contained in:
seven332 committed 2018-12-18 15:22:32 +08:00
1 parent 88aebbd075
commit f0fa226b16
21 files changed
+77 -103
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
+3 -3
View File
@@ -30,11 +30,11 @@ import com.hippo.ehviewer.client.data.FavListUrlBuilder;
import com.hippo.ehviewer.ui.CommonOperations;
import com.hippo.glgallery.GalleryView;
import com.hippo.unifile.UniFile;
import com.hippo.yorozuya.AssertUtils;
import com.hippo.yorozuya.FileUtils;
import com.hippo.yorozuya.MathUtils;
import com.hippo.yorozuya.NumberUtils;
import java.io.File;
import junit.framework.Assert;
public class Settings {
@@ -796,7 +796,7 @@ public class Settings {
}
public static void putFavCat(String[] value) {
Assert.assertEquals(10, value.length);
AssertUtils.assertEquals(10, value.length);
sSettingsPre.edit()
.putString(KEY_FAV_CAT_0, value[0])
.putString(KEY_FAV_CAT_1, value[1])
@@ -827,7 +827,7 @@ public class Settings {
}
public static void putFavCount(int[] count) {
Assert.assertEquals(10, count.length);
AssertUtils.assertEquals(10, count.length);
sSettingsPre.edit()
.putInt(KEY_FAV_COUNT_0, count[0])
.putInt(KEY_FAV_COUNT_1, count[1])
app/src/main/java/com/hippo/ehviewer/client/EhEngine.java
+7 -12
View File
@@ -20,7 +20,6 @@ import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.util.Log;
import android.util.Pair;
import com.hippo.ehviewer.AppConfig;
import com.hippo.ehviewer.GetText;
import com.hippo.ehviewer.R;
@@ -48,21 +47,12 @@ import com.hippo.ehviewer.client.parser.TorrentParser;
import com.hippo.ehviewer.client.parser.VoteCommentParser;
import com.hippo.ehviewer.client.parser.WhatsHotParser;
import com.hippo.network.StatusCodeException;
import junit.framework.Assert;
import org.json.JSONArray;
import org.json.JSONObject;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.select.Elements;
import com.hippo.yorozuya.AssertUtils;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import okhttp3.Call;
import okhttp3.FormBody;
import okhttp3.Headers;
@@ -72,6 +62,11 @@ import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.RequestBody;
import okhttp3.Response;
import org.json.JSONArray;
import org.json.JSONObject;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.select.Elements;
public class EhEngine {
@@ -543,7 +538,7 @@ public class EhEngine {
public static Void addFavoritesRange(@Nullable EhClient.Task task, OkHttpClient okHttpClient,
long[] gidArray, String[] tokenArray, int dstCat) throws Exception {
Assert.assertEquals(gidArray.length, tokenArray.length);
AssertUtils.assertEquals(gidArray.length, tokenArray.length);
for (int i = 0, n = gidArray.length; i < n; i++) {
addFavorites(task, okHttpClient, gidArray[i], tokenArray[i], dstCat, null);
}
app/src/main/java/com/hippo/ehviewer/client/parser/FavoritesParser.java
+3 -6
View File
@@ -22,16 +22,13 @@ import com.hippo.ehviewer.client.data.GalleryInfo;
import com.hippo.ehviewer.client.exception.EhException;
import com.hippo.ehviewer.client.exception.ParseException;
import com.hippo.util.JsoupUtils;
import junit.framework.Assert;
import com.hippo.yorozuya.AssertUtils;
import java.util.List;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
import org.jsoup.select.Elements;
import java.util.List;
public class FavoritesParser {
public static class Result {
@@ -54,7 +51,7 @@ public class FavoritesParser {
//noinspection ConstantConditions
Elements fps = ido.getElementsByClass("fp");
// Last one is "fp fps"
Assert.assertEquals(11, fps.size());
AssertUtils.assertEquals(11, fps.size());
for (int i = 0; i < 10; i++) {
Element fp = fps.get(i);
app/src/main/java/com/hippo/ehviewer/ui/scene/CookieSignInScene.java
+5 -5
View File
@@ -35,8 +35,8 @@ import com.hippo.ehviewer.R;
import com.hippo.ehviewer.client.EhCookieStore;
import com.hippo.ehviewer.client.EhUrl;
import com.hippo.ehviewer.client.EhUtils;
import com.hippo.yorozuya.AssertUtils;
import com.hippo.yorozuya.ViewUtils;
import junit.framework.Assert;
import okhttp3.Cookie;
public class CookieSignInScene extends SolidScene implements EditText.OnEditorActionListener,
@@ -72,13 +72,13 @@ public class CookieSignInScene extends SolidScene implements EditText.OnEditorAc
View view = inflater.inflate(R.layout.scene_cookie_sign_in, container, false);
mIpbMemberIdLayout = (TextInputLayout) ViewUtils.$$(view, R.id.ipb_member_id_layout);
mIpbMemberId = mIpbMemberIdLayout.getEditText();
Assert.assertNotNull(mIpbMemberId);
AssertUtils.assertNotNull(mIpbMemberId);
mIpbPassHashLayout = (TextInputLayout) ViewUtils.$$(view, R.id.ipb_pass_hash_layout);
mIpbPassHash = mIpbPassHashLayout.getEditText();
Assert.assertNotNull(mIpbPassHash);
AssertUtils.assertNotNull(mIpbPassHash);
mIgneousLayout = (TextInputLayout) ViewUtils.$$(view, R.id.igneous_layout);
mIgneous = mIgneousLayout.getEditText();
Assert.assertNotNull(mIgneous);
AssertUtils.assertNotNull(mIgneous);
mOk = ViewUtils.$$(view, R.id.ok);
mIpbPassHash.setOnEditorActionListener(this);
@@ -87,7 +87,7 @@ public class CookieSignInScene extends SolidScene implements EditText.OnEditorAc
// Try to get old version cookie info
Context context = getContext2();
Assert.assertNotNull(context);
AssertUtils.assertNotNull(context);
SharedPreferences sharedPreferences = context.getSharedPreferences("eh_info", 0);
String ipbMemberId = sharedPreferences.getString("ipb_member_id", null);
String ipbPassHash = sharedPreferences.getString("ipb_pass_hash", null);
app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadLabelsScene.java
+3 -3
View File
@@ -46,9 +46,9 @@ import com.hippo.ehviewer.R;
import com.hippo.ehviewer.dao.DownloadLabel;
import com.hippo.util.DrawableManager;
import com.hippo.view.ViewTransition;
import com.hippo.yorozuya.AssertUtils;
import com.hippo.yorozuya.ViewUtils;
import java.util.List;
import junit.framework.Assert;
public class DownloadLabelsScene extends ToolbarScene {
@@ -92,7 +92,7 @@ public class DownloadLabelsScene extends ToolbarScene {
mViewTransition = new ViewTransition(mRecyclerView, tip);
Context context = getContext2();
Assert.assertNotNull(context);
AssertUtils.assertNotNull(context);
Drawable drawable = DrawableManager.getDrawable(context, R.drawable.big_label);
drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
tip.setCompoundDrawables(null, drawable, null, null);
@@ -339,7 +339,7 @@ public class DownloadLabelsScene extends ToolbarScene {
public LabelAdapter() {
mInflater = getLayoutInflater2();
Assert.assertNotNull(mInflater);
AssertUtils.assertNotNull(mInflater);
}
@Override
app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java
+5 -5
View File
@@ -88,6 +88,7 @@ import com.hippo.view.ViewTransition;
import com.hippo.widget.FabLayout;
import com.hippo.widget.LoadImageView;
import com.hippo.widget.recyclerview.AutoStaggeredGridLayoutManager;
import com.hippo.yorozuya.AssertUtils;
import com.hippo.yorozuya.FileUtils;
import com.hippo.yorozuya.IOUtils;
import com.hippo.yorozuya.ObjectUtils;
@@ -99,7 +100,6 @@ import java.io.OutputStream;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import junit.framework.Assert;
public class DownloadsScene extends ToolbarScene
implements DownloadManager.DownloadInfoListener,
@@ -191,7 +191,7 @@ public class DownloadsScene extends ToolbarScene
super.onCreate(savedInstanceState);
Context context = getContext2();
Assert.assertNotNull(context);
AssertUtils.assertNotNull(context);
mDownloadManager = EhApplication.getDownloadManager(context);
mDownloadManager.addDownloadInfoListener(this);
@@ -284,7 +284,7 @@ public class DownloadsScene extends ToolbarScene
mViewTransition = new ViewTransition(content, tip);
Context context = getContext2();
Assert.assertNotNull(content);
AssertUtils.assertNotNull(content);
Resources resources = context.getResources();
Drawable drawable = DrawableManager.getDrawable(context, R.drawable.big_download);
@@ -517,7 +517,7 @@ public class DownloadsScene extends ToolbarScene
View view = inflater.inflate(R.layout.drawer_list, container, false);
final Context context = getContext2();
Assert.assertNotNull(context);
AssertUtils.assertNotNull(context);
Toolbar toolbar = (Toolbar) view.findViewById(R.id.toolbar);
toolbar.setTitle(R.string.download_labels);
@@ -1136,7 +1136,7 @@ public class DownloadsScene extends ToolbarScene
public DownloadAdapter() {
mInflater = getLayoutInflater2();
Assert.assertNotNull(mInflater);
AssertUtils.assertNotNull(mInflater);
View calculator = mInflater.inflate(R.layout.item_gallery_list_thumb_height, null);
ViewUtils.measureView(calculator, 1024, ViewGroup.LayoutParams.WRAP_CONTENT);
app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java
+5 -8
View File
@@ -45,7 +45,6 @@ import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import com.github.amlcurran.showcaseview.ShowcaseView;
import com.github.amlcurran.showcaseview.SimpleShowcaseEventListener;
import com.github.amlcurran.showcaseview.targets.PointTarget;
@@ -79,12 +78,10 @@ import com.hippo.util.DrawableManager;
import com.hippo.widget.ContentLayout;
import com.hippo.widget.FabLayout;
import com.hippo.widget.SearchBarMover;
import com.hippo.yorozuya.AssertUtils;
import com.hippo.yorozuya.ObjectUtils;
import com.hippo.yorozuya.SimpleHandler;
import com.hippo.yorozuya.ViewUtils;
import junit.framework.Assert;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -177,7 +174,7 @@ public class FavoritesScene extends BaseScene implements
super.onCreate(savedInstanceState);
Context context = getContext2();
Assert.assertNotNull(context);
AssertUtils.assertNotNull(context);
mClient = EhApplication.getEhClient(context);
mFavCatArray = Settings.getFavCat();
mFavCountArray = Settings.getFavCount();
@@ -241,7 +238,7 @@ public class FavoritesScene extends BaseScene implements
View view = inflater.inflate(R.layout.scene_favorites, container, false);
ContentLayout contentLayout = (ContentLayout) view.findViewById(R.id.content_layout);
MainActivity activity = getActivity2();
Assert.assertNotNull(activity);
AssertUtils.assertNotNull(activity);
mDrawerLayout = (EhDrawerLayout) ViewUtils.$$(activity, R.id.draw_view);
mRecyclerView = contentLayout.getRecyclerView();
FastScroller fastScroller = contentLayout.getFastScroller();
@@ -250,7 +247,7 @@ public class FavoritesScene extends BaseScene implements
mFabLayout = (FabLayout) ViewUtils.$$(view, R.id.fab_layout);
Context context = getContext2();
Assert.assertNotNull(context);
AssertUtils.assertNotNull(context);
Resources resources = context.getResources();
int paddingTopSB = resources.getDimensionPixelOffset(R.dimen.gallery_padding_top_search_bar);
@@ -487,7 +484,7 @@ public class FavoritesScene extends BaseScene implements
final Context context = getContext2();
Toolbar toolbar = (Toolbar) ViewUtils.$$(view, R.id.toolbar);
Assert.assertNotNull(context);
AssertUtils.assertNotNull(context);
toolbar.setTitle(R.string.collections);
toolbar.inflateMenu(R.menu.drawer_favorites);
app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java
+3 -3
View File
@@ -77,6 +77,7 @@ import com.hippo.widget.FabLayout;
import com.hippo.widget.LinkifyTextView;
import com.hippo.widget.ObservedTextView;
import com.hippo.yorozuya.AnimationUtils;
import com.hippo.yorozuya.AssertUtils;
import com.hippo.yorozuya.LayoutUtils;
import com.hippo.yorozuya.ResourcesUtils;
import com.hippo.yorozuya.SimpleAnimatorListener;
@@ -85,7 +86,6 @@ import com.hippo.yorozuya.ViewUtils;
import com.hippo.yorozuya.collect.IntList;
import java.util.ArrayList;
import java.util.List;
import junit.framework.Assert;
public final class GalleryCommentsScene extends ToolbarScene
implements EasyRecyclerView.OnItemClickListener,
@@ -190,7 +190,7 @@ public final class GalleryCommentsScene extends ToolbarScene
mFab = (FloatingActionButton) ViewUtils.$$(view, R.id.fab);
Context context = getContext2();
Assert.assertNotNull(context);
AssertUtils.assertNotNull(context);
Resources resources = context.getResources();
int paddingBottomFab = resources.getDimensionPixelOffset(R.dimen.gallery_padding_bottom_fab);
@@ -617,7 +617,7 @@ public final class GalleryCommentsScene extends ToolbarScene
public CommentAdapter() {
mInflater = getLayoutInflater2();
Assert.assertNotNull(mInflater);
AssertUtils.assertNotNull(mInflater);
}
@Override
app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
+8 -8
View File
@@ -101,6 +101,7 @@ import com.hippo.widget.LoadImageView;
import com.hippo.widget.ObservedTextView;
import com.hippo.widget.ProgressView;
import com.hippo.widget.SimpleGridAutoSpanLayout;
import com.hippo.yorozuya.AssertUtils;
import com.hippo.yorozuya.FileUtils;
import com.hippo.yorozuya.IOUtils;
import com.hippo.yorozuya.IntIdGenerator;
@@ -113,7 +114,6 @@ import java.io.OutputStream;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.List;
import junit.framework.Assert;
public class GalleryDetailScene extends BaseScene implements View.OnClickListener,
com.hippo.ehviewer.download.DownloadManager.DownloadInfoListener,
@@ -407,7 +407,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
long gid = getGid();
if (gid != -1) {
Context context = getContext2();
Assert.assertNotNull(context);
AssertUtils.assertNotNull(context);
mDownloadState = EhApplication.getDownloadManager(context).getDownloadState(gid);
} else {
mDownloadState = DownloadInfo.STATE_INVALID;
@@ -422,7 +422,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
mViewTransition = new ViewTransition(mainView, progressView, mTip);
Context context = getContext2();
Assert.assertNotNull(context);
AssertUtils.assertNotNull(context);
Drawable drawable = DrawableManager.getDrawable(context, R.drawable.big_weird_face);
drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
@@ -542,7 +542,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
super.onDestroyView();
Context context = getContext2();
Assert.assertNotNull(context);
AssertUtils.assertNotNull(context);
EhApplication.getDownloadManager(context).removeDownloadInfoListener(this);
mTip = null;
@@ -599,7 +599,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
private boolean prepareData() {
Context context = getContext2();
Assert.assertNotNull(context);
AssertUtils.assertNotNull(context);
if (mGalleryDetail != null) {
return true;
@@ -789,7 +789,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
}
Resources resources = getResources2();
Assert.assertNotNull(resources);
AssertUtils.assertNotNull(resources);
mThumb.load(EhCacheKeyFactory.getThumbKey(gd.gid), gd.thumb);
mTitle.setText(EhUtils.getSuitableTitle(gd));
@@ -965,7 +965,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
private String getAllRatingText(float rating, int ratingCount) {
Resources resources = getResources2();
Assert.assertNotNull(resources);
AssertUtils.assertNotNull(resources);
return resources.getString(R.string.rating_text, getRatingText(rating, resources), rating, ratingCount);
}
@@ -988,7 +988,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
}
Context context = getContext2();
Assert.assertNotNull(context);
AssertUtils.assertNotNull(context);
PopupMenu popup = new PopupMenu(context, mOtherActions, Gravity.TOP);
mPopupMenu = popup;
popup.getMenuInflater().inflate(R.menu.scene_gallery_detail, popup.getMenu());
app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java
+4 -4
View File
@@ -38,10 +38,10 @@ import com.hippo.ehviewer.client.EhUrl;
import com.hippo.ehviewer.client.EhUtils;
import com.hippo.ehviewer.client.data.GalleryDetail;
import com.hippo.ripple.Ripple;
import com.hippo.yorozuya.AssertUtils;
import com.hippo.yorozuya.LayoutUtils;
import com.hippo.yorozuya.ViewUtils;
import java.util.ArrayList;
import junit.framework.Assert;
public final class GalleryInfoScene extends ToolbarScene implements EasyRecyclerView.OnItemClickListener {
@@ -84,7 +84,7 @@ public final class GalleryInfoScene extends ToolbarScene implements EasyRecycler
}
Resources resources = getResources2();
Assert.assertNotNull(resources);
AssertUtils.assertNotNull(resources);
mKeys.add(resources.getString(R.string.header_key));
mValues.add(resources.getString(R.string.header_value));
mKeys.add(resources.getString(R.string.key_gid));
@@ -157,7 +157,7 @@ public final class GalleryInfoScene extends ToolbarScene implements EasyRecycler
View view = inflater.inflate(R.layout.scene_gallery_info, container, false);
Context context = getContext2();
Assert.assertNotNull(context);
AssertUtils.assertNotNull(context);
mRecyclerView = (EasyRecyclerView) ViewUtils.$$(view, R.id.recycler_view);
InfoAdapter adapter = new InfoAdapter();
@@ -239,7 +239,7 @@ public final class GalleryInfoScene extends ToolbarScene implements EasyRecycler
public InfoAdapter() {
mInflater = getLayoutInflater2();
Assert.assertNotNull(mInflater);
AssertUtils.assertNotNull(mInflater);
}
@Override
app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
+4 -4
View File
@@ -90,6 +90,7 @@ import com.hippo.widget.ContentLayout;
import com.hippo.widget.FabLayout;
import com.hippo.widget.SearchBarMover;
import com.hippo.yorozuya.AnimationUtils;
import com.hippo.yorozuya.AssertUtils;
import com.hippo.yorozuya.MathUtils;
import com.hippo.yorozuya.SimpleAnimatorListener;
import com.hippo.yorozuya.StringUtils;
@@ -99,7 +100,6 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.Collections;
import java.util.List;
import junit.framework.Assert;
public final class GalleryListScene extends BaseScene
implements EasyRecyclerView.OnItemClickListener, EasyRecyclerView.OnItemLongClickListener,
@@ -258,7 +258,7 @@ public final class GalleryListScene extends BaseScene
super.onCreate(savedInstanceState);
Context context = getContext2();
Assert.assertNotNull(context);
AssertUtils.assertNotNull(context);
mClient = EhApplication.getEhClient(context);
if (savedInstanceState == null) {
@@ -473,7 +473,7 @@ public final class GalleryListScene extends BaseScene
View view = inflater.inflate(R.layout.scene_gallery_list, container, false);
Context context = getContext2();
Assert.assertNotNull(context);
AssertUtils.assertNotNull(context);
Resources resources = context.getResources();
mHideActionFabSlop = ViewConfiguration.get(context).getScaledTouchSlop();
@@ -719,7 +719,7 @@ public final class GalleryListScene extends BaseScene
final ListView listView = (ListView) ViewUtils.$$(view, R.id.list_view);
Context context = getContext2();
Assert.assertNotNull(context);
AssertUtils.assertNotNull(context);
final List<QuickSearch> list = EhDB.getAllQuickSearch();
final ArrayAdapter<QuickSearch> adapter = new ArrayAdapter<>(context, R.layout.item_simple_list, list);
app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java
+4 -5
View File
@@ -53,11 +53,10 @@ import com.hippo.widget.ContentLayout;
import com.hippo.widget.LoadImageView;
import com.hippo.widget.Slider;
import com.hippo.widget.recyclerview.AutoGridLayoutManager;
import com.hippo.yorozuya.AssertUtils;
import com.hippo.yorozuya.LayoutUtils;
import com.hippo.yorozuya.ViewUtils;
import junit.framework.Assert;
import java.util.ArrayList;
import java.util.Locale;
@@ -91,7 +90,7 @@ public class GalleryPreviewsScene extends ToolbarScene implements EasyRecyclerVi
super.onCreate(savedInstanceState);
Context context = getContext2();
Assert.assertNotNull(context);
AssertUtils.assertNotNull(context);
mClient = EhApplication.getEhClient(context);
if (savedInstanceState == null) {
onInit();
@@ -138,7 +137,7 @@ public class GalleryPreviewsScene extends ToolbarScene implements EasyRecyclerVi
mRecyclerView = contentLayout.getRecyclerView();
Context context = getContext2();
Assert.assertNotNull(context);
AssertUtils.assertNotNull(context);
Resources resources = context.getResources();
mAdapter = new GalleryPreviewAdapter();
@@ -261,7 +260,7 @@ public class GalleryPreviewsScene extends ToolbarScene implements EasyRecyclerVi
public GalleryPreviewAdapter() {
mInflater = getLayoutInflater2();
Assert.assertNotNull(mInflater);
AssertUtils.assertNotNull(mInflater);
}
@Override
app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java
+2 -2
View File
@@ -64,9 +64,9 @@ import com.hippo.util.DrawableManager;
import com.hippo.view.ViewTransition;
import com.hippo.widget.LoadImageView;
import com.hippo.widget.recyclerview.AutoStaggeredGridLayoutManager;
import com.hippo.yorozuya.AssertUtils;
import com.hippo.yorozuya.ViewUtils;
import de.greenrobot.dao.query.LazyList;
import junit.framework.Assert;
public class HistoryScene extends ToolbarScene
implements EasyRecyclerView.OnItemClickListener,
@@ -101,7 +101,7 @@ public class HistoryScene extends ToolbarScene
mViewTransition = new ViewTransition(content, tip);
Context context = getContext2();
Assert.assertNotNull(context);
AssertUtils.assertNotNull(context);
Resources resources = context.getResources();
Drawable drawable = DrawableManager.getDrawable(context, R.drawable.big_history);
app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.java
+2 -4
View File
@@ -25,7 +25,6 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import com.hippo.ehviewer.EhApplication;
import com.hippo.ehviewer.R;
import com.hippo.ehviewer.client.EhClient;
@@ -36,10 +35,9 @@ import com.hippo.scene.SceneFragment;
import com.hippo.util.DrawableManager;
import com.hippo.util.ExceptionUtils;
import com.hippo.view.ViewTransition;
import com.hippo.yorozuya.AssertUtils;
import com.hippo.yorozuya.ViewUtils;
import junit.framework.Assert;
/**
* Only show a progress with jobs in background
*/
@@ -170,7 +168,7 @@ public final class ProgressScene extends BaseScene implements View.OnClickListen
mTip = (TextView) ViewUtils.$$(view, R.id.tip);
Context context = getContext2();
Assert.assertNotNull(context);
AssertUtils.assertNotNull(context);
Drawable drawable = DrawableManager.getDrawable(context, R.drawable.big_weird_face);
drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
app/src/main/java/com/hippo/ehviewer/ui/scene/QuickSearchScene.java
+3 -3
View File
@@ -42,9 +42,9 @@ import com.hippo.ehviewer.R;
import com.hippo.ehviewer.dao.QuickSearch;
import com.hippo.util.DrawableManager;
import com.hippo.view.ViewTransition;
import com.hippo.yorozuya.AssertUtils;
import com.hippo.yorozuya.ViewUtils;
import java.util.List;
import junit.framework.Assert;
public final class QuickSearchScene extends ToolbarScene {
@@ -88,7 +88,7 @@ public final class QuickSearchScene extends ToolbarScene {
mViewTransition = new ViewTransition(mRecyclerView, tip);
Context context = getContext2();
Assert.assertNotNull(context);
AssertUtils.assertNotNull(context);
Drawable drawable = DrawableManager.getDrawable(context, R.drawable.big_search);
drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
@@ -210,7 +210,7 @@ public final class QuickSearchScene extends ToolbarScene {
public QuickSearchAdapter() {
mInflater = getLayoutInflater2();
Assert.assertNotNull(mInflater);
AssertUtils.assertNotNull(mInflater);
}
@Override
app/src/main/java/com/hippo/ehviewer/ui/scene/SecurityScene.java
+2 -5
View File
@@ -28,18 +28,15 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import com.hippo.ehviewer.R;
import com.hippo.ehviewer.Settings;
import com.hippo.ehviewer.ui.MainActivity;
import com.hippo.hardware.ShakeDetector;
import com.hippo.widget.lockpattern.LockPatternUtils;
import com.hippo.widget.lockpattern.LockPatternView;
import com.hippo.yorozuya.AssertUtils;
import com.hippo.yorozuya.ObjectUtils;
import com.hippo.yorozuya.ViewUtils;
import junit.framework.Assert;
import java.util.List;
public class SecurityScene extends SolidScene implements
@@ -74,7 +71,7 @@ public class SecurityScene extends SolidScene implements
super.onCreate(savedInstanceState);
Context context = getContext2();
Assert.assertNotNull(context);
AssertUtils.assertNotNull(context);
mSensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
if (null != mSensorManager) {
mAccelerometer = mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java
+4 -6
View File
@@ -29,7 +29,6 @@ import android.view.ViewGroup;
import android.view.inputmethod.EditorInfo;
import android.widget.EditText;
import android.widget.TextView;
import com.hippo.ehviewer.EhApplication;
import com.hippo.ehviewer.R;
import com.hippo.ehviewer.Settings;
@@ -44,11 +43,10 @@ import com.hippo.ehviewer.widget.RecaptchaView;
import com.hippo.scene.Announcer;
import com.hippo.scene.SceneFragment;
import com.hippo.util.ExceptionUtils;
import com.hippo.yorozuya.AssertUtils;
import com.hippo.yorozuya.IntIdGenerator;
import com.hippo.yorozuya.ViewUtils;
import junit.framework.Assert;
public final class SignInScene extends SolidScene implements EditText.OnEditorActionListener,
View.OnClickListener {
@@ -125,10 +123,10 @@ public final class SignInScene extends SolidScene implements EditText.OnEditorAc
mProgress = ViewUtils.$$(view, R.id.progress);
mUsernameLayout = (TextInputLayout) ViewUtils.$$(loginForm, R.id.username_layout);
mUsername = mUsernameLayout.getEditText();
Assert.assertNotNull(mUsername);
AssertUtils.assertNotNull(mUsername);
mPasswordLayout = (TextInputLayout) ViewUtils.$$(loginForm, R.id.password_layout);
mPassword = mPasswordLayout.getEditText();
Assert.assertNotNull(mPassword);
AssertUtils.assertNotNull(mPassword);
mRecaptcha = (EditText) ViewUtils.$$(loginForm, R.id.recaptcha);
mRecaptchaView = (RecaptchaView) ViewUtils.$$(loginForm, R.id.recaptcha_image);
mRegister = ViewUtils.$$(loginForm, R.id.register);
@@ -150,7 +148,7 @@ public final class SignInScene extends SolidScene implements EditText.OnEditorAc
mSkipSigningIn.setOnClickListener(this);
Context context = getContext2();
Assert.assertNotNull(context);
AssertUtils.assertNotNull(context);
EhApplication application = (EhApplication) context.getApplicationContext();
if (application.containGlobalStuff(mRequestId)) {
mSigningIn = true;
app/src/main/java/com/hippo/ehviewer/ui/scene/WebViewSignInScene.java
+2 -2
View File
@@ -32,10 +32,10 @@ import com.hippo.ehviewer.EhApplication;
import com.hippo.ehviewer.client.EhCookieStore;
import com.hippo.ehviewer.client.EhUrl;
import com.hippo.ehviewer.client.EhUtils;
import com.hippo.yorozuya.AssertUtils;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import junit.framework.Assert;
import okhttp3.Cookie;
import okhttp3.HttpUrl;
@@ -59,7 +59,7 @@ public class WebViewSignInScene extends SolidScene {
public View onCreateView2(LayoutInflater inflater,
@Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
Context context = getContext2();
Assert.assertNotNull(context);
AssertUtils.assertNotNull(context);
EhUtils.signOut(context);
app/src/main/java/com/hippo/scene/StageActivity.java
+2 -5
View File
@@ -25,13 +25,10 @@ import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import android.util.Log;
import android.view.View;
import com.hippo.ehviewer.R;
import com.hippo.ehviewer.ui.EhActivity;
import com.hippo.yorozuya.AssertUtils;
import com.hippo.yorozuya.IntIdGenerator;
import junit.framework.Assert;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -334,7 +331,7 @@ public abstract class StageActivity extends EhActivity {
String tag = mSceneTagList.get(mSceneTagList.size() - 1);
Fragment fragment = fragmentManager.findFragmentByTag(tag);
if (fragment != null) {
Assert.assertTrue(SceneFragment.class.isInstance(fragment));
AssertUtils.assertTrue(SceneFragment.class.isInstance(fragment));
currentScene = (SceneFragment) fragment;
}
}
app/src/main/java/com/hippo/widget/FabLayout.java
+3 -5
View File
@@ -26,13 +26,11 @@ import android.util.AttributeSet;
import android.view.View;
import android.view.ViewGroup;
import android.view.animation.Interpolator;
import com.hippo.ehviewer.R;
import com.hippo.yorozuya.AnimationUtils;
import com.hippo.yorozuya.AssertUtils;
import com.hippo.yorozuya.SimpleAnimatorListener;
import junit.framework.Assert;
public class FabLayout extends ViewGroup implements View.OnClickListener {
private static final long ANIMATE_TIME = 300L;
@@ -109,9 +107,9 @@ public class FabLayout extends ViewGroup implements View.OnClickListener {
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
Assert.assertEquals("Measure mode must be MeasureSpec.EXACTLY",
AssertUtils.assertEquals("Measure mode must be MeasureSpec.EXACTLY",
MeasureSpec.getMode(widthMeasureSpec), MeasureSpec.EXACTLY);
Assert.assertEquals("Measure mode must be MeasureSpec.EXACTLY",
AssertUtils.assertEquals("Measure mode must be MeasureSpec.EXACTLY",
MeasureSpec.getMode(heightMeasureSpec), MeasureSpec.EXACTLY);
int width = MeasureSpec.getSize(widthMeasureSpec);
app/src/main/java/com/hippo/widget/MaxSizeContainer.java
+3 -5
View File
@@ -21,10 +21,8 @@ import android.content.res.TypedArray;
import android.util.AttributeSet;
import android.view.View;
import android.view.ViewGroup;
import com.hippo.ehviewer.R;
import junit.framework.Assert;
import com.hippo.yorozuya.AssertUtils;
public class MaxSizeContainer extends ViewGroup {
@@ -70,7 +68,7 @@ public class MaxSizeContainer extends ViewGroup {
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
Assert.assertEquals("getChildCount() must be 1", 1, getChildCount());
AssertUtils.assertEquals("getChildCount() must be 1", 1, getChildCount());
View child = getChildAt(0);
if (child.getVisibility() != GONE) {
@@ -84,7 +82,7 @@ public class MaxSizeContainer extends ViewGroup {
@Override
protected void onLayout(boolean changed, int l, int t, int r, int b) {
Assert.assertEquals("getChildCount() must be 1", 1, getChildCount());
AssertUtils.assertEquals("getChildCount() must be 1", 1, getChildCount());
View child = getChildAt(0);
if (child.getVisibility() != GONE) {