Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 23:35:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1269027 - Add empty state for no synced devices. r=sebastian

Browse Source 
MozReview-Commit-ID: 2STg7zSgXF9

--HG--
rename : mobile/android/base/resources/layout/remote_tabs_setup.xml => mobile/android/base/resources/layout/history_sync_setup.xml
extra : rebase_source : 087871f814df30ad7259bf3175baece06e6136f4
extra : histedit_source : 2e5ccbfa39e88effdf1c0592ffd1a82c9d3e1ab1
This commit is contained in:
Chenxia Liu 2016-04-29 15:38:19 -07:00
parent 3d04951350
commit e27e382bc1
4 changed files with 72 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mobile/android/base/java/org/mozilla/gecko/home/CombinedHistoryAdapter.java
View File

@ -15,7 +15,6 @@ import android.view.ViewGroup;
import android.widget.TextView;
import org.mozilla.gecko.R;
import org.mozilla.gecko.db.BrowserContract;
import org.mozilla.gecko.db.RemoteTab;
public class CombinedHistoryAdapter extends RecyclerView.Adapter<CombinedHistoryItem> implements CombinedHistoryRecyclerView.AdapterContextMenuBuilder {
private static final int SYNCED_DEVICES_SMARTFOLDER_INDEX = 0;

96
mobile/android/base/java/org/mozilla/gecko/home/CombinedHistoryPanel.java
View File

@ -10,6 +10,7 @@ import android.app.AlertDialog;
import android.content.ContentResolver;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.database.Cursor;
import android.os.Bundle;
import android.support.v4.app.LoaderManager;
@ -29,7 +30,6 @@ import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewStub;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
@ -41,6 +41,7 @@ import org.mozilla.gecko.GeckoProfile;
import org.mozilla.gecko.R;
import org.mozilla.gecko.RemoteClientsDialogFragment;
import org.mozilla.gecko.fxa.FirefoxAccounts;
import org.mozilla.gecko.fxa.FxAccountConstants;
import org.mozilla.gecko.fxa.SyncStatusListener;
import org.mozilla.gecko.restrictions.Restrictions;
import org.mozilla.gecko.Telemetry;
@ -83,7 +84,8 @@ public class CombinedHistoryPanel extends HomeFragment implements RemoteClientsD
protected RemoteTabsSyncListener mSyncStatusListener;
// Reference to the View to display when there are no results.
private View mEmptyView;
private View mHistoryEmptyView;
private View mClientsEmptyView;
public interface OnPanelLevelChangeListener {
enum PanelLevel {
@ -124,6 +126,10 @@ public class CombinedHistoryPanel extends HomeFragment implements RemoteClientsD
mRefreshLayout = (SwipeRefreshLayout) view.findViewById(R.id.refresh_layout);
setUpRefreshLayout();
mClientsEmptyView = view.findViewById(R.id.home_clients_empty_view);
mHistoryEmptyView = view.findViewById(R.id.home_history_empty_view);
setUpEmptyViews();
mPanelFooterButton = (Button) view.findViewById(R.id.clear_history_button);
mPanelFooterButton.setOnClickListener(new OnFooterButtonClickListener());
}
@ -153,6 +159,40 @@ public class CombinedHistoryPanel extends HomeFragment implements RemoteClientsD
mRefreshLayout.setOnRefreshListener(new RemoteTabsRefreshListener());
}
private void setUpEmptyViews() {
// Set up history empty view.
final ImageView emptyIcon = (ImageView) mHistoryEmptyView.findViewById(R.id.home_empty_image);
emptyIcon.setVisibility(View.GONE);
final TextView emptyText = (TextView) mHistoryEmptyView.findViewById(R.id.home_empty_text);
emptyText.setText(R.string.home_most_recent_empty);
final TextView emptyHint = (TextView) mHistoryEmptyView.findViewById(R.id.home_empty_hint);
if (!Restrictions.isAllowed(getActivity(), Restrictable.PRIVATE_BROWSING)) {
emptyHint.setVisibility(View.GONE);
} else {
final String hintText = getResources().getString(R.string.home_most_recent_emptyhint);
final SpannableStringBuilder hintBuilder = formatHintText(hintText);
if (hintBuilder != null) {
emptyHint.setText(hintBuilder);
emptyHint.setMovementMethod(LinkMovementMethod.getInstance());
emptyHint.setVisibility(View.VISIBLE);
}
}
// Set up Clients empty view.
final Button syncSetupButton = (Button) mClientsEmptyView.findViewById(R.id.sync_setup_button);
syncSetupButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
// This Activity will redirect to the correct Activity as needed.
final Intent intent = new Intent(FxAccountConstants.ACTION_FXA_GET_STARTED);
startActivity(intent);
}
});
}
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
@ -253,7 +293,7 @@ public class CombinedHistoryPanel extends HomeFragment implements RemoteClientsD
mPanelLevel = level;
switch (level) {
case PARENT:
mRecyclerView.swapAdapter(mHistoryAdapter, false);
mRecyclerView.swapAdapter(mHistoryAdapter, true);
break;
case CHILD:
mRecyclerView.swapAdapter(mClientsAdapter, true);
@ -270,7 +310,7 @@ public class CombinedHistoryPanel extends HomeFragment implements RemoteClientsD
switch (mPanelLevel) {
case PARENT:
final boolean historyRestricted = !Restrictions.isAllowed(getActivity(), Restrictable.CLEAR_HISTORY);
if (historyRestricted || mHistoryAdapter.getItemCount() <= NUM_SMART_FOLDERS) {
if (historyRestricted || mHistoryAdapter.getItemCount() == NUM_SMART_FOLDERS) {
mPanelFooterButton.setVisibility(View.GONE);
} else {
mPanelFooterButton.setVisibility(View.VISIBLE);
@ -318,51 +358,25 @@ public class CombinedHistoryPanel extends HomeFragment implements RemoteClientsD
}
private void updateEmptyView() {
boolean showEmptyHistoryView = false;
boolean showEmptyClientsView = false;
switch (mPanelLevel) {
case PARENT:
final boolean showEmptyHistoryView = mHistoryAdapter.getItemCount() == NUM_SMART_FOLDERS && mClientsAdapter.getItemCount() == 1;
if (showEmptyHistoryView) {
if (mEmptyView == null) {
// Set empty panel view if it needs to be shown and hasn't been inflated.
final ViewStub emptyViewStub = (ViewStub) getView().findViewById(R.id.home_empty_view_stub);
mEmptyView = emptyViewStub.inflate();
final ImageView emptyIcon = (ImageView) mEmptyView.findViewById(R.id.home_empty_image);
emptyIcon.setImageResource(R.drawable.icon_most_recent_empty);
final TextView emptyText = (TextView) mEmptyView.findViewById(R.id.home_empty_text);
emptyText.setText(R.string.home_most_recent_empty);
final TextView emptyHint = (TextView) mEmptyView.findViewById(R.id.home_empty_hint);
if (!Restrictions.isAllowed(getActivity(), Restrictable.PRIVATE_BROWSING)) {
emptyHint.setVisibility(View.GONE);
} else {
final String hintText = getResources().getString(R.string.home_most_recent_emptyhint);
final SpannableStringBuilder hintBuilder = formatHintText(hintText);
if (hintBuilder != null) {
emptyHint.setText(hintBuilder);
emptyHint.setMovementMethod(LinkMovementMethod.getInstance());
emptyHint.setVisibility(View.VISIBLE);
}
}
}
mEmptyView.setVisibility(View.VISIBLE);
} else {
if (mEmptyView != null) {
mEmptyView.setVisibility(View.GONE);
}
}
showEmptyHistoryView = mHistoryAdapter.getItemCount() == NUM_SMART_FOLDERS;
break;
case CHILD:
// TODO: Bug 1262285
if (mEmptyView != null) {
mEmptyView.setVisibility(View.GONE);
}
showEmptyClientsView = mClientsAdapter.getItemCount() == 1;
break;
}
final boolean showEmptyView = showEmptyClientsView || showEmptyHistoryView;
mRecyclerView.setOverScrollMode(showEmptyView? View.OVER_SCROLL_NEVER : View.OVER_SCROLL_IF_CONTENT_SCROLLS);
mClientsEmptyView.setVisibility(showEmptyClientsView ? View.VISIBLE : View.GONE);
mHistoryEmptyView.setVisibility(showEmptyHistoryView ? View.VISIBLE : View.GONE);
}
/**
* Make Span that is clickable, and underlined
* between the string markers <code>FORMAT_S1</code> and

2
mobile/android/base/resources/layout/remote_tabs_setup.xml → mobile/android/base/resources/layout/history_sync_setup.xml
View File

@ -25,7 +25,7 @@
android:text="@string/fxaccount_getting_started_description" />
<Button
android:id="@+id/remote_tabs_setup_get_started"
android:id="@+id/sync_setup_button"
style="@style/RemoteTabsPanelItem.Button"
android:layout_width="match_parent"
android:layout_height="wrap_content"

28
mobile/android/base/resources/layout/home_combined_history_panel.xml
View File

@ -8,16 +8,6 @@
android:layout_height="match_parent"
android:orientation="vertical">
<ViewStub android:id="@+id/home_empty_view_stub"
android:layout="@layout/home_empty_panel"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<ViewStub android:id="@+id/home_sync_empty_view_stub"
android:layout="@layout/remote_tabs_setup"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/refresh_layout"
android:layout_width="match_parent"
@ -26,11 +16,25 @@
<org.mozilla.gecko.home.CombinedHistoryRecyclerView
android:id="@+id/combined_recycler_view"
android:layout_height="match_parent"
android:layout_width="match_parent"/>
android:layout_width="match_parent"
android:layout_height="match_parent"/>
</android.support.v4.widget.SwipeRefreshLayout>
<include android:id="@+id/home_history_empty_view"
layout="@layout/home_empty_panel"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="3"
android:visibility="gone"/>
<include android:id="@+id/home_clients_empty_view"
layout="@layout/history_sync_setup"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="3"
android:visibility="gone"/>
<Button android:id="@+id/clear_history_button"
style="@style/Widget.Home.ActionButton"
android:text="@string/home_clear_history_button"