Uplift of "What's new" feature. (#1201)

app/src/main/java/org/mozilla/focus/ext/Context.kt

@@ -0,0 +1,19 @@
+/* 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.focus.ext
+
+import android.content.Context
+
+// Extension functions for the Context class
+
+/**
+ * The (visible) version name of the application, as specified by the <manifest> tag's versionName
+ * attribute. E.g. "2.0".
+ */
+val Context.appVersionName: String?
+    get() {
+        val packageInfo = packageManager.getPackageInfo(packageName, 0)
+        return packageInfo.versionName
+    }

app/src/main/java/org/mozilla/focus/fragment/BrowserFragment.java

@@ -48,8 +48,8 @@
 import org.mozilla.focus.broadcastreceiver.DownloadBroadcastReceiver;
 import org.mozilla.focus.customtabs.CustomTabConfig;
 import org.mozilla.focus.locale.LocaleAwareAppCompatActivity;
-import org.mozilla.focus.menu.BrowserMenu;
-import org.mozilla.focus.menu.WebContextMenu;
+import org.mozilla.focus.menu.browser.BrowserMenu;
+import org.mozilla.focus.menu.context.WebContextMenu;
 import org.mozilla.focus.open.OpenWithFragment;
 import org.mozilla.focus.session.NullSession;
 import org.mozilla.focus.session.Session;

app/src/main/java/org/mozilla/focus/fragment/UrlInputFragment.java

@@ -14,13 +14,10 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.FragmentManager;
-import android.support.v7.widget.PopupMenu;
 import android.text.SpannableString;
 import android.text.TextUtils;
 import android.text.style.StyleSpan;
-import android.view.Gravity;
 import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
@@ -32,21 +29,24 @@
 import org.mozilla.focus.autocomplete.UrlAutoCompleteFilter;
 import org.mozilla.focus.locale.LocaleAwareAppCompatActivity;
 import org.mozilla.focus.locale.LocaleAwareFragment;
+import org.mozilla.focus.menu.home.HomeMenu;
 import org.mozilla.focus.session.Session;
 import org.mozilla.focus.session.SessionManager;
 import org.mozilla.focus.session.Source;
 import org.mozilla.focus.telemetry.TelemetryWrapper;
 import org.mozilla.focus.utils.Settings;
+import org.mozilla.focus.utils.SupportUtils;
 import org.mozilla.focus.utils.ThreadUtils;
 import org.mozilla.focus.utils.UrlUtils;
 import org.mozilla.focus.utils.ViewUtils;
+import org.mozilla.focus.whatsnew.WhatsNew;
 import org.mozilla.focus.widget.InlineAutocompleteEditText;
 import org.mozilla.focus.widget.ResizableKeyboardLinearLayout;
 
 /**
  * Fragment for displaying he URL input controls.
  */
-public class UrlInputFragment extends LocaleAwareFragment implements View.OnClickListener, InlineAutocompleteEditText.OnCommitListener, InlineAutocompleteEditText.OnFilterListener, PopupMenu.OnMenuItemClickListener {
+public class UrlInputFragment extends LocaleAwareFragment implements View.OnClickListener, InlineAutocompleteEditText.OnCommitListener, InlineAutocompleteEditText.OnFilterListener {
     public static final String FRAGMENT_TAG = "url_input";
 
     private static final String ARGUMENT_ANIMATION = "animation";
@@ -115,7 +115,7 @@ public static UrlInputFragment createWithBackground() {
     private View toolbarBackgroundView;
     private View menuView;
 
-    private @Nullable PopupMenu displayedPopupMenu;
+    private @Nullable HomeMenu displayedPopupMenu;
 
     private volatile boolean isAnimating;
 
@@ -267,12 +267,28 @@ public void onClick(View view) {
                 break;
 
             case R.id.menu:
-                final PopupMenu popupMenu = new PopupMenu(view.getContext(), view);
-                popupMenu.getMenuInflater().inflate(R.menu.menu_home, popupMenu.getMenu());
-                popupMenu.setOnMenuItemClickListener(this);
-                popupMenu.setGravity(Gravity.TOP);
-                popupMenu.show();
-                displayedPopupMenu = popupMenu;
+                final HomeMenu menu = new HomeMenu(getContext(), this);
+                menu.show(view);
+
+                displayedPopupMenu = menu;
+                break;
+
+            case R.id.whats_new:
+                TelemetryWrapper.openWhatsNewEvent(WhatsNew.shouldHighlightWhatsNew(getContext()));
+
+                WhatsNew.userViewedWhatsNew(getContext());
+
+                SessionManager.getInstance()
+                        .createSession(Source.MENU, SupportUtils.getWhatsNewUrl(getContext()));
+                break;
+
+            case R.id.settings:
+                ((LocaleAwareAppCompatActivity) getActivity()).openPreferences();
+                break;
+
+            case R.id.help:
+                final Intent helpIntent = InfoActivity.getHelpIntent(getActivity());
+                startActivity(helpIntent);
                 break;
 
             default:
@@ -571,33 +587,4 @@ public void onFilter(String searchText, InlineAutocompleteEditText view) {
             searchViewContainer.setVisibility(View.VISIBLE);
         }
     }
-
-    @Override
-    public boolean onMenuItemClick(MenuItem item) {
-        final int id = item.getItemId();
-
-        switch (id) {
-            case R.id.settings:
-                ((LocaleAwareAppCompatActivity) getActivity()).openPreferences();
-                return true;
-
-            case R.id.about:
-                Intent aboutIntent = InfoActivity.getAboutIntent(getActivity());
-                startActivity(aboutIntent);
-                return true;
-
-            case R.id.rights:
-                Intent rightsIntent = InfoActivity.getRightsIntent(getActivity());
-                startActivity(rightsIntent);
-                return true;
-
-            case R.id.help:
-                Intent helpIntent = InfoActivity.getHelpIntent(getActivity());
-                startActivity(helpIntent);
-                return true;
-
-            default:
-                throw new IllegalStateException("Unhandled view ID in onMenuItemClick()");
-        }
-    }
 }

app/src/main/java/org/mozilla/focus/menu/BlockingItemViewHolder.java → app/src/main/java/org/mozilla/focus/menu/browser/BlockingItemViewHolder.java

@@ -3,7 +3,7 @@
  * 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.focus.menu;
+package org.mozilla.focus.menu.browser;
 
 import android.view.View;
 import android.widget.CompoundButton;

app/src/main/java/org/mozilla/focus/menu/BrowserMenu.java → app/src/main/java/org/mozilla/focus/menu/browser/BrowserMenu.java

@@ -3,7 +3,7 @@
  * 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.focus.menu;
+package org.mozilla.focus.menu.browser;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -22,6 +22,9 @@
 import org.mozilla.focus.fragment.BrowserFragment;
 import org.mozilla.focus.utils.ViewUtils;
 
+/**
+ * The overflow menu shown in the BrowserFragment containing page actions like "Refresh", "Share" etc.
+ */
 public class BrowserMenu extends PopupWindow {
     private BrowserMenuAdapter adapter;
 

app/src/main/java/org/mozilla/focus/menu/BrowserMenuAdapter.java → app/src/main/java/org/mozilla/focus/menu/browser/BrowserMenuAdapter.java

@@ -3,7 +3,7 @@
  * 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.focus.menu;
+package org.mozilla.focus.menu.browser;
 
 import android.app.PendingIntent;
 import android.content.Context;

app/src/main/java/org/mozilla/focus/menu/BrowserMenuViewHolder.java → app/src/main/java/org/mozilla/focus/menu/browser/BrowserMenuViewHolder.java

@@ -3,7 +3,7 @@
  * 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.focus.menu;
+package org.mozilla.focus.menu.browser;
 
 import android.support.v7.widget.RecyclerView;
 import android.view.View;

app/src/main/java/org/mozilla/focus/menu/CustomTabMenuItemViewHolder.java → app/src/main/java/org/mozilla/focus/menu/browser/CustomTabMenuItemViewHolder.java

@@ -1,4 +1,4 @@
-package org.mozilla.focus.menu;
+package org.mozilla.focus.menu.browser;
 
 import android.app.PendingIntent;
 import android.content.Intent;

app/src/main/java/org/mozilla/focus/menu/MenuItemViewHolder.java → app/src/main/java/org/mozilla/focus/menu/browser/MenuItemViewHolder.java

@@ -3,7 +3,7 @@
  * 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.focus.menu;
+package org.mozilla.focus.menu.browser;
 
 import android.view.View;
 import android.widget.TextView;

app/src/main/java/org/mozilla/focus/menu/NavigationItemViewHolder.java → app/src/main/java/org/mozilla/focus/menu/browser/NavigationItemViewHolder.java

@@ -3,7 +3,7 @@
  * 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.focus.menu;
+package org.mozilla.focus.menu.browser;
 
 import android.view.View;
 

app/src/main/java/org/mozilla/focus/menu/WebContextMenu.java → app/src/main/java/org/mozilla/focus/menu/context/WebContextMenu.java

@@ -2,7 +2,7 @@
  * 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.focus.menu;
+package org.mozilla.focus.menu.context;
 
 import android.app.Dialog;
 import android.content.ClipData;
@@ -29,6 +29,9 @@
 import org.mozilla.focus.web.Download;
 import org.mozilla.focus.web.IWebView;
 
+/**
+ * The context menu shown when long pressing a URL or an image inside the WebView.
+ */
 public class WebContextMenu {
 
     private static View createTitleView(final @NonNull Context context, final @NonNull String title) {

app/src/main/java/org/mozilla/focus/menu/home/HomeMenu.kt

@@ -0,0 +1,55 @@
+/* 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.focus.menu.home
+
+import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.support.v7.widget.LinearLayoutManager
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.PopupWindow
+import kotlinx.android.synthetic.main.menu.view.*
+import org.mozilla.focus.R
+import org.mozilla.focus.utils.ViewUtils
+
+/**
+ * The overflow menu shown on the start/home screen.
+ */
+class HomeMenu(
+        val context: Context,
+        val listener: View.OnClickListener
+) : PopupWindow(), View.OnClickListener {
+    init {
+        contentView = LayoutInflater.from(context).inflate(R.layout.menu, null)
+
+        with(contentView.list) {
+            layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+            adapter = HomeMenuAdapter(context, this@HomeMenu)
+        }
+
+        setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+
+        isFocusable = true
+
+        height = ViewGroup.LayoutParams.WRAP_CONTENT
+        width = ViewGroup.LayoutParams.WRAP_CONTENT
+
+        elevation = context.resources.getDimension(R.dimen.menu_elevation)
+    }
+
+    fun show(anchor: View) {
+        val xOffset = if (ViewUtils.isRTL(anchor)) -anchor.width else 0
+
+        super.showAsDropDown(anchor, xOffset, -(anchor.height + anchor.paddingBottom))
+    }
+
+    override fun onClick(view: View?) {
+        dismiss()
+
+        listener.onClick(view)
+    }
+}