[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Remove "overhaul" designation.

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Remove "overhaul" designation.
..


Remove "overhaul" designation.

Bug: T143441
Change-Id: I7063241b2b0b444255f3a15425485c09817d7fa0
---
R app/src/androidTest/java/org/wikipedia/navtab/NavTabViewTest.java
M app/src/main/AndroidManifest.xml
R app/src/main/java/org/wikipedia/MainActivity.java
R app/src/main/java/org/wikipedia/MainFragment.java
M app/src/main/java/org/wikipedia/analytics/SearchFunnel.java
R app/src/main/java/org/wikipedia/navtab/NavTab.java
R app/src/main/java/org/wikipedia/navtab/NavTabLayout.java
R app/src/main/java/org/wikipedia/navtab/NavTabView.java
R app/src/main/java/org/wikipedia/navtab/NavTabViewPagerAdapter.java
M app/src/main/java/org/wikipedia/page/PageActivity.java
R app/src/main/java/org/wikipedia/search/SearchFragment.java
M app/src/main/java/org/wikipedia/util/FeedbackUtil.java
M app/src/main/res/layout/activity_page.xml
R app/src/main/res/layout/fragment_main.xml
R app/src/main/res/layout/fragment_search.xml
M app/src/main/res/values-w480dp/dimens.xml
M app/src/main/res/values/dimens.xml
M app/src/main/res/values/styles.xml
18 files changed, 57 insertions(+), 63 deletions(-)

Approvals:
  jenkins-bot: Verified
  Niedzielski: Looks good to me, approved



diff --git 
a/app/src/androidTest/java/org/wikipedia/overhaul/navtab/NavTabViewTest.java 
b/app/src/androidTest/java/org/wikipedia/navtab/NavTabViewTest.java
similarity index 97%
rename from 
app/src/androidTest/java/org/wikipedia/overhaul/navtab/NavTabViewTest.java
rename to app/src/androidTest/java/org/wikipedia/navtab/NavTabViewTest.java
index 7c9da2e..79e56c1 100644
--- a/app/src/androidTest/java/org/wikipedia/overhaul/navtab/NavTabViewTest.java
+++ b/app/src/androidTest/java/org/wikipedia/navtab/NavTabViewTest.java
@@ -1,4 +1,4 @@
-package org.wikipedia.overhaul.navtab;
+package org.wikipedia.navtab;
 
 import android.support.annotation.NonNull;
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0092c03..7865961 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -54,7 +54,7 @@
 
 
-
-implements OverhaulFragment.Callback {
+public class MainActivity extends 
SingleFragmentActivityWithToolbar
+implements MainFragment.Callback {
 public static Intent newIntent(@NonNull Context context) {
-return new Intent(context, OverhaulActivity.class);
+return new Intent(context, MainActivity.class);
 }
 
-@Override protected OverhaulFragment createFragment() {
-return OverhaulFragment.newInstance();
+@Override protected MainFragment createFragment() {
+return MainFragment.newInstance();
 }
 
 @Override protected void setTheme() { }
diff --git a/app/src/main/java/org/wikipedia/overhaul/OverhaulFragment.java 
b/app/src/main/java/org/wikipedia/MainFragment.java
similarity index 87%
rename from app/src/main/java/org/wikipedia/overhaul/OverhaulFragment.java
rename to app/src/main/java/org/wikipedia/MainFragment.java
index 7d87106..7bf5b23 100644
--- a/app/src/main/java/org/wikipedia/overhaul/OverhaulFragment.java
+++ b/app/src/main/java/org/wikipedia/MainFragment.java
@@ -1,4 +1,4 @@
-package org.wikipedia.overhaul;
+package org.wikipedia;
 
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
@@ -15,8 +15,6 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import org.wikipedia.Constants;
-import org.wikipedia.R;
 import org.wikipedia.activity.FragmentUtil;
 import org.wikipedia.feed.FeedFragment;
 import org.wikipedia.feed.image.FeaturedImage;
@@ -25,15 +23,15 @@
 import org.wikipedia.history.HistoryEntry;
 import org.wikipedia.history.HistoryFragment;
 import org.wikipedia.nearby.NearbyFragment;
-import org.wikipedia.overhaul.navtab.NavTab;
-import org.wikipedia.overhaul.navtab.NavTabViewPagerAdapter;
+import org.wikipedia.navtab.NavTab;
+import org.wikipedia.navtab.NavTabViewPagerAdapter;
 import org.wikipedia.page.ExclusiveBottomSheetPresenter;
 import org.wikipedia.page.PageActivity;
 import org.wikipedia.page.PageTitle;
 import org.wikipedia.page.linkpreview.LinkPreviewDialog;
 import org.wikipedia.readinglist.AddToReadingListDialog;
 import org.wikipedia.readinglist.ReadingListsFragment;
-import org.wikipedia.search.OverhaulSearchFragment;
+import org.wikipedia.search.SearchFragment;
 import org.wikipedia.search.SearchResultsFragment;
 import org.wikipedia.util.ClipboardUtil;
 import org.wikipedia.util.FeedbackUtil;
@@ -44,22 +42,22 @@
 import butterknife.OnPageChange;
 import butterknife.Unbinder;
 
-public class OverhaulFragment extends Fragment implements 
FeedFragment.Callback,
+public class MainFragment extends Fragment implements FeedFragment.Callback,
 NearbyFragment.Callback, HistoryFragment.Callback, 
ReadingListsFragment.Callback,
-OverhaulSearchFragment.Callback, 

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Remove "overhaul" designation.

[Dbrant (Code Review)]

Dbrant has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/307876

Change subject: Remove "overhaul" designation.
..

Remove "overhaul" designation.

Bug: T143441
Change-Id: I7063241b2b0b444255f3a15425485c09817d7fa0
---
M app/src/main/AndroidManifest.xml
R app/src/main/java/org/wikipedia/MainActivity.java
R app/src/main/java/org/wikipedia/MainFragment.java
M app/src/main/java/org/wikipedia/analytics/SearchFunnel.java
R app/src/main/java/org/wikipedia/navtab/NavTab.java
R app/src/main/java/org/wikipedia/navtab/NavTabLayout.java
R app/src/main/java/org/wikipedia/navtab/NavTabView.java
R app/src/main/java/org/wikipedia/navtab/NavTabViewPagerAdapter.java
M app/src/main/java/org/wikipedia/page/PageActivity.java
R app/src/main/java/org/wikipedia/search/SearchFragment.java
M app/src/main/java/org/wikipedia/util/FeedbackUtil.java
M app/src/main/res/layout/activity_page.xml
R app/src/main/res/layout/fragment_main.xml
R app/src/main/res/layout/fragment_search.xml
M app/src/main/res/values-w480dp/dimens.xml
M app/src/main/res/values/dimens.xml
M app/src/main/res/values/styles.xml
17 files changed, 56 insertions(+), 62 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/76/307876/1

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0092c03..7865961 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -54,7 +54,7 @@
 
 
-
-implements OverhaulFragment.Callback {
+public class MainActivity extends 
SingleFragmentActivityWithToolbar
+implements MainFragment.Callback {
 public static Intent newIntent(@NonNull Context context) {
-return new Intent(context, OverhaulActivity.class);
+return new Intent(context, MainActivity.class);
 }
 
-@Override protected OverhaulFragment createFragment() {
-return OverhaulFragment.newInstance();
+@Override protected MainFragment createFragment() {
+return MainFragment.newInstance();
 }
 
 @Override protected void setTheme() { }
diff --git a/app/src/main/java/org/wikipedia/overhaul/OverhaulFragment.java 
b/app/src/main/java/org/wikipedia/MainFragment.java
similarity index 87%
rename from app/src/main/java/org/wikipedia/overhaul/OverhaulFragment.java
rename to app/src/main/java/org/wikipedia/MainFragment.java
index 7d87106..7bf5b23 100644
--- a/app/src/main/java/org/wikipedia/overhaul/OverhaulFragment.java
+++ b/app/src/main/java/org/wikipedia/MainFragment.java
@@ -1,4 +1,4 @@
-package org.wikipedia.overhaul;
+package org.wikipedia;
 
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
@@ -15,8 +15,6 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import org.wikipedia.Constants;
-import org.wikipedia.R;
 import org.wikipedia.activity.FragmentUtil;
 import org.wikipedia.feed.FeedFragment;
 import org.wikipedia.feed.image.FeaturedImage;
@@ -25,15 +23,15 @@
 import org.wikipedia.history.HistoryEntry;
 import org.wikipedia.history.HistoryFragment;
 import org.wikipedia.nearby.NearbyFragment;
-import org.wikipedia.overhaul.navtab.NavTab;
-import org.wikipedia.overhaul.navtab.NavTabViewPagerAdapter;
+import org.wikipedia.navtab.NavTab;
+import org.wikipedia.navtab.NavTabViewPagerAdapter;
 import org.wikipedia.page.ExclusiveBottomSheetPresenter;
 import org.wikipedia.page.PageActivity;
 import org.wikipedia.page.PageTitle;
 import org.wikipedia.page.linkpreview.LinkPreviewDialog;
 import org.wikipedia.readinglist.AddToReadingListDialog;
 import org.wikipedia.readinglist.ReadingListsFragment;
-import org.wikipedia.search.OverhaulSearchFragment;
+import org.wikipedia.search.SearchFragment;
 import org.wikipedia.search.SearchResultsFragment;
 import org.wikipedia.util.ClipboardUtil;
 import org.wikipedia.util.FeedbackUtil;
@@ -44,22 +42,22 @@
 import butterknife.OnPageChange;
 import butterknife.Unbinder;
 
-public class OverhaulFragment extends Fragment implements 
FeedFragment.Callback,
+public class MainFragment extends Fragment implements FeedFragment.Callback,
 NearbyFragment.Callback, HistoryFragment.Callback, 
ReadingListsFragment.Callback,
-OverhaulSearchFragment.Callback, SearchResultsFragment.Callback,
+SearchFragment.Callback, SearchResultsFragment.Callback,
 LinkPreviewDialog.Callback {
-@BindView(R.id.fragment_overhaul_view_pager) ViewPager viewPager;
+@BindView(R.id.fragment_main_view_pager) ViewPager viewPager;
 @BindView(R.id.view_nav_view_pager_tab_layout) TabLayout tabLayout;
 private Unbinder unbinder;
-private OverhaulSearchFragment searchFragment;
+private SearchFragment searchFragment;
 private ExclusiveBottomSheetPresenter bottomSheetPresenter;
 
 public interface Callback {
 void onTabChanged(@NonNull NavTab tab, @NonNull Fragment fragment);
 }
 
-public static