From 4fa1b2268d4cddebf9bf1ed6149e9a1d6bd613ff Mon Sep 17 00:00:00 2001
From: BoykoDmytro <boo.bda88@gmail.com>
Date: Fri, 30 Jun 2017 19:53:41 +0300
Subject: [PATCH] fixed crash with new model.

---
 .../ui/activities/EditProfileActivity.java    |  5 +++--
 .../fragments/profile/MyProfileFragment.java  | 21 ++++++++++++-------
 .../main/res/layout/fragment_my_profile.xml   |  7 ++++---
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/ninja/mobile/ui/activities/EditProfileActivity.java b/app/src/main/java/com/ninja/mobile/ui/activities/EditProfileActivity.java
index 47b5bd44cb..7ad3146b04 100644
--- a/app/src/main/java/com/ninja/mobile/ui/activities/EditProfileActivity.java
+++ b/app/src/main/java/com/ninja/mobile/ui/activities/EditProfileActivity.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 
+import com.ninja.mobile.models.Person;
 import com.ninja.mobile.models.User;
 import com.ninja.mobile.ui.base.BaseActivity;
 import com.ninja.mobile.ui.fragments.profile.EditProfileFragment;
@@ -15,9 +16,9 @@ import com.ninja.mobile.ui.fragments.profile.MyProfileFragment;
 
 public class EditProfileActivity extends BaseActivity {
 
-    public static Intent getLaunchEditProfileActivity(Context context, User user) {
+    public static Intent getLaunchEditProfileActivity(Context context, Person person) {
         Intent intent = new Intent(context, EditProfileActivity.class);
-        intent.putExtra(MyProfileFragment.EDIT_PROFILE_TAG, user);
+        intent.putExtra(MyProfileFragment.EDIT_PROFILE_TAG, person);
         return intent;
     }
 
diff --git a/app/src/main/java/com/ninja/mobile/ui/fragments/profile/MyProfileFragment.java b/app/src/main/java/com/ninja/mobile/ui/fragments/profile/MyProfileFragment.java
index dccb83bb8a..f409756538 100644
--- a/app/src/main/java/com/ninja/mobile/ui/fragments/profile/MyProfileFragment.java
+++ b/app/src/main/java/com/ninja/mobile/ui/fragments/profile/MyProfileFragment.java
@@ -58,6 +58,8 @@ public class MyProfileFragment extends BaseFragment implements MyProfileView,
     ImageView userPhoto;
     @BindView(R.id.username_myprofilefragment)
     TextView userName;
+    @BindView(R.id.phone_number_myprofilefragment)
+    TextView userPhone;
 
     @InjectPresenter
     MyProfilePresenter mPresenter;
@@ -76,14 +78,14 @@ public class MyProfileFragment extends BaseFragment implements MyProfileView,
         super.onViewCreated(view, savedInstanceState);
         //// FIXME: 29.06.2017 set real user info
         user = new User();
+        user.setPhonenumber("+380 56 234 567");
         Person person = new Person();
-        person.setName("Marshall");
+        person.setName("Marshallыыыыы");
         person.setSurname("Taplits");
-        person.setPhoneNumber("+380 56 234 567");
         Account account = new Account();
         account.setPerson(person);
         user.getAccounts().add(account);
-        setPersonModel(person);
+        setPersonModel(user);
     }
 
     @OnClick(R.id.username_myprofilefragment)
@@ -109,7 +111,8 @@ public class MyProfileFragment extends BaseFragment implements MyProfileView,
                 .request(Manifest.permission.CAMERA)
                 .subscribe(granted -> {
                     if (granted) {
-                        startActivityForResult(QRCodeReaderActivity.getLaunchQRCodeReaderActivity(getContext()), QR_SCAN_REQUEST_CODE);
+                        startActivityForResult(QRCodeReaderActivity.
+                                getLaunchQRCodeReaderActivity(getContext()), QR_SCAN_REQUEST_CODE);
                     }
                 });
     }
@@ -117,7 +120,7 @@ public class MyProfileFragment extends BaseFragment implements MyProfileView,
     @Override
     public void navigateToEditProfile() {
         startActivityForResult(EditProfileActivity.getLaunchEditProfileActivity(getContext(),
-                user), EDIT_PROFILE_REQUEST_CODE);
+                user.getAccount().getPerson()), EDIT_PROFILE_REQUEST_CODE);
     }
 
     @Override
@@ -170,15 +173,17 @@ public class MyProfileFragment extends BaseFragment implements MyProfileView,
                 decodePhotoFromGallery(data);
             } else if (requestCode == EDIT_PROFILE_REQUEST_CODE && data != null) {
                 Person person = data.getParcelableExtra(EDIT_PROFILE_TAG);
-                setPersonModel(person);
+                user.getAccount().setPerson(person);
+                setPersonModel(user);
             }
         }
         super.onActivityResult(requestCode, resultCode, data);
     }
 
-    private void setPersonModel(Person person) {
-        this.user.getAccount().setPerson(person);
+    private void setPersonModel(User user) {
+        Person person = user.getAccount().getPerson();
         userName.setText(person.getFullName());
+        userPhone.setText(user.getPhonenumber());
     }
 
     private void decodePhotoFromGallery(Intent data) {
diff --git a/app/src/main/res/layout/fragment_my_profile.xml b/app/src/main/res/layout/fragment_my_profile.xml
index dc7d37fe28..4428fcf8c8 100644
--- a/app/src/main/res/layout/fragment_my_profile.xml
+++ b/app/src/main/res/layout/fragment_my_profile.xml
@@ -65,8 +65,9 @@
         android:background="@android:color/transparent"
         android:drawableEnd="@drawable/v_icon_edit"
         android:drawablePadding="8dp"
-        android:gravity="end"
         android:maxLines="1"
+        android:ellipsize="end"
+        android:lines="1"
         android:paddingEnd="42dp"
         android:paddingStart="42dp"
         android:textColor="@color/colorAccent"
@@ -80,7 +81,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="9dp"
         android:gravity="center"
-        tools:text="+380 56 234 567"
         android:textColor="@android:color/white"
-        android:textSize="20sp" />
+        android:textSize="20sp"
+        tools:text="+380 56 234 567" />
 </LinearLayout>
\ No newline at end of file
-- 
GitLab