Refactor and clean up

mozilla-mobile · Mar 26, 2019 · e8227b1 · e8227b1
1 parent ff6bdda
commit e8227b1
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 22 deletions.
diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarUIView.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarUIView.kt
@@ -93,39 +93,63 @@ class ToolbarUIView(
     }
 
     override fun updateView() = Consumer<SearchState> {
-        with(view.context) {
-            if (it.isEditing) {
-                val defaultEngineIcon = components.search.searchEngineManager.defaultSearchEngine?.icon
-                val searchIcon = it.engine?.icon ?: defaultEngineIcon
-                val draw = BitmapDrawable(searchIcon)
-                val iconSize =
-                    containerView?.context!!.resources.getDimension(R.dimen.preference_icon_drawable_size).toInt()
-                draw.setBounds(0, 0, iconSize, iconSize)
-                engineIconView?.backgroundDrawable = draw
-            }
+        if (shouldUpdateEngineIcon(it)) {
+            updateEngineIcon(it)
         }
 
         if (shouldClearSearchURL(it)) {
-            view.url = ""
-            view.editMode()
+            clearSearchURL()
         }
 
-        if (it.engine == state?.engine) {
-            if (it.isEditing) {
-                view.url = it.query
-                view.editMode()
-            } else {
-                view.displayMode()
-            }
+        if (shouldUpdateEditingState(it)) {
+            updateEditingState(it)
         }
 
         state = it
     }
 
+    private fun shouldUpdateEngineIcon(newState: SearchState): Boolean {
+        return (newState.isEditing && engineDidChange(newState))
+    }
+
+    private fun updateEngineIcon(newState: SearchState) {
+        with(view.context) {
+            val defaultEngineIcon = components.search.searchEngineManager.defaultSearchEngine?.icon
+            val searchIcon = newState.engine?.icon ?: defaultEngineIcon
+            val draw = BitmapDrawable(searchIcon)
+            val iconSize =
+                containerView?.context!!.resources.getDimension(R.dimen.preference_icon_drawable_size).toInt()
+            draw.setBounds(0, 0, iconSize, iconSize)
+            engineIconView?.backgroundDrawable = draw
+        }
+    }
+
     private fun shouldClearSearchURL(newState: SearchState): Boolean {
         return newState.engine != state?.engine && view.url == newState.query
     }
 
+    private fun clearSearchURL() {
+        view.url = ""
+        view.editMode()
+    }
+
+    private fun shouldUpdateEditingState(newState: SearchState): Boolean {
+        return !engineDidChange(newState)
+    }
+
+    private fun updateEditingState(newState: SearchState) {
+        if (newState.isEditing) {
+            view.url = newState.query
+            view.editMode()
+        } else {
+            view.displayMode()
+        }
+    }
+
+    private fun engineDidChange(newState: SearchState): Boolean {
+        return newState.engine != state?.engine
+    }
+
     companion object {
         const val browserActionMarginDp = 8
     }

diff --git a/app/src/main/java/org/mozilla/fenix/search/awesomebar/ShortcutsSuggestionProvider.kt b/app/src/main/java/org/mozilla/fenix/search/awesomebar/ShortcutsSuggestionProvider.kt
@@ -46,7 +46,6 @@ class ShortcutsSuggestionProvider(
                 },
                 title = context.getString(R.string.search_shortcuts_engine_settings),
                 onSuggestionClicked = {
-                    // Open search engine settings
                     selectShortcutEngineSettings()
                 })
         )

diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
@@ -11,8 +11,6 @@
     android:id="@+id/search_layout"
     android:background="?attr/searchBackground">
 
-
-
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/toolbar_wrapper"
         android:layout_width="0dp"