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 @@ <meta-data android:name="net.hockeyapp.android.appIdentifier" android:value="@string/hockeyapp_app_id" /> - <activity android:name=".overhaul.OverhaulActivity" + <activity android:name=".MainActivity" android:theme="@style/PageTheme" android:windowSoftInputMode="stateHidden" android:configChanges="orientation|screenSize" diff --git a/app/src/main/java/org/wikipedia/overhaul/OverhaulActivity.java b/app/src/main/java/org/wikipedia/MainActivity.java similarity index 67% rename from app/src/main/java/org/wikipedia/overhaul/OverhaulActivity.java rename to app/src/main/java/org/wikipedia/MainActivity.java index c230e17..c816376 100644 --- a/app/src/main/java/org/wikipedia/overhaul/OverhaulActivity.java +++ b/app/src/main/java/org/wikipedia/MainActivity.java @@ -1,4 +1,4 @@ -package org.wikipedia.overhaul; +package org.wikipedia; import android.content.Context; import android.content.Intent; @@ -6,18 +6,17 @@ import android.support.v4.app.Fragment; import android.view.View; -import org.wikipedia.MainActivityToolbarProvider; import org.wikipedia.activity.SingleFragmentActivityWithToolbar; -import org.wikipedia.overhaul.navtab.NavTab; +import org.wikipedia.navtab.NavTab; -public class OverhaulActivity extends SingleFragmentActivityWithToolbar<OverhaulFragment> - implements OverhaulFragment.Callback { +public class MainActivity extends SingleFragmentActivityWithToolbar<MainFragment> + 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 OverhaulFragment newInstance() { - OverhaulFragment fragment = new OverhaulFragment(); + public static MainFragment newInstance() { + MainFragment fragment = new MainFragment(); fragment.setRetainInstance(true); return fragment; } @@ -68,14 +66,14 @@ @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { super.onCreateView(inflater, container, savedInstanceState); - View view = inflater.inflate(R.layout.fragment_overhaul, container, false); + View view = inflater.inflate(R.layout.fragment_main, container, false); unbinder = ButterKnife.bind(this, view); viewPager.setAdapter(new NavTabViewPagerAdapter(getChildFragmentManager())); tabLayout.setupWithViewPager(viewPager); bottomSheetPresenter = new ExclusiveBottomSheetPresenter(getChildFragmentManager()); - searchFragment = (OverhaulSearchFragment) getChildFragmentManager().findFragmentById(R.id.search_fragment); + searchFragment = (SearchFragment) getChildFragmentManager().findFragmentById(R.id.search_fragment); return view; } @@ -91,7 +89,7 @@ && resultCode == Activity.RESULT_OK && data != null && data.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS) != null) { String searchQuery = data.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS).get(0); - openSearchFromIntent(searchQuery, OverhaulSearchFragment.InvokeSource.VOICE); + openSearchFromIntent(searchQuery, SearchFragment.InvokeSource.VOICE); } else { super.onActivityResult(requestCode, resultCode, data); } @@ -103,7 +101,7 @@ } @Override public void onFeedSearchRequested() { - searchFragment.setInvokeSource(OverhaulSearchFragment.InvokeSource.FEED_BAR); + searchFragment.setInvokeSource(SearchFragment.InvokeSource.FEED_BAR); searchFragment.openSearch(); } @@ -225,7 +223,7 @@ ShareUtil.shareText(getContext(), title); } - @OnPageChange(R.id.fragment_overhaul_view_pager) void onTabChanged(int position) { + @OnPageChange(R.id.fragment_main_view_pager) void onTabChanged(int position) { Callback callback = callback(); Fragment fragment = ((NavTabViewPagerAdapter) viewPager.getAdapter()).getCurrentFragment(); if (callback != null && fragment != null) { @@ -244,7 +242,7 @@ } private void openSearchFromIntent(@Nullable final CharSequence query, - final OverhaulSearchFragment.InvokeSource source) { + final SearchFragment.InvokeSource source) { tabLayout.post(new Runnable() { @Override public void run() { diff --git a/app/src/main/java/org/wikipedia/analytics/SearchFunnel.java b/app/src/main/java/org/wikipedia/analytics/SearchFunnel.java index fd6879e..63f2844 100644 --- a/app/src/main/java/org/wikipedia/analytics/SearchFunnel.java +++ b/app/src/main/java/org/wikipedia/analytics/SearchFunnel.java @@ -4,14 +4,14 @@ import org.json.JSONObject; import org.wikipedia.WikipediaApp; -import org.wikipedia.search.OverhaulSearchFragment; +import org.wikipedia.search.SearchFragment; public class SearchFunnel extends Funnel { private static final String SCHEMA_NAME = "MobileWikiAppSearch"; private static final int REVISION = 15729321; - private OverhaulSearchFragment.InvokeSource source; + private SearchFragment.InvokeSource source; - public SearchFunnel(WikipediaApp app, OverhaulSearchFragment.InvokeSource source) { + public SearchFunnel(WikipediaApp app, SearchFragment.InvokeSource source) { super(app, SCHEMA_NAME, REVISION, Funnel.SAMPLE_LOG_100); this.source = source; } diff --git a/app/src/main/java/org/wikipedia/overhaul/navtab/NavTab.java b/app/src/main/java/org/wikipedia/navtab/NavTab.java similarity index 97% rename from app/src/main/java/org/wikipedia/overhaul/navtab/NavTab.java rename to app/src/main/java/org/wikipedia/navtab/NavTab.java index 5bc3da2..594c4eb 100644 --- a/app/src/main/java/org/wikipedia/overhaul/navtab/NavTab.java +++ b/app/src/main/java/org/wikipedia/navtab/NavTab.java @@ -1,4 +1,4 @@ -package org.wikipedia.overhaul.navtab; +package org.wikipedia.navtab; import android.support.annotation.DrawableRes; import android.support.annotation.NonNull; diff --git a/app/src/main/java/org/wikipedia/overhaul/navtab/NavTabLayout.java b/app/src/main/java/org/wikipedia/navtab/NavTabLayout.java similarity index 96% rename from app/src/main/java/org/wikipedia/overhaul/navtab/NavTabLayout.java rename to app/src/main/java/org/wikipedia/navtab/NavTabLayout.java index f9aa7cc..dcfe6b9 100644 --- a/app/src/main/java/org/wikipedia/overhaul/navtab/NavTabLayout.java +++ b/app/src/main/java/org/wikipedia/navtab/NavTabLayout.java @@ -1,4 +1,4 @@ -package org.wikipedia.overhaul.navtab; +package org.wikipedia.navtab; import android.content.Context; import android.support.annotation.Nullable; diff --git a/app/src/main/java/org/wikipedia/overhaul/navtab/NavTabView.java b/app/src/main/java/org/wikipedia/navtab/NavTabView.java similarity index 98% rename from app/src/main/java/org/wikipedia/overhaul/navtab/NavTabView.java rename to app/src/main/java/org/wikipedia/navtab/NavTabView.java index 880c47a..7fce93b 100644 --- a/app/src/main/java/org/wikipedia/overhaul/navtab/NavTabView.java +++ b/app/src/main/java/org/wikipedia/navtab/NavTabView.java @@ -1,4 +1,4 @@ -package org.wikipedia.overhaul.navtab; +package org.wikipedia.navtab; import android.content.Context; import android.graphics.drawable.Drawable; diff --git a/app/src/main/java/org/wikipedia/overhaul/navtab/NavTabViewPagerAdapter.java b/app/src/main/java/org/wikipedia/navtab/NavTabViewPagerAdapter.java similarity index 95% rename from app/src/main/java/org/wikipedia/overhaul/navtab/NavTabViewPagerAdapter.java rename to app/src/main/java/org/wikipedia/navtab/NavTabViewPagerAdapter.java index e283c22..35aa117 100644 --- a/app/src/main/java/org/wikipedia/overhaul/navtab/NavTabViewPagerAdapter.java +++ b/app/src/main/java/org/wikipedia/navtab/NavTabViewPagerAdapter.java @@ -1,4 +1,4 @@ -package org.wikipedia.overhaul.navtab; +package org.wikipedia.navtab; import android.support.annotation.Nullable; import android.support.v4.app.Fragment; diff --git a/app/src/main/java/org/wikipedia/page/PageActivity.java b/app/src/main/java/org/wikipedia/page/PageActivity.java index db5fd4d..59d29da 100644 --- a/app/src/main/java/org/wikipedia/page/PageActivity.java +++ b/app/src/main/java/org/wikipedia/page/PageActivity.java @@ -64,8 +64,8 @@ import org.wikipedia.page.tabs.TabsProvider; import org.wikipedia.readinglist.AddToReadingListDialog; import org.wikipedia.recurring.RecurringTasksExecutor; -import org.wikipedia.search.OverhaulSearchFragment; import org.wikipedia.search.SearchBarHideHandler; +import org.wikipedia.search.SearchFragment; import org.wikipedia.search.SearchResultsFragment; import org.wikipedia.settings.Prefs; import org.wikipedia.settings.SettingsActivity; @@ -93,7 +93,7 @@ import static org.wikipedia.util.UriUtil.visitInExternalBrowser; public class PageActivity extends ThemedActionBarActivity implements PageFragment.Callback, - LinkPreviewDialog.Callback, OverhaulSearchFragment.Callback, + LinkPreviewDialog.Callback, SearchFragment.Callback, SearchResultsFragment.Callback, WiktionaryDialog.Callback { public static final String ACTION_PAGE_FOR_TITLE = "org.wikipedia.page_for_title"; @@ -113,7 +113,7 @@ private Unbinder unbinder; private PageFragment pageFragment; - private OverhaulSearchFragment searchFragment; + private SearchFragment searchFragment; private WikipediaApp app; private Bus bus; @@ -165,7 +165,7 @@ updateProgressBar(false, true, 0); pageFragment = (PageFragment) getSupportFragmentManager().findFragmentById(R.id.page_fragment); - searchFragment = (OverhaulSearchFragment) getSupportFragmentManager().findFragmentById(R.id.page_search_fragment); + searchFragment = (SearchFragment) getSupportFragmentManager().findFragmentById(R.id.page_search_fragment); bottomSheetPresenter = new ExclusiveBottomSheetPresenter(this.getSupportFragmentManager()); setSupportActionBar(toolbar); @@ -294,7 +294,7 @@ handleProcessTextIntent(intent); } else if (intent.hasExtra(EXTRA_SEARCH_FROM_WIDGET)) { new IntentFunnel(app).logSearchWidgetTap(); - openSearchFromIntent(null, OverhaulSearchFragment.InvokeSource.WIDGET); + openSearchFromIntent(null, SearchFragment.InvokeSource.WIDGET); } else if (intent.hasExtra(EXTRA_FEATURED_ARTICLE_FROM_WIDGET)) { new IntentFunnel(app).logFeaturedArticleWidgetTap(); loadMainPageInForegroundTab(); @@ -306,7 +306,7 @@ private void handleShareIntent(Intent intent) { String text = intent.getStringExtra(Intent.EXTRA_TEXT); openSearchFromIntent(text == null ? null : text.trim(), - OverhaulSearchFragment.InvokeSource.INTENT_SHARE); + SearchFragment.InvokeSource.INTENT_SHARE); } @TargetApi(Build.VERSION_CODES.M) @@ -316,11 +316,11 @@ } String text = intent.getStringExtra(Intent.EXTRA_PROCESS_TEXT); openSearchFromIntent(text == null ? null : text.trim(), - OverhaulSearchFragment.InvokeSource.INTENT_PROCESS_TEXT); + SearchFragment.InvokeSource.INTENT_PROCESS_TEXT); } private void openSearchFromIntent(@Nullable final CharSequence query, - final OverhaulSearchFragment.InvokeSource source) { + final SearchFragment.InvokeSource source) { tabsContainerView.post(new Runnable() { @Override public void run() { @@ -627,7 +627,7 @@ @Override public void onPageSearchRequested() { - searchFragment.setInvokeSource(OverhaulSearchFragment.InvokeSource.TOOLBAR); + searchFragment.setInvokeSource(SearchFragment.InvokeSource.TOOLBAR); searchFragment.openSearch(); } @@ -992,7 +992,7 @@ if (resultCode == RESULT_OK && data != null && data.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS) != null) { String searchQuery = data.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS).get(0); - openSearchFromIntent(searchQuery, OverhaulSearchFragment.InvokeSource.VOICE); + openSearchFromIntent(searchQuery, SearchFragment.InvokeSource.VOICE); } } diff --git a/app/src/main/java/org/wikipedia/search/OverhaulSearchFragment.java b/app/src/main/java/org/wikipedia/search/SearchFragment.java similarity index 98% rename from app/src/main/java/org/wikipedia/search/OverhaulSearchFragment.java rename to app/src/main/java/org/wikipedia/search/SearchFragment.java index 11c9996..43e2788 100644 --- a/app/src/main/java/org/wikipedia/search/OverhaulSearchFragment.java +++ b/app/src/main/java/org/wikipedia/search/SearchFragment.java @@ -43,7 +43,7 @@ import butterknife.ButterKnife; import butterknife.Unbinder; -public class OverhaulSearchFragment extends Fragment implements BackPressedHandler, +public class SearchFragment extends Fragment implements BackPressedHandler, SearchResultsFragment.Parent, RecentSearchesFragment.Parent { public enum InvokeSource implements EnumCode { TOOLBAR(0), @@ -131,7 +131,7 @@ @Override public View onCreateView(final LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { app = WikipediaApp.getInstance(); - View view = inflater.inflate(R.layout.fragment_search_overhaul, container, false); + View view = inflater.inflate(R.layout.fragment_search, container, false); unbinder = ButterKnife.bind(this, view); searchContainer.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/org/wikipedia/util/FeedbackUtil.java b/app/src/main/java/org/wikipedia/util/FeedbackUtil.java index 50d0964..56cccb5 100644 --- a/app/src/main/java/org/wikipedia/util/FeedbackUtil.java +++ b/app/src/main/java/org/wikipedia/util/FeedbackUtil.java @@ -15,9 +15,9 @@ import android.widget.TextView; import android.widget.Toast; +import org.wikipedia.MainActivity; import org.wikipedia.R; import org.wikipedia.analytics.ReadingListsFunnel; -import org.wikipedia.overhaul.OverhaulActivity; import org.wikipedia.page.ExclusiveBottomSheetPresenter; import org.wikipedia.page.PageActivity; import org.wikipedia.page.PageTitle; @@ -131,8 +131,8 @@ private static View findBestView(Activity activity) { if (activity instanceof PageActivity) { return activity.findViewById(R.id.page_contents_container); - } else if (activity instanceof OverhaulActivity) { - return activity.findViewById(R.id.fragment_overhaul_view_pager_container); + } else if (activity instanceof MainActivity) { + return activity.findViewById(R.id.fragment_main_view_pager_container); } else { return activity.findViewById(android.R.id.content); } diff --git a/app/src/main/res/layout/activity_page.xml b/app/src/main/res/layout/activity_page.xml index 98fd8d0..de06f7b 100644 --- a/app/src/main/res/layout/activity_page.xml +++ b/app/src/main/res/layout/activity_page.xml @@ -75,8 +75,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/page_search_fragment" - android:name="org.wikipedia.search.OverhaulSearchFragment" - android:layout="@layout/fragment_search_overhaul" - tools:layout="@layout/fragment_search_overhaul" /> + android:name="org.wikipedia.search.SearchFragment" + android:layout="@layout/fragment_search" + tools:layout="@layout/fragment_search" /> </FrameLayout> diff --git a/app/src/main/res/layout/fragment_overhaul.xml b/app/src/main/res/layout/fragment_main.xml similarity index 82% rename from app/src/main/res/layout/fragment_overhaul.xml rename to app/src/main/res/layout/fragment_main.xml index b44d6cd..e255ab3 100644 --- a/app/src/main/res/layout/fragment_overhaul.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -9,7 +9,7 @@ <RelativeLayout android:layout_width="match_parent" android:layout_height="match_parent"> - <org.wikipedia.overhaul.navtab.NavTabLayout + <org.wikipedia.navtab.NavTabLayout android:id="@+id/view_nav_view_pager_tab_layout" android:layout_width="match_parent" android:layout_height="@dimen/view_nav_view_pager_tab_layout_height" @@ -20,12 +20,12 @@ app:tabIndicatorColor="@color/foundation_blue" /> <android.support.design.widget.CoordinatorLayout - android:id="@+id/fragment_overhaul_view_pager_container" + android:id="@+id/fragment_main_view_pager_container" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_above="@id/view_nav_view_pager_tab_layout"> <org.wikipedia.readinglist.NoSwipeViewPager - android:id="@+id/fragment_overhaul_view_pager" + android:id="@+id/fragment_main_view_pager" android:layout_width="match_parent" android:layout_height="match_parent" /> </android.support.design.widget.CoordinatorLayout> @@ -36,8 +36,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/search_fragment" - android:name="org.wikipedia.search.OverhaulSearchFragment" + android:name="org.wikipedia.search.SearchFragment" android:layout="@id/view_nav_view_pager_tab_layout" - tools:layout="@layout/fragment_search_overhaul" /> + tools:layout="@layout/fragment_search" /> </FrameLayout> diff --git a/app/src/main/res/layout/fragment_search_overhaul.xml b/app/src/main/res/layout/fragment_search.xml similarity index 100% rename from app/src/main/res/layout/fragment_search_overhaul.xml rename to app/src/main/res/layout/fragment_search.xml diff --git a/app/src/main/res/values-w480dp/dimens.xml b/app/src/main/res/values-w480dp/dimens.xml index aaf3b4f..b281c69 100644 --- a/app/src/main/res/values-w480dp/dimens.xml +++ b/app/src/main/res/values-w480dp/dimens.xml @@ -2,6 +2,6 @@ <resources> <bool name="wide">true</bool> - <!-- Overhaul --> + <!-- Navigation --> <dimen name="view_nav_view_pager_tab_layout_height">48dp</dimen> </resources> \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 28e6546..569d1a3 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -100,6 +100,6 @@ <dimen name="view_list_card_item_image">40dp</dimen> <dimen name="overflow_elevation">16dp</dimen> - <!-- Overhaul --> + <!-- Navigation --> <dimen name="view_nav_view_pager_tab_layout_height">72dp</dimen> </resources> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 54af9fa..bf70388 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -12,9 +12,6 @@ <item name="navTabViewStyle">@style/NavTabView</item> </style> - <style name="OverhaulTheme" parent="PageTheme"> - </style> - <style name="PageTheme" parent="AppTheme"> <item name="android:windowTranslucentStatus" tools:targetApi="19">true</item> </style> -- To view, visit https://gerrit.wikimedia.org/r/307876 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7063241b2b0b444255f3a15425485c09817d7fa0 Gerrit-PatchSet: 3 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Dbrant <dbr...@wikimedia.org> Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org> Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org> Gerrit-Reviewer: Mholloway <mhollo...@wikimedia.org> Gerrit-Reviewer: Niedzielski <sniedziel...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits