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:06:49 +02:00
parent 1a944364c4 4005bef38c
commit fe1960fdce
4 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,8 +12,8 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:gravity="center"
android:gravity="center"> android:orientation="vertical">
<Space <Space
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -24,9 +24,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="Name:"
android:textSize="25sp" android:textSize="25sp"
android:textStyle="bold" android:textStyle="bold" />
android:text="Name:" />
<Space <Space
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -36,20 +36,48 @@
android:id="@+id/logout_button" android:id="@+id/logout_button"
android:layout_width="300dp" android:layout_width="300dp"
android:layout_height="50dp" android:layout_height="50dp"
android:background="?attr/colorPrimary"
android:onClick="logOutOnClick" android:onClick="logOutOnClick"
android:text="@string/logout_button" /> android:text="@string/logout_button"
android:textColor="@android:color/white"
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:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="300dp" android:layout_height="300dp"
app:srcCompat="@drawable/ic_account_box_black_24dp" /> app:srcCompat="@drawable/ic_account_box_black_24dp" />
<Space
android:layout_width="match_parent"
android:layout_height="20dp" />
<Button <Button
android:id="@+id/profile_pic_button" android:id="@+id/profile_pic_button"
android:layout_width="300dp" android:layout_width="300dp"
android:layout_height="50dp" android:layout_height="50dp"
android:text="@string/profile_picture_button" /> 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
android:id="@+id/change_psw_button"
android:layout_width="300dp"
android:layout_height="50dp"
android:background="?attr/colorPrimary"
android:text="@string/change_psw_button"
android:textColor="@android:color/white"
android:textSize="16sp" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

2
app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml
View File

@@ -15,4 +15,6 @@
<string name="logo_text">MyHyvesBookPlusTagram logo</string> <string name="logo_text">MyHyvesBookPlusTagram logo</string>
<string name="logout_button">Uitloggen</string> <string name="logout_button">Uitloggen</string>
<string name="profile_picture_button">Wijzig Profiel Foto</string> <string name="profile_picture_button">Wijzig Profiel Foto</string>
<string name="profile_picture_description">profiel foto</string>
<string name="change_psw_button">Wachtwoord wijzigen</string>
</resources> </resources>

2
app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml
View File

@@ -20,4 +20,6 @@
<string name="logo_text">MyHyvesBookPlusTagram logo</string> <string name="logo_text">MyHyvesBookPlusTagram logo</string>
<string name="logout_button">LogOut</string> <string name="logout_button">LogOut</string>
<string name="profile_picture_button">Change Profile Picture</string> <string name="profile_picture_button">Change Profile Picture</string>
<string name="profile_picture_description">profile picture</string>
<string name="change_psw_button">Change Password</string>
</resources> </resources>