From fd4f473dee4bdfab00aef5b31e95b880af7377c9 Mon Sep 17 00:00:00 2001 From: houxg Date: Mon, 5 Dec 2016 19:12:51 +0800 Subject: [PATCH] code refactor: remove context param --- .../main/java/org/houxg/leamonax/ui/NoteFragment.java | 2 +- .../java/org/houxg/leamonax/ui/SearchActivity.java | 6 +++--- .../org/houxg/leamonax/ui/edit/SettingFragment.java | 2 +- .../java/org/houxg/leamonax/utils/DisplayUtils.java | 10 +++++----- .../leamonax/widget/RoundedRectBackgroundSpan.java | 3 +-- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/org/houxg/leamonax/ui/NoteFragment.java b/app/src/main/java/org/houxg/leamonax/ui/NoteFragment.java index 63c5afc..637a223 100644 --- a/app/src/main/java/org/houxg/leamonax/ui/NoteFragment.java +++ b/app/src/main/java/org/houxg/leamonax/ui/NoteFragment.java @@ -79,7 +79,7 @@ public class NoteFragment extends Fragment implements NoteAdapter.NoteAdapterLis RecyclerView.LayoutManager layoutManager = new LinearLayoutManager(container.getContext()); mNoteListView.setLayoutManager(layoutManager); mNoteListView.setItemAnimator(new DefaultItemAnimator()); - mNoteListView.addItemDecoration(new DividerDecoration(DisplayUtils.dp2px(container.getContext(), 8))); + mNoteListView.addItemDecoration(new DividerDecoration(DisplayUtils.dp2px(8))); mAdapter = new NoteAdapter(this); mNoteListView.setAdapter(mAdapter); diff --git a/app/src/main/java/org/houxg/leamonax/ui/SearchActivity.java b/app/src/main/java/org/houxg/leamonax/ui/SearchActivity.java index 47cde9d..1cc218e 100644 --- a/app/src/main/java/org/houxg/leamonax/ui/SearchActivity.java +++ b/app/src/main/java/org/houxg/leamonax/ui/SearchActivity.java @@ -58,9 +58,9 @@ public class SearchActivity extends BaseActivity implements NoteAdapter.NoteAdap mNoteListView.setLayoutManager(layoutManager); mNoteListView.setItemAnimator(new DefaultItemAnimator()); - int dashGap = DisplayUtils.dp2px(this, 4); - int dashWidth = DisplayUtils.dp2px(this, 8); - int height = DisplayUtils.dp2px(this, 1); + int dashGap = DisplayUtils.dp2px(4); + int dashWidth = DisplayUtils.dp2px(8); + int height = DisplayUtils.dp2px(1); mNoteListView.addItemDecoration(new DashDividerDecoration(0xffa0a0a0, dashGap, dashWidth, height)); mAdapter = new NoteAdapter(this); mNoteListView.setAdapter(mAdapter); diff --git a/app/src/main/java/org/houxg/leamonax/ui/edit/SettingFragment.java b/app/src/main/java/org/houxg/leamonax/ui/edit/SettingFragment.java index fc6200a..0101ed1 100644 --- a/app/src/main/java/org/houxg/leamonax/ui/edit/SettingFragment.java +++ b/app/src/main/java/org/houxg/leamonax/ui/edit/SettingFragment.java @@ -77,7 +77,7 @@ public class SettingFragment extends Fragment { mTagEt.setAdapter(arrayAdapter); mTagEt.setTokenizer(new MultiAutoCompleteTextView.CommaTokenizer()); - final int tagPadding = DisplayUtils.dp2px(container.getContext(), 2); + final int tagPadding = DisplayUtils.dp2px(2); mTagEt.addTextChangedListener(new TextWatcher() { @Override public void beforeTextChanged(CharSequence s, int start, int count, int after) { diff --git a/app/src/main/java/org/houxg/leamonax/utils/DisplayUtils.java b/app/src/main/java/org/houxg/leamonax/utils/DisplayUtils.java index 9c961a7..788813a 100644 --- a/app/src/main/java/org/houxg/leamonax/utils/DisplayUtils.java +++ b/app/src/main/java/org/houxg/leamonax/utils/DisplayUtils.java @@ -1,16 +1,16 @@ package org.houxg.leamonax.utils; -import android.content.Context; +import org.houxg.leamonax.Leamonax; public class DisplayUtils { - public static int dp2px(Context context, float dp) { - final float scale = context.getResources().getDisplayMetrics().density; + public static int dp2px(float dp) { + final float scale = Leamonax.getContext().getResources().getDisplayMetrics().density; return (int) (dp * scale + 0.5f); } - public static int px2dp(Context context, float px) { - final float scale = context.getResources().getDisplayMetrics().density; + public static int px2dp(float px) { + final float scale = Leamonax.getContext().getResources().getDisplayMetrics().density; return (int) (px / scale + 0.5f); } } diff --git a/app/src/main/java/org/houxg/leamonax/widget/RoundedRectBackgroundSpan.java b/app/src/main/java/org/houxg/leamonax/widget/RoundedRectBackgroundSpan.java index bd4d325..dc7a8a8 100644 --- a/app/src/main/java/org/houxg/leamonax/widget/RoundedRectBackgroundSpan.java +++ b/app/src/main/java/org/houxg/leamonax/widget/RoundedRectBackgroundSpan.java @@ -6,7 +6,6 @@ import android.graphics.Paint; import android.graphics.RectF; import android.text.style.ReplacementSpan; -import org.houxg.leamonax.Leamonax; import org.houxg.leamonax.utils.DisplayUtils; public class RoundedRectBackgroundSpan extends ReplacementSpan { @@ -34,7 +33,7 @@ public class RoundedRectBackgroundSpan extends ReplacementSpan { @Override public void draw(Canvas canvas, CharSequence text, int start, int end, float x, int top, int y, int bottom, Paint paint) { mTempRect.set(x, top, x + paint.measureText(text, start, end) + padding * 2, bottom); - float offsetY = DisplayUtils.dp2px(Leamonax.getContext(), 2); + float offsetY = DisplayUtils.dp2px(2); mTempRect.offset(0, -offsetY); int textColor = paint.getColor(); paint.setColor(mColor);