From afecf51bfaa0a2f6ff886a1c252ab202bbef7c91 Mon Sep 17 00:00:00 2001 From: tom79 Date: Sun, 29 Sep 2019 15:33:59 +0200 Subject: [PATCH] Larger media when alone --- .../android/activities/BaseMainActivity.java | 2 +- .../android/drawers/PixelfedListAdapter.java | 22 ++++++++++++++++--- app/src/main/res/layout/drawer_pixelfed.xml | 9 ++++++++ 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java index 2ee392647..3575423bc 100644 --- a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java @@ -282,7 +282,7 @@ public abstract class BaseMainActivity extends BaseActivity countNewNotifications = 0; //TODO: remove that line - social = UpdateAccountInfoAsyncTask.SOCIAL.PIXELFED; + // social = UpdateAccountInfoAsyncTask.SOCIAL.PIXELFED; regex_home = sharedpreferences.getString(Helper.SET_FILTER_REGEX_HOME, null); regex_local = sharedpreferences.getString(Helper.SET_FILTER_REGEX_LOCAL, null); diff --git a/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java index a4f46d444..3577e0d81 100644 --- a/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java @@ -20,10 +20,12 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.database.sqlite.SQLiteDatabase; +import android.graphics.Bitmap; import android.os.AsyncTask; import android.os.Bundle; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.core.content.ContextCompat; import androidx.cardview.widget.CardView; @@ -46,9 +48,13 @@ import android.widget.TextView; import android.widget.Toast; import com.bumptech.glide.Glide; +import com.bumptech.glide.load.DataSource; +import com.bumptech.glide.load.engine.GlideException; import com.bumptech.glide.load.resource.bitmap.FitCenter; import com.bumptech.glide.load.resource.bitmap.RoundedCorners; +import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.RequestOptions; +import com.bumptech.glide.request.target.Target; import com.smarteist.autoimageslider.IndicatorAnimations; import com.smarteist.autoimageslider.SliderAnimations; import com.smarteist.autoimageslider.SliderView; @@ -68,6 +74,7 @@ import app.fedilab.android.client.Entities.Emojis; import app.fedilab.android.client.Entities.Error; import app.fedilab.android.client.Entities.Notification; import app.fedilab.android.client.Entities.Status; +import app.fedilab.android.client.Glide.GlideApp; import app.fedilab.android.helper.CrossActions; import app.fedilab.android.helper.Helper; import app.fedilab.android.helper.MastalabAutoCompleteTextView; @@ -330,7 +337,7 @@ public class PixelfedListAdapter extends RecyclerView.Adapter implements OnPostA private class ViewHolderPixelfed extends RecyclerView.ViewHolder { SliderView imageSlider; - ImageView pf_pp, pf_comment; + ImageView art_media, pf_pp, pf_comment; SparkButton pf_fav, pf_share; TextView pf_username, pf_likes, pf_description, pf_date; CardView pf_cardview; @@ -348,6 +355,7 @@ public class PixelfedListAdapter extends RecyclerView.Adapter implements OnPostA ViewHolderPixelfed(View itemView) { super(itemView); + art_media = itemView.findViewById(R.id.art_media); imageSlider = itemView.findViewById(R.id.imageSlider); pf_pp = itemView.findViewById(R.id.pf_pp); pf_username = itemView.findViewById(R.id.pf_username); @@ -553,12 +561,20 @@ public class PixelfedListAdapter extends RecyclerView.Adapter implements OnPostA - if (status.getMedia_attachments() != null && status.getMedia_attachments().size() > 0){ + if (status.getMedia_attachments() != null && status.getMedia_attachments().size() > 1){ SliderAdapter sliderAdapter = new SliderAdapter(new WeakReference<>((Activity)context), false, status.getMedia_attachments()); holder.imageSlider.setSliderAdapter(sliderAdapter); holder.imageSlider.setIndicatorAnimation(IndicatorAnimations.WORM); holder.imageSlider.setSliderTransformAnimation(SliderAnimations.SIMPLETRANSFORMATION); - + holder.art_media.setVisibility(View.GONE); + holder.imageSlider.setVisibility(View.VISIBLE); + }else if(status.getMedia_attachments() != null ){ + holder.art_media.setVisibility(View.VISIBLE); + holder.imageSlider.setVisibility(View.GONE); + GlideApp.with(context) + .asBitmap() + .load(status.getMedia_attachments().get(0).getPreview_url()) + .into(holder.art_media); } holder.pf_likes.setText(context.getResources().getQuantityString(R.plurals.likes, status.getFavourites_count(), status.getFavourites_count())); diff --git a/app/src/main/res/layout/drawer_pixelfed.xml b/app/src/main/res/layout/drawer_pixelfed.xml index 8e30c8900..a8d708bb6 100644 --- a/app/src/main/res/layout/drawer_pixelfed.xml +++ b/app/src/main/res/layout/drawer_pixelfed.xml @@ -56,6 +56,7 @@ + +