From d24a9dd5a977d3df7f8afd6aafe564ac89790a93 Mon Sep 17 00:00:00 2001 From: Christophe Beyls Date: Mon, 12 Dec 2016 18:22:53 +0100 Subject: [PATCH] Fixed dips to pixels rounding --- .../v4/preference/PreferenceFragment.java | 19 +++++++++---------- .../fragments/RecyclerViewFragment.java | 4 ++-- .../fosdem/fragments/SmoothListFragment.java | 4 ++-- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/android/support/v4/preference/PreferenceFragment.java b/app/src/main/java/android/support/v4/preference/PreferenceFragment.java index 93febbc..e78fafc 100644 --- a/app/src/main/java/android/support/v4/preference/PreferenceFragment.java +++ b/app/src/main/java/android/support/v4/preference/PreferenceFragment.java @@ -22,9 +22,8 @@ import android.widget.ListView; /** * A PreferenceFragment for the support library. Based on the platform's code with some removed features and a basic ListView layout. - * + * * @author Christophe Beyls - * */ public abstract class PreferenceFragment extends Fragment { @@ -32,19 +31,19 @@ public abstract class PreferenceFragment extends Fragment { static final int MSG_BIND_PREFERENCES = 1; static final int MSG_REQUEST_FOCUS = 2; private static final String PREFERENCES_TAG = "android:preferences"; - private static final float HC_HORIZONTAL_PADDING = 16; + private static final float HC_HORIZONTAL_PADDING = 16f; @SuppressLint("HandlerLeak") private final Handler mHandler = new Handler() { @Override public void handleMessage(Message msg) { switch (msg.what) { - case MSG_BIND_PREFERENCES: - bindPreferences(); - break; - case MSG_REQUEST_FOCUS: - mList.focusableViewAvailable(mList); - break; + case MSG_BIND_PREFERENCES: + bindPreferences(); + break; + case MSG_REQUEST_FOCUS: + mList.focusableViewAvailable(mList); + break; } } }; @@ -70,7 +69,7 @@ public abstract class PreferenceFragment extends Fragment { ListView listView = new ListView(getActivity()); listView.setId(android.R.id.list); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { - final int horizontalPadding = (int) (HC_HORIZONTAL_PADDING * getResources().getDisplayMetrics().density); + final int horizontalPadding = (int) (HC_HORIZONTAL_PADDING * getResources().getDisplayMetrics().density + 0.5f); listView.setPadding(horizontalPadding, 0, horizontalPadding, 0); } return listView; diff --git a/app/src/main/java/be/digitalia/fosdem/fragments/RecyclerViewFragment.java b/app/src/main/java/be/digitalia/fosdem/fragments/RecyclerViewFragment.java index e77332d..c5e5e09 100644 --- a/app/src/main/java/be/digitalia/fosdem/fragments/RecyclerViewFragment.java +++ b/app/src/main/java/be/digitalia/fosdem/fragments/RecyclerViewFragment.java @@ -24,7 +24,7 @@ import be.digitalia.fosdem.widgets.ContentLoadingProgressBar; */ public class RecyclerViewFragment extends Fragment { - private static final int DEFAULT_EMPTY_VIEW_PADDING_DIPS = 16; + private static final float DEFAULT_EMPTY_VIEW_PADDING_DIPS = 16f; static class ViewHolder { FrameLayout container; @@ -90,7 +90,7 @@ public class RecyclerViewFragment extends Fragment { protected View onCreateEmptyView(LayoutInflater inflater, ViewGroup container, @Nullable Bundle savedInstanceState) { TextView textView = new TextView(inflater.getContext()); textView.setGravity(Gravity.CENTER); - int textPadding = (int) (getResources().getDisplayMetrics().density * DEFAULT_EMPTY_VIEW_PADDING_DIPS); + int textPadding = (int) (getResources().getDisplayMetrics().density * DEFAULT_EMPTY_VIEW_PADDING_DIPS + 0.5f); textView.setPadding(textPadding, textPadding, textPadding, textPadding); return textView; } diff --git a/app/src/main/java/be/digitalia/fosdem/fragments/SmoothListFragment.java b/app/src/main/java/be/digitalia/fosdem/fragments/SmoothListFragment.java index 4e0c12d..4fb5a46 100644 --- a/app/src/main/java/be/digitalia/fosdem/fragments/SmoothListFragment.java +++ b/app/src/main/java/be/digitalia/fosdem/fragments/SmoothListFragment.java @@ -24,7 +24,7 @@ import be.digitalia.fosdem.widgets.ContentLoadingProgressBar; */ public class SmoothListFragment extends Fragment { - private static final int DEFAULT_EMPTY_VIEW_PADDING_DIPS = 16; + private static final float DEFAULT_EMPTY_VIEW_PADDING_DIPS = 16f; static class ViewHolder { FrameLayout container; @@ -52,7 +52,7 @@ public class SmoothListFragment extends Fragment { protected View onCreateEmptyView(LayoutInflater inflater, ViewGroup container, @Nullable Bundle savedInstanceState) { TextView textView = new TextView(inflater.getContext()); textView.setGravity(Gravity.CENTER); - int textPadding = (int) (getResources().getDisplayMetrics().density * DEFAULT_EMPTY_VIEW_PADDING_DIPS); + int textPadding = (int) (getResources().getDisplayMetrics().density * DEFAULT_EMPTY_VIEW_PADDING_DIPS + 0.5f); textView.setPadding(textPadding, textPadding, textPadding, textPadding); return textView; }