From bd2b69a3305714a645da3ac5de16235fbe90f436 Mon Sep 17 00:00:00 2001 From: Niels Zwemmer Date: Tue, 20 Jun 2017 11:39:50 +0200 Subject: [PATCH 01/21] Added some changes to form a baseline for Paul --- .../tagram/ProfileFragment.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) 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 f1eecc8..877d756 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 @@ -17,7 +17,7 @@ import android.view.ViewGroup; * Use the {@link ProfileFragment#newInstance} factory method to * create an instance of this fragment. */ -public class ProfileFragment extends Fragment { +public class ProfileFragment extends Fragment implements View.OnClickListener{ // TODO: Rename parameter arguments, choose names that match // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER private static final String ARG_PARAM1 = "param1"; @@ -51,6 +51,11 @@ public class ProfileFragment extends Fragment { return fragment; } + protected void bindOnClick() { + profilePicButton.setOnClickListener(this); + logOutButton.setOnClickListener(this); + } + @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -74,6 +79,18 @@ public class ProfileFragment extends Fragment { } } + @Override + public void onClick(View v) { + switch (v.getId()) { + case R.id.profile_pic_button: + profilePicOnClick(); + break; + case R.id.logout_button: + logOutOnClick(); + break; + } + } + @Override public void onAttach(Context context) { super.onAttach(context); From 3aac4fc96db33e97a4e2e5ffebd5f45bedde948f Mon Sep 17 00:00:00 2001 From: Paul Lagerweij Date: Tue, 20 Jun 2017 13:01:51 +0200 Subject: [PATCH 02/21] login-, picture-button to fragment_profile.xml button's are next to each other --- .../src/main/res/layout/fragment_camera.xml | 5 ---- .../src/main/res/layout/fragment_profile.xml | 24 +++++++++++++++---- .../app/src/main/res/values-nl/strings.xml | 2 ++ .../app/src/main/res/values/strings.xml | 2 ++ 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_camera.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_camera.xml index 49fd204..392188c 100644 --- a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_camera.xml +++ b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_camera.xml @@ -14,11 +14,6 @@ android:layout_height="wrap_content" android:text="@string/hello_camera" /> -