Feature/reader search toolbar

README.md

@@ -34,6 +34,25 @@ test the project:
 
 You can use [Android Studio][3] by importing the project as a Gradle project.
 
+### Additional Build Instructions for Windows ###
+
+The [visual editor][10] uses a linux-style symlink for its [assets folder][11],
+which has to be converted to a Windows symlink.
+
+From git bash, inside the project root:
+
+    $ rm libs/editor/WordPressEditor/src/main/assets
+    $ git ls-files --deleted -z | git update-index --assume-unchanged -z --stdin
+
+Then, from a Windows command prompt:
+
+    mklink /D [PROJECT_ROOT]\libs\editor\WordPressEditor\src\main\assets %PROJECT_ROOT%\libs\editor\libs\editor-common\assets
+
+Finally, update `[PROJECT_ROOT]\.git\info\exclude` to ignore the symlink locally:
+
+    # editor assets symlink
+    libs/editor/WordPressEditor/src/main/assets
+
 ## Directory structure ##
 
     |-- libs                    # dependencies used to build debug variants
@@ -122,3 +141,5 @@ be covered by a different license compatible with the GPLv2.
 [7]: https://developer.wordpress.com/docs/api/
 [8]: https://facebook.github.io/buck
 [9]: https://facebook.github.io/watchman/docs/install.html
+[10]: https://github.com/wordpress-mobile/WordPress-Editor-Android
+[11]: https://github.com/wordpress-mobile/WordPress-Android/blob/develop/libs/editor/WordPressEditor/src/main/assets

WordPress/build.gradle

@@ -151,7 +151,7 @@ task generateCrashlyticsConfig(group: "generate", description: "Generate Crashly
         inputFile.withInputStream { stream ->
             properties.load(stream)
         }
-        def crashlyticsApiKey = properties.getProperty('crashlytics.apikey', '0')
+        def crashlyticsApiKey = properties.getProperty('wp.crashlytics.apikey', '0')
         def writer = new FileWriter(outputFile)
         writer.write("""// auto-generated file from ${rootDir}/gradle.properties do not modify
 apiKey=${crashlyticsApiKey}""")

WordPress/src/main/AndroidManifest.xml

@@ -256,7 +256,8 @@
         <activity
             android:name=".ui.reader.ReaderPostListActivity"
             android:label="@string/reader"
-            android:theme="@style/Calypso.NoActionBar" />
+            android:theme="@style/Calypso.NoActionBar">
+        </activity>
         <activity
             android:name=".ui.reader.ReaderPostPagerActivity"
             android:label="@string/reader_title_post_detail"

WordPress/src/main/java/org/wordpress/android/WordPress.java

@@ -49,6 +49,7 @@
 import org.wordpress.android.ui.accounts.helpers.UpdateBlogListTask.GenericUpdateBlogListTask;
 import org.wordpress.android.ui.notifications.utils.NotificationsUtils;
 import org.wordpress.android.ui.notifications.utils.SimperiumUtils;
+import org.wordpress.android.ui.plans.PlansUtils;
 import org.wordpress.android.ui.prefs.AppPrefs;
 import org.wordpress.android.ui.stats.StatsWidgetProvider;
 import org.wordpress.android.ui.stats.datasets.StatsDatabaseHelper;
@@ -822,6 +823,7 @@ public void onAppComesFromBackground() {
                 sUpdateCurrentBlogOption.runIfNotLimited();
             }
             sDeleteExpiredStats.runIfNotLimited();
+            PlansUtils.synchIAPsWordPressCom();
         }
 
         @Override

WordPress/src/main/java/org/wordpress/android/datasets/ReaderDatabase.java

@@ -19,7 +19,7 @@
  */
 public class ReaderDatabase extends SQLiteOpenHelper {
     protected static final String DB_NAME = "wpreader.db";
-    private static final int DB_VERSION = 114;
+    private static final int DB_VERSION = 115;
 
     /*
      * version history
@@ -66,6 +66,7 @@ public class ReaderDatabase extends SQLiteOpenHelper {
      *  112 - no structural change, just reset db
      *  113 - added tag_title to tag tables
      *  114 - renamed tag_name to tag_slug in tag tables
+     *  115 - added ReaderSearchTable
      */
 
     /*
@@ -141,6 +142,7 @@ private void createAllTables(SQLiteDatabase db) {
         ReaderUserTable.createTables(db);
         ReaderThumbnailTable.createTables(db);
         ReaderBlogTable.createTables(db);
+        ReaderSearchTable.createTables(db);
     }
 
     private void dropAllTables(SQLiteDatabase db) {
@@ -151,6 +153,7 @@ private void dropAllTables(SQLiteDatabase db) {
         ReaderUserTable.dropTables(db);
         ReaderThumbnailTable.dropTables(db);
         ReaderBlogTable.dropTables(db);
+        ReaderSearchTable.dropTables(db);
     }
 
     /*

WordPress/src/main/java/org/wordpress/android/datasets/ReaderSearchTable.java

@@ -0,0 +1,81 @@
+package org.wordpress.android.datasets;
+
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteStatement;
+import android.support.annotation.NonNull;
+import android.text.TextUtils;
+
+import org.wordpress.android.util.DateTimeUtils;
+import org.wordpress.android.util.SqlUtils;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * user's reader search history
+ */
+public class ReaderSearchTable {
+
+    protected static void createTables(SQLiteDatabase db) {
+        db.execSQL("CREATE TABLE tbl_search_history ("
+                 + "	query_string   TEXT NOT NULL COLLATE NOCASE PRIMARY KEY,"
+                 + "    date_used      TEXT,"
+                 + "    counter        INTEGER DEFAULT 1)");
+    }
+
+    protected static void dropTables(SQLiteDatabase db) {
+        db.execSQL("DROP TABLE IF EXISTS tbl_search_history");
+    }
+
+    /*
+     * adds the passed query string, updating the usage counter and date
+     */
+    public static void addOrUpdateQueryString(@NonNull String query) {
+        String date = DateTimeUtils.javaDateToIso8601(new Date());
+        int counter = getCounterForQueryString(query) + 1;
+
+        SQLiteStatement stmt = ReaderDatabase.getWritableDb().compileStatement(
+                "INSERT OR REPLACE INTO tbl_search_history (query_string, date_used, counter) VALUES (?1,?2,?3)");
+        try {
+            stmt.bindString(1, query);
+            stmt.bindString(2, date);
+            stmt.bindLong  (3, counter);
+            stmt.execute();
+        } finally {
+            SqlUtils.closeStatement(stmt);
+        }
+    }
+
+    private static int getCounterForQueryString(@NonNull String query) {
+        String[] args = {query};
+        return SqlUtils.intForQuery(ReaderDatabase.getReadableDb(),
+                "SELECT counter FROM tbl_search_history WHERE query_string=?", args);
+    }
+
+    public static List<String> getQueryStrings() {
+        return getQueryStrings(null);
+    }
+    public static List<String> getQueryStrings(String filter) {
+        List<String> queries = new ArrayList<>();
+        Cursor cursor;
+        if (TextUtils.isEmpty(filter)) {
+            cursor = ReaderDatabase.getReadableDb().rawQuery(
+                    "SELECT query_string FROM tbl_search_history ORDER BY date_used DESC", null);
+        } else {
+            String likeFilter = filter + "%";
+            cursor = ReaderDatabase.getReadableDb().rawQuery(
+                    "SELECT query_string FROM tbl_search_history WHERE query_string LIKE ? ORDER BY date_used DESC", new String[]{likeFilter});
+        }
+
+        try {
+            while (cursor.moveToNext()) {
+                queries.add(cursor.getString(0));
+            }
+            return queries;
+        } finally {
+            SqlUtils.closeCursor(cursor);
+        }
+    }
+}

WordPress/src/main/java/org/wordpress/android/datasets/ReaderTagTable.java

@@ -29,7 +29,7 @@ protected static void createTables(SQLiteDatabase db) {
                  + "	tag_title    TEXT COLLATE NOCASE,"
                  + "    tag_type     INTEGER DEFAULT 0,"
                  + "    endpoint     TEXT,"
-                + " 	date_updated TEXT,"
+                 + " 	date_updated TEXT,"
                  + "    PRIMARY KEY (tag_slug, tag_type)"
                  + ")");
 

WordPress/src/main/java/org/wordpress/android/ui/FilteredRecyclerView.java

@@ -1,18 +1,19 @@
 package org.wordpress.android.ui;
 
 import android.content.Context;
+import android.support.annotation.MenuRes;
 import android.support.design.widget.AppBarLayout;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.LayoutInflater;
+import android.view.Menu;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
-import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.Spinner;
@@ -41,7 +42,6 @@ public class FilteredRecyclerView extends RelativeLayout {
     private RecyclerView mRecyclerView;
     private TextView mEmptyView;
     private View mCustomEmptyView;
-    private LinearLayout mCustomComponentsContainer;
     private Toolbar mToolbar;
     private AppBarLayout mAppBarLayout;
 
@@ -124,7 +124,6 @@ private void init() {
         mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
         mRecyclerView.addItemDecoration(new RecyclerItemDecoration(spacingHorizontal, spacingVertical));
 
-        mCustomComponentsContainer = (LinearLayout) findViewById(R.id.custom_components_toolbar_container);
         mToolbar = (Toolbar) findViewById(R.id.toolbar_with_spinner);
         mAppBarLayout = (AppBarLayout) findViewById(R.id.app_bar_layout);
 
@@ -278,15 +277,12 @@ public void hideLoadingProgress() {
     }
 
     /*
-     * use this to add custom control/component views to your toolbar. Components are added on the right side of the
-      * toolbar */
-    public void addToolbarCustomControl(View v, OnClickListener clickListener){
-        if (v != null){
-            mCustomComponentsContainer.addView(v);
-            if (clickListener != null){
-                v.setOnClickListener(clickListener);
-            }
-        }
+     * add a menu to the right side of the toolbar, returns the toolbar menu so the caller
+     * can act upon it
+     */
+    public Menu addToolbarMenu(@MenuRes int menuResId) {
+        mToolbar.inflateMenu(menuResId);
+        return mToolbar.getMenu();
     }
 
     public void setToolbarBackgroundColor(int color){
@@ -362,6 +358,10 @@ public void removeOnScrollListener(RecyclerView.OnScrollListener listener) {
         }
     }
 
+    public RecyclerView getInternalRecyclerView() {
+        return mRecyclerView;
+    }
+
     public void hideToolbar(){
         mAppBarLayout.setExpanded(false, true);
     }

WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java

@@ -80,6 +80,14 @@ public interface OnScrollToTopListener {
         void onScrollToTop();
     }
 
+    /*
+     * tab fragments implement this and return true if the fragment handles the back button
+     * and doesn't want the activity to handle it as well
+     */
+    public interface OnActivityBackPressedListener {
+        boolean onActivityBackPressed();
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         ProfilingUtils.split("WPMainActivity.onCreate");
@@ -314,6 +322,23 @@ protected void onResume() {
         ProfilingUtils.stop();
     }
 
+    @Override
+    public void onBackPressed() {
+        // let the fragment handle the back button if it implements our OnParentBackPressedListener
+        Fragment fragment = getActiveFragment();
+        if (fragment instanceof OnActivityBackPressedListener) {
+            boolean handled = ((OnActivityBackPressedListener) fragment).onActivityBackPressed();
+            if (handled) {
+                return;
+            }
+        }
+        super.onBackPressed();
+    }
+
+    private Fragment getActiveFragment() {
+        return mTabAdapter.getFragment(mViewPager.getCurrentItem());
+    }
+
     private void checkMagicLinkSignIn() {
         if (getIntent() !=  null) {
             if (getIntent().getBooleanExtra(MagicLinkSignInActivity.MAGIC_LOGIN, false)) {