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

Merge branch 'bug_fix' into develop

This commit is contained in:
stom79 2017-11-01 08:42:25 +01:00
parent 18508ac1f8 c3f7324629
commit 7394b4e93b
1 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
app/src/main/res/layout-sw600dp/activity_show_account.xml
View File

@ -30,7 +30,7 @@
android:fitsSystemWindows="true"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.design.widget.CollapsingToolbarLayout
android:layout_width="500dp"
android:layout_width="match_parent"
android:layout_gravity="center_horizontal"
android:id="@+id/collapsingToolbarLayout"
android:layout_height="wrap_content"
@ -52,17 +52,20 @@
android:scaleType="centerCrop"
app:layout_collapseMode="parallax"
tools:ignore="ContentDescription" />
<Space
android:layout_width="250dp"
android:layout_height="250dp"
android:layout_centerHorizontal="true"
android:id="@+id/blankspace" />
<android.support.design.widget.FloatingActionButton
android:layout_gravity="end|bottom"
android:visibility="gone"
app:fabSize="mini"
android:id="@+id/account_follow"
android:textAllCaps="false"
android:layout_toRightOf="@id/blankspace"
android:layout_toEndOf="@id/blankspace"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_marginRight="10dp"
android:layout_marginEnd="10dp"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginBottom="5dp"
@ -78,13 +81,15 @@
android:layout_marginEnd="10dp"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginTop="5dp"/>
android:layout_marginTop="5dp"
tools:ignore="ContentDescription" />
</RelativeLayout>
<LinearLayout
android:layout_marginTop="60dp"
android:layout_below="@+id/top_banner"
android:id="@+id/main_header_container"
android:layout_width="match_parent"
android:layout_width="500dp"
android:layout_centerHorizontal="true"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:gravity="center"
@ -97,14 +102,15 @@
android:gravity="center"
android:orientation="horizontal"
android:layout_height="wrap_content"
>
android:baselineAligned="false">
<LinearLayout
android:layout_width="0dp"
android:layout_weight="1"
android:orientation="vertical"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
tools:ignore="UselessParent">
<TextView
android:id="@+id/account_dn"
android:textColor="@color/mastodonC4"
@ -116,7 +122,8 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:orientation="horizontal"
tools:ignore="UseCompoundDrawables">
<TextView
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
@ -216,11 +223,23 @@
android:layout_gravity="center_vertical"
android:id="@+id/show_account_title"
android:maxLines="1"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:textSize="14sp"
android:textColor="?attr/actionBarTextColor"
/>
<ImageButton
android:background="?attr/selectableItemBackgroundBorderless"
android:id="@+id/action_more"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_gravity="center"
android:src="@drawable/ic_more_vert"
android:layout_marginEnd="10dp"
android:layout_marginRight="10dp"
android:gravity="center"
tools:ignore="ContentDescription" />
</LinearLayout>
</android.support.v7.widget.Toolbar>