Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 12:25:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1393274: Rename card_history_item -> webpage_item_row & friends. r=liuche

Browse Source 
Unrelated to RTL changes but these names are awful and gotta go!

MozReview-Commit-ID: Kud6tgfEGkk

--HG--
rename : mobile/android/app/src/main/res/layout/activity_stream_card_history_item.xml => mobile/android/app/src/main/res/layout/activity_stream_webpage_item_row.xml
extra : rebase_source : 9369fd07eb959caf800cad58b37e543b83402b08
This commit is contained in:
Michael Comella 2017-08-30 11:45:27 -07:00
parent be459fc2f8
commit d581fb44db
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mobile/android/app/src/main/res/layout/activity_stream_card_history_item.xml → mobile/android/app/src/main/res/layout/activity_stream_webpage_item_row.xml
View File

@ -18,7 +18,7 @@
android:layout_height="wrap_content">
<org.mozilla.gecko.activitystream.homepanel.stream.StreamOverridablePageIconLayout
android:id="@+id/icon"
android:id="@+id/page_icon"
android:layout_width="@dimen/favicon_bg"
android:layout_height="@dimen/favicon_bg"
android:layout_marginStart="@dimen/activity_stream_base_margin"
@ -43,7 +43,7 @@
android:paddingTop="16dp" />
<TextView
android:id="@+id/page"
android:id="@+id/page_domain"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toEndOf="@id/icon_wrapper"
@ -58,10 +58,10 @@
tools:text="twitter" />
<TextView
android:id="@+id/card_history_label"
android:id="@+id/page_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/page"
android:layout_below="@id/page_domain"
android:layout_toEndOf="@id/icon_wrapper"
android:layout_toLeftOf="@id/menu"
android:layout_toRightOf="@id/icon_wrapper"
@ -79,7 +79,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_below="@id/card_history_label"
android:layout_below="@id/page_title"
android:layout_toEndOf="@id/icon_wrapper"
android:layout_toRightOf="@id/icon_wrapper"
android:gravity="center_vertical"
@ -93,13 +93,13 @@
tools:ignore="UseCompoundDrawables">
<ImageView
android:id="@+id/source_icon"
android:id="@+id/page_source_icon"
android:layout_width="12dp"
android:layout_height="12dp"
tools:src="@drawable/ic_as_bookmarked" />
<TextView
android:id="@+id/card_history_source"
android:id="@+id/page_source"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="2dp"

12
mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/stream/WebpageItemRow.java
View File

@ -31,7 +31,7 @@ import java.util.UUID;
public class WebpageItemRow extends StreamViewHolder {
private static final String LOGTAG = "GeckoWebpageItemRow";
public static final int LAYOUT_ID = R.layout.activity_stream_card_history_item;
public static final int LAYOUT_ID = R.layout.activity_stream_webpage_item_row;
private static final double SIZE_RATIO = 0.75;
private WebpageRowModel webpageModel;
@ -47,11 +47,11 @@ public class WebpageItemRow extends StreamViewHolder {
public WebpageItemRow(final View itemView, final StreamHighlightItemRowContextMenuListener contextMenuListener) {
super(itemView);
pageTitleView = (TextView) itemView.findViewById(R.id.card_history_label);
pageIconLayout = (StreamOverridablePageIconLayout) itemView.findViewById(R.id.icon);
pageSourceView = (TextView) itemView.findViewById(R.id.card_history_source);
pageDomainView = (TextView) itemView.findViewById(R.id.page);
pageSourceIconView = (ImageView) itemView.findViewById(R.id.source_icon);
pageTitleView = (TextView) itemView.findViewById(R.id.page_title);
pageIconLayout = (StreamOverridablePageIconLayout) itemView.findViewById(R.id.page_icon);
pageSourceView = (TextView) itemView.findViewById(R.id.page_source);
pageDomainView = (TextView) itemView.findViewById(R.id.page_domain);
pageSourceIconView = (ImageView) itemView.findViewById(R.id.page_source_icon);
menuButton = (ImageView) itemView.findViewById(R.id.menu);
menuButton.setImageDrawable(