Paul profile #6

Merged
11306084 merged 29 commits from paul-profile into master 2017-06-22 11:39:39 +02:00
Showing only changes of commit 291261fcee - Show all commits

View File

@@ -1,4 +1,5 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -6,24 +7,40 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:layout_height="match_parent"
<Button
android:id="@+id/logout_button"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight=".50"
android:onClick="logOutOnClick"
android:text="@string/logout_button" />
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<Button
android:id="@+id/profile_pic_button"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight=".50"
android:text="@string/profile_picture_button" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<Button
android:id="@+id/logout_button"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:onClick="logOutOnClick"
android:text="@string/logout_button" />
<ImageView
android:id="@+id/imageView_profile_picture"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
app:srcCompat="@drawable/ic_account_box_black_24dp" />
<Button
android:id="@+id/profile_pic_button"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:text="@string/profile_picture_button" />
</LinearLayout>
</ScrollView>
</LinearLayout>
</FrameLayout>