From a2f0cf6f561165bda4e8e74948600a7243ba2a72 Mon Sep 17 00:00:00 2001 From: Mariotaku Lee Date: Sat, 6 Jun 2015 21:11:16 +0800 Subject: [PATCH] trying to change image view implementation --- twidere/build.gradle | 1 + .../util/imageloader/TwidereImageDownloader.java | 2 +- .../twidere/view/holder/StatusViewHolder.java | 11 +++++++---- .../card_item_message_conversation_incoming.xml | 2 +- .../src/main/res/layout/card_item_status_common.xml | 2 +- .../src/main/res/layout/card_item_status_compact.xml | 2 +- twidere/src/main/res/values/styles.xml | 6 ++++++ 7 files changed, 18 insertions(+), 8 deletions(-) diff --git a/twidere/build.gradle b/twidere/build.gradle index 5065c856c..77d22f7df 100644 --- a/twidere/build.gradle +++ b/twidere/build.gradle @@ -86,6 +86,7 @@ dependencies { compile 'ch.acra:acra:4.6.2' compile 'org.jraf:android-switch-backport:2.0.1' compile 'com.fasterxml.jackson.core:jackson-databind:2.4.4' + compile 'com.makeramen:roundedimageview:2.1.0' googleCompile 'com.google.android.gms:play-services-maps:7.5.0' googleCompile 'com.google.maps.android:android-maps-utils:0.3.4' fdroidCompile 'org.osmdroid:osmdroid-android:4.3' diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/imageloader/TwidereImageDownloader.java b/twidere/src/main/java/org/mariotaku/twidere/util/imageloader/TwidereImageDownloader.java index 2a3216eda..bef8e0907 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/imageloader/TwidereImageDownloader.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/imageloader/TwidereImageDownloader.java @@ -88,7 +88,7 @@ public class TwidereImageDownloader extends BaseImageDownloader implements Const if (mUseThumbor && mPreferences.getBoolean(KEY_THUMBOR_ENABLED)) { final String address = mPreferences.getString(KEY_THUMBOR_ADDRESS, null); final String securityKey = mPreferences.getString(KEY_THUMBOR_SECURITY_KEY, null); - if (URLUtil.isValidUrl(address)) { + if (address != null && URLUtil.isValidUrl(address)) { if (TextUtils.isEmpty(securityKey)) { mThumbor = Thumbor.create(address); } else { diff --git a/twidere/src/main/java/org/mariotaku/twidere/view/holder/StatusViewHolder.java b/twidere/src/main/java/org/mariotaku/twidere/view/holder/StatusViewHolder.java index 9a8f253c9..3119efe1c 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/view/holder/StatusViewHolder.java +++ b/twidere/src/main/java/org/mariotaku/twidere/view/holder/StatusViewHolder.java @@ -15,6 +15,8 @@ import android.view.View.OnLongClickListener; import android.widget.ImageView; import android.widget.TextView; +import com.makeramen.roundedimageview.RoundedImageView; + import org.mariotaku.twidere.Constants; import org.mariotaku.twidere.R; import org.mariotaku.twidere.adapter.iface.ContentCardClickListener; @@ -58,7 +60,7 @@ public class StatusViewHolder extends ViewHolder implements Constants, OnClickLi private final IStatusesAdapter adapter; private final ImageView replyRetweetIcon; - private final ShapedImageView profileImageView; + private final RoundedImageView profileImageView; private final ImageView profileTypeView; private final ImageView extraTypeView; private final TextView textView; @@ -80,7 +82,7 @@ public class StatusViewHolder extends ViewHolder implements Constants, OnClickLi super(itemView); this.adapter = adapter; itemContent = (IColorLabelView) itemView.findViewById(R.id.item_content); - profileImageView = (ShapedImageView) itemView.findViewById(R.id.profile_image); + profileImageView = (RoundedImageView) itemView.findViewById(R.id.profile_image); profileTypeView = (ImageView) itemView.findViewById(R.id.profile_type); extraTypeView = (ImageView) itemView.findViewById(R.id.extra_type); textView = (TextView) itemView.findViewById(R.id.text); @@ -545,7 +547,7 @@ public class StatusViewHolder extends ViewHolder implements Constants, OnClickLi return (CardView) itemView.findViewById(R.id.card); } - public ShapedImageView getProfileImageView() { + public ImageView getProfileImageView() { return profileImageView; } @@ -631,7 +633,8 @@ public class StatusViewHolder extends ViewHolder implements Constants, OnClickLi public void setupViewOptions() { setTextSize(adapter.getTextSize()); mediaPreview.setStyle(adapter.getMediaPreviewStyle()); - profileImageView.setStyle(adapter.getProfileImageStyle()); +// profileImageView.setStyle(adapter.getProfileImageStyle()); + profileImageView.setOval(adapter.getProfileImageStyle() == ShapedImageView.SHAPE_CIRCLE); actionButtons.setVisibility(adapter.isCardActionsHidden() ? View.GONE : View.VISIBLE); itemMenu.setVisibility(adapter.isCardActionsHidden() ? View.GONE : View.VISIBLE); diff --git a/twidere/src/main/res/layout/card_item_message_conversation_incoming.xml b/twidere/src/main/res/layout/card_item_message_conversation_incoming.xml index 94dd6b733..5344ed5b3 100644 --- a/twidere/src/main/res/layout/card_item_message_conversation_incoming.xml +++ b/twidere/src/main/res/layout/card_item_message_conversation_incoming.xml @@ -23,7 +23,7 @@ android:layout_height="wrap_content" android:padding="8dp"> - - - 10%p ?android:colorBackground circle + true + 2dp