align shipping option name to left and shipping cost to right on bottom sheet

chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestSection.java

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.payments.ui;
 
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Color;
 import android.graphics.Typeface;
@@ skipping 917 matching lines @@
                 int columnSpan = 1;
                 if (!optionIconExists) columnSpan++;
                 if (!editIconExists) columnSpan++;
 
                 TextView labelView = new TextView(context);
                 if (mRowType == OPTION_ROW_TYPE_OPTION) {
                     // Show the string representing the PaymentOption.
                     ApiCompatibilityUtils.setTextAppearance(labelView, isEnabled
                             ? R.style.PaymentsUiSectionDefaultText
                             : R.style.PaymentsUiSectionDisabledText);
-                    labelView.setText(convertOptionToString(mOption,
+                    labelView.setText(convertOptionToString(mOption, false, /* mainLabelOnly */
                             mDelegate.isBoldLabelNeeded(OptionSection.this),
                             false /* singleLine */));
                     labelView.setEnabled(isEnabled);
                 } else if (mRowType == OPTION_ROW_TYPE_ADD) {
                     // Shows string saying that the user can add a new option, e.g. credit card no.
                     String typeface = resources.getString(R.string.roboto_medium_typeface);
                     int textStyle = resources.getInteger(R.integer.roboto_medium_textstyle);
                     int buttonHeight = resources.getDimensionPixelSize(
                             R.dimen.payments_section_add_button_height);
 
@@ skipping 105 matching lines @@
         private SectionInformation mSectionInformation;
 
         /** Indicates whether the summary is displayed in a single line. */
         private boolean mSummaryInSingleLine;
 
         /** Indicates whether the summary is set to display in a single line in DISPLAY_MODE_NORMAL
          * by caller.
          */
         boolean mSetDisplaySummaryInSingleLineInNormalMode = true;
 
+        /** Indicates whether the main label and the sub-label of summary should be separated
+         * in DISPLAY_MODE_NORMAL. */
+        private boolean mSeparateMainAndSubLabelInNormalMode = false;

[gogerald1, 2017/05/31 20:34:47]

To make this feature more general instead of putting too much data specific
control, it looks better to name it "mSplitSummaryInNormalMode" with comments
"Indicates whether the summary should be split to display in the left and right
summary text views in {@link DISPLAY_MODE_NORMAL}." or similar

[gogerald1, 2017/05/31 20:34:47]

"=false" is not needed here,

[wuandy1, 2017/06/01 17:17:56]

Done.

[wuandy1, 2017/06/01 17:17:57]

Done.

+
         /** Indicates whether the summary is set to R.style.PaymentsUiSectionDescriptiveText. */
         private boolean mSummaryInDescriptiveText;
 
         private FocusChangedObserver mFocusChangedObserver;
 
         /**
          * Constructs an OptionSection.
          *
          * @param context     Context to pull resources from.
          * @param sectionName Title of the section to display.
@@ skipping 92 matching lines @@
 
         /**
          * @param singleLine If true, sets the summary text to display in a single line
          *                   in {@link #DISPLAY_MODE_NORMAL} when there is a valid selected
          *                   option, otherwise sets the summary text to display in multiple lines.
          */
         public void setDisplaySummaryInSingleLineInNormalMode(boolean singleLine) {
             mSetDisplaySummaryInSingleLineInNormalMode = singleLine;
         }
 
+        /**
+         * @param separateMainAndSubLabelInNormalMode set to true if the main label and the

[gogerald1, 2017/05/31 20:34:47]

splitSummary?

[wuandy1, 2017/06/01 17:17:56]

Done.

+         *                                            sub-label(eg, shipping option name and cost)
+         *                                            should be displayed seprately when in

[gogerald1, 2017/05/31 20:34:47]

"If true, sets to split and display the summary in the left and right summary
text views in {@link #DISPLAY_MODE_NORMAL}, otherwise the entire summary is
displayed in the left summary text view. Note that the summary is split into
'label' and the rest ('sublabel, 'Tertiary label' and so on)." or similar

[wuandy1, 2017/06/01 17:17:56]

Done.

+         *                                            DISPLAY_MODE_NORMAL.
+         */
+        public void setSeparateMainAndSubLabelInNormalMode(

[gogerald1, 2017/05/31 20:34:47]

setSplitSummaryInNormalMode()?

[wuandy1, 2017/06/01 17:17:56]

Done.

+                boolean separateMainAndSubLabelInNormalMode) {
+            mSeparateMainAndSubLabelInNormalMode = separateMainAndSubLabelInNormalMode;
+        }
+
         /** Updates the View to account for the new {@link SectionInformation} being passed in. */
         public void update(SectionInformation information) {
             mSectionInformation = information;
             PaymentOption selectedItem = information.getSelectedItem();
             updateSelectedItem(selectedItem);
             updateOptionList(information, selectedItem);
             updateControlLayout();
         }
 
         private View createLoadingSpinner() {
@@ skipping 97 matching lines @@
                         getContext(), mSectionInformation, getSummaryLeftTextView());
             } else {
                 setLogoDrawable(selectedItem.getDrawableIcon());
                 // Selected item summary should be displayed as
                 // R.style.PaymentsUiSectionDefaultText.
                 if (mSummaryInDescriptiveText) {
                     ApiCompatibilityUtils.setTextAppearance(
                             getSummaryLeftTextView(), R.style.PaymentsUiSectionDefaultText);
                     mSummaryInDescriptiveText = false;
                 }
-                setSummaryText(convertOptionToString(selectedItem, false /* useBoldLabel */,
-                                       mSummaryInSingleLine),
-                        null);
+                // Align main label to the left and sub label to the right if caller specified and

[gogerald1, 2017/05/31 20:34:47]

no need to comment on alignment, the left summary text view is set to occupy the
entire available space so as to push the right summary text view to the end.

[wuandy1, 2017/06/01 17:17:56]

Done.

+                // section is in DISPLAY_MODE_NORMAL
+                boolean separateMainAndSubLabel = mSeparateMainAndSubLabelInNormalMode
+                        && (mDisplayMode == DISPLAY_MODE_NORMAL);
+                setSummaryText(
+                        convertOptionToString(selectedItem,

[gogerald1, 2017/05/31 20:34:47]

"setSummaryText(selectedItem.getLabel(), convertOptionToString(selectedItem,
true /* excludeMainLabel */, false /* useBoldLabel */, mSummaryInSingleLine));"
?

[wuandy1, 2017/06/01 17:17:57]

changed to excludeMainLabel.

+                                /* convert only main label if it is displayed separately from sub
+                                   label*/
+                                separateMainAndSubLabel, false /* useBoldLabel */,
+                                mSummaryInSingleLine),
+                        separateMainAndSubLabel ? selectedItem.getSublabel() : null);
             }
 
             updateControlLayout();
         }
 
         private void updateOptionList(SectionInformation information, PaymentOption selectedItem) {
             mOptionLayout.removeAllViews();
             mOptionRows.clear();
             mLabelsForTest.clear();
 
@@ skipping 34 matching lines @@
             // If the user is allowed to add new options, show the button for it.
             if (information.getAddStringId() != 0 && mCanAddItems) {
                 OptionRow addRow = new OptionRow(mOptionLayout, mOptionLayout.getChildCount(),
                         OptionRow.OPTION_ROW_TYPE_ADD, null, false);
                 addRow.setLabel(information.getAddStringId());
                 addRow.setButtonId(R.id.payments_add_option_button);
                 mOptionRows.add(addRow);
             }
         }
 
-        private CharSequence convertOptionToString(
-                PaymentOption item, boolean useBoldLabel, boolean singleLine) {
+        private CharSequence convertOptionToString(PaymentOption item, boolean mainLabelOnly,

[gogerald1, 2017/05/31 20:34:47]

excludeMainLabel?

[wuandy1, 2017/06/01 17:17:57]

Done.

+                boolean useBoldLabel, boolean singleLine) {
             SpannableStringBuilder builder = new SpannableStringBuilder(item.getLabel());
-            String labelSeparator = singleLine
-                    ? getContext().getString(R.string.autofill_address_summary_separator)
-                    : "\n";
+
             if (useBoldLabel) {
                 builder.setSpan(
                         new StyleSpan(android.graphics.Typeface.BOLD), 0, builder.length(), 0);
             }
 
-            if (!TextUtils.isEmpty(item.getSublabel())) {
-                if (builder.length() > 0) builder.append(labelSeparator);
-                builder.append(item.getSublabel());
-            }
+            String labelSeparator = singleLine
+                    ? getContext().getString(R.string.autofill_address_summary_separator)
+                    : "\n";
+            if (!mainLabelOnly) { // build for sublabel and tertiary label
+                if (!TextUtils.isEmpty(item.getSublabel())) {
+                    if (builder.length() > 0) builder.append(labelSeparator);
+                    builder.append(item.getSublabel());
+                }
 
-            if (!TextUtils.isEmpty(item.getTertiaryLabel())) {
-                if (builder.length() > 0) builder.append(labelSeparator);
-                builder.append(item.getTertiaryLabel());
+                if (!TextUtils.isEmpty(item.getTertiaryLabel())) {
+                    if (builder.length() > 0) builder.append(labelSeparator);
+                    builder.append(item.getTertiaryLabel());
+                }
             }
 
             if (!item.isComplete() && !TextUtils.isEmpty(item.getEditMessage())) {
                 if (builder.length() > 0) builder.append(labelSeparator);
                 String editMessage = item.getEditMessage();
                 builder.append(editMessage);
                 Object foregroundSpanner = new ForegroundColorSpan(ApiCompatibilityUtils.getColor(
                         getContext().getResources(), R.color.google_blue_700));
                 Object sizeSpanner = new AbsoluteSizeSpan(14, true);
                 int startIndex = builder.length() - editMessage.length();
@@ skipping 10 matching lines @@
          */
         @VisibleForTesting
         public TextView getOptionLabelsForTest(int labelIndex) {
             return mLabelsForTest.get(labelIndex);
         }
 
         /**
          * Returns the label of the section summary.
          */
         @VisibleForTesting
         public TextView getSummaryLabelForTest() {

[gogerald1, 2017/05/31 20:34:47]

rename it to getLeftSummaryLabelForTest,

[wuandy1, 2017/06/01 17:17:56]

Done.

             return getSummaryLeftTextView();
         }
 
+        /**
+         * Returns the label of the summary for the OptionSection.
+         */
+        @VisibleForTesting
+        public TextView getSummarySubLabelForTest() {

[gogerald1, 2017/05/31 20:34:47]

rename it to getRightSummaryLabelForTest

[wuandy1, 2017/06/01 17:17:57]

Done.

+            return getSummaryRightTextView();
+        }
+
         /** Returns the number of option labels. */
         @VisibleForTesting
         public int getNumberOfOptionLabelsForTest() {
             return mLabelsForTest.size();
         }
 
         /** Returns the OptionRow at the specified |index|. */
         @VisibleForTesting
         public OptionRow getOptionRowAtIndex(int index) {
             return mOptionRows.get(index);
@@ skipping 27 matching lines @@
         }
 
         /** Expand the separator to be the full width of the dialog. */
         public void expand() {
             LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) getLayoutParams();
             ApiCompatibilityUtils.setMarginStart(params, 0);
             ApiCompatibilityUtils.setMarginEnd(params, 0);
         }
     }
 }