Larger media when alone
This commit is contained in:
parent
f4907a4c7b
commit
afecf51bfa
|
@ -282,7 +282,7 @@ public abstract class BaseMainActivity extends BaseActivity
|
||||||
countNewNotifications = 0;
|
countNewNotifications = 0;
|
||||||
|
|
||||||
//TODO: remove that line
|
//TODO: remove that line
|
||||||
social = UpdateAccountInfoAsyncTask.SOCIAL.PIXELFED;
|
// social = UpdateAccountInfoAsyncTask.SOCIAL.PIXELFED;
|
||||||
|
|
||||||
regex_home = sharedpreferences.getString(Helper.SET_FILTER_REGEX_HOME, null);
|
regex_home = sharedpreferences.getString(Helper.SET_FILTER_REGEX_HOME, null);
|
||||||
regex_local = sharedpreferences.getString(Helper.SET_FILTER_REGEX_LOCAL, null);
|
regex_local = sharedpreferences.getString(Helper.SET_FILTER_REGEX_LOCAL, null);
|
||||||
|
|
|
@ -20,10 +20,12 @@ import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.SharedPreferences;
|
import android.content.SharedPreferences;
|
||||||
import android.database.sqlite.SQLiteDatabase;
|
import android.database.sqlite.SQLiteDatabase;
|
||||||
|
import android.graphics.Bitmap;
|
||||||
import android.os.AsyncTask;
|
import android.os.AsyncTask;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
|
import androidx.annotation.Nullable;
|
||||||
import androidx.constraintlayout.widget.ConstraintLayout;
|
import androidx.constraintlayout.widget.ConstraintLayout;
|
||||||
import androidx.core.content.ContextCompat;
|
import androidx.core.content.ContextCompat;
|
||||||
import androidx.cardview.widget.CardView;
|
import androidx.cardview.widget.CardView;
|
||||||
|
@ -46,9 +48,13 @@ import android.widget.TextView;
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
import com.bumptech.glide.Glide;
|
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.FitCenter;
|
||||||
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
|
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.RequestOptions;
|
||||||
|
import com.bumptech.glide.request.target.Target;
|
||||||
import com.smarteist.autoimageslider.IndicatorAnimations;
|
import com.smarteist.autoimageslider.IndicatorAnimations;
|
||||||
import com.smarteist.autoimageslider.SliderAnimations;
|
import com.smarteist.autoimageslider.SliderAnimations;
|
||||||
import com.smarteist.autoimageslider.SliderView;
|
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.Error;
|
||||||
import app.fedilab.android.client.Entities.Notification;
|
import app.fedilab.android.client.Entities.Notification;
|
||||||
import app.fedilab.android.client.Entities.Status;
|
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.CrossActions;
|
||||||
import app.fedilab.android.helper.Helper;
|
import app.fedilab.android.helper.Helper;
|
||||||
import app.fedilab.android.helper.MastalabAutoCompleteTextView;
|
import app.fedilab.android.helper.MastalabAutoCompleteTextView;
|
||||||
|
@ -330,7 +337,7 @@ public class PixelfedListAdapter extends RecyclerView.Adapter implements OnPostA
|
||||||
|
|
||||||
private class ViewHolderPixelfed extends RecyclerView.ViewHolder {
|
private class ViewHolderPixelfed extends RecyclerView.ViewHolder {
|
||||||
SliderView imageSlider;
|
SliderView imageSlider;
|
||||||
ImageView pf_pp, pf_comment;
|
ImageView art_media, pf_pp, pf_comment;
|
||||||
SparkButton pf_fav, pf_share;
|
SparkButton pf_fav, pf_share;
|
||||||
TextView pf_username, pf_likes, pf_description, pf_date;
|
TextView pf_username, pf_likes, pf_description, pf_date;
|
||||||
CardView pf_cardview;
|
CardView pf_cardview;
|
||||||
|
@ -348,6 +355,7 @@ public class PixelfedListAdapter extends RecyclerView.Adapter implements OnPostA
|
||||||
|
|
||||||
ViewHolderPixelfed(View itemView) {
|
ViewHolderPixelfed(View itemView) {
|
||||||
super(itemView);
|
super(itemView);
|
||||||
|
art_media = itemView.findViewById(R.id.art_media);
|
||||||
imageSlider = itemView.findViewById(R.id.imageSlider);
|
imageSlider = itemView.findViewById(R.id.imageSlider);
|
||||||
pf_pp = itemView.findViewById(R.id.pf_pp);
|
pf_pp = itemView.findViewById(R.id.pf_pp);
|
||||||
pf_username = itemView.findViewById(R.id.pf_username);
|
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());
|
SliderAdapter sliderAdapter = new SliderAdapter(new WeakReference<>((Activity)context), false, status.getMedia_attachments());
|
||||||
holder.imageSlider.setSliderAdapter(sliderAdapter);
|
holder.imageSlider.setSliderAdapter(sliderAdapter);
|
||||||
holder.imageSlider.setIndicatorAnimation(IndicatorAnimations.WORM);
|
holder.imageSlider.setIndicatorAnimation(IndicatorAnimations.WORM);
|
||||||
holder.imageSlider.setSliderTransformAnimation(SliderAnimations.SIMPLETRANSFORMATION);
|
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()));
|
holder.pf_likes.setText(context.getResources().getQuantityString(R.plurals.likes, status.getFavourites_count(), status.getFavourites_count()));
|
||||||
|
|
|
@ -56,6 +56,7 @@
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
<com.smarteist.autoimageslider.SliderView
|
<com.smarteist.autoimageslider.SliderView
|
||||||
android:id="@+id/imageSlider"
|
android:id="@+id/imageSlider"
|
||||||
|
android:visibility="gone"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="300dp"
|
android:layout_height="300dp"
|
||||||
app:sliderAnimationDuration="1000"
|
app:sliderAnimationDuration="1000"
|
||||||
|
@ -73,6 +74,14 @@
|
||||||
app:sliderScrollTimeInSec="1"
|
app:sliderScrollTimeInSec="1"
|
||||||
app:sliderStartAutoCycle="false" />
|
app:sliderStartAutoCycle="false" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:visibility="gone"
|
||||||
|
android:id="@+id/art_media"
|
||||||
|
android:scaleType="fitCenter"
|
||||||
|
android:adjustViewBounds="true"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content" />
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:paddingLeft="10dp"
|
android:paddingLeft="10dp"
|
||||||
|
|
Loading…
Reference in New Issue