MyHyvesBookPlus/TheReturnOfTheMyHyvesBookPlus
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/paul-profile' into niels-profile

Browse Source
This commit is contained in:
Niels Zwemmer
2017-06-21 14:40:32 +02:00
parent fa3f42da7e 63bef257da
commit 84a2c75c85
1 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile.xml
View File

@@ -30,45 +30,28 @@
<Space <Space
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="12dp" /> android:layout_height="10dp" />
<Button <ImageButton
android:id="@+id/logout_button" android:id="@+id/profile_pic_button"
android:layout_width="300dp" android:layout_width="60dp"
android:layout_height="50dp" android:layout_height="80dp"
android:background="?attr/colorPrimary" android:layout_marginStart="110dp"
android:onClick="logOutOnClick" android:background="@android:color/transparent"
android:text="@string/logout_button" android:elevation="1dp"
android:textColor="@android:color/white" app:srcCompat="@android:drawable/ic_menu_camera" />
android:textSize="16sp" />
<Space
android:layout_width="match_parent"
android:layout_height="20dp" />
<ImageView <ImageView
android:id="@+id/imageView_profile_picture" android:id="@+id/imageView_profile_picture"
android:contentDescription="@string/profile_picture_description" android:contentDescription="@string/profile_picture_description"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="300dp" android:layout_height="300dp"
app:srcCompat="@drawable/avatar_standard" /> app:srcCompat="@drawable/avatar_standard"
android:layout_marginTop="-70dp"/>
<Space <Space
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="20dp" /> android:layout_height="25dp" />
<Button
android:id="@+id/profile_pic_button"
android:layout_width="300dp"
android:layout_height="50dp"
android:background="?attr/colorPrimary"
android:text="@string/profile_picture_button"
android:textColor="@android:color/white"
android:textSize="16sp" />
<Space
android:layout_width="match_parent"
android:layout_height="20dp" />
<Button <Button
android:id="@+id/change_psw_button" android:id="@+id/change_psw_button"
@@ -83,6 +66,16 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="20dp" /> android:layout_height="20dp" />
<Button
android:id="@+id/logout_button"
android:layout_width="300dp"
android:layout_height="50dp"
android:background="?attr/colorPrimary"
android:onClick="logOutOnClick"
android:text="@string/logout_button"
android:textColor="@android:color/white"
android:textSize="16sp" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
</FrameLayout> </FrameLayout>