dialer-app

Merge lp:~renatofilho/dialer-app/fix-phone-formatter into lp:dialer-app

fix-phone-formatter
Merge into trunk

Proposed by Renato Araujo Oliveira Filho on 2014-07-04

Status:	Merged
Approved by:	Tiago Salem Herrmann on 2014-07-07
Approved revision:	170
Merged at revision:	170
Proposed branch:	lp:~renatofilho/dialer-app/fix-phone-formatter
Merge into:	lp:dialer-app
Diff against target:	71 lines (+8/-28) 2 files modified src/qml/DialerPage/DialerPage.qml (+3/-11) src/qml/DialerPage/KeypadEntry.qml (+5/-17)
To merge this branch:	bzr merge lp:~renatofilho/dialer-app/fix-phone-formatter
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Tiago Salem Herrmann (community)		2014-07-04	Approve on 2014-07-07
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-07-07
Review via email: mp+225697@code.launchpad.net

Commit message

Used PhoneNumberInput class in KeypadEntry.

This class implement the phone number format internally.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-05:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/268/rebuild

review: Needs Fixing (continuous-integration)

lp:~renatofilho/dialer-app/fix-phone-formatter updated on 2014-07-05

167. By Renato Araujo Oliveira Filho on 2014-07-05: Set keypad entry default location.
168. By Renato Araujo Oliveira Filho on 2014-07-05: Moved comments to the right place.
169. By Renato Araujo Oliveira Filho on 2014-07-05: Fixed cursor position during entry modify.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-05:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/269/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-05:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/270/rebuild

review: Needs Fixing (continuous-integration)

lp:~renatofilho/dialer-app/fix-phone-formatter updated on 2014-07-07

170. By Renato Araujo Oliveira Filho on 2014-07-07: Trunk merged.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-07:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/271/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Renato Araujo Oliveira Filho (renatofilho) wrote on 2014-07-07:

Are there any related MPs required for this MP to build/function as expected? YES
* lp:~renatofilho/address-book-app/extend-avatar

Is your branch in sync with latest trunk? YES

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator? YES

Did you successfully run all tests found in your component's Test Plan on device or emulator? YES

If you changed the UI, was the change specified/approved by design? NO UI CHANGE

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP? NO UI CHANG

Revision history for this message

Renato Araujo Oliveira Filho (renatofilho) wrote on 2014-07-07:

> Are there any related MPs required for this MP to build/function as expected?
> YES
> * lp:~renatofilho/address-book-app/extend-avatar
CORRECT BRANCH: lp:~renatofilho/telephony-service/fix-phone-number-field-cursor
>
> Is your branch in sync with latest trunk? YES
>
> Did you perform an exploratory manual test run of your code change and any
> related functionality on device or emulator? YES
>
> Did you successfully run all tests found in your component's Test Plan on
> device or emulator? YES
>
> If you changed the UI, was the change specified/approved by design? NO UI
> CHANGE
>
> If you changed the packaging (debian), did you add a core-dev as a reviewer to
> this MP? NO UI CHANG

Revision history for this message

Renato Araujo Oliveira Filho (renatofilho) wrote on 2014-07-07:

Are there any related MPs required for this MP to build/function as expected? YES
* lp:~renatofilho/telephony-service/fix-phone-number-field-cursor

Is your branch in sync with latest trunk? YES

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator? YES

Did you successfully run all tests found in your component's Test Plan on device or emulator? YES

If you changed the UI, was the change specified/approved by design? NO UI CHANGE

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP? NO UI CHANG

Revision history for this message

Tiago Salem Herrmann (tiagosh) wrote on 2014-07-07:

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
No, It depends on another branch.

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Ishan Joshi

Renato Araujo Oliveira Filho

Ubuntu Phablet Team

 === modified file 'src/qml/DialerPage/DialerPage.qml'
 --- src/qml/DialerPage/DialerPage.qml	2014-07-02 17:11:00 +0000
 +++ src/qml/DialerPage/DialerPage.qml	2014-07-07 17:36:47 +0000
@@ -160,10 +160,8 @@
              onPressAndHold: input.text = ""
              onClicked:  {
--                if (input.cursorPosition != 0)  {
--                    var position = input.cursorPosition;
--                    input.text = input.text.slice(0, input.cursorPosition - 1) + input.text.slice(input.cursorPosition);
--                    input.cursorPosition = position - 1;
++                if (input.cursorPosition > 0)  {
++                    input.remove(input.cursorPosition, input.cursorPosition - 1)
+                 }
+             }
+         }
@@ -281,13 +279,7 @@
+             }
              onKeyPressed: {
--                if (input.cursorPosition != 0)  {
--                    var position = input.cursorPosition;
--                    input.text = input.text.slice(0, input.cursorPosition) + label + input.text.slice(input.cursorPosition);
--                    input.cursorPosition = position +1 ;
--                } else {
--                    keypadEntry.value += label
--                }
++                input.insert(input.cursorPosition, label)
+             }
+         }
 === modified file 'src/qml/DialerPage/KeypadEntry.qml'
 --- src/qml/DialerPage/KeypadEntry.qml	2014-06-13 17:21:22 +0000
 +++ src/qml/DialerPage/KeypadEntry.qml	2014-07-07 17:36:47 +0000
@@ -31,7 +31,7 @@
      height: input.height
--    TextInput {
++    PhoneNumberInput {
          id: input
          property bool __adjusting: false
@@ -51,22 +51,10 @@
          cursorVisible: true
          clip: true
          opacity: 0.9
--
--        AsYouTypeFormatter {
--            id: formatter
--
--            // FIXME: this should probably be done in the component itself
--            property string firstDigit: input.text.slice(0,1)
--            enabled: firstDigit != "*" && firstDigit != "#"
--            defaultRegionCode: "US"
--            text: input.text
--        }
--
--        Binding {
--            target: input
--            property: "text"
--            value: formatter.formattedText
--        }
++        defaultRegion: i18n.tr("US")
++        updateOnlyWhenFocused: false
++        // FIXME: this should probably be done in the component itself
++        autoFormat: input.text.length > 0 && input.text.charAt(0) !== "*" && input.text.charAt(0) !== "#"
          // Use a custom cursor that does not blink to avoid extra CPU usage.
          // https://bugs.launchpad.net/dialer-app/+bug/1188669

dialer-app

Merge lp:~renatofilho/dialer-app/fix-phone-formatter into lp:dialer-app

Commit message

Description of the change

Preview Diff

Subscribers