From 4005bef38cbd39cd5b8576c4302ca86c8ac2df3c Mon Sep 17 00:00:00 2001
From: Paul Lagerweij <p.a.lagerweij@gmail.com>
Date: Wed, 21 Jun 2017 14:06:05 +0200
Subject: [PATCH] added change psw button to profile fragment

---
 .../tagram/ProfileFragment.java               |  4 +-
 .../src/main/res/layout/fragment_profile.xml  | 40 ++++++++++++++++---
 .../app/src/main/res/values-nl/strings.xml    |  2 +
 .../app/src/main/res/values/strings.xml       |  2 +
 4 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
index 6341dd6..a22844b 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java
@@ -111,9 +111,9 @@ public class ProfileFragment extends Fragment implements View.OnClickListener{
 
     // TODO: Rename method, update argument and hook method into UI event
     public void onButtonPressed(Uri uri) {
-       - if (mListener != null) {
+       if (mListener != null) {
             mListener.onFragmentInteraction(uri);
-        }
+       }
     }
 
     @Override
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile.xml
index 26f3d3f..996b4d0 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_profile.xml
@@ -12,8 +12,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:gravity="center">
+            android:gravity="center"
+            android:orientation="vertical">
 
             <Space
                 android:layout_width="match_parent"
@@ -24,9 +24,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center_horizontal"
+                android:text="Name:"
                 android:textSize="25sp"
-                android:textStyle="bold"
-                android:text="Name:" />
+                android:textStyle="bold" />
 
             <Space
                 android:layout_width="match_parent"
@@ -36,20 +36,48 @@
                 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:text="@string/logout_button"
+                android:textColor="@android:color/white"
+                android:textSize="16sp" />
+
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="20dp" />
 
             <ImageView
                 android:id="@+id/imageView_profile_picture"
+                android:contentDescription="@string/profile_picture_description"
                 android:layout_width="match_parent"
                 android:layout_height="300dp"
                 app:srcCompat="@drawable/ic_account_box_black_24dp" />
 
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="20dp" />
+
             <Button
                 android:id="@+id/profile_pic_button"
                 android:layout_width="300dp"
                 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>
     </ScrollView>
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml
index 9115ae4..7368b39 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml
@@ -15,4 +15,6 @@
     <string name="logo_text">MyHyvesBookPlusTagram logo</string>
     <string name="logout_button">Uitloggen</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>
\ No newline at end of file
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml
index 9cffb8b..6d43245 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml
@@ -20,4 +20,6 @@
     <string name="logo_text">MyHyvesBookPlusTagram logo</string>
     <string name="logout_button">LogOut</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>