Feature/4.1 widget (#150)

* Add basic widget

* Add widget assets

* Clearing out browser UI manually - this shouldn't need done in code

Ideally, we would get a new Activity instance and not have to handle this in code.

* Fix padding issue on widget

* Update preview image and fix padding

* Fix test

* Remove unused resource file

* Add FLAG_ACTIVITY_CLEAR_TOP to resolve stack issue launching from widget

* Keep the `HomeActivity` around even when launching from widget

* Removing flag as it's no longer needed now that we're not killing home

* Fix formatting

* Restrict min widget width to 4 columns

* Use 4 columns as default widget width, allow user to drop down to 3

Author: CDRussell

app/src/androidTest/java/com/duckduckgo/app/browser/BrowserViewModelTest.kt

@@ -24,15 +24,12 @@ import android.arch.persistence.room.Room
 import android.net.Uri
 import android.support.test.InstrumentationRegistry
 import com.duckduckgo.app.autocomplete.api.AutoCompleteApi
-import com.duckduckgo.app.blockingObserve
 import com.duckduckgo.app.bookmarks.db.BookmarkEntity
 import com.duckduckgo.app.bookmarks.db.BookmarksDao
-import com.duckduckgo.app.bookmarks.ui.BookmarksActivity
 import com.duckduckgo.app.browser.BrowserViewModel.Command
 import com.duckduckgo.app.browser.BrowserViewModel.Command.LandingPage
 import com.duckduckgo.app.browser.BrowserViewModel.Command.Navigate
 import com.duckduckgo.app.browser.omnibar.OmnibarEntryConverter
-import com.duckduckgo.app.global.StringResolver
 import com.duckduckgo.app.global.db.AppDatabase
 import com.duckduckgo.app.privacymonitor.db.NetworkLeaderboardDao
 import com.duckduckgo.app.privacymonitor.db.NetworkLeaderboardEntry
@@ -46,10 +43,7 @@ import com.duckduckgo.app.settings.db.SettingsDataStore
 import com.duckduckgo.app.trackerdetection.model.TrackerNetwork
 import com.duckduckgo.app.trackerdetection.model.TrackerNetworks
 import com.duckduckgo.app.trackerdetection.model.TrackingEvent
-import com.nhaarman.mockito_kotlin.any
-import com.nhaarman.mockito_kotlin.doReturn
-import com.nhaarman.mockito_kotlin.mock
-import com.nhaarman.mockito_kotlin.whenever
+import com.nhaarman.mockito_kotlin.*
 import org.junit.After
 import org.junit.Assert.*
 import org.junit.Before
@@ -249,7 +243,7 @@ class BrowserViewModelTest {
     fun whenSharedTextReceivedThenNavigationTriggered() {
         testee.onSharedTextReceived("http://example.com")
         val captor: ArgumentCaptor<Command> = ArgumentCaptor.forClass(Command::class.java)
-        verify(mockNavigationObserver).onChanged(captor.capture())
+        verify(mockNavigationObserver, times(2)).onChanged(captor.capture())
         assertNotNull(captor.value)
         assertTrue(captor.value is Navigate)
     }

app/src/main/AndroidManifest.xml

@@ -15,7 +15,6 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning">
-
         <meta-data
             android:name="android.webkit.WebView.MetricsOptOut"
             android:value="true" />
@@ -25,10 +24,10 @@
             android:label="@string/appName">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
         <activity
             android:name="com.duckduckgo.app.home.HomeActivity"
             android:label="@string/appName"
@@ -48,47 +47,41 @@
             <!-- Allows apps to consume links and text shared from other apps e.g chrome -->
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
+
                 <category android:name="android.intent.category.DEFAULT" />
+
                 <data android:mimeType="text/plain" />
             </intent-filter>
-
         </activity>
-
         <activity
             android:name=".BrowserActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:parentActivityName="com.duckduckgo.app.home.HomeActivity" />
-
         <activity
             android:name="com.duckduckgo.app.privacymonitor.ui.PrivacyDashboardActivity"
             android:label="@string/privacyDashboardActivityTitle"
             android:parentActivityName=".BrowserActivity" />
-
         <activity
             android:name="com.duckduckgo.app.privacymonitor.ui.ScorecardActivity"
             android:label="@string/scorecardActivityTitle"
             android:parentActivityName="com.duckduckgo.app.privacymonitor.ui.PrivacyDashboardActivity" />
-
         <activity
             android:name="com.duckduckgo.app.privacymonitor.ui.TrackerNetworksActivity"
             android:label="@string/networksActivityTitle"
             android:parentActivityName="com.duckduckgo.app.privacymonitor.ui.PrivacyDashboardActivity" />
-
         <activity
             android:name="com.duckduckgo.app.privacymonitor.ui.PrivacyPracticesActivity"
             android:label="@string/privacyTermsActivityTitle"
             android:parentActivityName="com.duckduckgo.app.privacymonitor.ui.PrivacyDashboardActivity" />
-
         <activity
             android:name="com.duckduckgo.app.settings.SettingsActivity"
-            android:label="@string/settingsActivityTitle" />
+            android:label="@string/settingsActivityTitle"/>
 
         <activity
             android:name="com.duckduckgo.app.about.AboutDuckDuckGoActivity"
             android:label="@string/aboutActivityTitle"
             android:parentActivityName="com.duckduckgo.app.settings.SettingsActivity"
             android:theme="@style/AppTheme" />
-
         <activity
             android:name="com.duckduckgo.app.bookmarks.ui.BookmarksActivity"
             android:label="@string/bookmarksActivityTitle" />
@@ -97,7 +90,15 @@
             android:name="com.duckduckgo.app.job.AppConfigurationJobService"
             android:permission="android.permission.BIND_JOB_SERVICE" />
 
+        <receiver android:name="com.duckduckgo.widget.SearchWidget">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
 
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/search_widget_info" />
+        </receiver>
     </application>
 
 </manifest>

app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt

@@ -148,6 +148,13 @@ class BrowserActivity : DuckDuckGoActivity() {
                     val intent = Intent(Intent.ACTION_SENDTO, Uri.parse("smsto:${it.telephoneNumber}"))
                     startActivity(intent)
                 }
+                is BrowserViewModel.Command.ShowKeyboard -> {
+                    Timber.i("Command: showing keyboard")
+                    omnibarTextInput.postDelayed({omnibarTextInput.showKeyboard()}, 300)
+                }
+                is BrowserViewModel.Command.ReinitialiseWebView -> {
+                    webView.clearHistory()
+                }
             }
         })
     }
@@ -287,7 +294,7 @@ class BrowserActivity : DuckDuckGoActivity() {
             setSupportZoom(true)
         }
 
-        webView.setDownloadListener { url, userAgent, contentDisposition, mimetype, contentLength ->
+        webView.setDownloadListener { url, _, _, _, _ ->
             val request = DownloadManager.Request(Uri.parse(url))
             request.allowScanningByMediaScanner()
             request.setNotificationVisibility(VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
@@ -378,31 +385,37 @@ class BrowserActivity : DuckDuckGoActivity() {
         popupMenu.show(rootView, anchorView)
     }
 
+    @Suppress("UNUSED_PARAMETER")
     fun onGoForwardClicked(view: View) {
         webView.goForward()
         popupMenu.dismiss()
     }
 
+    @Suppress("UNUSED_PARAMETER")
     fun onGoBackClicked(view: View) {
         webView.goBack()
         popupMenu.dismiss()
     }
 
+    @Suppress("UNUSED_PARAMETER")
     fun onRefreshClicked(view: View) {
         webView.reload()
         popupMenu.dismiss()
     }
 
+    @Suppress("UNUSED_PARAMETER")
     fun onBookmarksClicked(view: View) {
         launchBookmarksView()
         popupMenu.dismiss()
     }
 
+    @Suppress("UNUSED_PARAMETER")
     fun onAddBookmarkClicked(view: View) {
         addBookmark()
         popupMenu.dismiss()
     }
 
+    @Suppress("UNUSED_PARAMETER")
     fun onSettingsClicked(view: View) {
         launchSettingsView()
         popupMenu.dismiss()

app/src/main/java/com/duckduckgo/app/browser/BrowserViewModel.kt

@@ -30,7 +30,6 @@ import com.duckduckgo.app.bookmarks.db.BookmarksDao
 import com.duckduckgo.app.browser.BrowserViewModel.Command.Navigate
 import com.duckduckgo.app.browser.omnibar.OmnibarEntryConverter
 import com.duckduckgo.app.global.SingleLiveEvent
-import com.duckduckgo.app.global.StringResolver
 import com.duckduckgo.app.privacymonitor.SiteMonitor
 import com.duckduckgo.app.privacymonitor.db.NetworkLeaderboardDao
 import com.duckduckgo.app.privacymonitor.db.NetworkLeaderboardEntry
@@ -84,6 +83,8 @@ class BrowserViewModel(
         class DialNumber(val telephoneNumber: String) : Command()
         class SendSms(val telephoneNumber: String) : Command()
         class SendEmail(val emailAddress: String) : Command()
+        class ShowKeyboard : Command()
+        class ReinitialiseWebView : Command()
     }
 
     /* Observable data for Activity to subscribe to */
@@ -108,6 +109,7 @@ class BrowserViewModel(
     private var appConfigurationDownloaded = false
 
     init {
+        command.value = Command.ShowKeyboard()
         viewState.value = ViewState(canAddBookmarks = false)
         privacyMonitorRepository.privacyMonitor = MutableLiveData()
         appConfigurationObservable.observeForever(appConfigurationObserver)
@@ -148,6 +150,7 @@ class BrowserViewModel(
         if (input.isBlank()) {
             return
         }
+
         val trimmedInput = input.trim()
         url.value = buildUrl(trimmedInput)
         viewState.value = currentViewState().copy(

app/src/main/java/com/duckduckgo/app/home/HomeActivity.kt

@@ -78,7 +78,15 @@ class HomeActivity : DuckDuckGoActivity() {
     }
 
     private fun consumeSharedQuery(intent: Intent?) {
-        val query = intent?.intentText ?: return
+
+        if (intent == null) return
+
+        if (intent.hasExtra(KEY_SKIP_HOME)) {
+            startActivity(BrowserActivity.intent(this))
+            return
+        }
+
+        val query = intent.intentText ?: return
         startActivity(BrowserActivity.intent(this, query))
     }
 
@@ -143,5 +151,13 @@ class HomeActivity : DuckDuckGoActivity() {
             }
             return intent
         }
+
+        fun launchSkipHome(context: Context) : Intent {
+            val intent = intent(context)
+            intent.putExtra(KEY_SKIP_HOME, true)
+            return intent
+        }
+
+        const val KEY_SKIP_HOME: String = "KEY_SKIP_HOME"
     }
 }

app/src/main/java/com/duckduckgo/widget/SearchWidget.kt

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2018 DuckDuckGo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.duckduckgo.widget
+
+import android.app.PendingIntent
+import android.appwidget.AppWidgetManager
+import android.appwidget.AppWidgetProvider
+import android.content.Context
+import android.widget.RemoteViews
+import com.duckduckgo.app.browser.R
+import com.duckduckgo.app.home.HomeActivity
+
+/**
+ * Implementation of App Widget functionality.
+ */
+class SearchWidget : AppWidgetProvider() {
+
+    override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray) {
+        // There may be multiple widgets active, so update all of them
+        for (appWidgetId in appWidgetIds) {
+            updateAppWidget(context, appWidgetManager, appWidgetId)
+        }
+    }
+
+    companion object {
+
+        internal fun updateAppWidget(context: Context, appWidgetManager: AppWidgetManager,
+                                     appWidgetId: Int) {
+
+            val views = RemoteViews(context.packageName, R.layout.search_widget)
+            views.setOnClickPendingIntent(R.id.widgetContainer, buildPendingIntent(context))
+            appWidgetManager.updateAppWidget(appWidgetId, views)
+        }
+
+        private fun buildPendingIntent(context: Context) : PendingIntent {
+            val intent = HomeActivity.launchSkipHome(context)
+            return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)
+        }
+    }
+}
+