diff --git a/Clover/app/src/main/java/org/floens/chan/controller/Controller.java b/Clover/app/src/main/java/org/floens/chan/controller/Controller.java index 1965a060..6a83e8e3 100644 --- a/Clover/app/src/main/java/org/floens/chan/controller/Controller.java +++ b/Clover/app/src/main/java/org/floens/chan/controller/Controller.java @@ -41,7 +41,7 @@ public abstract class Controller { public Context context; public ViewGroup view; - public NavigationItem navigationItem = new NavigationItem(); + public NavigationItem navigation = new NavigationItem(); public Controller parentController; diff --git a/Clover/app/src/main/java/org/floens/chan/controller/ui/NavigationControllerContainerLayout.java b/Clover/app/src/main/java/org/floens/chan/controller/ui/NavigationControllerContainerLayout.java index f4a79480..749839e3 100644 --- a/Clover/app/src/main/java/org/floens/chan/controller/ui/NavigationControllerContainerLayout.java +++ b/Clover/app/src/main/java/org/floens/chan/controller/ui/NavigationControllerContainerLayout.java @@ -120,7 +120,7 @@ public class NavigationControllerContainerLayout extends FrameLayout { @Override public boolean onInterceptTouchEvent(MotionEvent event) { - if (!swipeEnabled || tracking || navigationController.isBlockingInput() || !navigationController.getTop().navigationItem.swipeable || getBelowTop() == null) { + if (!swipeEnabled || tracking || navigationController.isBlockingInput() || !navigationController.getTop().navigation.swipeable || getBelowTop() == null) { return false; } diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/AdvancedSettingsController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/AdvancedSettingsController.java index 5b62993b..7ebd2373 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/AdvancedSettingsController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/AdvancedSettingsController.java @@ -50,7 +50,7 @@ public class AdvancedSettingsController extends SettingsController { public void onCreate() { super.onCreate(); - navigationItem.setTitle(R.string.settings_screen_advanced); + navigation.setTitle(R.string.settings_screen_advanced); view = inflateRes(R.layout.settings_layout); content = (LinearLayout) view.findViewById(R.id.scrollview_content); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/AlbumDownloadController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/AlbumDownloadController.java index 1c799ca5..5c998e99 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/AlbumDownloadController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/AlbumDownloadController.java @@ -79,8 +79,8 @@ public class AlbumDownloadController extends Controller implements ToolbarMenuIt updateTitle(); - navigationItem.menu = new ToolbarMenu(context); - navigationItem.menu.addItem(new ToolbarMenuItem(context, this, CHECK_ALL, R.drawable.ic_select_all_white_24dp)); + navigation.menu = new ToolbarMenu(context); + navigation.menu.addItem(new ToolbarMenuItem(context, this, CHECK_ALL, R.drawable.ic_select_all_white_24dp)); download = (FloatingActionButton) view.findViewById(R.id.download); download.setOnClickListener(this); @@ -167,8 +167,8 @@ public class AlbumDownloadController extends Controller implements ToolbarMenuIt } private void updateTitle() { - navigationItem.title = context.getString(R.string.album_download_screen, getCheckCount(), items.size()); - ((ToolbarNavigationController) navigationController).toolbar.updateTitle(navigationItem); + navigation.title = context.getString(R.string.album_download_screen, getCheckCount(), items.size()); + ((ToolbarNavigationController) navigationController).toolbar.updateTitle(navigation); } private void updateAllChecked() { diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/AlbumViewController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/AlbumViewController.java index 85242ee8..2943ad2f 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/AlbumViewController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/AlbumViewController.java @@ -63,10 +63,10 @@ public class AlbumViewController extends Controller implements ImageViewerContro view = inflateRes(R.layout.controller_album_view); - navigationItem.menu = new ToolbarMenu(context); + navigation.menu = new ToolbarMenu(context); List items = new ArrayList<>(); items.add(new FloatingMenuItem(SAVE_ALBUM_ID, R.string.action_download_album)); - navigationItem.createOverflow(context, this, items); + navigation.createOverflow(context, this, items); recyclerView = (GridRecyclerView) view.findViewById(R.id.recycler_view); recyclerView.setHasFixedSize(true); @@ -83,8 +83,8 @@ public class AlbumViewController extends Controller implements ImageViewerContro public void setImages(Loadable loadable, List postImages, int index, String title) { this.loadable = loadable; this.postImages = postImages; - navigationItem.title = title; - navigationItem.subtitle = context.getResources().getQuantityString(R.plurals.image, postImages.size(), postImages.size()); + navigation.title = title; + navigation.subtitle = context.getResources().getQuantityString(R.plurals.image, postImages.size(), postImages.size()); targetIndex = index; } diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/BoardSetupController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/BoardSetupController.java index 3e8548cf..048e3887 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/BoardSetupController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/BoardSetupController.java @@ -105,8 +105,8 @@ public class BoardSetupController extends Controller implements View.OnClickList view = inflateRes(R.layout.controller_board_setup); // Navigation - navigationItem.title = context.getString(R.string.setup_board_title, site.name()); - navigationItem.swipeable = false; + navigation.title = context.getString(R.string.setup_board_title, site.name()); + navigation.swipeable = false; // View binding savedBoardsRecycler = view.findViewById(R.id.boards_recycler); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/BrowseController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/BrowseController.java index 7c2c10e4..85c40a99 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/BrowseController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/BrowseController.java @@ -107,14 +107,14 @@ public class BrowseController extends ThreadController implements ToolbarMenuIte private void initNavigation() { // Navigation item - navigationItem.hasDrawer = true; + navigation.hasDrawer = true; setupMiddleNavigation(); // Toolbar menu ToolbarMenu menu = new ToolbarMenu(context); - navigationItem.menu = menu; - navigationItem.hasBack = false; + navigation.menu = menu; + navigation.hasBack = false; search = menu.addItem(new ToolbarMenuItem(context, this, SEARCH_ID, R.drawable.ic_search_white_24dp)); refresh = menu.addItem(new ToolbarMenuItem(context, this, REFRESH_ID, R.drawable.ic_refresh_white_24dp)); @@ -140,7 +140,7 @@ public class BrowseController extends ThreadController implements ToolbarMenuIte } private void setupMiddleNavigation() { - navigationItem.middleMenu = new ToolbarMiddleMenu() { + navigation.middleMenu = new ToolbarMiddleMenu() { @SuppressLint("InflateParams") @Override public void show(View anchor) { @@ -294,14 +294,14 @@ public class BrowseController extends ThreadController implements ToolbarMenuIte public void loadBoard(Loadable loadable) { String name = BoardHelper.getName(loadable.board); loadable.title = name; - navigationItem.title = name; + navigation.title = name; ThreadPresenter presenter = threadLayout.getPresenter(); presenter.unbindLoadable(); presenter.bindLoadable(loadable); presenter.requestData(); - ((ToolbarNavigationController) navigationController).toolbar.updateTitle(navigationItem); + ((ToolbarNavigationController) navigationController).toolbar.updateTitle(navigation); } @Override diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/DeveloperSettingsController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/DeveloperSettingsController.java index a9d374dd..fcbc7fa5 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/DeveloperSettingsController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/DeveloperSettingsController.java @@ -50,7 +50,7 @@ public class DeveloperSettingsController extends Controller { inject(this); - navigationItem.setTitle(R.string.settings_developer); + navigation.setTitle(R.string.settings_developer); LinearLayout wrapper = new LinearLayout(context); wrapper.setOrientation(LinearLayout.VERTICAL); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/DrawerController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/DrawerController.java index 206fb27a..512518a7 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/DrawerController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/DrawerController.java @@ -122,7 +122,7 @@ public class DrawerController extends Controller implements DrawerAdapter.Callba } public void onMenuClicked() { - if (getMainToolbarNavigationController().getTop().navigationItem.hasDrawer) { + if (getMainToolbarNavigationController().getTop().navigation.hasDrawer) { drawerLayout.openDrawer(drawer); } } diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/FiltersController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/FiltersController.java index 42a24a17..77e481c7 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/FiltersController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/FiltersController.java @@ -108,9 +108,9 @@ public class FiltersController extends Controller implements ToolbarMenuItem.Too super.onCreate(); inject(this); - navigationItem.setTitle(R.string.filters_screen); - navigationItem.menu = new ToolbarMenu(context); - navigationItem.menu.addItem(new ToolbarMenuItem(context, this, SEARCH_ID, R.drawable.ic_search_white_24dp)); + navigation.setTitle(R.string.filters_screen); + navigation.menu = new ToolbarMenu(context); + navigation.menu.addItem(new ToolbarMenuItem(context, this, SEARCH_ID, R.drawable.ic_search_white_24dp)); view = inflateRes(R.layout.controller_filters); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/HistoryController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/HistoryController.java index 80f8e9bb..1c771c76 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/HistoryController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/HistoryController.java @@ -87,19 +87,19 @@ public class HistoryController extends Controller implements CompoundButton.OnCh databaseHistoryManager = databaseManager.getDatabaseHistoryManager(); databaseSavedReplyManager = databaseManager.getDatabaseSavedReplyManager(); - navigationItem.setTitle(R.string.history_screen); + navigation.setTitle(R.string.history_screen); List items = new ArrayList<>(); items.add(new FloatingMenuItem(CLEAR_ID, R.string.history_clear)); items.add(new FloatingMenuItem(SAVED_REPLY_CLEAR_ID, R.string.saved_reply_clear)); - navigationItem.menu = new ToolbarMenu(context); - navigationItem.menu.addItem(new ToolbarMenuItem(context, this, SEARCH_ID, R.drawable.ic_search_white_24dp)); - ToolbarMenuItem overflow = navigationItem.createOverflow(context, this, items); + navigation.menu = new ToolbarMenu(context); + navigation.menu.addItem(new ToolbarMenuItem(context, this, SEARCH_ID, R.drawable.ic_search_white_24dp)); + ToolbarMenuItem overflow = navigation.createOverflow(context, this, items); overflow.getSubMenu().setPopupWidth(dp(4 * 56)); SwitchCompat historyEnabledSwitch = new SwitchCompat(context); historyEnabledSwitch.setChecked(ChanSettings.historyEnabled.get()); historyEnabledSwitch.setOnCheckedChangeListener(this); - navigationItem.rightView = historyEnabledSwitch; + navigation.rightView = historyEnabledSwitch; view = inflateRes(R.layout.controller_history); crossfade = (CrossfadeView) view.findViewById(R.id.crossfade); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/ImageViewerController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/ImageViewerController.java index add69599..180bc70d 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/ImageViewerController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/ImageViewerController.java @@ -124,19 +124,19 @@ public class ImageViewerController extends Controller implements ImageViewerPres getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); - navigationItem.subtitle = "0"; - navigationItem.menu = new ToolbarMenu(context); + navigation.subtitle = "0"; + navigation.menu = new ToolbarMenu(context); if (goPostCallback != null) { - navigationItem.menu.addItem(new ToolbarMenuItem(context, this, GO_POST_ID, R.drawable.ic_subdirectory_arrow_left_white_24dp)); + navigation.menu.addItem(new ToolbarMenuItem(context, this, GO_POST_ID, R.drawable.ic_subdirectory_arrow_left_white_24dp)); } - navigationItem.menu.addItem(new ToolbarMenuItem(context, this, SAVE_ID, R.drawable.ic_file_download_white_24dp)); + navigation.menu.addItem(new ToolbarMenuItem(context, this, SAVE_ID, R.drawable.ic_file_download_white_24dp)); List items = new ArrayList<>(); items.add(new FloatingMenuItem(OPEN_BROWSER_ID, R.string.action_open_browser)); items.add(new FloatingMenuItem(SHARE_ID, R.string.action_share)); items.add(new FloatingMenuItem(SEARCH_ID, R.string.action_search_image)); items.add(new FloatingMenuItem(SAVE_ALBUM, R.string.action_download_album)); - overflowMenuItem = navigationItem.createOverflow(context, this, items); + overflowMenuItem = navigation.createOverflow(context, this, items); view = inflateRes(R.layout.controller_image_viewer); previewImage = (TransitionImageView) view.findViewById(R.id.preview_image); @@ -291,12 +291,12 @@ public class ImageViewerController extends Controller implements ImageViewerPres public void setTitle(PostImage postImage, int index, int count, boolean spoiler) { if (spoiler) { - navigationItem.title = getString(R.string.image_spoiler_filename); + navigation.title = getString(R.string.image_spoiler_filename); } else { - navigationItem.title = postImage.filename + "." + postImage.extension; + navigation.title = postImage.filename + "." + postImage.extension; } - navigationItem.subtitle = (index + 1) + "/" + count; - ((ToolbarNavigationController) navigationController).toolbar.updateTitle(navigationItem); + navigation.subtitle = (index + 1) + "/" + count; + ((ToolbarNavigationController) navigationController).toolbar.updateTitle(navigation); } public void scrollToImage(PostImage postImage) { diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/LicensesController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/LicensesController.java index 61315500..4e7f4462 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/LicensesController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/LicensesController.java @@ -36,7 +36,7 @@ public class LicensesController extends Controller { public void onCreate() { super.onCreate(); - navigationItem.title = title; + navigation.title = title; WebView webView = new WebView(context); webView.loadUrl(url); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/LoginController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/LoginController.java index 3c808ae6..7374346a 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/LoginController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/LoginController.java @@ -61,7 +61,7 @@ public class LoginController extends Controller implements View.OnClickListener, public void onCreate() { super.onCreate(); - navigationItem.setTitle(R.string.settings_screen_pass); + navigation.setTitle(R.string.settings_screen_pass); view = inflateRes(R.layout.controller_pass); container = view.findViewById(R.id.container); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/LogsController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/LogsController.java index 4f602070..df69df4e 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/LogsController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/LogsController.java @@ -58,12 +58,12 @@ public class LogsController extends Controller implements ToolbarMenuItem.Toolba public void onCreate() { super.onCreate(); - navigationItem.setTitle(org.floens.chan.R.string.settings_logs_screen); + navigation.setTitle(org.floens.chan.R.string.settings_logs_screen); - navigationItem.menu = new ToolbarMenu(context); + navigation.menu = new ToolbarMenu(context); List items = new ArrayList<>(); items.add(new FloatingMenuItem(COPY_ID, R.string.settings_logs_copy)); - navigationItem.createOverflow(context, this, items); + navigation.createOverflow(context, this, items); ScrollView container = new ScrollView(context); container.setBackgroundColor(getAttrColor(context, org.floens.chan.R.attr.backcolor)); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/MainSettingsController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/MainSettingsController.java index b3829ce2..e928dfdb 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/MainSettingsController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/MainSettingsController.java @@ -95,9 +95,9 @@ public class MainSettingsController extends SettingsController implements Toolba EventBus.getDefault().register(this); - navigationItem.setTitle(R.string.settings_screen); - navigationItem.menu = new ToolbarMenu(context); - overflow = navigationItem.createOverflow(context, this, Collections.singletonList( + navigation.setTitle(R.string.settings_screen); + navigation.menu = new ToolbarMenu(context); + overflow = navigation.createOverflow(context, this, Collections.singletonList( new FloatingMenuItem(ADVANCED_SETTINGS, R.string.settings_screen_advanced) )); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/ReportController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/ReportController.java index c01439da..80385353 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/ReportController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/ReportController.java @@ -42,7 +42,7 @@ public class ReportController extends Controller { @Override public void onCreate() { super.onCreate(); - navigationItem.title = context.getString(R.string.report_screen, PostHelper.getTitle(post, null)); + navigation.title = context.getString(R.string.report_screen, PostHelper.getTitle(post, null)); Site site = post.board.getSite(); HttpUrl url = site.endpoints().report(post); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/SaveLocationController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/SaveLocationController.java index 1fc04133..3b7f9deb 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/SaveLocationController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/SaveLocationController.java @@ -56,7 +56,7 @@ public class SaveLocationController extends Controller implements FileWatcher.Fi public void onCreate() { super.onCreate(); - navigationItem.setTitle(R.string.save_location_screen); + navigation.setTitle(R.string.save_location_screen); view = inflateRes(R.layout.controller_save_location); filesLayout = (FilesLayout) view.findViewById(R.id.files_layout); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/SiteSetupController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/SiteSetupController.java index 41100fc1..f8e7e332 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/SiteSetupController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/SiteSetupController.java @@ -48,8 +48,8 @@ public class SiteSetupController extends SettingsController implements SiteSetup inject(this); // Navigation - navigationItem.setTitle(R.string.settings_screen); - navigationItem.title = context.getString(R.string.setup_site_title, site.name()); + navigation.setTitle(R.string.settings_screen); + navigation.title = context.getString(R.string.setup_site_title, site.name()); // View binding view = inflateRes(R.layout.settings_layout); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/SitesSetupController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/SitesSetupController.java index a6be7a3a..24027e11 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/SitesSetupController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/SitesSetupController.java @@ -78,7 +78,7 @@ public class SitesSetupController extends StyledToolbarNavigationController impl view = inflateRes(R.layout.controller_sites_setup); // Navigation - navigationItem.setTitle(R.string.setup_sites_title); + navigation.setTitle(R.string.setup_sites_title); // View binding sitesRecyclerview = view.findViewById(R.id.sites_recycler); @@ -98,9 +98,9 @@ public class SitesSetupController extends StyledToolbarNavigationController impl } public void showDoneCheckmark() { - navigationItem.swipeable = false; - navigationItem.menu = new ToolbarMenu(context); - doneMenuItem = navigationItem.menu.addItem( + navigation.swipeable = false; + navigation.menu = new ToolbarMenu(context); + doneMenuItem = navigation.menu.addItem( new ToolbarMenuItem(context, this, DONE_ID, 0, R.drawable.ic_done_white_24dp)); doneMenuItem.getView().setAlpha(0f); } @@ -193,7 +193,7 @@ public class SitesSetupController extends StyledToolbarNavigationController impl doneMenuItem.getView().animate().alpha(nextAllowed ? 1f : 0f).start(); } if (!nextAllowed) { - navigationItem.swipeable = false; + navigation.swipeable = false; } } diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/StyledToolbarNavigationController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/StyledToolbarNavigationController.java index 9e4d05d7..a03ec711 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/StyledToolbarNavigationController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/StyledToolbarNavigationController.java @@ -64,7 +64,7 @@ public class StyledToolbarNavigationController extends ToolbarNavigationControll if (to != null) { DrawerController drawerController = getDrawerController(); if (drawerController != null) { - drawerController.setDrawerEnabled(to.navigationItem.hasDrawer); + drawerController.setDrawerEnabled(to.navigation.hasDrawer); } } } @@ -76,7 +76,7 @@ public class StyledToolbarNavigationController extends ToolbarNavigationControll if (finish) { DrawerController drawerController = getDrawerController(); if (drawerController != null) { - drawerController.setDrawerEnabled(to.navigationItem.hasDrawer); + drawerController.setDrawerEnabled(to.navigation.hasDrawer); } } } diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/ThemeSettingsController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/ThemeSettingsController.java index a1463342..1aa5987d 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/ThemeSettingsController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/ThemeSettingsController.java @@ -46,7 +46,6 @@ import org.floens.chan.core.model.orm.Loadable; import org.floens.chan.core.model.Post; import org.floens.chan.core.model.PostLinkable; import org.floens.chan.core.settings.ChanSettings; -import org.floens.chan.core.site.Sites; import org.floens.chan.ui.activity.StartActivity; import org.floens.chan.ui.cell.PostCell; import org.floens.chan.ui.theme.Theme; @@ -147,8 +146,8 @@ public class ThemeSettingsController extends Controller implements View.OnClickL public void onCreate() { super.onCreate(); - navigationItem.setTitle(R.string.settings_screen_theme); - navigationItem.swipeable = false; + navigation.setTitle(R.string.settings_screen_theme); + navigation.swipeable = false; view = inflateRes(R.layout.controller_theme); themeHelper = ThemeHelper.getInstance(); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/ThreadController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/ThreadController.java index 0300147d..97795366 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/ThreadController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/ThreadController.java @@ -65,7 +65,7 @@ public abstract class ThreadController extends Controller implements ThreadLayou EventBus.getDefault().register(this); - navigationItem.handlesToolbarInset = true; + navigation.handlesToolbarInset = true; threadLayout = (ThreadLayout) LayoutInflater.from(context).inflate(R.layout.layout_thread, null); threadLayout.create(this); @@ -80,7 +80,7 @@ public abstract class ThreadController extends Controller implements ThreadLayou swipeRefreshLayout.setOnRefreshListener(this); - if (navigationItem.handlesToolbarInset) { + if (navigation.handlesToolbarInset) { int toolbarHeight = getToolbar().getToolbarHeight(); swipeRefreshLayout.setProgressViewOffset(false, toolbarHeight - dp(40), toolbarHeight + dp(64 - 40)); } @@ -203,7 +203,7 @@ public abstract class ThreadController extends Controller implements ThreadLayou public void showAlbum(List images, int index) { if (threadLayout.getPresenter().getChanThread() != null) { AlbumViewController albumViewController = new AlbumViewController(context); - albumViewController.setImages(getLoadable(), images, index, navigationItem.title); + albumViewController.setImages(getLoadable(), images, index, navigation.title); if (doubleNavigationController != null) { doubleNavigationController.pushController(albumViewController); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/ThreadSlideController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/ThreadSlideController.java index 4fee6eb4..3fffbd91 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/ThreadSlideController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/ThreadSlideController.java @@ -55,9 +55,9 @@ public class ThreadSlideController extends Controller implements DoubleNavigatio doubleNavigationController = this; - navigationItem.swipeable = false; - navigationItem.handlesToolbarInset = true; - navigationItem.hasDrawer = true; + navigation.swipeable = false; + navigation.handlesToolbarInset = true; + navigation.hasDrawer = true; view = inflateRes(R.layout.controller_thread_slide); @@ -262,20 +262,20 @@ public class ThreadSlideController extends Controller implements DoubleNavigatio NavigationItem item = null; if (left) { if (leftController != null) { - item = leftController.navigationItem; + item = leftController.navigation; } } else { if (rightController != null) { - item = rightController.navigationItem; + item = rightController.navigation; } } if (item != null) { - navigationItem = item; - navigationItem.swipeable = false; - navigationItem.handlesToolbarInset = true; - navigationItem.hasDrawer = true; - toolbar.setNavigationItem(false, true, navigationItem); + navigation = item; + navigation.swipeable = false; + navigation.handlesToolbarInset = true; + navigation.hasDrawer = true; + toolbar.setNavigationItem(false, true, navigation); } } } diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/ToolbarNavigationController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/ToolbarNavigationController.java index 4bfe30db..d22a4446 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/ToolbarNavigationController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/ToolbarNavigationController.java @@ -48,7 +48,7 @@ public abstract class ToolbarNavigationController extends NavigationController i super.transition(from, to, pushing, controllerTransition); if (to != null) { - toolbar.setNavigationItem(controllerTransition != null, pushing, to.navigationItem); + toolbar.setNavigationItem(controllerTransition != null, pushing, to.navigation); updateToolbarCollapse(to, controllerTransition != null); } } @@ -60,7 +60,7 @@ public abstract class ToolbarNavigationController extends NavigationController i } toolbar.processScrollCollapse(Toolbar.TOOLBAR_COLLAPSE_SHOW, true); - toolbar.beginTransition(to.navigationItem); + toolbar.beginTransition(to.navigation); toolbar.transitionProgress(0f, false); return true; @@ -106,7 +106,7 @@ public abstract class ToolbarNavigationController extends NavigationController i @Override public void onSearchVisibilityChanged(NavigationItem item, boolean visible) { for (Controller controller : childControllers) { - if (controller.navigationItem == item) { + if (controller.navigation == item) { ((ToolbarSearchCallback) controller).onSearchVisibilityChanged(visible); break; } @@ -116,7 +116,7 @@ public abstract class ToolbarNavigationController extends NavigationController i @Override public void onSearchEntered(NavigationItem item, String entered) { for (Controller controller : childControllers) { - if (controller.navigationItem == item) { + if (controller.navigation == item) { ((ToolbarSearchCallback) controller).onSearchEntered(entered); break; } @@ -124,7 +124,7 @@ public abstract class ToolbarNavigationController extends NavigationController i } protected void updateToolbarCollapse(Controller controller, boolean animate) { - if (requireSpaceForToolbar && !controller.navigationItem.handlesToolbarInset) { + if (requireSpaceForToolbar && !controller.navigation.handlesToolbarInset) { FrameLayout.LayoutParams toViewParams = (FrameLayout.LayoutParams) controller.view.getLayoutParams(); toViewParams.topMargin = toolbar.getToolbarHeight(); controller.view.setLayoutParams(toViewParams); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/ViewThreadController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/ViewThreadController.java index 9e308c55..6fc57ed1 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/ViewThreadController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/ViewThreadController.java @@ -81,11 +81,11 @@ public class ViewThreadController extends ThreadController implements ThreadLayo view.setBackgroundColor(getAttrColor(context, R.attr.backcolor)); - navigationItem.hasDrawer = true; - navigationItem.menu = new ToolbarMenu(context); + navigation.hasDrawer = true; + navigation.menu = new ToolbarMenu(context); - navigationItem.menu.addItem(new ToolbarMenuItem(context, this, ALBUM_ID, R.drawable.ic_image_white_24dp)); - pinItem = navigationItem.menu.addItem(new ToolbarMenuItem(context, this, PIN_ID, R.drawable.ic_bookmark_outline_white_24dp)); + navigation.menu.addItem(new ToolbarMenuItem(context, this, ALBUM_ID, R.drawable.ic_image_white_24dp)); + pinItem = navigation.menu.addItem(new ToolbarMenuItem(context, this, PIN_ID, R.drawable.ic_bookmark_outline_white_24dp)); List items = new ArrayList<>(); if (!ChanSettings.enableReplyFab.get()) { items.add(new FloatingMenuItem(REPLY_ID, context.getString(R.string.action_reply))); @@ -96,7 +96,7 @@ public class ViewThreadController extends ThreadController implements ThreadLayo items.add(new FloatingMenuItem(SHARE_ID, R.string.action_share)); items.add(new FloatingMenuItem(UP_ID, R.string.action_up)); items.add(new FloatingMenuItem(DOWN_ID, R.string.action_down)); - overflowItem = navigationItem.createOverflow(context, this, items); + overflowItem = navigation.createOverflow(context, this, items); loadThread(loadable); } @@ -149,8 +149,8 @@ public class ViewThreadController extends ThreadController implements ThreadLayo if (!loadable.equals(presenter.getLoadable())) { presenter.bindLoadable(loadable); this.loadable = presenter.getLoadable(); - navigationItem.title = loadable.title; - ((ToolbarNavigationController) navigationController).toolbar.updateTitle(navigationItem); + navigation.title = loadable.title; + ((ToolbarNavigationController) navigationController).toolbar.updateTitle(navigation); setPinIconState(presenter.isPinned()); updateDrawerHighlighting(loadable); updateLeftPaneHighlighting(loadable); @@ -169,8 +169,8 @@ public class ViewThreadController extends ThreadController implements ThreadLayo public void onShowPosts() { super.onShowPosts(); - navigationItem.title = loadable.title; - ((ToolbarNavigationController) navigationController).toolbar.updateTitle(navigationItem); + navigation.title = loadable.title; + ((ToolbarNavigationController) navigationController).toolbar.updateTitle(navigation); } @Override diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/WatchSettingsController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/WatchSettingsController.java index dc1475b6..c16a6cc7 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/WatchSettingsController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/WatchSettingsController.java @@ -52,7 +52,7 @@ public class WatchSettingsController extends SettingsController implements Compo boolean enabled = ChanSettings.watchEnabled.get(); - navigationItem.setTitle(R.string.settings_screen_watch); + navigation.setTitle(R.string.settings_screen_watch); view = inflateRes(R.layout.controller_watch); content = (LinearLayout) view.findViewById(R.id.scrollview_content); @@ -63,7 +63,7 @@ public class WatchSettingsController extends SettingsController implements Compo SwitchCompat globalSwitch = new SwitchCompat(context); globalSwitch.setChecked(enabled); globalSwitch.setOnCheckedChangeListener(this); - navigationItem.rightView = globalSwitch; + navigation.rightView = globalSwitch; populatePreferences();