wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 977164 - Update TwoLinePageRow in Remote Tabs home panel. r=margaret

Browse Source 
This patch extracts a non-Cursor update method and uses it (when
possible) in the adapter that backs the Remote Tabs home panel.  This
updates the "switch-to-tab" text and button when appropriate.
This commit is contained in:
Nick Alexander 2014-09-08 12:58:34 -07:00
parent ebbd90d39c
commit 9dd5c3c8ce
2 changed files with 92 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mobile/android/base/RemoteTabsExpandableListAdapter.java
View File

@ -9,6 +9,7 @@ import java.util.List;
import org.mozilla.gecko.TabsAccessor.RemoteClient;
import org.mozilla.gecko.TabsAccessor.RemoteTab;
import org.mozilla.gecko.home.TwoLinePageRow;
import android.content.Context;
import android.text.TextUtils;
@ -151,11 +152,18 @@ public class RemoteTabsExpandableListAdapter extends BaseExpandableListAdapter {
final RemoteClient client = clients.get(groupPosition);
final RemoteTab tab = client.tabs.get(childPosition);
final TextView titleView = (TextView) view.findViewById(R.id.title);
titleView.setText(TextUtils.isEmpty(tab.title) ? tab.url : tab.title);
// The view is a TwoLinePageRow only for some of our child views: it's
// present for the home panel children and not for the tabs tray
// children. Therefore, we must handle one case manually.
if (view instanceof TwoLinePageRow) {
((TwoLinePageRow) view).update(tab.title, tab.url);
} else {
final TextView titleView = (TextView) view.findViewById(R.id.title);
titleView.setText(TextUtils.isEmpty(tab.title) ? tab.url : tab.title);
final TextView urlView = (TextView) view.findViewById(R.id.url);
urlView.setText(tab.url);
final TextView urlView = (TextView) view.findViewById(R.id.url);
urlView.setText(tab.url);
}
return view;
}

103
mobile/android/base/home/TwoLinePageRow.java
View File

@ -50,6 +50,11 @@ public class TwoLinePageRow extends LinearLayout
this.view = new WeakReference<FaviconView>(view);
}
/**
* Update this row's favicon.
* <p>
* This method is always invoked on the UI thread.
*/
@Override
public void onFaviconLoaded(String url, String faviconURL, Bitmap favicon) {
FaviconView v = view.get();
@ -96,24 +101,49 @@ public class TwoLinePageRow extends LinearLayout
@Override
protected void onAttachedToWindow() {
super.onAttachedToWindow();
Tabs.registerOnTabsChangedListener(this);
}
@Override
protected void onDetachedFromWindow() {
super.onDetachedFromWindow();
// Tabs' listener array is safe to modify during use: its
// iteration pattern is based on snapshots.
Tabs.unregisterOnTabsChangedListener(this);
}
/**
* Update the row in response to a tab change event.
* <p>
* This method is always invoked on the UI thread.
*/
@Override
public void onTabChanged(final Tab tab, final Tabs.TabEvents msg, final Object data) {
switch(msg) {
// Carefully check if this tab event is relevant to this row.
final String pageUrl = mPageUrl;
if (pageUrl == null) {
return;
}
final String tabUrl;
if (tab == null) {
return;
}
tabUrl = tab.getURL();
if (!pageUrl.equals(tabUrl)) {
return;
}
switch (msg) {
case ADDED:
case CLOSED:
case LOCATION_CHANGE:
updateDisplayedUrl();
break;
default:
break;
}
}
@ -181,32 +211,29 @@ public class TwoLinePageRow extends LinearLayout
mShowIcons = showIcons;
}
public void updateFromCursor(Cursor cursor) {
if (cursor == null) {
return;
}
int titleIndex = cursor.getColumnIndexOrThrow(URLColumns.TITLE);
final String title = cursor.getString(titleIndex);
int urlIndex = cursor.getColumnIndexOrThrow(URLColumns.URL);
final String url = cursor.getString(urlIndex);
/**
* Update the data displayed by this row.
* <p>
* This method must be invoked on the UI thread.
*
* @param title to display.
* @param url to display.
*/
public void update(String title, String url) {
update(title, url, 0);
}
protected void update(String title, String url, long bookmarkId) {
if (mShowIcons) {
final int bookmarkIdIndex = cursor.getColumnIndex(Combined.BOOKMARK_ID);
if (bookmarkIdIndex != -1) {
final long bookmarkId = cursor.getLong(bookmarkIdIndex);
// The bookmark id will be 0 (null in database) when the url
// is not a bookmark.
if (bookmarkId == 0) {
setPageTypeIcon(NO_ICON);
} else {
setPageTypeIcon(R.drawable.ic_url_bar_star);
}
} else {
// The bookmark id will be 0 (null in database) when the url
// is not a bookmark.
if (bookmarkId == 0) {
setPageTypeIcon(NO_ICON);
} else {
setPageTypeIcon(R.drawable.ic_url_bar_star);
}
} else {
setPageTypeIcon(NO_ICON);
}
// Use the URL instead of an empty title for consistency with the normal URL
@ -220,8 +247,38 @@ public class TwoLinePageRow extends LinearLayout
// Blank the Favicon, so we don't show the wrong Favicon if we scroll and miss DB.
mFavicon.clearImage();
Favicons.cancelFaviconLoad(mLoadFaviconJobId);
mLoadFaviconJobId = Favicons.getSizedFaviconForPageFromLocal(getContext(), url, mFaviconListener);
updateDisplayedUrl(url);
}
/**
* Update the data displayed by this row.
* <p>
* This method must be invoked on the UI thread.
*
* @param cursor to extract data from.
*/
public void updateFromCursor(Cursor cursor) {
if (cursor == null) {
return;
}
int titleIndex = cursor.getColumnIndexOrThrow(URLColumns.TITLE);
final String title = cursor.getString(titleIndex);
int urlIndex = cursor.getColumnIndexOrThrow(URLColumns.URL);
final String url = cursor.getString(urlIndex);
final long bookmarkId;
final int bookmarkIdIndex = cursor.getColumnIndex(Combined.BOOKMARK_ID);
if (bookmarkIdIndex != -1) {
bookmarkId = cursor.getLong(bookmarkIdIndex);
} else {
bookmarkId = 0;
}
update(title, url, bookmarkId);
}
}