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

Change layout

This commit is contained in:
stom79 2019-01-29 16:07:39 +01:00
parent 48d0646b83
commit d9bb2f3155
4 changed files with 181 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -290,7 +290,6 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
ImageView conversation_pp_3;
ImageView conversation_pp_4;
LinearLayout conversation_pp;
LinearLayout vertical_content;
RelativeLayout status_prev4_container;
TextView status_reply;
ImageView status_pin;
@ -399,7 +398,6 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
conversation_pp_4 = itemView.findViewById(R.id.conversation_pp_4);
conversation_pp_2_container = itemView.findViewById(R.id.conversation_pp_2_container);
conversation_pp_3_container = itemView.findViewById(R.id.conversation_pp_3_container);
vertical_content = itemView.findViewById(R.id.vertical_content);
left_buttons = itemView.findViewById(R.id.left_buttons);
status_show_more_content = itemView.findViewById(R.id.status_show_more_content);
spark_button_fav = itemView.findViewById(R.id.spark_button_fav);
@ -786,24 +784,6 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
holder.status_account_displayname.setCompoundDrawables(null, null, null, null);
holder.status_account_displayname_owner.setCompoundDrawables(null, null, imgConversation, null);
}
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( expand_media && status.isSensitive() || (status.getReblog() != null && status.getReblog().isSensitive())) {
changeDrawableColor(context, holder.hide_preview, R.color.red_1);
changeDrawableColor(context, holder.hide_preview_h, R.color.red_1);
@ -812,8 +792,6 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
changeDrawableColor(context, holder.hide_preview_h, R.color.white);
}
holder.vertical_content.setLayoutParams(params);
holder.left_buttons.setLayoutParams(paramsB);
if (!status.isClickable())
Status.transform(context, status);
if (!status.isEmojiFound())

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

@ -34,13 +34,14 @@
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="wrap_content"
android:layout_height="60dp"
android:layout_width="match_parent"
>
<ImageView
@ -130,7 +131,43 @@
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"
/>
</LinearLayout>
</LinearLayout>
<!-- RIGHT COLUMN -->
<LinearLayout
android:layout_marginStart="10dp"
android:layout_marginLeft="10dp"
@ -180,82 +217,33 @@
android:gravity="end"
android:layout_height="wrap_content" />
</LinearLayout>
</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">
<!-- SPOILER CONTAINER -->
<LinearLayout
android:id="@+id/left_buttons"
android:id="@+id/status_spoiler_container"
android:layout_width="match_parent"
android:orientation="vertical"
android:layout_width="60dp"
android:paddingEnd="10dp"
android:paddingRight="10dp"
android:visibility="gone"
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"
<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"
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"
/>
style="?attr/borderless"
android:text="@string/load_attachment_spoiler" />
</LinearLayout>
<LinearLayout
android:id="@+id/status_content_container"
@ -586,7 +574,7 @@
android:layout_width="match_parent"
android:scaleType="centerCrop"
android:layout_height="match_parent"
/>
/>
<ImageView
android:visibility="gone"
android:id="@+id/status_prev2_play"
@ -636,7 +624,7 @@
android:layout_width="match_parent"
android:scaleType="centerCrop"
android:layout_height="match_parent"
/>
/>
<ImageView
android:id="@+id/status_prev4_play"
android:layout_centerInParent="true"
@ -666,151 +654,150 @@
style="?attr/borderless"
android:text="@string/load_attachment" />
</LinearLayout>
</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"
<LinearLayout
android:id="@+id/status_spoiler_mention_container"
android:layout_width="match_parent"
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:orientation="vertical"
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" />
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: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_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"
/>
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:id="@+id/status_reblog_count"
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_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"
/>
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_favorite_count"
android:id="@+id/status_reply"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<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"
<LinearLayout
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
android:layout_width="25dp"
android:layout_height="25dp"
android:contentDescription="@string/toot_visibility_tilte"/>
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>
<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" />
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>
</LinearLayout>
</LinearLayout>
</LinearLayout>
<Button
android:id="@+id/fetch_more"
android:visibility="gone"

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

@ -129,12 +129,6 @@
android:contentDescription="@string/profile_picture" />
</RelativeLayout>
</LinearLayout>
<LinearLayout
android:visibility="gone"
android:id="@+id/vertical_content"
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<LinearLayout
android:id="@+id/left_buttons"
android:orientation="vertical"

7
app/src/main/res/layout/drawer_status_focused.xml
View File

@ -81,12 +81,7 @@
android:layout_height="wrap_content"
android:contentDescription="@string/profile_picture" />
</LinearLayout>
<LinearLayout
android:visibility="gone"
android:id="@+id/vertical_content"
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<LinearLayout
android:id="@+id/left_buttons"
android:orientation="vertical"