Merge branch 'ui_design' into develop

This commit is contained in:
stom79 2018-11-10 09:49:38 +01:00
commit f093634057
6 changed files with 8 additions and 6 deletions

View File

@ -140,8 +140,6 @@
android:textSize="16sp"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
<TextView
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
android:textColor="?attr/color_in_account_header"
android:id="@+id/account_un"
android:maxLines="1"
@ -438,7 +436,6 @@
android:id="@+id/account_tabLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:tabTextAppearance="@android:style/TextAppearance.Widget.TabWidget"
app:tabMode="fixed"
app:tabGravity="fill"
/>

View File

@ -138,8 +138,6 @@
android:textSize="16sp"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
<TextView
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
android:textColor="?attr/color_in_account_header"
android:id="@+id/account_un"
android:maxLines="1"
@ -436,7 +434,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:tabSelectedTextColor="?attr/colorAccent"
app:tabTextAppearance="@android:style/TextAppearance.Widget.TabWidget"
app:tabMode="fixed"
app:tabGravity="fill"
/>

View File

@ -20,6 +20,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:id="@+id/main_container"
android:orientation="horizontal">
<ImageView

View File

@ -20,6 +20,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/account_container"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:orientation="horizontal">
<ImageView
android:layout_gravity="center"

View File

@ -21,6 +21,8 @@
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:padding="2dp"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:id="@+id/account_container"
android:orientation="horizontal">
<ImageView

View File

@ -20,6 +20,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/main_container"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:orientation="vertical">
<TextView
android:id="@+id/account_search_title"