964508 - Rename TwoLineRow members to match the latest dataset terminology

Status: RESOLVED FIXED

(Firefox for Android Graveyard :: General, defect)

Description

[Lucas Rocha (:lucasr)]

PrimaryText -> Title
SecondaryText -> Description

Comment 1

[Lucas Rocha (:lucasr)]

Attachment: Rename TwoLineRow members to match the current dataset terminology (r=margaret)

Comment 2

[:Margaret Leibovic]

Comment on attachment 8367489 [details] [diff] [review]
Rename TwoLineRow members to match the current dataset terminology (r=margaret)

Review of attachment 8367489 [details] [diff] [review]:
-----------------------------------------------------------------

This patch looks fine, but I want us to give the icons better names before we land it.

::: mobile/android/base/home/TwoLineRow.java
@@ +20,5 @@
>  public abstract class TwoLineRow extends LinearLayout {
>      protected static final int NO_ICON = 0;
>  
> +    private final TextView mTitle;
> +    private int mTitleIconId;

Oh, weird, I thought that the primary icon was the big favicon icon, but looking at this code more closely, I see that it's for the small icon that appears on the right side of the description. So the fact that we originally called these primary/secondary icons is confusing, and I don't think we should call them title/description icons either, since they actually both appear on the description row. Maybe we should call them leftIcon and rightIcon? Or leftDescriptionIcon and rightDescriptionIcon?

Comment 3

[Lucas Rocha (:lucasr)]

Attachment: Rename TwoLineRow members to match the current dataset terminology (r=margaret)

Comment 4

[Lucas Rocha (:lucasr)]

Comment on attachment 8371375 [details] [diff] [review]
Rename TwoLineRow members to match the current dataset terminology (r=margaret)

primaryText -> title
secondaryText -> description
primaryIcon -> rightDescriptionIcon
secondaryIcon -> leftDescriptionIcon

Comment 5

[Lucas Rocha (:lucasr)]

Comment on attachment 8371375 [details] [diff] [review]
Rename TwoLineRow members to match the current dataset terminology (r=margaret)

Scratch that, I actually think it makes more sense to move the icon bits to TwoLinePageRow.

Comment 6

[Lucas Rocha (:lucasr)]

Attachment: Rename TwoLineRow members and move icon code to TwoLinePageRow (r=margaret)

Comment 7

[Lucas Rocha (:lucasr)]

Comment on attachment 8371473 [details] [diff] [review]
Rename TwoLineRow members and move icon code to TwoLinePageRow (r=margaret)

I'm a bit happier with this approach:
primaryText -> title
secondaryText -> description
primaryIcon -> pageTypeIcon (in TwoLinePageRow)
secondaryIcon -> switchToTabIcon (in TwoLinePageRow)

This way we can use more meaningful names for the description icons as they are only used in TwoLinePageRow.

Comment 8

[:Margaret Leibovic]

Comment on attachment 8371473 [details] [diff] [review]
Rename TwoLineRow members and move icon code to TwoLinePageRow (r=margaret)

Review of attachment 8371473 [details] [diff] [review]:
-----------------------------------------------------------------

Nice, this is much clearer.

::: mobile/android/base/home/PanelListRow.java
@@ +55,3 @@
>  
>          int urlIndex = cursor.getColumnIndexOrThrow(URLColumns.URL);
>          final String url = cursor.getString(urlIndex);

Is there a bug filed to have this get the description now that we have that in the schema? If not, we can probably just do that here, since it would be a small change.

I was actually thrown off with my test add-on, since the URL showed up, not the description I set.

::: mobile/android/base/home/TwoLineRow.java
@@ +17,5 @@
>  
>  import java.lang.ref.WeakReference;
>  
>  public abstract class TwoLineRow extends LinearLayout {
>      protected static final int NO_ICON = 0;

NO_ICON is only used in TwoLinePageRow now, we should probably move it there, unless we have other plans for icons in TwoLineRow.

Comment 9

[Lucas Rocha (:lucasr)]

(In reply to :Margaret Leibovic from comment #8)
> Comment on attachment 8371473 [details] [diff] [review]
> Rename TwoLineRow members and move icon code to TwoLinePageRow (r=margaret)
> 
> Review of attachment 8371473 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> Nice, this is much clearer.
> 
> ::: mobile/android/base/home/PanelListRow.java
> @@ +55,3 @@
> >  
> >          int urlIndex = cursor.getColumnIndexOrThrow(URLColumns.URL);
> >          final String url = cursor.getString(urlIndex);
> 
> Is there a bug filed to have this get the description now that we have that
> in the schema? If not, we can probably just do that here, since it would be
> a small change.

Filed bug 969316 and posted a separate patch there. 

> I was actually thrown off with my test add-on, since the URL showed up, not
> the description I set.
> 
> ::: mobile/android/base/home/TwoLineRow.java
> @@ +17,5 @@
> >  
> >  import java.lang.ref.WeakReference;
> >  
> >  public abstract class TwoLineRow extends LinearLayout {
> >      protected static final int NO_ICON = 0;
> 
> NO_ICON is only used in TwoLinePageRow now, we should probably move it
> there, unless we have other plans for icons in TwoLineRow.

Nice catch. Moved it to TwoLinePageRow.

Comment 10

[Lucas Rocha (:lucasr)]

https://hg.mozilla.org/integration/fx-team/rev/4c412ebc25b7

Comment 11

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/4c412ebc25b7