diff options
author | tom79 <tschneider.ac@gmail.com> | 2019-05-12 14:48:23 +0200 |
---|---|---|
committer | tom79 <tschneider.ac@gmail.com> | 2019-05-12 14:48:23 +0200 |
commit | ddea5e1653dae437e5f7c23ab72b7c13fecfb84c (patch) | |
tree | d5531ccc3abd703ee5dc26299c9076571e5f758d /app/src/main/res/layout | |
parent | a894a75a82470a68246519120b946ee084e77d1e (diff) |
#915 comment - Change layout for statuses
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r-- | app/src/main/res/layout/drawer_status.xml | 464 | ||||
-rw-r--r-- | app/src/main/res/layout/drawer_status_compact.xml | 26 | ||||
-rw-r--r-- | app/src/main/res/layout/drawer_status_focused.xml | 31 |
3 files changed, 247 insertions, 274 deletions
diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml index 94032b09f..9b2d6d640 100644 --- a/app/src/main/res/layout/drawer_status.xml +++ b/app/src/main/res/layout/drawer_status.xml @@ -15,6 +15,7 @@ You should have received a copy of the GNU General Public License along with Mastalab; if not, see <http://www.gnu.org/licenses>. --> + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" @@ -26,19 +27,13 @@ android:layout_marginEnd="5dp" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" - android:divider="?android:dividerHorizontal" - android:showDividers="end" - android:orientation="vertical"> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:baselineAligned="false"> + android:orientation="horizontal" + > + <LinearLayout - android:layout_height="wrap_content" - android:layout_width="50dp" - android:orientation="vertical" - > + android:layout_width="60dp" + android:layout_height="match_parent" + android:orientation="vertical"> <RelativeLayout android:layout_height="wrap_content" android:layout_width="match_parent" @@ -130,14 +125,61 @@ android:visibility="gone" android:contentDescription="@string/profile_picture" /> </RelativeLayout> + <LinearLayout + android:id="@+id/left_buttons" + android:orientation="vertical" + android:layout_width="60dp" + android:paddingEnd="10dp" + android:paddingRight="10dp" + 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> <LinearLayout + android:orientation="vertical" android:layout_marginStart="10dp" android:layout_marginLeft="10dp" android:layout_width="0dp" android:layout_weight="1" - android:layout_height="wrap_content" - android:orientation="vertical"> + android:layout_height="wrap_content"> <TextView android:id="@+id/status_account_displayname" android:maxLines="1" @@ -187,93 +229,32 @@ 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"> <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" - /> - <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" - /> + style="?attr/borderless" + android:text="@string/load_attachment_spoiler" /> </LinearLayout> <LinearLayout android:id="@+id/status_content_container" @@ -420,13 +401,10 @@ android:layout_width="match_parent" android:layout_height="match_parent"/> </FrameLayout> - - <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" > - <RelativeLayout android:id="@+id/status_horizontal_document_container" android:visibility="gone" @@ -697,176 +675,168 @@ </RelativeLayout> </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: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:orientation="vertical" 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:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - <include + 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" - layout="@layout/layout_poll" /> - </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"> - <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: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:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + <include + android:layout_width="match_parent" + android:layout_height="wrap_content" + layout="@layout/layout_poll" /> + </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"> <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: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: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_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> + <Button + android:id="@+id/fetch_more" + android:visibility="gone" + android:textAllCaps="false" + android:drawableLeft="@drawable/ic_fetch_more" + android:drawableStart="@drawable/ic_fetch_more" + android:gravity="center" + android:layout_gravity="center" + android:drawablePadding="5dp" + android:textStyle="bold" + android:textSize="16sp" + android:maxLines="1" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + style="?attr/borderless" + android:text="@string/fetch_more_toots" /> </LinearLayout> - </LinearLayout> - <Button - android:id="@+id/fetch_more" - android:visibility="gone" - android:textAllCaps="false" - android:drawableLeft="@drawable/ic_fetch_more" - android:drawableStart="@drawable/ic_fetch_more" - android:gravity="center" - android:layout_gravity="center" - android:drawablePadding="5dp" - android:textStyle="bold" - android:textSize="16sp" - android:maxLines="1" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - style="?attr/borderless" - android:text="@string/fetch_more_toots" /> + </LinearLayout> diff --git a/app/src/main/res/layout/drawer_status_compact.xml b/app/src/main/res/layout/drawer_status_compact.xml index 5dc10eefe..17f437532 100644 --- a/app/src/main/res/layout/drawer_status_compact.xml +++ b/app/src/main/res/layout/drawer_status_compact.xml @@ -26,8 +26,6 @@ android:layout_marginEnd="5dp" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" - android:divider="?android:dividerHorizontal" - android:showDividers="end" android:orientation="vertical"> <LinearLayout android:layout_width="match_parent" @@ -37,7 +35,7 @@ android:baselineAligned="false"> <LinearLayout android:layout_height="wrap_content" - android:layout_width="50dp" + android:layout_width="40dp" android:orientation="vertical" > <RelativeLayout @@ -45,8 +43,8 @@ android:layout_width="match_parent" > <ImageView - android:layout_width="50dp" - android:layout_height="50dp" + android:layout_width="40dp" + android:layout_height="40dp" android:layout_marginTop="5dp" android:layout_centerHorizontal="true" android:id="@+id/status_account_profile" @@ -55,8 +53,8 @@ <LinearLayout android:id="@+id/conversation_pp" android:visibility="gone" - android:layout_width="50dp" - android:layout_height="50dp" + android:layout_width="40dp" + android:layout_height="40dp" android:orientation="horizontal"> <ImageView android:id="@+id/conversation_pp_1" @@ -109,8 +107,8 @@ </LinearLayout> <ImageView - android:layout_width="50dp" - android:layout_height="50dp" + android:layout_width="40dp" + android:layout_height="40dp" android:layout_alignParentStart="true" android:layout_alignParentLeft="true" android:layout_centerHorizontal="true" @@ -119,11 +117,11 @@ android:contentDescription="@string/profile_picture" /> <ImageView android:id="@+id/status_account_profile_boost_by" - android:layout_height="30dp" - android:layout_width="30dp" + android:layout_height="20dp" + android:layout_width="20dp" android:layout_alignParentEnd="true" android:layout_alignParentRight="true" - android:layout_marginTop="25dp" + android:layout_marginTop="20dp" style="?attr/shapeBorder" android:visibility="gone" android:contentDescription="@string/profile_picture" /> @@ -150,7 +148,7 @@ android:layout_marginStart="-2dp" android:layout_marginLeft="-2dp" android:textStyle="bold" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" /> <LinearLayout @@ -169,7 +167,7 @@ android:maxLines="1" android:drawablePadding="2dp" android:textStyle="bold" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" /> <TextView android:textSize="12sp" diff --git a/app/src/main/res/layout/drawer_status_focused.xml b/app/src/main/res/layout/drawer_status_focused.xml index fc6e9c868..5aa04b96a 100644 --- a/app/src/main/res/layout/drawer_status_focused.xml +++ b/app/src/main/res/layout/drawer_status_focused.xml @@ -95,13 +95,6 @@ android:layout_weight="1" android:layout_height="wrap_content" android:orientation="vertical"> - <ImageView - android:id="@+id/cached_status" - android:visibility="gone" - android:layout_width="20dp" - android:layout_height="20dp" - android:src="@drawable/ic_cached_black" - android:contentDescription="@string/cached_status" /> <TextView android:id="@+id/status_account_displayname" android:maxLines="1" @@ -109,13 +102,25 @@ android:drawablePadding="2dp" android:layout_width="wrap_content" android:layout_height="wrap_content" /> - <TextView - android:id="@+id/status_account_displayname_owner" - android:maxLines="1" - android:drawablePadding="2dp" - android:textStyle="bold" + <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" /> + android:layout_height="wrap_content" + android:orientation="horizontal"> + <ImageView + android:id="@+id/cached_status" + android:visibility="gone" + android:layout_width="20dp" + android:layout_height="20dp" + android:src="@drawable/ic_cached_black" + android:contentDescription="@string/cached_status" /> + <TextView + android:id="@+id/status_account_displayname_owner" + android:maxLines="1" + android:drawablePadding="2dp" + android:textStyle="bold" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + </LinearLayout> <TextView android:textSize="12sp" android:maxLines="1" |