author Andrzej Hunt <ahunt@mozilla.com>

Tue, 22 Mar 2016 12:58:19 -0700

changeset 343978 9fb26911dec1643c03720e35d668cee402e5df76

parent 343977 a30891be3fd91d1f9adf3c0fb3f4ce9f959594f6

child 343979 b5d554e55253c91ada8b0118d59e3bf4af8466ce

push id 13730

push user ahunt@mozilla.com

push date Wed, 23 Mar 2016 17:30:25 +0000

reviewers liuche

bugs 1234316

milestone 48.0a1

mobile/android/base/java/org/mozilla/gecko/home/ReadingListPanel.java file | annotate | diff | comparison | revisions

mobile/android/base/locales/en-US/android_strings.dtd file | annotate | diff | comparison | revisions

mobile/android/base/resources/drawable-hdpi/reading_list_migration.png file | annotate | diff | comparison | revisions

mobile/android/base/resources/drawable-xhdpi/reading_list_migration.png file | annotate | diff | comparison | revisions

mobile/android/base/resources/drawable-xxhdpi/reading_list_migration.png file | annotate | diff | comparison | revisions

mobile/android/base/resources/layout/readinglistpanel_gone_fragment.xml file | annotate | diff | comparison | revisions

mobile/android/base/strings.xml.in file | annotate | diff | comparison | revisions
--- a/mobile/android/base/java/org/mozilla/gecko/home/ReadingListPanel.java
+++ b/mobile/android/base/java/org/mozilla/gecko/home/ReadingListPanel.java
@@ -1,228 +1,61 @@
 /* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 package org.mozilla.gecko.home;
 
-import java.util.EnumSet;
+import android.os.Bundle;
 
-import org.mozilla.gecko.GeckoProfile;
-import org.mozilla.gecko.R;
-import org.mozilla.gecko.reader.ReaderModeUtils;
-import org.mozilla.gecko.Telemetry;
-import org.mozilla.gecko.TelemetryContract;
-import org.mozilla.gecko.db.BrowserContract.ReadingListItems;
-import org.mozilla.gecko.db.BrowserContract.URLColumns;
-import org.mozilla.gecko.db.ReadingListAccessor;
-import org.mozilla.gecko.home.HomeContextMenuInfo.RemoveItemType;
-import org.mozilla.gecko.home.HomePager.OnUrlOpenListener;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.os.Bundle;
-import android.support.v4.content.Loader;
-import android.support.v4.widget.CursorAdapter;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ViewStub;
-import android.widget.AdapterView;
-import android.widget.ImageView;
-import android.widget.TextView;
-import org.mozilla.gecko.util.NetworkUtils;
+
+import org.mozilla.gecko.AppConstants;
+import org.mozilla.gecko.Locales;
+import org.mozilla.gecko.R;
+
+import java.util.EnumSet;
+import java.util.Locale;
 
 /**
- * Fragment that displays reading list contents in a ListView.
+ * Fragment that used to display reading list contents in a ListView, and now directs
+ * users to Bookmarks to view their former reading-list content.
  */
 public class ReadingListPanel extends HomeFragment {
 
-    // Cursor loader ID for reading list
-    private static final int LOADER_ID_READING_LIST = 0;
-
-    // Formatted string in hint text to be replaced with an icon.
-    private final String MATCH_STRING = "%I";
-
-    // Adapter for the list of reading list items
-    private ReadingListAdapter mAdapter;
-
-    // The view shown by the fragment
-    private HomeListView mList;
-
-    // Reference to the View to display when there are no results.
-    private View mEmptyView;
-
-    // Reference to top view.
-    private View mTopView;
-
-    // Callbacks used for the reading list and favicon cursor loaders
-    private CursorLoaderCallbacks mCursorLoaderCallbacks;
-
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.home_list_panel, container, false);
-    }
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstance) {
+        final ViewGroup root = (ViewGroup) inflater.inflate(R.layout.readinglistpanel_gone_fragment, container, false);
 
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        mTopView = view;
-
-        mList = (HomeListView) view.findViewById(R.id.list);
-        mList.setTag(HomePager.LIST_TAG_READING_LIST);
-
-        mList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+        // We could update the ID names - however this panel is only intended to be live for one
+        // release, hence there's little utility in optimising this code.
+        root.findViewById(R.id.welcome_account).setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                final Context context = getActivity();
-                if (context == null) {
-                    return;
-                }
-
-                final Cursor c = mAdapter.getCursor();
-                if (c == null || !c.moveToPosition(position)) {
-                    return;
-                }
-
-                String url = c.getString(c.getColumnIndexOrThrow(URLColumns.URL));
-                url = ReaderModeUtils.getAboutReaderForUrl(url);
-
-                Telemetry.sendUIEvent(TelemetryContract.Event.LOAD_URL, TelemetryContract.Method.LIST_ITEM, "reading_list");
-                Telemetry.addToHistogram("FENNEC_LOAD_SAVED_PAGE", NetworkUtils.isConnected(context) ? 0 : 1);
-
-                // This item is a TwoLinePageRow, so we allow switch-to-tab.
-                mUrlOpenListener.onUrlOpen(url, EnumSet.of(OnUrlOpenListener.Flags.ALLOW_SWITCH_TO_TAB));
-
-                markAsRead(context, id);
+            public void onClick(View v) {
+                mUrlOpenListener.onUrlOpen("about:home?panel=" + HomeConfig.getIdForBuiltinPanelType(HomeConfig.PanelType.BOOKMARKS),
+                        EnumSet.noneOf(HomePager.OnUrlOpenListener.Flags.class));
             }
         });
 
-        mList.setContextMenuInfoFactory(new HomeContextMenuInfo.Factory() {
+        root.findViewById(R.id.welcome_browse).setOnClickListener(new View.OnClickListener() {
             @Override
-            public HomeContextMenuInfo makeInfoForCursor(View view, int position, long id, Cursor cursor) {
-                final HomeContextMenuInfo info = new HomeContextMenuInfo(view, position, id);
-                info.url = cursor.getString(cursor.getColumnIndexOrThrow(ReadingListItems.URL));
-                info.title = cursor.getString(cursor.getColumnIndexOrThrow(ReadingListItems.TITLE));
-                info.readingListItemId = cursor.getInt(cursor.getColumnIndexOrThrow(ReadingListItems._ID));
-                info.isUnread = cursor.getInt(cursor.getColumnIndexOrThrow(ReadingListItems.IS_UNREAD)) == 1;
-                info.itemType = RemoveItemType.READING_LIST;
-                return info;
+            public void onClick(View v) {
+                final String link = getString(R.string.migrated_reading_list_url,
+                        AppConstants.MOZ_APP_VERSION,
+                        AppConstants.OS_TARGET,
+                        Locales.getLanguageTag(Locale.getDefault()));
+
+                mUrlOpenListener.onUrlOpen(link,
+                        EnumSet.noneOf(HomePager.OnUrlOpenListener.Flags.class));
             }
         });
-        registerForContextMenu(mList);
-    }
 
-    private void markAsRead(final Context context, final long id) {
-        GeckoProfile.get(context).getDB().getReadingListAccessor().markAsRead(
-            context.getContentResolver(),
-            id
-        );
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-
-        // Discard any additional item clicks on the list as the
-        // panel is getting destroyed (bug 1210243).
-        mList.setOnItemClickListener(null);
-
-        mList = null;
-        mTopView = null;
-        mEmptyView = null;
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-
-        mAdapter = new ReadingListAdapter(getActivity(), null);
-        mList.setAdapter(mAdapter);
-
-        // Create callbacks before the initial loader is started.
-        mCursorLoaderCallbacks = new CursorLoaderCallbacks();
-        loadIfVisible();
+        return root;
     }
 
     @Override
     protected void load() {
-        getLoaderManager().initLoader(LOADER_ID_READING_LIST, null, mCursorLoaderCallbacks);
-    }
-
-    private void updateUiFromCursor(Cursor c) {
-        // We delay setting the empty view until the cursor is actually empty.
-        // This avoids image flashing.
-        if ((c == null || c.getCount() == 0) && mEmptyView == null) {
-            final ViewStub emptyViewStub = (ViewStub) mTopView.findViewById(R.id.home_empty_view_stub);
-            mEmptyView = emptyViewStub.inflate();
-
-            final TextView emptyText = (TextView) mEmptyView.findViewById(R.id.home_empty_text);
-            emptyText.setText(R.string.home_reading_list_empty);
-
-            final ImageView emptyImage = (ImageView) mEmptyView.findViewById(R.id.home_empty_image);
-            emptyImage.setImageResource(R.drawable.icon_reading_list_empty);
-
-            mList.setEmptyView(mEmptyView);
-        }
-    }
-
-    /**
-     * Cursor loader for the list of reading list items.
-     */
-    private static class ReadingListLoader extends SimpleCursorLoader {
-        private final ReadingListAccessor accessor;
-
-        public ReadingListLoader(Context context) {
-            super(context);
-            accessor = GeckoProfile.get(context).getDB().getReadingListAccessor();
-        }
-
-        @Override
-        public Cursor loadCursor() {
-            return accessor.getReadingList(getContext().getContentResolver());
-        }
-    }
-
-    /**
-     * Cursor adapter for the list of reading list items.
-     */
-    private class ReadingListAdapter extends CursorAdapter {
-        public ReadingListAdapter(Context context, Cursor cursor) {
-            super(context, cursor, 0);
-        }
-
-        @Override
-        public void bindView(View view, Context context, Cursor cursor) {
-            final ReadingListRow row = (ReadingListRow) view;
-            row.updateFromCursor(cursor);
-        }
-
-        @Override
-        public View newView(Context context, Cursor cursor, ViewGroup parent) {
-            return LayoutInflater.from(parent.getContext()).inflate(R.layout.reading_list_item_row, parent, false);
-        }
-    }
-
-    /**
-     * LoaderCallbacks implementation that interacts with the LoaderManager.
-     */
-    private class CursorLoaderCallbacks extends TransitionAwareCursorLoaderCallbacks {
-        @Override
-        public Loader<Cursor> onCreateLoader(int id, Bundle args) {
-            return new ReadingListLoader(getActivity());
-        }
-
-        @Override
-        public void onLoadFinishedAfterTransitions(Loader<Cursor> loader, Cursor c) {
-            mAdapter.swapCursor(c);
-            updateUiFromCursor(c);
-        }
-
-        @Override
-        public void onLoaderReset(Loader<Cursor> loader) {
-            super.onLoaderReset(loader);
-            mAdapter.swapCursor(null);
-        }
+        // Must be overriden, but we're not doing any loading hence no real implementation...
     }
 }
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -19,16 +19,20 @@
 <!ENTITY firstrun_sync_subtext "Sync your tabs, passwords, and more everywhere you use it.">
 <!ENTITY firstrun_signin_message "Get connected, get started">
 <!ENTITY firstrun_signin_button "Sign in to Sync">
 <!ENTITY  onboard_start_button_browser "Start Browsing">
 <!ENTITY firstrun_button_next "Next">
 
 <!ENTITY  onboard_start_restricted1 "Stay safe and in control with this simplified version of &brandShortName;.">
 
+<!ENTITY  reading_list_migration_title "Reading List connected">
+<!ENTITY  reading_list_migration_subtext "Your Reading List items will now be added to your Bookmarks">
+<!ENTITY  reading_list_migration_goto_bookmarks "Go to Bookmarks">
+
 <!-- Localization note: These are used as the titles of different pages on the home screen.
      They are automatically converted to all caps by the Android platform. -->
 <!ENTITY  bookmarks_title "Bookmarks">
 <!ENTITY  history_title "History">
 <!ENTITY  reading_list_title "Reading List">
 <!ENTITY  recent_tabs_title "Recent Tabs">
 
 <!ENTITY  switch_to_tab "Switch to tab">
copy from mobile/android/base/resources/layout/firstrun_sync_fragment.xml
copy to mobile/android/base/resources/layout/readinglistpanel_gone_fragment.xml
--- a/mobile/android/base/resources/layout/firstrun_sync_fragment.xml
+++ b/mobile/android/base/resources/layout/readinglistpanel_gone_fragment.xml
@@ -12,44 +12,48 @@
 
     <LinearLayout android:layout_width="match_parent"
                   android:layout_height="wrap_content"
                   android:minHeight="@dimen/firstrun_min_height"
                   android:background="@color/about_page_header_grey"
                   android:gravity="center_horizontal"
                   android:orientation="vertical">
 
-
         <ImageView android:layout_width="wrap_content"
-                   android:layout_height="@dimen/firstrun_background_height"
+                   android:layout_height="wrap_content"
                    android:layout_marginTop="40dp"
                    android:layout_marginBottom="40dp"
                    android:scaleType="fitCenter"
                    android:layout_gravity="center"
                    android:adjustViewBounds="true"
-                   android:src="@drawable/firstrun_signin"/>
+                   android:src="@drawable/reading_list_migration"/>
 
         <TextView android:layout_width="@dimen/firstrun_content_width"
                   android:layout_height="wrap_content"
                   android:gravity="center"
-                  android:paddingBottom="40dp"
                   android:textAppearance="@style/TextAppearance.FirstrunLight.Main"
-                  android:text="@string/firstrun_signin_message"/>
+                  android:text="@string/reading_list_migration_title"/>
+
+        <TextView android:id="@+id/firstrun_subtext"
+                  android:layout_width="@dimen/firstrun_content_width"
+                  android:layout_height="wrap_content"
+                  android:paddingTop="20dp"
+                  android:paddingBottom="30dp"
+                  android:gravity="center"
+                  android:text="@string/reading_list_migration_subtext"
+                  android:textAppearance="@style/TextAppearance.FirstrunRegular.Body"
+                  android:singleLine="false"/>
 
         <Button android:id="@+id/welcome_account"
                 style="@style/Widget.Firstrun.Button"
                 android:background="@drawable/button_background_action_orange_round"
                 android:layout_gravity="center"
-                android:text="@string/firstrun_signin_button"/>
-
-        <View android:layout_weight="1"
-              android:layout_height="0dp"
-              android:layout_width="match_parent"/>
+                android:text="@string/reading_list_migration_goto_bookmarks"/>
 
         <TextView android:id="@+id/welcome_browse"
                   android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
-                  android:padding="30dp"
+                  android:padding="16dp"
                   android:gravity="center"
                   android:textAppearance="@style/TextAppearance.FirstrunRegular.Link"
-                  android:text="@string/firstrun_welcome_button_browser"/>
+                  android:text="@string/pref_learn_more"/>
     </LinearLayout>
 </ScrollView>
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -52,16 +52,19 @@
 
   <string name="firstrun_welcome_restricted">&onboard_start_restricted1;</string>
 
   <string name="bookmarks_title">&bookmarks_title;</string>
   <string name="history_title">&history_title;</string>
   <string name="reading_list_title">&reading_list_title;</string>
   <string name="recent_tabs_title">&recent_tabs_title;</string>
 
+  <!-- https://support.mozilla.org/1/mobile/%VERSION%/%OS%/%LOCALE%/reading-list -->
+  <string name="migrated_reading_list_url">https://support.mozilla.org/1/mobile/&formatS1;/&formatS2;/&formatS3;/reading-list</string>
+
   <string name="switch_to_tab">&switch_to_tab;</string>
 
   <string name="crash_reporter_title">&crash_reporter_title;</string>
   <string name="crash_message2">&crash_message2;</string>
   <string name="crash_send_report_message3">&crash_send_report_message3;</string>
   <string name="crash_include_url2">&crash_include_url2;</string>
   <string name="crash_sorry">&crash_sorry;</string>
   <string name="crash_comment">&crash_comment;</string>
@@ -346,16 +349,20 @@
   <string name="site_settings_cancel">&site_settings_cancel;</string>
   <string name="site_settings_clear">&site_settings_clear;</string>
 
   <string name="reading_list_added">&reading_list_added3;</string>
   <string name="reading_list_removed">&reading_list_removed;</string>
   <string name="reading_list_remove">&reading_list_remove;</string>
   <string name="reading_list_duplicate">&reading_list_duplicate;</string>
 
+  <string name="reading_list_migration_title">&reading_list_migration_title;</string>
+  <string name="reading_list_migration_subtext">&reading_list_migration_subtext;</string>
+  <string name="reading_list_migration_goto_bookmarks">&reading_list_migration_goto_bookmarks;</string>
+
   <string name="page_action_dropmarker_description">&page_action_dropmarker_description;</string>
 
   <string name="contextmenu_open_new_tab">&contextmenu_open_new_tab;</string>
   <string name="contextmenu_open_private_tab">&contextmenu_open_private_tab;</string>
   <string name="contextmenu_remove">&contextmenu_remove;</string>
   <string name="contextmenu_add_to_launcher">&contextmenu_add_to_launcher;</string>
   <string name="contextmenu_share">&contextmenu_share;</string>
   <string name="contextmenu_pasteandgo">&contextmenu_pasteandgo;</string>
author	Andrzej Hunt <ahunt@mozilla.com>
	Tue, 22 Mar 2016 12:58:19 -0700
changeset 343978	9fb26911dec1643c03720e35d668cee402e5df76
parent 343977	a30891be3fd91d1f9adf3c0fb3f4ce9f959594f6
child 343979	b5d554e55253c91ada8b0118d59e3bf4af8466ce
push id	13730
push user	ahunt@mozilla.com
push date	Wed, 23 Mar 2016 17:30:25 +0000
reviewers	liuche
bugs	1234316
milestone	48.0a1
mobile/android/base/java/org/mozilla/gecko/home/ReadingListPanel.java		file \| annotate \| diff \| comparison \| revisions
mobile/android/base/locales/en-US/android_strings.dtd		file \| annotate \| diff \| comparison \| revisions
mobile/android/base/resources/drawable-hdpi/reading_list_migration.png		file \| annotate \| diff \| comparison \| revisions
mobile/android/base/resources/drawable-xhdpi/reading_list_migration.png		file \| annotate \| diff \| comparison \| revisions
mobile/android/base/resources/drawable-xxhdpi/reading_list_migration.png		file \| annotate \| diff \| comparison \| revisions
mobile/android/base/resources/layout/readinglistpanel_gone_fragment.xml		file \| annotate \| diff \| comparison \| revisions
mobile/android/base/strings.xml.in		file \| annotate \| diff \| comparison \| revisions