From 4873d989a0489b4213a15daba462960d97a7f19c Mon Sep 17 00:00:00 2001 From: Jeff Boek Date: Tue, 12 Feb 2019 15:51:30 -0800 Subject: [PATCH] Moves the shared toolbar component to the components package --- .../org/mozilla/fenix/browser/BrowserFragment.kt | 12 ++++++------ .../toolbar/ToolbarComponent.kt | 2 +- .../toolbar/ToolbarIntegration.kt | 2 +- .../{search => components}/toolbar/ToolbarMenu.kt | 2 +- .../{search => components}/toolbar/ToolbarUIView.kt | 2 +- app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt | 9 +++++++++ .../java/org/mozilla/fenix/search/SearchFragment.kt | 8 ++++---- 7 files changed, 23 insertions(+), 14 deletions(-) rename app/src/main/java/org/mozilla/fenix/{search => components}/toolbar/ToolbarComponent.kt (98%) rename app/src/main/java/org/mozilla/fenix/{search => components}/toolbar/ToolbarIntegration.kt (98%) rename app/src/main/java/org/mozilla/fenix/{search => components}/toolbar/ToolbarMenu.kt (99%) rename app/src/main/java/org/mozilla/fenix/{search => components}/toolbar/ToolbarUIView.kt (98%) create mode 100644 app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt diff --git a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt index aa2acdf3f..51834a96a 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt @@ -39,12 +39,12 @@ import org.mozilla.fenix.ext.requireComponents import org.mozilla.fenix.ext.share import org.mozilla.fenix.mvi.ActionBusFactory import org.mozilla.fenix.mvi.getSafeManagedObservable -import org.mozilla.fenix.search.toolbar.SearchAction -import org.mozilla.fenix.search.toolbar.SearchState -import org.mozilla.fenix.search.toolbar.ToolbarComponent -import org.mozilla.fenix.search.toolbar.ToolbarIntegration -import org.mozilla.fenix.search.toolbar.ToolbarMenu -import org.mozilla.fenix.search.toolbar.ToolbarUIView +import org.mozilla.fenix.components.toolbar.SearchAction +import org.mozilla.fenix.components.toolbar.SearchState +import org.mozilla.fenix.components.toolbar.ToolbarComponent +import org.mozilla.fenix.components.toolbar.ToolbarIntegration +import org.mozilla.fenix.components.toolbar.ToolbarMenu +import org.mozilla.fenix.components.toolbar.ToolbarUIView class BrowserFragment : Fragment(), BackHandler { private lateinit var toolbarComponent: ToolbarComponent diff --git a/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarComponent.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarComponent.kt similarity index 98% rename from app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarComponent.kt rename to app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarComponent.kt index a1226ecb3..fd6593e46 100644 --- a/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarComponent.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarComponent.kt @@ -2,7 +2,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.fenix.search.toolbar +package org.mozilla.fenix.components.toolbar import android.view.ViewGroup import androidx.core.content.ContextCompat diff --git a/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarIntegration.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt similarity index 98% rename from app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarIntegration.kt rename to app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt index 7fe094fd2..1b5dec7cd 100644 --- a/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarIntegration.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt @@ -2,7 +2,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.fenix.search.toolbar +package org.mozilla.fenix.components.toolbar import android.content.Context import androidx.navigation.Navigation diff --git a/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarMenu.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarMenu.kt similarity index 99% rename from app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarMenu.kt rename to app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarMenu.kt index 085224445..6e48d9e78 100644 --- a/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarMenu.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarMenu.kt @@ -2,7 +2,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.fenix.search.toolbar +package org.mozilla.fenix.components.toolbar import android.content.Context import mozilla.components.browser.menu.BrowserMenuBuilder diff --git a/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarUIView.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarUIView.kt similarity index 98% rename from app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarUIView.kt rename to app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarUIView.kt index 6d6025d83..e899e91df 100644 --- a/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarUIView.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarUIView.kt @@ -2,7 +2,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.fenix.search.toolbar +package org.mozilla.fenix.components.toolbar import android.view.LayoutInflater import android.view.ViewGroup diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt b/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt new file mode 100644 index 000000000..c7b6cb74b --- /dev/null +++ b/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt @@ -0,0 +1,9 @@ +package org.mozilla.fenix.home + +/* 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/. */ + +class HomeMenu { + +} \ No newline at end of file diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt index e3d10634f..4e4d04792 100644 --- a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt @@ -21,10 +21,10 @@ import org.mozilla.fenix.search.awesomebar.AwesomeBarAction import org.mozilla.fenix.search.awesomebar.AwesomeBarChange import org.mozilla.fenix.search.awesomebar.AwesomeBarComponent import org.mozilla.fenix.search.awesomebar.AwesomeBarState -import org.mozilla.fenix.search.toolbar.SearchAction -import org.mozilla.fenix.search.toolbar.SearchState -import org.mozilla.fenix.search.toolbar.ToolbarComponent -import org.mozilla.fenix.search.toolbar.ToolbarUIView +import org.mozilla.fenix.components.toolbar.SearchAction +import org.mozilla.fenix.components.toolbar.SearchState +import org.mozilla.fenix.components.toolbar.ToolbarComponent +import org.mozilla.fenix.components.toolbar.ToolbarUIView class SearchFragment : Fragment() { private lateinit var toolbarComponent: ToolbarComponent