cynic
/
Clover
mirror of https://github.com/kurisufriend/Clover
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename navigationItem to navigation

Browse Source
refactor-toolbar
Floens 8 years ago
parent fbe777d0cd
commit 203fe03a17
27 changed files with 88 additions and 89 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      Clover/app/src/main/java/org/floens/chan/controller/Controller.java
  2. 2
      Clover/app/src/main/java/org/floens/chan/controller/ui/NavigationControllerContainerLayout.java
  3. 2
      Clover/app/src/main/java/org/floens/chan/ui/controller/AdvancedSettingsController.java
  4. 8
      Clover/app/src/main/java/org/floens/chan/ui/controller/AlbumDownloadController.java
  5. 8
      Clover/app/src/main/java/org/floens/chan/ui/controller/AlbumViewController.java
  6. 4
      Clover/app/src/main/java/org/floens/chan/ui/controller/BoardSetupController.java
  7. 12
      Clover/app/src/main/java/org/floens/chan/ui/controller/BrowseController.java
  8. 2
      Clover/app/src/main/java/org/floens/chan/ui/controller/DeveloperSettingsController.java
  9. 2
      Clover/app/src/main/java/org/floens/chan/ui/controller/DrawerController.java
  10. 6
      Clover/app/src/main/java/org/floens/chan/ui/controller/FiltersController.java
  11. 10
      Clover/app/src/main/java/org/floens/chan/ui/controller/HistoryController.java
  12. 18
      Clover/app/src/main/java/org/floens/chan/ui/controller/ImageViewerController.java
  13. 2
      Clover/app/src/main/java/org/floens/chan/ui/controller/LicensesController.java
  14. 2
      Clover/app/src/main/java/org/floens/chan/ui/controller/LoginController.java
  15. 6
      Clover/app/src/main/java/org/floens/chan/ui/controller/LogsController.java
  16. 6
      Clover/app/src/main/java/org/floens/chan/ui/controller/MainSettingsController.java
  17. 2
      Clover/app/src/main/java/org/floens/chan/ui/controller/ReportController.java
  18. 2
      Clover/app/src/main/java/org/floens/chan/ui/controller/SaveLocationController.java
  19. 4
      Clover/app/src/main/java/org/floens/chan/ui/controller/SiteSetupController.java
  20. 10
      Clover/app/src/main/java/org/floens/chan/ui/controller/SitesSetupController.java
  21. 4
      Clover/app/src/main/java/org/floens/chan/ui/controller/StyledToolbarNavigationController.java
  22. 5
      Clover/app/src/main/java/org/floens/chan/ui/controller/ThemeSettingsController.java
  23. 6
      Clover/app/src/main/java/org/floens/chan/ui/controller/ThreadController.java
  24. 20
      Clover/app/src/main/java/org/floens/chan/ui/controller/ThreadSlideController.java
  25. 10
      Clover/app/src/main/java/org/floens/chan/ui/controller/ToolbarNavigationController.java
  26. 18
      Clover/app/src/main/java/org/floens/chan/ui/controller/ViewThreadController.java
  27. 4
      Clover/app/src/main/java/org/floens/chan/ui/controller/WatchSettingsController.java

2
Clover/app/src/main/java/org/floens/chan/controller/Controller.java
Unescape View File

@ -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;

2
Clover/app/src/main/java/org/floens/chan/controller/ui/NavigationControllerContainerLayout.java
Unescape View File

@ -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;
}

2
Clover/app/src/main/java/org/floens/chan/ui/controller/AdvancedSettingsController.java
Unescape View File

@ -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);

8
Clover/app/src/main/java/org/floens/chan/ui/controller/AlbumDownloadController.java
Unescape View File

@ -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() {

8
Clover/app/src/main/java/org/floens/chan/ui/controller/AlbumViewController.java
Unescape View File

@ -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<FloatingMenuItem> 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<PostImage> 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;
}

4
Clover/app/src/main/java/org/floens/chan/ui/controller/BoardSetupController.java
Unescape View File

@ -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);

12
Clover/app/src/main/java/org/floens/chan/ui/controller/BrowseController.java
Unescape View File

@ -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

2
Clover/app/src/main/java/org/floens/chan/ui/controller/DeveloperSettingsController.java
Unescape View File

@ -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);

2
Clover/app/src/main/java/org/floens/chan/ui/controller/DrawerController.java
Unescape View File

@ -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);
}
}

6
Clover/app/src/main/java/org/floens/chan/ui/controller/FiltersController.java
Unescape View File

@ -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);

10
Clover/app/src/main/java/org/floens/chan/ui/controller/HistoryController.java
Unescape View File

@ -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<FloatingMenuItem> 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);

18
Clover/app/src/main/java/org/floens/chan/ui/controller/ImageViewerController.java
Unescape View File

@ -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<FloatingMenuItem> 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) {

2
Clover/app/src/main/java/org/floens/chan/ui/controller/LicensesController.java
Unescape View File

@ -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);

2
Clover/app/src/main/java/org/floens/chan/ui/controller/LoginController.java
Unescape View File

@ -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);

6
Clover/app/src/main/java/org/floens/chan/ui/controller/LogsController.java
Unescape View File

@ -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<FloatingMenuItem> 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));

6
Clover/app/src/main/java/org/floens/chan/ui/controller/MainSettingsController.java
Unescape View File

@ -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)
));

2
Clover/app/src/main/java/org/floens/chan/ui/controller/ReportController.java
Unescape View File

@ -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);

2
Clover/app/src/main/java/org/floens/chan/ui/controller/SaveLocationController.java
Unescape View File

@ -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);

4
Clover/app/src/main/java/org/floens/chan/ui/controller/SiteSetupController.java
Unescape View File

@ -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);

10
Clover/app/src/main/java/org/floens/chan/ui/controller/SitesSetupController.java
Unescape View File

@ -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;
}
}

4
Clover/app/src/main/java/org/floens/chan/ui/controller/StyledToolbarNavigationController.java
Unescape View File

@ -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);
}
}
}

5
Clover/app/src/main/java/org/floens/chan/ui/controller/ThemeSettingsController.java
Unescape View File

@ -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();

6
Clover/app/src/main/java/org/floens/chan/ui/controller/ThreadController.java
Unescape View File

@ -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<PostImage> 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);

20
Clover/app/src/main/java/org/floens/chan/ui/controller/ThreadSlideController.java
Unescape View File

@ -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);
}
}
}

10
Clover/app/src/main/java/org/floens/chan/ui/controller/ToolbarNavigationController.java
Unescape View File

@ -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);

18
Clover/app/src/main/java/org/floens/chan/ui/controller/ViewThreadController.java
Unescape View File

@ -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<FloatingMenuItem> 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

4
Clover/app/src/main/java/org/floens/chan/ui/controller/WatchSettingsController.java
Unescape View File

@ -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();

Write Preview
Loading…
Cancel
Save