Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Improve cards - Issue #556

This commit is contained in:
stom79 2018-11-08 18:40:02 +01:00
parent aee4b0ff63
commit b3700d7e77
4 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
View File

@ -42,7 +42,6 @@ import android.text.Spannable;
import android.text.Spanned;
import android.text.method.LinkMovementMethod;
import android.text.style.ForegroundColorSpan;
import android.util.Log;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.MenuItem;
@ -526,6 +525,10 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
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_reply.setTextColor(ContextCompat.getColor(context, R.color.dark_icon));
holder.status_cardview_title.setTextColor(ContextCompat.getColor(context, R.color.mastodonC2));
holder.status_cardview_content.setTextColor(ContextCompat.getColor(context, R.color.dark_icon));
holder.status_cardview_url.setTextColor(ContextCompat.getColor(context, R.color.dark_icon));
}else if( theme == Helper.THEME_DARK ){
changeDrawableColor(context, R.drawable.ic_reply,R.color.dark_icon);
changeDrawableColor(context, holder.status_more, R.color.dark_icon);
@ -541,6 +544,10 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
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_reply.setTextColor(ContextCompat.getColor(context, R.color.dark_icon));
holder.status_cardview_title.setTextColor(ContextCompat.getColor(context, R.color.mastodonC2));
holder.status_cardview_content.setTextColor(ContextCompat.getColor(context, R.color.dark_icon));
holder.status_cardview_url.setTextColor(ContextCompat.getColor(context, R.color.dark_icon));
}else {
changeDrawableColor(context, R.drawable.ic_reply,R.color.black);
changeDrawableColor(context, R.drawable.ic_more_horiz,R.color.black);
@ -559,6 +566,10 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
holder.status_favorite_count.setTextColor(ContextCompat.getColor(context, R.color.black));
holder.status_reblog_count.setTextColor(ContextCompat.getColor(context, R.color.black));
holder.status_reply.setTextColor(ContextCompat.getColor(context, R.color.black));
holder.status_cardview_title.setTextColor(ContextCompat.getColor(context, R.color.black));
holder.status_cardview_content.setTextColor(ContextCompat.getColor(context, R.color.black));
holder.status_cardview_url.setTextColor(ContextCompat.getColor(context, R.color.black));
}
if( theme == THEME_DARK) {
holder.status_account_displayname.setTextColor(ContextCompat.getColor(context, R.color.dark_text_toot_header));
@ -1136,6 +1147,10 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
}
if( type == RetrieveFeedsAsyncTask.Type.CONTEXT || display_card){
if( type == RetrieveFeedsAsyncTask.Type.CONTEXT)
holder.status_cardview_content.setVisibility(View.VISIBLE);
else
holder.status_cardview_content.setVisibility(View.GONE);
if( position == conversationPosition || display_card){
Card card = status.getReblog()!= null?status.getReblog().getCard():status.getCard();
@ -1149,6 +1164,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
if( !((Activity)context).isFinishing())
Glide.with(holder.status_cardview_image.getContext())
.load(card.getImage())
.apply(new RequestOptions().transforms(new CenterCrop(), new RoundedCorners((int)Helper.convertDpToPixel(7, context))))
.into(holder.status_cardview_image);
}else
holder.status_cardview_image.setVisibility(View.GONE);

8
app/src/main/res/drawable/card_border.xml
View File

@ -3,13 +3,7 @@
<solid android:color="@color/transparent"/>
<stroke android:width="1dp"
android:color="@color/mastodonC1__"
/>
<padding android:left="1dp"
android:top="1dp"
android:right="1dp"
android:bottom="1dp"
android:color="@color/notif_dark_3"
/>
<corners android:bottomRightRadius="7dp" android:bottomLeftRadius="7dp"

13
app/src/main/res/layout/drawer_status.xml
View File

@ -283,11 +283,10 @@
<LinearLayout
android:id="@+id/status_cardview"
android:padding="5dp"
android:layout_marginBottom="5dp"
android:visibility="gone"
android:background="@drawable/card_border"
android:layout_width="match_parent"
android:gravity="center_vertical"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
@ -295,19 +294,23 @@
android:id="@+id/status_cardview_image"
android:layout_width="80dp"
android:gravity="center"
android:scaleType="centerCrop"
android:layout_height="80dp"
tools:ignore="ContentDescription" />
<LinearLayout
android:orientation="vertical"
android:layout_width="0dp"
android:layout_marginLeft="2dp"
android:layout_marginStart="2dp"
android:padding="5dp"
android:gravity="center_vertical"
android:layout_marginLeft="5dp"
android:layout_marginStart="5dp"
android:layout_weight="1"
android:layout_height="wrap_content">
<TextView
android:textSize="14sp"
android:maxLines="1"
android:textStyle="bold"
android:singleLine="true"
android:id="@+id/status_cardview_title"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@ -316,7 +319,7 @@
android:id="@+id/status_cardview_content"
android:layout_width="match_parent"
android:textSize="12sp"
android:maxLines="4"
android:maxLines="3"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/status_cardview_url"

1
app/src/main/res/layout/drawer_status_compact.xml
View File

@ -289,6 +289,7 @@
android:orientation="vertical"
android:layout_width="0dp"
android:layout_marginLeft="2dp"
android:gravity="center_vertical"
android:layout_marginStart="2dp"
android:layout_weight="1"
android:layout_height="wrap_content">