layout fix
This commit is contained in:
parent
b7efc8e6fc
commit
670bc23b0d
|
@ -45,6 +45,7 @@ public class MessageHolder extends ViewHolder implements OnClickListener, OnTagC
|
|||
|
||||
private TextView username, screenname, time, text;
|
||||
private ImageView profile, verifiedIcon, lockedIcon;
|
||||
private RecyclerView iconList;
|
||||
private Button answer, delete;
|
||||
|
||||
private OnItemClickListener listener;
|
||||
|
@ -61,7 +62,7 @@ public class MessageHolder extends ViewHolder implements OnClickListener, OnTagC
|
|||
|
||||
CardView background = (CardView) itemView;
|
||||
ViewGroup container = itemView.findViewById(R.id.item_message_container);
|
||||
RecyclerView attachments = itemView.findViewById(R.id.item_message_attachment_list);
|
||||
iconList = itemView.findViewById(R.id.item_message_attachment_list);
|
||||
profile = itemView.findViewById(R.id.item_message_profile);
|
||||
verifiedIcon = itemView.findViewById(R.id.item_message_verified);
|
||||
lockedIcon = itemView.findViewById(R.id.item_message_private);
|
||||
|
@ -78,8 +79,8 @@ public class MessageHolder extends ViewHolder implements OnClickListener, OnTagC
|
|||
|
||||
adapter = new IconAdapter(settings);
|
||||
adapter.addOnMediaClickListener(this);
|
||||
attachments.setLayoutManager(new LinearLayoutManager(parent.getContext(), HORIZONTAL, false));
|
||||
attachments.setAdapter(adapter);
|
||||
iconList.setLayoutManager(new LinearLayoutManager(parent.getContext(), HORIZONTAL, false));
|
||||
iconList.setAdapter(adapter);
|
||||
|
||||
itemView.setOnClickListener(this);
|
||||
profile.setOnClickListener(this);
|
||||
|
@ -134,12 +135,19 @@ public class MessageHolder extends ViewHolder implements OnClickListener, OnTagC
|
|||
*/
|
||||
public void setContent(Message message) {
|
||||
User sender = message.getSender();
|
||||
Spanned textSpan = Tagger.makeTextWithLinks(message.getText(), settings.getHighlightColor(), this);
|
||||
|
||||
username.setText(sender.getUsername());
|
||||
screenname.setText(sender.getScreenname());
|
||||
time.setText(StringTools.formatCreationTime(itemView.getResources(), message.getTimestamp()));
|
||||
text.setText(textSpan);
|
||||
adapter.addItems(message);
|
||||
|
||||
if (!message.getText().trim().isEmpty()) {
|
||||
Spanned textSpan = Tagger.makeTextWithLinks(message.getText(), settings.getHighlightColor(), this);
|
||||
text.setText(textSpan);
|
||||
text.setVisibility(View.VISIBLE);
|
||||
} else {
|
||||
text.setVisibility(View.GONE);
|
||||
}
|
||||
if (sender.isVerified()) {
|
||||
verifiedIcon.setVisibility(View.VISIBLE);
|
||||
} else {
|
||||
|
@ -150,7 +158,11 @@ public class MessageHolder extends ViewHolder implements OnClickListener, OnTagC
|
|||
} else {
|
||||
lockedIcon.setVisibility(View.GONE);
|
||||
}
|
||||
adapter.addItems(message);
|
||||
if (adapter.isEmpty()) {
|
||||
iconList.setVisibility(View.GONE);
|
||||
} else {
|
||||
iconList.setVisibility(View.VISIBLE);
|
||||
}
|
||||
String profileImageUrl = sender.getProfileImageThumbnailUrl();
|
||||
if (settings.imagesEnabled() && !profileImageUrl.isEmpty()) {
|
||||
Transformation roundCorner = new RoundedCornersTransformation(2, 0);
|
||||
|
|
|
@ -129,7 +129,7 @@ public class StatusHolder extends ViewHolder implements OnClickListener {
|
|||
repost.setText(StringTools.NUMBER_FORMAT.format(status.getRepostCount()));
|
||||
favorite.setText(StringTools.NUMBER_FORMAT.format(status.getFavoriteCount()));
|
||||
created.setText(StringTools.formatCreationTime(itemView.getResources(), status.getTimestamp()));
|
||||
if (!status.getText().isEmpty()) {
|
||||
if (!status.getText().trim().isEmpty()) {
|
||||
Spanned textSpan = Tagger.makeTextWithLinks(status.getText(), settings.getHighlightColor());
|
||||
text.setText(textSpan);
|
||||
text.setVisibility(View.VISIBLE);
|
||||
|
|
|
@ -44,6 +44,8 @@ public class ImageViewer extends MediaActivity {
|
|||
*/
|
||||
private static final String CACHE_FOLDER = "imagecache";
|
||||
|
||||
private static final int TOOLBAR_COLOR_MASK = 0xcfa0a0a0;
|
||||
|
||||
private ZoomView zoomImage;
|
||||
private ProgressBar loadingCircle;
|
||||
|
||||
|
@ -67,6 +69,7 @@ public class ImageViewer extends MediaActivity {
|
|||
settings = GlobalSettings.getInstance(this);
|
||||
AppStyles.setProgressColor(loadingCircle, settings.getHighlightColor());
|
||||
toolbar.setTitle("");
|
||||
toolbar.setBackgroundColor(settings.getBackgroundColor() & TOOLBAR_COLOR_MASK);
|
||||
setSupportActionBar(toolbar);
|
||||
|
||||
cacheFolder = new File(getExternalCacheDir(), ImageViewer.CACHE_FOLDER);
|
||||
|
|
|
@ -752,8 +752,10 @@ public class StatusActivity extends AppCompatActivity implements OnClickListener
|
|||
if ((status.getCards().length > 0 || status.getMedia().length > 0) || status.getPoll() != null) {
|
||||
cardList.setVisibility(VISIBLE);
|
||||
adapter.replaceAll(status);
|
||||
statusText.setMaxLines(5);
|
||||
} else {
|
||||
cardList.setVisibility(GONE);
|
||||
statusText.setMaxLines(10);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -94,6 +94,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/dmitem_text_margin"
|
||||
android:linksClickable="true"
|
||||
android:maxLines="@integer/dmitem_text_lines_max"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/item_message_profile_barrier"
|
||||
app:layout_constraintBottom_toTopOf="@id/item_message_attachment_list"
|
||||
|
@ -102,7 +103,7 @@
|
|||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/item_message_attachment_list"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_height="@dimen/dmitem_indicator_size"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/item_message_text"
|
||||
app:layout_constraintEnd_toEndOf="parent" />
|
||||
|
|
|
@ -166,7 +166,7 @@
|
|||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/item_status_layout_margin"
|
||||
android:maxLines="16"
|
||||
android:maxLines="10"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/item_status_text_barrier"
|
||||
app:layout_constraintEnd_toEndOf="parent" />
|
||||
|
|
|
@ -128,6 +128,8 @@
|
|||
<dimen name="dmitem_button_margin">5dp</dimen>
|
||||
<dimen name="dmitem_margin_layout">5dp</dimen>
|
||||
<dimen name="dmitem_icon_size">16sp</dimen>
|
||||
<dimen name="dmitem_indicator_size">30sp</dimen>
|
||||
<integer name="dmitem_text_lines_max">10</integer>
|
||||
|
||||
<!--dimens of item_account.xml-->
|
||||
<dimen name="login_name_textsize_big">14sp</dimen>
|
||||
|
|
Loading…
Reference in New Issue