From a9d209979e73ce187beb220740aa224f88cbe80b Mon Sep 17 00:00:00 2001
From: amine younes <amine.younes-bouacida@savoirfairelinux.com>
Date: Wed, 26 Jun 2019 16:36:50 -0400
Subject: [PATCH] tv profile account creation: fix the cancel behavior
+ when the user presses the back button, keep the modifications
+ minor code refactoring
Change-Id: I7dc39ebcad50cb7dbee84e10130fe4506e6be6f8
Gitlab: #628
---
.../tv/account/TVProfileCreationFragment.java | 29 +++++++++++++++----
1 file changed, 23 insertions(+), 6 deletions(-)
diff --git a/ring-android/app/src/main/java/cx/ring/tv/account/TVProfileCreationFragment.java b/ring-android/app/src/main/java/cx/ring/tv/account/TVProfileCreationFragment.java
index f6326f0b2..ad01b0e56 100644
--- a/ring-android/app/src/main/java/cx/ring/tv/account/TVProfileCreationFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/tv/account/TVProfileCreationFragment.java
@@ -209,18 +209,35 @@ public class TVProfileCreationFragment extends RingGuidedStepFragment<ProfileCre
}
public long onGuidedActionEditedAndProceed(GuidedAction action) {
- if (action.getId() == USER_NAME) {
+ switch ((int) action.getId()){
+ case USER_NAME:
+ String username = action.getEditTitle().toString();
+ presenter.fullNameUpdated(username);
+ if (username.isEmpty())
+ action.setTitle(getString(R.string.profile_name_hint));
+ else
+ action.setTitle(username);
+ break;
+ case CAMERA:
+ presenter.cameraClick();
+ break;
+ case GALLERY:
+ presenter.galleryClick();
+ break;
+ }
+ return super.onGuidedActionEditedAndProceed(action);
+ }
+
+ @Override
+ public void onGuidedActionEditCanceled(GuidedAction action) {
+ if ((int) action.getId() == USER_NAME) {
String username = action.getEditTitle().toString();
presenter.fullNameUpdated(username);
if (TextUtils.isEmpty(username))
action.setTitle(getString(R.string.profile_name_hint));
else
action.setTitle(username);
- } else if (action.getId() == CAMERA) {
- presenter.cameraClick();
- } else if (action.getId() == GALLERY) {
- presenter.galleryClick();
}
- return super.onGuidedActionEditedAndProceed(action);
+ super.onGuidedActionEditCanceled(action);
}
}
\ No newline at end of file
--
GitLab