From 1c8b68ab0e2c21c75e31e4f1f4b0455114c5bd06 Mon Sep 17 00:00:00 2001 From: Yuri Revich Date: Tue, 24 Nov 2015 21:54:42 +0300 Subject: [PATCH] fix autoformat --- .../ui/catalogue/CatalogueFragment.java | 9 +++---- .../mangafeed/ui/library/LibraryHolder.java | 15 ++++-------- .../mangafeed/ui/main/MainActivity.java | 6 ++--- .../ui/manga/chapter/ChaptersFragment.java | 9 +++---- .../ui/manga/chapter/ChaptersPresenter.java | 14 ++++------- .../ui/manga/info/MangaInfoFragment.java | 24 +++++++------------ .../ui/manga/info/MangaInfoPresenter.java | 3 +-- 7 files changed, 27 insertions(+), 53 deletions(-) diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/catalogue/CatalogueFragment.java b/app/src/main/java/eu/kanade/mangafeed/ui/catalogue/CatalogueFragment.java index 7259a05d2..856d65419 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/catalogue/CatalogueFragment.java +++ b/app/src/main/java/eu/kanade/mangafeed/ui/catalogue/CatalogueFragment.java @@ -32,14 +32,11 @@ import uk.co.ribot.easyadapter.EasyAdapter; @RequiresPresenter(CataloguePresenter.class) public class CatalogueFragment extends BaseRxFragment { - @Bind(R.id.gridView) - GridView manga_list; + @Bind(R.id.gridView) GridView manga_list; - @Bind(R.id.progress) - ProgressBar progress; + @Bind(R.id.progress) ProgressBar progress; - @Bind(R.id.progress_grid) - ProgressBar progress_grid; + @Bind(R.id.progress_grid) ProgressBar progress_grid; private EasyAdapter adapter; private EndlessScrollListener scroll_listener; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/library/LibraryHolder.java b/app/src/main/java/eu/kanade/mangafeed/ui/library/LibraryHolder.java index 2a15cdbf7..bc7eab9c8 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/library/LibraryHolder.java +++ b/app/src/main/java/eu/kanade/mangafeed/ui/library/LibraryHolder.java @@ -20,17 +20,13 @@ import uk.co.ribot.easyadapter.annotations.ViewId; @LayoutId(R.layout.item_catalogue) public class LibraryHolder extends ItemViewHolder { - @ViewId(R.id.thumbnail) - ImageView thumbnail; + @ViewId(R.id.thumbnail) ImageView thumbnail; - @ViewId(R.id.title) - TextView title; + @ViewId(R.id.title) TextView title; - @ViewId(R.id.author) - TextView author; + @ViewId(R.id.author) TextView author; - @ViewId(R.id.unreadText) - TextView unreadText; + @ViewId(R.id.unreadText) TextView unreadText; public LibraryHolder(View view) { super(view); @@ -43,8 +39,7 @@ public class LibraryHolder extends ItemViewHolder { if (manga.unread > 0) { unreadText.setVisibility(View.VISIBLE); unreadText.setText(Integer.toString(manga.unread)); - } - else { + } else { unreadText.setVisibility(View.GONE); } diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/main/MainActivity.java b/app/src/main/java/eu/kanade/mangafeed/ui/main/MainActivity.java index 541daf8ae..1f52a2c1a 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/main/MainActivity.java +++ b/app/src/main/java/eu/kanade/mangafeed/ui/main/MainActivity.java @@ -22,11 +22,9 @@ import nucleus.view.ViewWithPresenter; public class MainActivity extends BaseActivity { - @Bind(R.id.toolbar) - Toolbar toolbar; + @Bind(R.id.toolbar) Toolbar toolbar; - @Bind(R.id.drawer_container) - FrameLayout container; + @Bind(R.id.drawer_container) FrameLayout container; private Drawer drawer; private FragmentStack fragmentStack; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersFragment.java b/app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersFragment.java index cb426e470..f40cfc039 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersFragment.java +++ b/app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersFragment.java @@ -35,12 +35,10 @@ import rx.Observable; public class ChaptersFragment extends BaseRxFragment implements ActionMode.Callback, ChaptersAdapter.OnItemClickListener { - @Bind(R.id.chapter_list) - RecyclerView chapters; - @Bind(R.id.swipe_refresh) - SwipeRefreshLayout swipeRefresh; + @Bind(R.id.chapter_list) RecyclerView chapters; + @Bind(R.id.swipe_refresh) SwipeRefreshLayout swipeRefresh; + @Bind(R.id.toolbar_bottom) Toolbar toolbarBottom; - Toolbar toolbarBottom; private MenuItem sortUpBtn; private MenuItem sortDownBtn; private CheckBox readCb; @@ -71,7 +69,6 @@ public class ChaptersFragment extends BaseRxFragment implemen createAdapter(); setSwipeRefreshListener(); - toolbarBottom = (Toolbar) view.findViewById(R.id.toolbar_bottom); toolbarBottom.inflateMenu(R.menu.chapter_filter); sortUpBtn = toolbarBottom.getMenu().findItem(R.id.action_sort_up); diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersPresenter.java b/app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersPresenter.java index 75e385096..dce7a7d88 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersPresenter.java +++ b/app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersPresenter.java @@ -30,14 +30,10 @@ import rx.schedulers.Schedulers; public class ChaptersPresenter extends BasePresenter { - @Inject - DatabaseHelper db; - @Inject - SourceManager sourceManager; - @Inject - PreferencesHelper preferences; - @Inject - DownloadManager downloadManager; + @Inject DatabaseHelper db; + @Inject SourceManager sourceManager; + @Inject PreferencesHelper preferences; + @Inject DownloadManager downloadManager; private Manga manga; private Source source; @@ -177,7 +173,7 @@ public class ChaptersPresenter extends BasePresenter { } } - public void initReadCb(){ + public void initReadCb() { if (getView() != null) { getView().setReadFilter(onlyUnread);//TODO do we need save filter for manga? } diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/manga/info/MangaInfoFragment.java b/app/src/main/java/eu/kanade/mangafeed/ui/manga/info/MangaInfoFragment.java index 3c0c93d08..063bcd903 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/manga/info/MangaInfoFragment.java +++ b/app/src/main/java/eu/kanade/mangafeed/ui/manga/info/MangaInfoFragment.java @@ -26,23 +26,15 @@ import nucleus.factory.RequiresPresenter; @RequiresPresenter(MangaInfoPresenter.class) public class MangaInfoFragment extends BaseRxFragment { - @Bind(R.id.manga_artist) - TextView mArtist; - @Bind(R.id.manga_author) - TextView mAuthor; - @Bind(R.id.manga_chapters) - TextView mChapters; - @Bind(R.id.manga_genres) - TextView mGenres; - @Bind(R.id.manga_status) - TextView mStatus; - @Bind(R.id.manga_summary) - TextView mDescription; - @Bind(R.id.manga_cover) - ImageView mCover; + @Bind(R.id.manga_artist) TextView mArtist; + @Bind(R.id.manga_author) TextView mAuthor; + @Bind(R.id.manga_chapters) TextView mChapters; + @Bind(R.id.manga_genres) TextView mGenres; + @Bind(R.id.manga_status) TextView mStatus; + @Bind(R.id.manga_summary) TextView mDescription; + @Bind(R.id.manga_cover) ImageView mCover; - @Bind(R.id.action_favorite) - Button favoriteBtn; + @Bind(R.id.action_favorite) Button favoriteBtn; public static MangaInfoFragment newInstance() { diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/manga/info/MangaInfoPresenter.java b/app/src/main/java/eu/kanade/mangafeed/ui/manga/info/MangaInfoPresenter.java index 3b7f8b509..7503bcdc5 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/manga/info/MangaInfoPresenter.java +++ b/app/src/main/java/eu/kanade/mangafeed/ui/manga/info/MangaInfoPresenter.java @@ -13,8 +13,7 @@ import rx.Observable; public class MangaInfoPresenter extends BasePresenter { - @Inject - DatabaseHelper db; + @Inject DatabaseHelper db; private Manga manga; private int count = -1;