Merge branch 'develop' of https://gitlab.com/tom79/mastalab into develop

This commit is contained in:
stom79 2018-11-10 09:49:45 +01:00
commit 8e75f17818
1 changed files with 14 additions and 11 deletions

View File

@ -112,26 +112,29 @@
android:layout_height="wrap_content"
tools:ignore="HardcodedText" />
<!-- About UX/UI designer -->
<TextView
android:padding="5dp"
android:layout_marginTop="10dp"
android:id="@+id/about_thanks_ux"
android:layout_width="match_parent"
android:textColor="?colorAccent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:textSize="16sp"
android:text="@string/thanks_text_ux"/>
android:layout_gravity="center_vertical|center_horizontal"
android:layout_marginTop="10dp"
android:gravity="center_vertical|center_horizontal"
android:padding="5dp"
android:text="@string/thanks_text_ux"
android:textColor="?colorAccent"
android:textSize="16sp" />
<fr.gouv.etalab.mastodon.helper.ExpandableHeightListView
android:id="@+id/lv_ux"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scrollbars="none"
android:divider="@null"/>
android:layout_gravity="center_vertical|center_horizontal"
android:layout_marginLeft="150dp"
android:layout_marginRight="150dp"
android:divider="@null"
android:scrollbars="none" />
<!-- About banner designer -->
<TextView
android:id="@+id/about_thanks_banner"