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

Fix layout issue

This commit is contained in:
stom79 2019-02-01 17:50:35 +01:00
parent 4c2542cd09
commit d97e4c9de7
2 changed files with 223 additions and 191 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

@ -795,6 +795,24 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
changeDrawableColor(context, holder.hide_preview, R.color.white);
changeDrawableColor(context, holder.hide_preview_h, R.color.white);
}
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
LinearLayout.LayoutParams paramsB = new LinearLayout.LayoutParams((int)Helper.convertDpToPixel(60, context), LinearLayout.LayoutParams.WRAP_CONTENT);
if( status.getReblog() == null && !isCompactMode && getItemViewType(viewHolder.getAdapterPosition()) != FOCUSED_STATUS){
params.setMargins(0,-(int)Helper.convertDpToPixel(10, context),0,0);
if (status.getSpoiler_text() != null && status.getSpoiler_text().trim().length() > 0 )
paramsB.setMargins(0,(int)Helper.convertDpToPixel(10, context),0,0);
else
paramsB.setMargins(0,(int)Helper.convertDpToPixel(15, context),0,0);
}else if( !isCompactMode && getItemViewType(viewHolder.getAdapterPosition()) != FOCUSED_STATUS){
if( status.getContent() == null || status.getContent().trim().equals("")) {
params.setMargins(0, -(int) Helper.convertDpToPixel(20, context), 0, 0);
paramsB.setMargins(0,(int) Helper.convertDpToPixel(20, context),0,0);
}else {
params.setMargins(0, 0, 0, 0);
paramsB.setMargins(0,0,0,0);
}
}
if (!status.isClickable())
Status.transform(context, status);

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

@ -34,14 +34,13 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:baselineAligned="false">
<!-- LEFT COLUMN -->
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="50dp"
android:orientation="vertical"
>
<RelativeLayout
android:layout_height="60dp"
android:layout_height="wrap_content"
android:layout_width="match_parent"
>
<ImageView
@ -131,54 +130,7 @@
android:visibility="gone"
android:contentDescription="@string/profile_picture" />
</RelativeLayout>
<LinearLayout
android:id="@+id/left_buttons"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/new_element"
android:layout_gravity="center_horizontal"
android:src="@drawable/ic_fiber_new"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/new_toot" />
<ImageButton
android:id="@+id/status_translate"
android:layout_gravity="center_horizontal"
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@drawable/ic_translate"
android:contentDescription="@string/translate"
style="@style/Base.Widget.AppCompat.Button.Colored"
/>
<ImageButton
android:id="@+id/status_bookmark"
android:gravity="center"
android:layout_gravity="center_horizontal"
android:tint="@android:color/white"
style="@style/Base.Widget.AppCompat.Button.Colored"
android:layout_width="40dp"
android:layout_height="40dp"
android:contentDescription="@string/bookmarks"
android:src="@drawable/ic_bookmark_border"
android:layout_marginTop="5dp"
/>
<ImageView
android:id="@+id/status_remove"
android:gravity="center"
android:visibility="gone"
android:layout_gravity="center_horizontal"
android:layout_width="20dp"
android:layout_height="20dp"
android:contentDescription="@string/delete"
android:src="@drawable/ic_clear_toot"
android:layout_marginTop="5dp"
/>
</LinearLayout>
</LinearLayout>
<!-- RIGHT COLUMN -->
<LinearLayout
android:layout_marginStart="10dp"
android:layout_marginLeft="10dp"
@ -228,33 +180,93 @@
android:gravity="end"
android:layout_height="wrap_content" />
</LinearLayout>
<!-- SPOILER CONTAINER -->
<LinearLayout
android:id="@+id/status_spoiler_container"
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/vertical_content"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_marginStart="60dp"
android:layout_marginLeft="60dp"
android:id="@+id/status_spoiler_container"
android:layout_width="match_parent"
android:orientation="vertical"
android:visibility="gone"
android:layout_height="wrap_content">
<fr.gouv.etalab.mastodon.helper.CustomTextView
android:id="@+id/status_spoiler"
android:layout_marginBottom="10dp"
android:textIsSelectable="true"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<Button
android:id="@+id/status_spoiler_button"
android:textAllCaps="false"
android:drawableLeft="@drawable/ic_remove_red_eye"
android:drawableStart="@drawable/ic_remove_red_eye"
android:gravity="center_vertical"
android:drawablePadding="5dp"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:maxLines="1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="?attr/borderless"
android:text="@string/load_attachment_spoiler" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/left_buttons"
android:orientation="vertical"
android:visibility="gone"
android:layout_width="60dp"
android:paddingEnd="10dp"
android:paddingRight="10dp"
android:layout_height="wrap_content">
<fr.gouv.etalab.mastodon.helper.CustomTextView
android:id="@+id/status_spoiler"
android:layout_marginBottom="10dp"
android:textIsSelectable="true"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<Button
android:id="@+id/status_spoiler_button"
android:textAllCaps="false"
android:drawableLeft="@drawable/ic_remove_red_eye"
android:drawableStart="@drawable/ic_remove_red_eye"
android:gravity="center_vertical"
android:drawablePadding="5dp"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:maxLines="1"
android:layout_width="match_parent"
<ImageView
android:id="@+id/new_element"
android:layout_gravity="center_horizontal"
android:src="@drawable/ic_fiber_new"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?attr/borderless"
android:text="@string/load_attachment_spoiler" />
android:contentDescription="@string/new_toot" />
<ImageButton
android:id="@+id/status_translate"
android:layout_gravity="center_horizontal"
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@drawable/ic_translate"
android:contentDescription="@string/translate"
style="@style/Base.Widget.AppCompat.Button.Colored"
/>
<ImageButton
android:id="@+id/status_bookmark"
android:gravity="center"
android:layout_gravity="center_horizontal"
android:tint="@android:color/white"
style="@style/Base.Widget.AppCompat.Button.Colored"
android:layout_width="40dp"
android:layout_height="40dp"
android:contentDescription="@string/bookmarks"
android:src="@drawable/ic_bookmark_border"
android:layout_marginTop="5dp"
/>
<ImageView
android:id="@+id/status_remove"
android:gravity="center"
android:visibility="gone"
android:layout_gravity="center_horizontal"
android:layout_width="20dp"
android:layout_height="20dp"
android:contentDescription="@string/delete"
android:src="@drawable/ic_clear_toot"
android:layout_marginTop="5dp"
/>
</LinearLayout>
<LinearLayout
android:id="@+id/status_content_container"
@ -268,6 +280,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<Button
android:layout_marginTop="-10dp"
android:paddingTop="2dp"
android:paddingBottom="2dp"
android:id="@+id/status_show_more_content"
@ -666,150 +679,151 @@
style="?attr/borderless"
android:text="@string/load_attachment" />
</LinearLayout>
<LinearLayout
android:id="@+id/status_spoiler_mention_container"
</LinearLayout>
<LinearLayout
android:layout_marginStart="60dp"
android:layout_marginLeft="60dp"
android:id="@+id/status_spoiler_mention_container"
android:layout_width="match_parent"
android:orientation="vertical"
android:visibility="gone"
android:layout_height="wrap_content">
<TextView
android:id="@+id/status_mention_spoiler"
android:layout_marginBottom="10dp"
android:layout_width="match_parent"
android:orientation="vertical"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:layout_marginStart="60dp"
android:layout_marginLeft="60dp"
android:id="@+id/status_peertube_container"
android:layout_width="match_parent"
android:visibility="gone"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:orientation="horizontal">
<TextView
android:drawablePadding="2dp"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:textColor="?colorAccent"
android:visibility="gone"
android:text="@string/reply"
android:id="@+id/status_peertube_reply"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:drawablePadding="2dp"
android:layout_marginStart="15dp"
android:layout_marginLeft="15dp"
android:visibility="gone"
android:textColor="?colorAccent"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:text="@string/delete"
android:id="@+id/status_peertube_delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>/
<LinearLayout
android:layout_marginStart="60dp"
android:layout_marginLeft="60dp"
android:id="@+id/status_action_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:orientation="horizontal">
<TextView
android:drawablePadding="2dp"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:id="@+id/status_reply"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<LinearLayout
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
android:orientation="horizontal"
android:layout_height="wrap_content">
<TextView
android:id="@+id/status_mention_spoiler"
android:layout_marginBottom="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:id="@+id/status_peertube_container"
android:layout_width="match_parent"
android:visibility="gone"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:orientation="horizontal">
<com.varunest.sparkbutton.SparkButton
android:id="@+id/spark_button_reblog"
android:layout_width="30dp"
android:layout_height="30dp"
app:sparkbutton_activeImage="@drawable/ic_repeat_boost"
app:sparkbutton_inActiveImage="@drawable/ic_repeat"
app:sparkbutton_iconSize="20dp"
android:contentDescription="@string/reblog"
/>
<TextView
android:drawablePadding="2dp"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:textColor="?colorAccent"
android:visibility="gone"
android:text="@string/reply"
android:id="@+id/status_peertube_reply"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:drawablePadding="2dp"
android:layout_marginStart="15dp"
android:layout_marginLeft="15dp"
android:visibility="gone"
android:textColor="?colorAccent"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:text="@string/delete"
android:id="@+id/status_peertube_delete"
android:id="@+id/status_reblog_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:id="@+id/status_action_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:orientation="horizontal">
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
android:orientation="horizontal"
android:layout_height="wrap_content">
<com.varunest.sparkbutton.SparkButton
android:id="@+id/spark_button_fav"
android:layout_width="30dp"
android:layout_height="30dp"
app:sparkbutton_activeImage="@drawable/ic_star"
app:sparkbutton_inActiveImage="@drawable/ic_star_border"
android:contentDescription="@string/favourite"
app:sparkbutton_iconSize="20dp"
/>
<TextView
android:drawablePadding="2dp"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:id="@+id/status_reply"
android:id="@+id/status_favorite_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:layout_width="wrap_content"
<ImageView
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:id="@+id/status_pin"
android:layout_gravity="center_vertical"
android:contentDescription="@string/pin_add"
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_pin_drop"/>
<LinearLayout
android:layout_width="0dp"
android:layout_weight="1"
android:layout_gravity="end"
android:gravity="end"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/status_privacy"
android:layout_gravity="center_vertical"
android:orientation="horizontal"
android:layout_height="wrap_content">
<com.varunest.sparkbutton.SparkButton
android:id="@+id/spark_button_reblog"
android:layout_width="30dp"
android:layout_height="30dp"
app:sparkbutton_activeImage="@drawable/ic_repeat_boost"
app:sparkbutton_inActiveImage="@drawable/ic_repeat"
app:sparkbutton_iconSize="20dp"
android:contentDescription="@string/reblog"
/>
<TextView
android:drawablePadding="2dp"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:id="@+id/status_reblog_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
android:orientation="horizontal"
android:layout_height="wrap_content">
<com.varunest.sparkbutton.SparkButton
android:id="@+id/spark_button_fav"
android:layout_width="30dp"
android:layout_height="30dp"
app:sparkbutton_activeImage="@drawable/ic_star"
app:sparkbutton_inActiveImage="@drawable/ic_star_border"
android:contentDescription="@string/favourite"
app:sparkbutton_iconSize="20dp"
/>
<TextView
android:drawablePadding="2dp"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:id="@+id/status_favorite_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
android:layout_width="25dp"
android:layout_height="25dp"
android:contentDescription="@string/toot_visibility_tilte"/>
<ImageView
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:id="@+id/status_pin"
android:layout_gravity="center_vertical"
android:contentDescription="@string/pin_add"
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_pin_drop"/>
<LinearLayout
android:layout_width="0dp"
android:layout_weight="1"
android:layout_gravity="end"
android:gravity="end"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/status_privacy"
android:layout_gravity="center_vertical"
android:layout_width="25dp"
android:layout_height="25dp"
android:contentDescription="@string/toot_visibility_tilte"/>
<ImageView
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:id="@+id/status_more"
android:layout_width="25dp"
android:layout_height="25dp"
android:src="@drawable/ic_more_horiz"
android:contentDescription="@string/display_toot_truncate" />
</LinearLayout>
android:id="@+id/status_more"
android:layout_width="25dp"
android:layout_height="25dp"
android:src="@drawable/ic_more_horiz"
android:contentDescription="@string/display_toot_truncate" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<Button
android:id="@+id/fetch_more"
android:visibility="gone"
@ -826,4 +840,4 @@
android:layout_height="wrap_content"
style="?attr/borderless"
android:text="@string/fetch_more_toots" />
</LinearLayout>
</LinearLayout>