Fixes issue #6
This commit is contained in:
parent
02eb980f0d
commit
bb4963b617
|
@ -52,6 +52,7 @@ import android.widget.Button;
|
||||||
import android.widget.EditText;
|
import android.widget.EditText;
|
||||||
import android.widget.ImageView;
|
import android.widget.ImageView;
|
||||||
import android.widget.LinearLayout;
|
import android.widget.LinearLayout;
|
||||||
|
import android.widget.ProgressBar;
|
||||||
import android.widget.RelativeLayout;
|
import android.widget.RelativeLayout;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
@ -201,7 +202,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
|
||||||
ImageView status_prev3_play;
|
ImageView status_prev3_play;
|
||||||
ImageView status_prev4_play;
|
ImageView status_prev4_play;
|
||||||
RelativeLayout status_prev4_container;
|
RelativeLayout status_prev4_container;
|
||||||
ImageView status_reply;
|
TextView status_reply;
|
||||||
ImageView status_pin;
|
ImageView status_pin;
|
||||||
ImageView status_privacy;
|
ImageView status_privacy;
|
||||||
FloatingActionButton status_translate;
|
FloatingActionButton status_translate;
|
||||||
|
@ -213,8 +214,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
|
||||||
LinearLayout status_action_container;
|
LinearLayout status_action_container;
|
||||||
LinearLayout status_replies;
|
LinearLayout status_replies;
|
||||||
LinearLayout status_replies_profile_pictures;
|
LinearLayout status_replies_profile_pictures;
|
||||||
TextView status_replies_text;
|
ProgressBar loader_replies;
|
||||||
LinearLayout loader_replies;
|
|
||||||
|
|
||||||
ImageView new_element;
|
ImageView new_element;
|
||||||
|
|
||||||
|
@ -264,7 +264,6 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
|
||||||
google_translate = itemView.findViewById(R.id.google_translate);
|
google_translate = itemView.findViewById(R.id.google_translate);
|
||||||
status_replies = itemView.findViewById(R.id.status_replies);
|
status_replies = itemView.findViewById(R.id.status_replies);
|
||||||
status_replies_profile_pictures = itemView.findViewById(R.id.status_replies_profile_pictures);
|
status_replies_profile_pictures = itemView.findViewById(R.id.status_replies_profile_pictures);
|
||||||
status_replies_text = itemView.findViewById(R.id.status_replies_text);
|
|
||||||
new_element = itemView.findViewById(R.id.new_element);
|
new_element = itemView.findViewById(R.id.new_element);
|
||||||
status_action_container = itemView.findViewById(R.id.status_action_container);
|
status_action_container = itemView.findViewById(R.id.status_action_container);
|
||||||
|
|
||||||
|
@ -340,26 +339,25 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
|
||||||
holder.status_replies_profile_pictures.removeAllViews();
|
holder.status_replies_profile_pictures.removeAllViews();
|
||||||
int i = 0;
|
int i = 0;
|
||||||
for (Status replies : status.getReplies()) {
|
for (Status replies : status.getReplies()) {
|
||||||
if (i > 4)
|
if (i > 10)
|
||||||
break;
|
break;
|
||||||
if (!addedPictures.contains(replies.getAccount().getAcct())) {
|
if (!addedPictures.contains(replies.getAccount().getAcct())) {
|
||||||
ImageView imageView = new ImageView(context);
|
ImageView imageView = new ImageView(context);
|
||||||
imageView.setMaxHeight((int) Helper.convertDpToPixel(40, context));
|
imageView.setMaxHeight((int) Helper.convertDpToPixel(30, context));
|
||||||
imageView.setMaxWidth((int) Helper.convertDpToPixel(40, context));
|
imageView.setMaxWidth((int) Helper.convertDpToPixel(30, context));
|
||||||
imageLoader.displayImage(replies.getAccount().getAvatar(), imageView, options);
|
imageLoader.displayImage(replies.getAccount().getAvatar(), imageView, options);
|
||||||
LinearLayout.LayoutParams imParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
|
LinearLayout.LayoutParams imParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
|
||||||
imParams.setMargins(10, 5, 10, 5);
|
imParams.setMargins(10, 5, 10, 5);
|
||||||
imParams.height = (int) Helper.convertDpToPixel(40, context);
|
imParams.height = (int) Helper.convertDpToPixel(30, context);
|
||||||
imParams.width = (int) Helper.convertDpToPixel(40, context);
|
imParams.width = (int) Helper.convertDpToPixel(30, context);
|
||||||
holder.status_replies_profile_pictures.addView(imageView, imParams);
|
holder.status_replies_profile_pictures.addView(imageView, imParams);
|
||||||
i++;
|
i++;
|
||||||
addedPictures.add(replies.getAccount().getAcct());
|
addedPictures.add(replies.getAccount().getAcct());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
holder.status_replies_text.setText(context.getResources().getQuantityString(R.plurals.preview_replies, status.getReplies().size(), status.getReplies().size()));
|
holder.status_reply.setText(String.valueOf(status.getReplies().size()));
|
||||||
holder.status_replies.setVisibility(View.VISIBLE);
|
holder.status_replies.setVisibility(View.VISIBLE);
|
||||||
holder.status_replies_text.setVisibility(View.VISIBLE);
|
|
||||||
holder.loader_replies.setVisibility(View.GONE);
|
holder.loader_replies.setVisibility(View.GONE);
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
|
@ -379,8 +377,6 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
|
||||||
holder.status_more.getLayoutParams().width = (int) Helper.convertDpToPixel((20*iconSizePercent/100), context);
|
holder.status_more.getLayoutParams().width = (int) Helper.convertDpToPixel((20*iconSizePercent/100), context);
|
||||||
holder.status_privacy.getLayoutParams().height = (int) Helper.convertDpToPixel((20*iconSizePercent/100), context);
|
holder.status_privacy.getLayoutParams().height = (int) Helper.convertDpToPixel((20*iconSizePercent/100), context);
|
||||||
holder.status_privacy.getLayoutParams().width = (int) Helper.convertDpToPixel((20*iconSizePercent/100), context);
|
holder.status_privacy.getLayoutParams().width = (int) Helper.convertDpToPixel((20*iconSizePercent/100), context);
|
||||||
holder.status_reply.getLayoutParams().height = (int) Helper.convertDpToPixel((20*iconSizePercent/100), context);
|
|
||||||
holder.status_reply.getLayoutParams().width = (int) Helper.convertDpToPixel((20*iconSizePercent/100), context);
|
|
||||||
holder.status_content.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14*textSizePercent/100);
|
holder.status_content.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14*textSizePercent/100);
|
||||||
holder.status_account_displayname.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14*textSizePercent/100);
|
holder.status_account_displayname.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14*textSizePercent/100);
|
||||||
holder.status_account_username.setTextSize(TypedValue.COMPLEX_UNIT_SP, 12*textSizePercent/100);
|
holder.status_account_username.setTextSize(TypedValue.COMPLEX_UNIT_SP, 12*textSizePercent/100);
|
||||||
|
@ -454,12 +450,14 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
|
||||||
if( theme == THEME_DARK){
|
if( theme == THEME_DARK){
|
||||||
holder.status_favorite_count.setTextColor(ContextCompat.getColor(context, R.color.dark_icon));
|
holder.status_favorite_count.setTextColor(ContextCompat.getColor(context, R.color.dark_icon));
|
||||||
holder.status_reblog_count.setTextColor(ContextCompat.getColor(context, R.color.dark_icon));
|
holder.status_reblog_count.setTextColor(ContextCompat.getColor(context, R.color.dark_icon));
|
||||||
|
holder.status_reply.setTextColor(ContextCompat.getColor(context, R.color.dark_icon));
|
||||||
holder.status_toot_date.setTextColor(ContextCompat.getColor(context, R.color.dark_icon));
|
holder.status_toot_date.setTextColor(ContextCompat.getColor(context, R.color.dark_icon));
|
||||||
holder.status_account_displayname.setTextColor(ContextCompat.getColor(context, R.color.dark_icon));
|
holder.status_account_displayname.setTextColor(ContextCompat.getColor(context, R.color.dark_icon));
|
||||||
}else {
|
}else {
|
||||||
holder.status_favorite_count.setTextColor(ContextCompat.getColor(context, R.color.black));
|
holder.status_favorite_count.setTextColor(ContextCompat.getColor(context, R.color.black));
|
||||||
holder.status_reblog_count.setTextColor(ContextCompat.getColor(context, R.color.black));
|
holder.status_reblog_count.setTextColor(ContextCompat.getColor(context, R.color.black));
|
||||||
holder.status_toot_date.setTextColor(ContextCompat.getColor(context, R.color.black));
|
holder.status_toot_date.setTextColor(ContextCompat.getColor(context, R.color.black));
|
||||||
|
holder.status_reply.setTextColor(ContextCompat.getColor(context, R.color.black));
|
||||||
holder.status_account_displayname.setTextColor(ContextCompat.getColor(context, R.color.black));
|
holder.status_account_displayname.setTextColor(ContextCompat.getColor(context, R.color.black));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -687,7 +685,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
Drawable imgFav, imgReblog, imgPinned;
|
Drawable imgFav, imgReblog, imgPinned, imgReply;
|
||||||
if( status.isFavourited() || (status.getReblog() != null && status.getReblog().isFavourited())) {
|
if( status.isFavourited() || (status.getReblog() != null && status.getReblog().isFavourited())) {
|
||||||
changeDrawableColor(context, R.drawable.ic_favorite,R.color.marked_icon);
|
changeDrawableColor(context, R.drawable.ic_favorite,R.color.marked_icon);
|
||||||
imgFav = ContextCompat.getDrawable(context, R.drawable.ic_favorite);
|
imgFav = ContextCompat.getDrawable(context, R.drawable.ic_favorite);
|
||||||
|
@ -720,14 +718,22 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
|
||||||
changeDrawableColor(context, R.drawable.ic_action_pin_dark,R.color.black);
|
changeDrawableColor(context, R.drawable.ic_action_pin_dark,R.color.black);
|
||||||
imgPinned = ContextCompat.getDrawable(context, R.drawable.ic_action_pin_dark);
|
imgPinned = ContextCompat.getDrawable(context, R.drawable.ic_action_pin_dark);
|
||||||
}
|
}
|
||||||
|
if( theme == THEME_DARK)
|
||||||
|
changeDrawableColor(context, R.drawable.ic_reply,R.color.dark_icon);
|
||||||
|
else
|
||||||
|
changeDrawableColor(context, R.drawable.ic_reply,R.color.black);
|
||||||
|
imgReply = ContextCompat.getDrawable(context, R.drawable.ic_reply);
|
||||||
|
|
||||||
|
|
||||||
imgFav.setBounds(0,0,(int) (20 * iconSizePercent/100 * scale + 0.5f),(int) (20 * iconSizePercent/100 * scale + 0.5f));
|
imgFav.setBounds(0,0,(int) (20 * iconSizePercent/100 * scale + 0.5f),(int) (20 * iconSizePercent/100 * scale + 0.5f));
|
||||||
imgReblog.setBounds(0,0,(int) (20 * iconSizePercent/100 * scale + 0.5f),(int) (20 * iconSizePercent/100 * scale + 0.5f));
|
imgReblog.setBounds(0,0,(int) (20 * iconSizePercent/100 * scale + 0.5f),(int) (20 * iconSizePercent/100 * scale + 0.5f));
|
||||||
imgPinned.setBounds(0,0,(int) (20 * iconSizePercent/100 * scale + 0.5f),(int) (20 * iconSizePercent/100 * scale + 0.5f));
|
imgPinned.setBounds(0,0,(int) (20 * iconSizePercent/100 * scale + 0.5f),(int) (20 * iconSizePercent/100 * scale + 0.5f));
|
||||||
|
imgReply.setBounds(0,0,(int) (20 * iconSizePercent/100 * scale + 0.5f),(int) (20 * iconSizePercent/100 * scale + 0.5f));
|
||||||
|
|
||||||
holder.status_favorite_count.setCompoundDrawables(imgFav, null, null, null);
|
holder.status_favorite_count.setCompoundDrawables(imgFav, null, null, null);
|
||||||
holder.status_reblog_count.setCompoundDrawables(imgReblog, null, null, null);
|
holder.status_reblog_count.setCompoundDrawables(imgReblog, null, null, null);
|
||||||
holder.status_pin.setImageDrawable(imgPinned);
|
holder.status_pin.setImageDrawable(imgPinned);
|
||||||
|
holder.status_reply.setCompoundDrawables(imgReply, null, null, null);
|
||||||
|
|
||||||
if( theme == Helper.THEME_LIGHT) {
|
if( theme == Helper.THEME_LIGHT) {
|
||||||
holder.status_show_more.setTextColor(ContextCompat.getColor(context, R.color.white));
|
holder.status_show_more.setTextColor(ContextCompat.getColor(context, R.color.white));
|
||||||
|
|
|
@ -356,13 +356,27 @@
|
||||||
android:layout_marginEnd="@dimen/activity_vertical_margin"
|
android:layout_marginEnd="@dimen/activity_vertical_margin"
|
||||||
android:layout_marginRight="@dimen/activity_vertical_margin"
|
android:layout_marginRight="@dimen/activity_vertical_margin"
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
<ImageView
|
<LinearLayout
|
||||||
android:id="@+id/status_reply"
|
android:layout_width="wrap_content"
|
||||||
android:layout_gravity="center_vertical"
|
android:layout_height="wrap_content"
|
||||||
android:layout_width="20dp"
|
android:orientation="horizontal">
|
||||||
android:layout_height="20dp"
|
<TextView
|
||||||
android:src="@drawable/ic_reply"
|
android:drawablePadding="2dp"
|
||||||
tools:ignore="ContentDescription" />
|
android:layout_gravity="center_vertical"
|
||||||
|
android:gravity="center_vertical"
|
||||||
|
android:id="@+id/status_reply"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content" />
|
||||||
|
<ProgressBar
|
||||||
|
android:id="@+id/loader_replies"
|
||||||
|
android:visibility="gone"
|
||||||
|
android:layout_marginLeft="10dp"
|
||||||
|
android:layout_marginStart="10dp"
|
||||||
|
android:indeterminate="true"
|
||||||
|
android:layout_width="30dp"
|
||||||
|
android:layout_height="30dp" />
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_marginLeft="20dp"
|
android:layout_marginLeft="20dp"
|
||||||
android:layout_marginStart="20dp"
|
android:layout_marginStart="20dp"
|
||||||
|
@ -416,42 +430,18 @@
|
||||||
tools:ignore="ContentDescription" />
|
tools:ignore="ContentDescription" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
<LinearLayout
|
|
||||||
android:visibility="gone"
|
|
||||||
android:id="@+id/loader_replies"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="horizontal">
|
|
||||||
<TextView
|
|
||||||
android:layout_marginStart="10dp"
|
|
||||||
android:layout_marginLeft="10dp"
|
|
||||||
android:layout_marginEnd="10dp"
|
|
||||||
android:layout_marginRight="10dp"
|
|
||||||
android:text="@string/replies"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content" />
|
|
||||||
<ProgressBar
|
|
||||||
android:layout_marginLeft="10dp"
|
|
||||||
android:layout_marginStart="10dp"
|
|
||||||
android:indeterminate="true"
|
|
||||||
android:layout_width="30dp"
|
|
||||||
android:layout_height="30dp" />
|
|
||||||
</LinearLayout>
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
android:layout_marginBottom="5dp"
|
android:layout_marginBottom="5dp"
|
||||||
|
android:layout_marginStart="@dimen/activity_vertical_margin"
|
||||||
|
android:layout_marginLeft="@dimen/activity_vertical_margin"
|
||||||
|
android:layout_marginEnd="@dimen/activity_vertical_margin"
|
||||||
|
android:layout_marginRight="@dimen/activity_vertical_margin"
|
||||||
android:id="@+id/status_replies"
|
android:id="@+id/status_replies"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal"
|
||||||
<TextView
|
android:baselineAligned="false">
|
||||||
android:layout_marginStart="10dp"
|
|
||||||
android:layout_marginLeft="10dp"
|
|
||||||
android:layout_marginEnd="10dp"
|
|
||||||
android:layout_marginRight="10dp"
|
|
||||||
android:id="@+id/status_replies_text"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content" />
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
android:id="@+id/status_replies_profile_pictures"
|
android:id="@+id/status_replies_profile_pictures"
|
||||||
|
|
Loading…
Reference in New Issue