diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 78bc50f4..0e735d79 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -20,7 +20,7 @@ android:theme="@style/SplashTheme" tools:replace="android:allowBackup"> @@ -29,7 +29,7 @@ + android:parentActivityName=".ui.modules.main.MainActivity"> + android:value=".ui.modules.main.MainActivity"/> + android:parentActivityName=".ui.modules.main.MainActivity"> + android:value=".ui.modules.main.MainActivity"/> + android:parentActivityName=".ui.modules.repos.RepoPagerActivity"> + android:value=".ui.modules.repos.RepoPagerActivity"/> + android:parentActivityName=".ui.modules.repos.RepoPagerActivity"> + android:value=".ui.modules.repos.RepoPagerActivity"/> + android:parentActivityName=".ui.modules.repos.RepoPagerActivity"> + android:value=".ui.modules.repos.RepoPagerActivity"/> + android:parentActivityName=".ui.modules.main.MainActivity"> + android:value=".ui.modules.main.MainActivity"/> + android:parentActivityName=".ui.modules.main.MainActivity"> + android:value=".ui.modules.main.MainActivity"/> + android:name=".ui.modules.search.SearchActivity" + android:parentActivityName=".ui.modules.main.MainActivity"> + android:value=".ui.modules.main.MainActivity"/> + android:parentActivityName=".ui.modules.main.MainActivity"> + android:value=".ui.modules.main.MainActivity"/> - + + android:parentActivityName=".ui.modules.repos.RepoPagerActivity"> + android:value=".ui.modules.repos.RepoPagerActivity"/> - + buildForProfile(@NonNull Context context, @NonNull String login) { - return Stream.of(new FragmentPagerAdapterModel(context.getString(R.string.overview), ProfileOverviewView.newInstance(login)), - new FragmentPagerAdapterModel(context.getString(R.string.repos), ProfileReposView.newInstance(login)), - new FragmentPagerAdapterModel(context.getString(R.string.starred), ProfileStarredView.newInstance(login)), - new FragmentPagerAdapterModel(context.getString(R.string.gists), ProfileGistsView.newInstance(login)), - new FragmentPagerAdapterModel(context.getString(R.string.followers), ProfileFollowersView.newInstance(login)), - new FragmentPagerAdapterModel(context.getString(R.string.following), ProfileFollowingView.newInstance(login))) + return Stream.of(new FragmentPagerAdapterModel(context.getString(R.string.overview), ProfileOverviewFragment.newInstance(login)), + new FragmentPagerAdapterModel(context.getString(R.string.repos), ProfileReposFragment.newInstance(login)), + new FragmentPagerAdapterModel(context.getString(R.string.starred), ProfileStarredFragment.newInstance(login)), + new FragmentPagerAdapterModel(context.getString(R.string.gists), ProfileGistsFragment.newInstance(login)), + new FragmentPagerAdapterModel(context.getString(R.string.followers), ProfileFollowersFragment.newInstance(login)), + new FragmentPagerAdapterModel(context.getString(R.string.following), ProfileFollowingFragment.newInstance(login))) .collect(Collectors.toList()); } public static List buildForRepoCode(@NonNull Context context, @NonNull String repoId, @NonNull String login, @NonNull String url, @NonNull String defaultBranch) { - return Stream.of(new FragmentPagerAdapterModel(context.getString(R.string.readme), ViewerView.newInstance(url, true)), - new FragmentPagerAdapterModel(context.getString(R.string.files), RepoFilePathView.newInstance(login, repoId, null, defaultBranch)), - new FragmentPagerAdapterModel(context.getString(R.string.commits), RepoCommitsView.newInstance(repoId, login, defaultBranch)), - new FragmentPagerAdapterModel(context.getString(R.string.releases), RepoReleasesView.newInstance(repoId, login)), - new FragmentPagerAdapterModel(context.getString(R.string.contributors), RepoContributorsView.newInstance(repoId, login))) + return Stream.of(new FragmentPagerAdapterModel(context.getString(R.string.readme), ViewerFragment.newInstance(url, true)), + new FragmentPagerAdapterModel(context.getString(R.string.files), RepoFilePathFragment.newInstance(login, repoId, null, defaultBranch)), + new FragmentPagerAdapterModel(context.getString(R.string.commits), RepoCommitsFragment.newInstance(repoId, login, defaultBranch)), + new FragmentPagerAdapterModel(context.getString(R.string.releases), RepoReleasesFragment.newInstance(repoId, login)), + new FragmentPagerAdapterModel(context.getString(R.string.contributors), RepoContributorsFragment.newInstance(repoId, login))) .collect(Collectors.toList()); } @NonNull public static List buildForSearch(@NonNull Context context) { - return Stream.of(new FragmentPagerAdapterModel(context.getString(R.string.repos), SearchReposView.newInstance()), - new FragmentPagerAdapterModel(context.getString(R.string.users), SearchUsersView.newInstance()), - new FragmentPagerAdapterModel(context.getString(R.string.issues), SearchIssuesView.newInstance()), - new FragmentPagerAdapterModel(context.getString(R.string.code), SearchCodeView.newInstance())) + return Stream.of(new FragmentPagerAdapterModel(context.getString(R.string.repos), SearchReposFragment.newInstance()), + new FragmentPagerAdapterModel(context.getString(R.string.users), SearchUsersFragment.newInstance()), + new FragmentPagerAdapterModel(context.getString(R.string.issues), SearchIssuesFragment.newInstance()), + new FragmentPagerAdapterModel(context.getString(R.string.code), SearchCodeFragment.newInstance())) .collect(Collectors.toList()); } @NonNull public static List buildForIssues(@NonNull Context context, @NonNull Issue issueModel) { - return Stream.of(new FragmentPagerAdapterModel(context.getString(R.string.details), IssueTimelineView.newInstance(issueModel))) + return Stream.of(new FragmentPagerAdapterModel(context.getString(R.string.details), IssueTimelineFragment.newInstance(issueModel))) .collect(Collectors.toList()); } @@ -106,9 +106,9 @@ import lombok.Setter; String login = pullRequest.getLogin(); String repoId = pullRequest.getRepoId(); int number = pullRequest.getNumber(); - return Stream.of(new FragmentPagerAdapterModel(context.getString(R.string.details), PullRequestTimelineView.newInstance(pullRequest)), - new FragmentPagerAdapterModel(context.getString(R.string.commits), PullRequestCommitsView.newInstance(repoId, login, number)), - new FragmentPagerAdapterModel(context.getString(R.string.files), PullRequestFilesView.newInstance(repoId, login, number))) + return Stream.of(new FragmentPagerAdapterModel(context.getString(R.string.details), PullRequestTimelineFragment.newInstance(pullRequest)), + new FragmentPagerAdapterModel(context.getString(R.string.commits), PullRequestCommitsFragment.newInstance(repoId, login, number)), + new FragmentPagerAdapterModel(context.getString(R.string.files), PullRequestFilesFragment.newInstance(repoId, login, number))) .collect(Collectors.toList()); } @@ -116,18 +116,18 @@ import lombok.Setter; @NonNull public static List buildForRepoIssue(@NonNull Context context, @NonNull String login, @NonNull String repoId) { return Stream.of(new FragmentPagerAdapterModel(context.getString(R.string.opened), - RepoOpenedIssuesView.newInstance(repoId, login)), + RepoOpenedIssuesFragment.newInstance(repoId, login)), new FragmentPagerAdapterModel(context.getString(R.string.closed), - RepoClosedIssuesView.newInstance(repoId, login))) + RepoClosedIssuesFragment.newInstance(repoId, login))) .collect(Collectors.toList()); } @NonNull public static List buildForRepoPullRequest(@NonNull Context context, @NonNull String login, @NonNull String repoId) { return Stream.of(new FragmentPagerAdapterModel(context.getString(R.string.opened), - RepoPullRequestView.newInstance(repoId, login, IssueState.open)), + RepoPullRequestFragment.newInstance(repoId, login, IssueState.open)), new FragmentPagerAdapterModel(context.getString(R.string.closed), - RepoPullRequestView.newInstance(repoId, login, IssueState.closed))) + RepoPullRequestFragment.newInstance(repoId, login, IssueState.closed))) .collect(Collectors.toList()); } @@ -135,16 +135,16 @@ import lombok.Setter; String login = commitModel.getLogin(); String repoId = commitModel.getRepoId(); String sha = commitModel.getSha(); - return Stream.of(new FragmentPagerAdapterModel(context.getString(R.string.commits), CommitFilesView.newInstance(commitModel.getSha(), + return Stream.of(new FragmentPagerAdapterModel(context.getString(R.string.commits), CommitFilesFragment.newInstance(commitModel.getSha(), commitModel.getFiles())) - , new FragmentPagerAdapterModel(context.getString(R.string.comments), CommitCommentsView.newInstance(login, repoId, sha))) + , new FragmentPagerAdapterModel(context.getString(R.string.comments), CommitCommentsFragments.newInstance(login, repoId, sha))) .collect(Collectors.toList()); } @NonNull public static List buildForGist(@NonNull Context context, @NonNull Gist gistsModel) { - return Stream.of(new FragmentPagerAdapterModel(context.getString(R.string.files), GistFilesListView.newInstance(gistsModel.getFiles())), - new FragmentPagerAdapterModel(context.getString(R.string.comments), GistCommentsView.newInstance(gistsModel.getGistId()))) + return Stream.of(new FragmentPagerAdapterModel(context.getString(R.string.files), GistFilesListFragment.newInstance(gistsModel.getFiles())), + new FragmentPagerAdapterModel(context.getString(R.string.comments), GistCommentsFragment.newInstance(gistsModel.getGistId()))) .collect(Collectors.toList()); } @@ -155,25 +155,25 @@ import lombok.Setter; } public static List buildForMyPulls(@NonNull Context context) { - return Stream.of(new FragmentPagerAdapterModel(context.getString(R.string.open), MyPullRequestView.newInstance(IssueState.open)) - , new FragmentPagerAdapterModel(context.getString(R.string.closed), MyPullRequestView.newInstance(IssueState.closed))) + return Stream.of(new FragmentPagerAdapterModel(context.getString(R.string.open), MyPullRequestFragment.newInstance(IssueState.open)) + , new FragmentPagerAdapterModel(context.getString(R.string.closed), MyPullRequestFragment.newInstance(IssueState.closed))) .collect(Collectors.toList()); } public static List buildForOrg(@NonNull Context context, @NonNull String login, boolean isMember) { return Stream.of( - new FragmentPagerAdapterModel(context.getString(R.string.feeds), isMember ? OrgFeedsView.newInstance(login) : null), - new FragmentPagerAdapterModel(context.getString(R.string.overview), OrgProfileOverviewView.newInstance(login)), - new FragmentPagerAdapterModel(context.getString(R.string.repos), OrgReposView.newInstance(login)), - new FragmentPagerAdapterModel(context.getString(R.string.people), OrgMembersView.newInstance(login)), - new FragmentPagerAdapterModel(context.getString(R.string.teams), isMember ? OrgTeamView.newInstance(login) : null)) + new FragmentPagerAdapterModel(context.getString(R.string.feeds), isMember ? OrgFeedsFragment.newInstance(login) : null), + new FragmentPagerAdapterModel(context.getString(R.string.overview), OrgProfileOverviewFragment.newInstance(login)), + new FragmentPagerAdapterModel(context.getString(R.string.repos), OrgReposFragment.newInstance(login)), + new FragmentPagerAdapterModel(context.getString(R.string.people), OrgMembersFragment.newInstance(login)), + new FragmentPagerAdapterModel(context.getString(R.string.teams), isMember ? OrgTeamFragment.newInstance(login) : null)) .filter(fragmentPagerAdapterModel -> fragmentPagerAdapterModel.getFragment() != null) .collect(Collectors.toList()); } public static List buildForTeam(@NonNull Context context, long id) { - return Stream.of(new FragmentPagerAdapterModel(context.getString(R.string.members), TeamMembersView.newInstance(id)), - new FragmentPagerAdapterModel(context.getString(R.string.repos), TeamReposView.newInstance(id))) + return Stream.of(new FragmentPagerAdapterModel(context.getString(R.string.members), TeamMembersFragment.newInstance(id)), + new FragmentPagerAdapterModel(context.getString(R.string.repos), TeamReposFragment.newInstance(id))) .collect(Collectors.toList()); } } diff --git a/app/src/main/java/com/fastaccess/helper/Logger.java b/app/src/main/java/com/fastaccess/helper/Logger.java index 8ece9273..e49e5807 100644 --- a/app/src/main/java/com/fastaccess/helper/Logger.java +++ b/app/src/main/java/com/fastaccess/helper/Logger.java @@ -33,8 +33,6 @@ public class Logger { Log.i(tag, text != null ? text.toString() : "LOGGER IS NULL");//avoid null } - public static void e(@Nullable Object text) {e(getCurrentClassName() + " || " + getCurrentMethodName(), text);} - public static void d(@Nullable Object text) { d(getCurrentClassName() + " || " + getCurrentMethodName(), text);//avoid null } diff --git a/app/src/main/java/com/fastaccess/provider/scheme/SchemeParser.java b/app/src/main/java/com/fastaccess/provider/scheme/SchemeParser.java index 3843f61e..8bbc28d8 100644 --- a/app/src/main/java/com/fastaccess/provider/scheme/SchemeParser.java +++ b/app/src/main/java/com/fastaccess/provider/scheme/SchemeParser.java @@ -14,14 +14,14 @@ import com.annimon.stream.Optional; import com.fastaccess.helper.ActivityHelper; import com.fastaccess.helper.InputHelper; import com.fastaccess.helper.Logger; -import com.fastaccess.ui.modules.code.CodeViewerView; -import com.fastaccess.ui.modules.gists.gist.GistView; -import com.fastaccess.ui.modules.repos.RepoPagerView; -import com.fastaccess.ui.modules.repos.code.commit.details.CommitPagerView; -import com.fastaccess.ui.modules.repos.issues.create.CreateIssueView; -import com.fastaccess.ui.modules.repos.issues.issue.details.IssuePagerView; -import com.fastaccess.ui.modules.repos.pull_requests.pull_request.details.PullRequestPagerView; -import com.fastaccess.ui.modules.user.UserPagerView; +import com.fastaccess.ui.modules.code.CodeViewerActivity; +import com.fastaccess.ui.modules.gists.gist.GistActivity; +import com.fastaccess.ui.modules.repos.RepoPagerActivity; +import com.fastaccess.ui.modules.repos.code.commit.details.CommitPagerActivity; +import com.fastaccess.ui.modules.repos.issues.create.CreateIssueActivity; +import com.fastaccess.ui.modules.repos.issues.issue.details.IssuePagerActivity; +import com.fastaccess.ui.modules.repos.pull_requests.pull_request.details.PullRequestPagerActivity; +import com.fastaccess.ui.modules.user.UserPagerActivity; import java.util.List; @@ -88,7 +88,7 @@ public class SchemeParser { if (HOST_GISTS.equals(data.getHost())) { String gist = getGistId(data); if (gist != null) { - return GistView.createIntent(context, gist); + return GistActivity.createIntent(context, gist); } } else if (HOST_GISTS_RAW.equalsIgnoreCase(data.getHost())) { return getGistFile(context, data); @@ -143,7 +143,7 @@ public class SchemeParser { return null; } if (issueNumber < 1) return null; - return PullRequestPagerView.createIntent(context, repo, owner, issueNumber, showRepoBtn); + return PullRequestPagerActivity.createIntent(context, repo, owner, issueNumber, showRepoBtn); } @Nullable private static Intent getIssueIntent(@NonNull Context context, @NonNull Uri uri, boolean showRepoBtn) { @@ -172,7 +172,7 @@ public class SchemeParser { return null; } if (issueNumber < 1) return null; - return IssuePagerView.createIntent(context, repo, owner, issueNumber, showRepoBtn); + return IssuePagerActivity.createIntent(context, repo, owner, issueNumber, showRepoBtn); } @Nullable private static Intent getRepo(@NonNull Context context, @NonNull Uri uri) { @@ -180,7 +180,7 @@ public class SchemeParser { if (segments == null || segments.size() < 2 || segments.size() > 2) return null; String owner = segments.get(0); String repoName = segments.get(1); - return RepoPagerView.createIntent(context, repoName, owner); + return RepoPagerActivity.createIntent(context, repoName, owner); } /** @@ -196,7 +196,7 @@ public class SchemeParser { } else if (segments.size() > 1) { String owner = segments.get(0); String repoName = segments.get(1); - return RepoPagerView.createIntent(context, repoName, owner); + return RepoPagerActivity.createIntent(context, repoName, owner); } } return null; @@ -209,7 +209,7 @@ public class SchemeParser { String login = segments.get(1); String repoId = segments.get(2); String sha = segments.get(4); - return CommitPagerView.createIntent(context, repoId, login, sha, showRepoBtn); + return CommitPagerActivity.createIntent(context, repoId, login, sha, showRepoBtn); } return null; } @@ -220,7 +220,7 @@ public class SchemeParser { String login = segments.get(0); String repoId = segments.get(1); String sha = segments.get(3); - return CommitPagerView.createIntent(context, repoId, login, sha, showRepoBtn); + return CommitPagerActivity.createIntent(context, repoId, login, sha, showRepoBtn); } @Nullable private static String getGistId(@NonNull Uri uri) { @@ -231,9 +231,9 @@ public class SchemeParser { @Nullable private static Intent getUser(@NonNull Context context, @NonNull Uri uri) { List segments = uri.getPathSegments(); if (segments != null && !segments.isEmpty() && segments.size() == 1) { - return UserPagerView.createIntent(context, segments.get(0)); + return UserPagerActivity.createIntent(context, segments.get(0)); } else if (segments != null && !segments.isEmpty() && segments.size() > 1 && segments.get(0).equalsIgnoreCase("orgs")) { - return UserPagerView.createIntent(context, segments.get(1), true); + return UserPagerActivity.createIntent(context, segments.get(1), true); } return null; } @@ -256,11 +256,11 @@ public class SchemeParser { fullUrl += "/" + segments.get(i); } } - if (fullUrl != null) return CodeViewerView.createIntent(context, fullUrl); + if (fullUrl != null) return CodeViewerActivity.createIntent(context, fullUrl); } else { String authority = uri.getAuthority(); if (TextUtils.equals(authority, RAW_AUTHORITY)) { - return CodeViewerView.createIntent(context, uri.toString()); + return CodeViewerActivity.createIntent(context, uri.toString()); } } return null; @@ -277,14 +277,14 @@ public class SchemeParser { if ("issues".equals(segments.get(2))) { String owner = segments.get(0); String repo = segments.get(1); - return CreateIssueView.getIntent(context, owner, repo); + return CreateIssueActivity.getIntent(context, owner, repo); } return null; } @Nullable private static Intent getGistFile(@NonNull Context context, @NonNull Uri uri) { if (uri.getHost().equalsIgnoreCase(HOST_GISTS_RAW)) { - return CodeViewerView.createIntent(context, uri.toString()); + return CodeViewerActivity.createIntent(context, uri.toString()); } return null; } diff --git a/app/src/main/java/com/fastaccess/provider/scheme/StackBuilderSchemeParser.java b/app/src/main/java/com/fastaccess/provider/scheme/StackBuilderSchemeParser.java index 0e3b4f80..e94e13ac 100644 --- a/app/src/main/java/com/fastaccess/provider/scheme/StackBuilderSchemeParser.java +++ b/app/src/main/java/com/fastaccess/provider/scheme/StackBuilderSchemeParser.java @@ -13,17 +13,17 @@ import com.annimon.stream.Optional; import com.fastaccess.helper.ActivityHelper; import com.fastaccess.helper.InputHelper; import com.fastaccess.helper.Logger; -import com.fastaccess.ui.modules.code.CodeViewerView; -import com.fastaccess.ui.modules.gists.gist.GistView; -import com.fastaccess.ui.modules.main.MainView; +import com.fastaccess.ui.modules.code.CodeViewerActivity; +import com.fastaccess.ui.modules.gists.gist.GistActivity; +import com.fastaccess.ui.modules.main.MainActivity; +import com.fastaccess.ui.modules.repos.RepoPagerActivity; import com.fastaccess.ui.modules.repos.RepoPagerMvp; -import com.fastaccess.ui.modules.repos.RepoPagerView; -import com.fastaccess.ui.modules.repos.code.commit.details.CommitPagerView; +import com.fastaccess.ui.modules.repos.code.commit.details.CommitPagerActivity; import com.fastaccess.ui.modules.repos.code.files.activity.RepoFilesActivity; -import com.fastaccess.ui.modules.repos.issues.create.CreateIssueView; -import com.fastaccess.ui.modules.repos.issues.issue.details.IssuePagerView; -import com.fastaccess.ui.modules.repos.pull_requests.pull_request.details.PullRequestPagerView; -import com.fastaccess.ui.modules.user.UserPagerView; +import com.fastaccess.ui.modules.repos.issues.create.CreateIssueActivity; +import com.fastaccess.ui.modules.repos.issues.issue.details.IssuePagerActivity; +import com.fastaccess.ui.modules.repos.pull_requests.pull_request.details.PullRequestPagerActivity; +import com.fastaccess.ui.modules.user.UserPagerActivity; import java.util.List; @@ -89,9 +89,9 @@ public class StackBuilderSchemeParser { String gist = getGistId(data); if (gist != null) { return TaskStackBuilder.create(context) - .addParentStack(MainView.class) - .addNextIntentWithParentStack(new Intent(context, MainView.class)) - .addNextIntent(GistView.createIntent(context, gist)); + .addParentStack(MainActivity.class) + .addNextIntentWithParentStack(new Intent(context, MainActivity.class)) + .addNextIntent(GistActivity.createIntent(context, gist)); } } else if (HOST_GISTS_RAW.equalsIgnoreCase(data.getHost())) { return getGistFile(context, data); @@ -147,10 +147,10 @@ public class StackBuilderSchemeParser { } if (issueNumber < 1) return null; return TaskStackBuilder.create(context) - .addParentStack(MainView.class) - .addNextIntentWithParentStack(new Intent(context, MainView.class)) - .addNextIntentWithParentStack(RepoPagerView.createIntent(context, repo, owner, RepoPagerMvp.PULL_REQUEST)) - .addNextIntent(PullRequestPagerView.createIntent(context, repo, owner, issueNumber)); + .addParentStack(MainActivity.class) + .addNextIntentWithParentStack(new Intent(context, MainActivity.class)) + .addNextIntentWithParentStack(RepoPagerActivity.createIntent(context, repo, owner, RepoPagerMvp.PULL_REQUEST)) + .addNextIntent(PullRequestPagerActivity.createIntent(context, repo, owner, issueNumber)); } @Nullable private static TaskStackBuilder getIssueIntent(@NonNull Context context, @NonNull Uri uri) { @@ -180,10 +180,10 @@ public class StackBuilderSchemeParser { } if (issueNumber < 1) return null; return TaskStackBuilder.create(context) - .addParentStack(MainView.class) - .addNextIntentWithParentStack(new Intent(context, MainView.class)) - .addNextIntentWithParentStack(RepoPagerView.createIntent(context, repo, owner, RepoPagerMvp.ISSUES)) - .addNextIntent(IssuePagerView.createIntent(context, repo, owner, issueNumber)); + .addParentStack(MainActivity.class) + .addNextIntentWithParentStack(new Intent(context, MainActivity.class)) + .addNextIntentWithParentStack(RepoPagerActivity.createIntent(context, repo, owner, RepoPagerMvp.ISSUES)) + .addNextIntent(IssuePagerActivity.createIntent(context, repo, owner, issueNumber)); } @Nullable private static TaskStackBuilder getRepo(@NonNull Context context, @NonNull Uri uri) { @@ -192,9 +192,9 @@ public class StackBuilderSchemeParser { String owner = segments.get(0); String repoName = segments.get(1); return TaskStackBuilder.create(context) - .addParentStack(MainView.class) - .addNextIntentWithParentStack(new Intent(context, MainView.class)) - .addNextIntent(RepoPagerView.createIntent(context, repoName, owner)); + .addParentStack(MainActivity.class) + .addNextIntentWithParentStack(new Intent(context, MainActivity.class)) + .addNextIntent(RepoPagerActivity.createIntent(context, repoName, owner)); } /** @@ -211,9 +211,9 @@ public class StackBuilderSchemeParser { String owner = segments.get(0); String repoName = segments.get(1); return TaskStackBuilder.create(context) - .addParentStack(MainView.class) - .addNextIntentWithParentStack(new Intent(context, MainView.class)) - .addNextIntent(RepoPagerView.createIntent(context, repoName, owner)); + .addParentStack(MainActivity.class) + .addNextIntentWithParentStack(new Intent(context, MainActivity.class)) + .addNextIntent(RepoPagerActivity.createIntent(context, repoName, owner)); } } return null; @@ -236,10 +236,10 @@ public class StackBuilderSchemeParser { } if (login != null && sha != null && repoId != null) { return TaskStackBuilder.create(context) - .addParentStack(MainView.class) - .addNextIntentWithParentStack(new Intent(context, MainView.class)) - .addNextIntentWithParentStack(RepoPagerView.createIntent(context, repoId, login)) - .addNextIntent(CommitPagerView.createIntent(context, repoId, login, sha)); + .addParentStack(MainActivity.class) + .addNextIntentWithParentStack(new Intent(context, MainActivity.class)) + .addNextIntentWithParentStack(RepoPagerActivity.createIntent(context, repoId, login)) + .addNextIntent(CommitPagerActivity.createIntent(context, repoId, login, sha)); } return null; } @@ -251,24 +251,24 @@ public class StackBuilderSchemeParser { String repoId = segments.get(1); String sha = segments.get(3); return TaskStackBuilder.create(context) - .addParentStack(MainView.class) - .addNextIntentWithParentStack(new Intent(context, MainView.class)) - .addNextIntentWithParentStack(RepoPagerView.createIntent(context, repoId, login)) - .addNextIntent(CommitPagerView.createIntent(context, repoId, login, sha)); + .addParentStack(MainActivity.class) + .addNextIntentWithParentStack(new Intent(context, MainActivity.class)) + .addNextIntentWithParentStack(RepoPagerActivity.createIntent(context, repoId, login)) + .addNextIntent(CommitPagerActivity.createIntent(context, repoId, login, sha)); } @Nullable private static TaskStackBuilder getUser(@NonNull Context context, @NonNull Uri uri) { List segments = uri.getPathSegments(); if (segments != null && !segments.isEmpty() && segments.size() == 1) { return TaskStackBuilder.create(context) - .addParentStack(MainView.class) - .addNextIntentWithParentStack(new Intent(context, MainView.class)) - .addNextIntent(UserPagerView.createIntent(context, segments.get(0))); + .addParentStack(MainActivity.class) + .addNextIntentWithParentStack(new Intent(context, MainActivity.class)) + .addNextIntent(UserPagerActivity.createIntent(context, segments.get(0))); } else if (segments != null && !segments.isEmpty() && segments.size() > 1 && segments.get(0).equalsIgnoreCase("orgs")) { return TaskStackBuilder.create(context) - .addParentStack(MainView.class) - .addNextIntentWithParentStack(new Intent(context, MainView.class)) - .addNextIntent(UserPagerView.createIntent(context, segments.get(1), true)); + .addParentStack(MainActivity.class) + .addNextIntentWithParentStack(new Intent(context, MainActivity.class)) + .addNextIntent(UserPagerActivity.createIntent(context, segments.get(1), true)); } return null; } @@ -294,22 +294,22 @@ public class StackBuilderSchemeParser { } } if (fullUrl.length() > 0 && owner != null && repo != null) return TaskStackBuilder.create(context) - .addParentStack(MainView.class) - .addNextIntentWithParentStack(new Intent(context, MainView.class)) - .addNextIntentWithParentStack(RepoPagerView.createIntent(context, repo, owner)) + .addParentStack(MainActivity.class) + .addNextIntentWithParentStack(new Intent(context, MainActivity.class)) + .addNextIntentWithParentStack(RepoPagerActivity.createIntent(context, repo, owner)) .addNextIntentWithParentStack(RepoFilesActivity.getIntent(context, fullUrl.toString())) - .addNextIntent(CodeViewerView.createIntent(context, fullUrl.toString())); + .addNextIntent(CodeViewerActivity.createIntent(context, fullUrl.toString())); } else { String authority = uri.getAuthority(); if (TextUtils.equals(authority, RAW_AUTHORITY)) { String owner = uri.getPathSegments().get(0); String repo = uri.getPathSegments().get(1); return TaskStackBuilder.create(context) - .addParentStack(MainView.class) - .addNextIntentWithParentStack(new Intent(context, MainView.class)) - .addNextIntentWithParentStack(RepoPagerView.createIntent(context, repo, owner)) + .addParentStack(MainActivity.class) + .addNextIntentWithParentStack(new Intent(context, MainActivity.class)) + .addNextIntentWithParentStack(RepoPagerActivity.createIntent(context, repo, owner)) .addNextIntentWithParentStack(RepoFilesActivity.getIntent(context, uri.toString())) - .addNextIntent(CodeViewerView.createIntent(context, uri.toString())); + .addNextIntent(CodeViewerActivity.createIntent(context, uri.toString())); } } return null; @@ -324,10 +324,10 @@ public class StackBuilderSchemeParser { String owner = segments.get(0); String repo = segments.get(1); return TaskStackBuilder.create(context) - .addParentStack(MainView.class) - .addNextIntentWithParentStack(new Intent(context, MainView.class)) - .addNextIntentWithParentStack(RepoPagerView.createIntent(context, repo, owner, RepoPagerMvp.ISSUES)) - .addNextIntent(CreateIssueView.getIntent(context, owner, repo)); + .addParentStack(MainActivity.class) + .addNextIntentWithParentStack(new Intent(context, MainActivity.class)) + .addNextIntentWithParentStack(RepoPagerActivity.createIntent(context, repo, owner, RepoPagerMvp.ISSUES)) + .addNextIntent(CreateIssueActivity.getIntent(context, owner, repo)); } return null; } @@ -335,10 +335,10 @@ public class StackBuilderSchemeParser { @Nullable private static TaskStackBuilder getGistFile(@NonNull Context context, @NonNull Uri uri) { if (uri.getHost().equalsIgnoreCase(HOST_GISTS_RAW)) { return TaskStackBuilder.create(context) - .addParentStack(MainView.class) - .addNextIntentWithParentStack(new Intent(context, MainView.class)) - .addNextIntentWithParentStack(GistView.createIntent(context, uri.getPathSegments().get(1))) - .addNextIntent(CodeViewerView.createIntent(context, uri.toString())); + .addParentStack(MainActivity.class) + .addNextIntentWithParentStack(new Intent(context, MainActivity.class)) + .addNextIntentWithParentStack(GistActivity.createIntent(context, uri.getPathSegments().get(1))) + .addNextIntent(CodeViewerActivity.createIntent(context, uri.toString())); } return null; } diff --git a/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java b/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java index ca9967cf..953181ba 100644 --- a/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java +++ b/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java @@ -33,14 +33,14 @@ import com.fastaccess.helper.ViewHelper; import com.fastaccess.ui.adapter.UsersAdapter; import com.fastaccess.ui.base.mvp.BaseMvp; import com.fastaccess.ui.base.mvp.presenter.BasePresenter; -import com.fastaccess.ui.modules.changelog.ChangelogView; +import com.fastaccess.ui.modules.changelog.ChangelogBottomSheetDialog; import com.fastaccess.ui.modules.gists.GistsListActivity; -import com.fastaccess.ui.modules.login.LoginView; -import com.fastaccess.ui.modules.main.MainView; +import com.fastaccess.ui.modules.login.LoginActivity; +import com.fastaccess.ui.modules.main.MainActivity; import com.fastaccess.ui.modules.main.donation.DonationView; import com.fastaccess.ui.modules.pinned.PinnedReposActivity; -import com.fastaccess.ui.modules.repos.RepoPagerView; -import com.fastaccess.ui.modules.user.UserPagerView; +import com.fastaccess.ui.modules.repos.RepoPagerActivity; +import com.fastaccess.ui.modules.user.UserPagerActivity; import com.fastaccess.ui.widgets.AvatarLayout; import com.fastaccess.ui.widgets.dialog.ProgressDialogFragment; import com.fastaccess.ui.widgets.recyclerview.DynamicRecyclerView; @@ -91,7 +91,7 @@ public abstract class BaseActivity { - Intent intent = new Intent(this, MainView.class); + Intent intent = new Intent(this, MainActivity.class); startActivity(intent); finish(); return true; diff --git a/app/src/main/java/com/fastaccess/ui/modules/about/FastHubAboutActivity.java b/app/src/main/java/com/fastaccess/ui/modules/about/FastHubAboutActivity.java index 503f4f49..8645e27e 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/about/FastHubAboutActivity.java +++ b/app/src/main/java/com/fastaccess/ui/modules/about/FastHubAboutActivity.java @@ -19,9 +19,9 @@ import com.fastaccess.R; import com.fastaccess.helper.ActivityHelper; import com.fastaccess.helper.BundleConstant; import com.fastaccess.helper.PrefGetter; -import com.fastaccess.ui.modules.repos.RepoPagerView; -import com.fastaccess.ui.modules.repos.issues.create.CreateIssueView; -import com.fastaccess.ui.modules.user.UserPagerView; +import com.fastaccess.ui.modules.repos.RepoPagerActivity; +import com.fastaccess.ui.modules.repos.issues.create.CreateIssueActivity; +import com.fastaccess.ui.modules.user.UserPagerActivity; import es.dmoral.toasty.Toasty; @@ -59,7 +59,7 @@ public class FastHubAboutActivity extends MaterialAboutActivity { .text(R.string.report_issue) .subText(R.string.report_issue_here) .icon(ContextCompat.getDrawable(context, R.drawable.ic_bug)) - .setOnClickListener(b -> CreateIssueView.startForResult(this, CreateIssueView.startForResult(this), malRecyclerview)) + .setOnClickListener(b -> CreateIssueActivity.startForResult(this, CreateIssueActivity.startForResult(this), malRecyclerview)) .build()); MaterialAboutCard.Builder authorCardBuilder = new MaterialAboutCard.Builder(); @@ -68,12 +68,12 @@ public class FastHubAboutActivity extends MaterialAboutActivity { .text("Kosh") .subText("k0shk0sh") .icon(ContextCompat.getDrawable(context, R.drawable.ic_profile)) - .setOnClickListener(b -> UserPagerView.startActivity(context, "k0shk0sh")) + .setOnClickListener(b -> UserPagerActivity.startActivity(context, "k0shk0sh")) .build()); authorCardBuilder.addItem(new MaterialAboutActionItem.Builder() .text(R.string.fork_github) .icon(ContextCompat.getDrawable(context, R.drawable.ic_github)) - .setOnClickListener(b -> startActivity(RepoPagerView.createIntent(this, "FastHub", "k0shk0sh"))) + .setOnClickListener(b -> startActivity(RepoPagerActivity.createIntent(this, "FastHub", "k0shk0sh"))) .build()); authorCardBuilder.addItem(ConvenienceBuilder.createEmailItem(context, ContextCompat.getDrawable(context, R.drawable.ic_email), diff --git a/app/src/main/java/com/fastaccess/ui/modules/changelog/ChangelogView.java b/app/src/main/java/com/fastaccess/ui/modules/changelog/ChangelogBottomSheetDialog.java similarity index 97% rename from app/src/main/java/com/fastaccess/ui/modules/changelog/ChangelogView.java rename to app/src/main/java/com/fastaccess/ui/modules/changelog/ChangelogBottomSheetDialog.java index 9258f272..65cdfbe2 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/changelog/ChangelogView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/changelog/ChangelogBottomSheetDialog.java @@ -24,7 +24,7 @@ import rx.Subscription; * Created by Kosh on 26 Mar 2017, 10:15 PM */ -public class ChangelogView extends BaseBottomSheetDialog { +public class ChangelogBottomSheetDialog extends BaseBottomSheetDialog { @BindView(R.id.title) FontTextView title; @BindView(R.id.message) FontTextView message; diff --git a/app/src/main/java/com/fastaccess/ui/modules/code/CodeViewerView.java b/app/src/main/java/com/fastaccess/ui/modules/code/CodeViewerActivity.java similarity index 89% rename from app/src/main/java/com/fastaccess/ui/modules/code/CodeViewerView.java rename to app/src/main/java/com/fastaccess/ui/modules/code/CodeViewerActivity.java index bbf10c02..cc90e5a3 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/code/CodeViewerView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/code/CodeViewerActivity.java @@ -19,9 +19,9 @@ import com.fastaccess.helper.InputHelper; import com.fastaccess.provider.rest.RestProvider; import com.fastaccess.ui.base.BaseActivity; import com.fastaccess.ui.base.mvp.presenter.BasePresenter; -import com.fastaccess.ui.modules.gists.gist.GistView; +import com.fastaccess.ui.modules.gists.gist.GistActivity; import com.fastaccess.ui.modules.repos.code.files.activity.RepoFilesActivity; -import com.fastaccess.ui.modules.repos.code.prettifier.ViewerView; +import com.fastaccess.ui.modules.repos.code.prettifier.ViewerFragment; import net.grandcentrix.thirtyinch.TiPresenter; @@ -31,7 +31,7 @@ import icepick.State; * Created by Kosh on 27 Nov 2016, 3:43 PM */ -public class CodeViewerView extends BaseActivity { +public class CodeViewerActivity extends BaseActivity { @State String url; @@ -40,7 +40,7 @@ public class CodeViewerView extends BaseActivity { } public static Intent createIntent(@NonNull Context context, @NonNull String url) { - Intent intent = new Intent(context, CodeViewerView.class); + Intent intent = new Intent(context, CodeViewerActivity.class); intent.putExtras(Bundler.start() .put(BundleConstant.EXTRA, url) .end()); @@ -76,7 +76,7 @@ public class CodeViewerView extends BaseActivity { url = Objects.requireNonNull(bundle.getString(BundleConstant.EXTRA), "Url is null"); getSupportFragmentManager() .beginTransaction() - .replace(R.id.container, ViewerView.newInstance(url), ViewerView.TAG) + .replace(R.id.container, ViewerFragment.newInstance(url), ViewerFragment.TAG) .commit(); } setTitle(Uri.parse(url).getLastPathSegment()); @@ -107,7 +107,7 @@ public class CodeViewerView extends BaseActivity { Uri uri = Uri.parse(url); if (uri.getHost().contains("gist.github")) { if (uri.getPathSegments() != null && !uri.getPathSegments().isEmpty() && uri.getPathSegments().size() >= 1) { - GistView.createIntent(this, uri.getPathSegments().get(1)); + GistActivity.createIntent(this, uri.getPathSegments().get(1)); } } else { RepoFilesActivity.startActivity(this, url); diff --git a/app/src/main/java/com/fastaccess/ui/modules/editor/EditorView.java b/app/src/main/java/com/fastaccess/ui/modules/editor/EditorActivity.java similarity index 98% rename from app/src/main/java/com/fastaccess/ui/modules/editor/EditorView.java rename to app/src/main/java/com/fastaccess/ui/modules/editor/EditorActivity.java index b9ecddca..e83a89b1 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/editor/EditorView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/editor/EditorActivity.java @@ -34,7 +34,7 @@ import uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt; * Created by Kosh on 27 Nov 2016, 1:32 AM */ -public class EditorView extends BaseActivity implements EditorMvp.View { +public class EditorActivity extends BaseActivity implements EditorMvp.View { private CharSequence savedText; @BindView(R.id.view) ForegroundImageView viewCode; diff --git a/app/src/main/java/com/fastaccess/ui/modules/feeds/FeedsView.java b/app/src/main/java/com/fastaccess/ui/modules/feeds/FeedsFragment.java similarity index 95% rename from app/src/main/java/com/fastaccess/ui/modules/feeds/FeedsView.java rename to app/src/main/java/com/fastaccess/ui/modules/feeds/FeedsFragment.java index c49536d3..088ddf51 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/feeds/FeedsView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/feeds/FeedsFragment.java @@ -30,9 +30,9 @@ import uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt; * Created by Kosh on 11 Nov 2016, 12:36 PM */ -public class FeedsView extends BaseFragment implements FeedsMvp.View { +public class FeedsFragment extends BaseFragment implements FeedsMvp.View { - public static final String TAG = FeedsView.class.getSimpleName(); + public static final String TAG = FeedsFragment.class.getSimpleName(); @BindView(R.id.recycler) DynamicRecyclerView recycler; @BindView(R.id.refresh) SwipeRefreshLayout refresh; @@ -40,8 +40,8 @@ public class FeedsView extends BaseFragment imple private FeedsAdapter adapter; private OnLoadMore onLoadMore; - public static FeedsView newInstance() { - return new FeedsView(); + public static FeedsFragment newInstance() { + return new FeedsFragment(); } @Override protected int fragmentLayout() { diff --git a/app/src/main/java/com/fastaccess/ui/modules/feeds/FeedsPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/feeds/FeedsPresenter.java index fcfd6178..53a41242 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/feeds/FeedsPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/feeds/FeedsPresenter.java @@ -18,7 +18,7 @@ import com.fastaccess.helper.RxHelper; import com.fastaccess.provider.rest.RestProvider; import com.fastaccess.provider.scheme.SchemeParser; import com.fastaccess.ui.base.mvp.presenter.BasePresenter; -import com.fastaccess.ui.modules.repos.RepoPagerView; +import com.fastaccess.ui.modules.repos.RepoPagerActivity; import java.util.ArrayList; @@ -104,7 +104,7 @@ class FeedsPresenter extends BasePresenter implements FeedsMvp.Pr @Override public void onItemClick(int position, View v, Event item) { if (item.getType() == EventsType.ForkEvent) { NameParser parser = new NameParser(item.getPayload().getForkee().getHtmlUrl()); - RepoPagerView.startRepoPager(v.getContext(), parser); + RepoPagerActivity.startRepoPager(v.getContext(), parser); } else { PayloadModel payloadModel = item.getPayload(); if (payloadModel != null) { diff --git a/app/src/main/java/com/fastaccess/ui/modules/filter/chooser/FilterChooserDialogView.java b/app/src/main/java/com/fastaccess/ui/modules/filter/chooser/FilterChooserBottomSheetDialog.java similarity index 86% rename from app/src/main/java/com/fastaccess/ui/modules/filter/chooser/FilterChooserDialogView.java rename to app/src/main/java/com/fastaccess/ui/modules/filter/chooser/FilterChooserBottomSheetDialog.java index 406c8635..78643676 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/filter/chooser/FilterChooserDialogView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/filter/chooser/FilterChooserBottomSheetDialog.java @@ -12,12 +12,12 @@ import butterknife.OnClick; * Created by Kosh on 10 Apr 2017, 12:18 PM */ -public class FilterChooserDialogView extends BaseBottomSheetDialog { +public class FilterChooserBottomSheetDialog extends BaseBottomSheetDialog { private FilterAddChooserListener listener; - public static FilterChooserDialogView newInstance() { - return new FilterChooserDialogView(); + public static FilterChooserBottomSheetDialog newInstance() { + return new FilterChooserBottomSheetDialog(); } @Override public void onAttach(Context context) { diff --git a/app/src/main/java/com/fastaccess/ui/modules/filter/issues/FilterIssuesActivityView.java b/app/src/main/java/com/fastaccess/ui/modules/filter/issues/FilterIssuesActivity.java similarity index 98% rename from app/src/main/java/com/fastaccess/ui/modules/filter/issues/FilterIssuesActivityView.java rename to app/src/main/java/com/fastaccess/ui/modules/filter/issues/FilterIssuesActivity.java index 2855e3df..fe4d4d5e 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/filter/issues/FilterIssuesActivityView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/filter/issues/FilterIssuesActivity.java @@ -31,7 +31,7 @@ import com.fastaccess.ui.adapter.MilestonesAdapter; import com.fastaccess.ui.adapter.SimpleListAdapter; import com.fastaccess.ui.adapter.UsersAdapter; import com.fastaccess.ui.base.BaseActivity; -import com.fastaccess.ui.modules.filter.issues.fragment.FilterIssueView; +import com.fastaccess.ui.modules.filter.issues.fragment.FilterIssueFragment; import com.fastaccess.ui.widgets.FontEditText; import com.fastaccess.ui.widgets.FontTextView; import com.fastaccess.ui.widgets.ForegroundImageView; @@ -53,7 +53,7 @@ import icepick.State; * Created by Kosh on 09 Apr 2017, 6:23 PM */ -public class FilterIssuesActivityView extends BaseActivity implements +public class FilterIssuesActivity extends BaseActivity implements FilterIssuesActivityMvp.View { @BindView(R.id.back) ForegroundImageView back; @BindView(R.id.open) FontTextView open; @@ -70,7 +70,7 @@ public class FilterIssuesActivityView extends BaseActivity implements FilterIssuesMvp.View { +public class FilterIssueFragment extends BaseFragment implements FilterIssuesMvp.View { @BindView(R.id.recycler) DynamicRecyclerView recycler; @BindView(R.id.refresh) SwipeRefreshLayout refresh; diff --git a/app/src/main/java/com/fastaccess/ui/modules/filter/issues/fragment/FilterIssuePresenter.java b/app/src/main/java/com/fastaccess/ui/modules/filter/issues/fragment/FilterIssuePresenter.java index e7009e11..13425824 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/filter/issues/fragment/FilterIssuePresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/filter/issues/fragment/FilterIssuePresenter.java @@ -8,7 +8,7 @@ import com.fastaccess.data.dao.PullsIssuesParser; import com.fastaccess.data.dao.model.Issue; import com.fastaccess.provider.rest.RestProvider; import com.fastaccess.ui.base.mvp.presenter.BasePresenter; -import com.fastaccess.ui.modules.repos.issues.issue.details.IssuePagerView; +import com.fastaccess.ui.modules.repos.issues.issue.details.IssuePagerActivity; import java.util.ArrayList; @@ -27,7 +27,7 @@ public class FilterIssuePresenter extends BasePresenter im @Override public void onItemClick(int position, View v, Issue item) { PullsIssuesParser parser = PullsIssuesParser.getForIssue(item.getHtmlUrl()); if (parser != null) { - v.getContext().startActivity(IssuePagerView.createIntent(v.getContext(), parser.getRepoId(), + v.getContext().startActivity(IssuePagerActivity.createIntent(v.getContext(), parser.getRepoId(), parser.getLogin(), parser.getNumber(), true)); } } diff --git a/app/src/main/java/com/fastaccess/ui/modules/gists/GistsView.java b/app/src/main/java/com/fastaccess/ui/modules/gists/GistsFragment.java similarity index 92% rename from app/src/main/java/com/fastaccess/ui/modules/gists/GistsView.java rename to app/src/main/java/com/fastaccess/ui/modules/gists/GistsFragment.java index 2a3c064d..7f0b1616 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/gists/GistsView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/gists/GistsFragment.java @@ -20,9 +20,9 @@ import butterknife.BindView; * Created by Kosh on 11 Nov 2016, 12:36 PM */ -public class GistsView extends BaseFragment implements GistsMvp.View { +public class GistsFragment extends BaseFragment implements GistsMvp.View { - public static final String TAG = GistsView.class.getSimpleName(); + public static final String TAG = GistsFragment.class.getSimpleName(); @BindView(R.id.recycler) DynamicRecyclerView recycler; @BindView(R.id.refresh) SwipeRefreshLayout refresh; @@ -31,8 +31,8 @@ public class GistsView extends BaseFragment imple private GistsAdapter adapter; private OnLoadMore onLoadMore; - public static GistsView newInstance() { - return new GistsView(); + public static GistsFragment newInstance() { + return new GistsFragment(); } @Override protected int fragmentLayout() { diff --git a/app/src/main/java/com/fastaccess/ui/modules/gists/GistsListActivity.java b/app/src/main/java/com/fastaccess/ui/modules/gists/GistsListActivity.java index 39b203eb..aff0920c 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/gists/GistsListActivity.java +++ b/app/src/main/java/com/fastaccess/ui/modules/gists/GistsListActivity.java @@ -13,8 +13,8 @@ import com.fastaccess.helper.BundleConstant; import com.fastaccess.helper.Bundler; import com.fastaccess.ui.base.BaseActivity; import com.fastaccess.ui.base.mvp.presenter.BasePresenter; -import com.fastaccess.ui.modules.gists.create.CreateGistView; -import com.fastaccess.ui.modules.profile.gists.ProfileGistsView; +import com.fastaccess.ui.modules.gists.create.CreateGistActivity; +import com.fastaccess.ui.modules.profile.gists.ProfileGistsFragment; import net.grandcentrix.thirtyinch.TiPresenter; @@ -64,8 +64,8 @@ public class GistsListActivity extends BaseActivity { myGists = getIntent().getExtras().getBoolean(BundleConstant.EXTRA); getSupportFragmentManager() .beginTransaction() - .replace(R.id.fragmentContainer, myGists ? ProfileGistsView.newInstance(Login.getUser().getLogin()) - : GistsView.newInstance(), GistsView.TAG) + .replace(R.id.fragmentContainer, myGists ? ProfileGistsFragment.newInstance(Login.getUser().getLogin()) + : GistsFragment.newInstance(), GistsFragment.TAG) .commit(); } setTitle(myGists ? R.string.my_gists : R.string.public_gists); @@ -73,6 +73,6 @@ public class GistsListActivity extends BaseActivity { } @OnClick(R.id.fab) public void onViewClicked() { - ActivityHelper.startReveal(this, new Intent(this, CreateGistView.class), fab); + ActivityHelper.startReveal(this, new Intent(this, CreateGistActivity.class), fab); } } diff --git a/app/src/main/java/com/fastaccess/ui/modules/gists/GistsPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/gists/GistsPresenter.java index 033378b2..e5e3982b 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/gists/GistsPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/gists/GistsPresenter.java @@ -8,7 +8,7 @@ import com.fastaccess.data.dao.model.Gist; import com.fastaccess.helper.RxHelper; import com.fastaccess.provider.rest.RestProvider; import com.fastaccess.ui.base.mvp.presenter.BasePresenter; -import com.fastaccess.ui.modules.gists.gist.GistView; +import com.fastaccess.ui.modules.gists.gist.GistActivity; import java.util.ArrayList; @@ -81,7 +81,7 @@ class GistsPresenter extends BasePresenter implements GistsMvp.Pr } @Override public void onItemClick(int position, View v, Gist item) { - v.getContext().startActivity(GistView.createIntent(v.getContext(), item.getGistId())); + v.getContext().startActivity(GistActivity.createIntent(v.getContext(), item.getGistId())); } @Override public void onItemLongClick(int position, View v, Gist item) { diff --git a/app/src/main/java/com/fastaccess/ui/modules/gists/create/CreateGistView.java b/app/src/main/java/com/fastaccess/ui/modules/gists/create/CreateGistActivity.java similarity index 93% rename from app/src/main/java/com/fastaccess/ui/modules/gists/create/CreateGistView.java rename to app/src/main/java/com/fastaccess/ui/modules/gists/create/CreateGistActivity.java index 2dda1f40..5b9c7ad4 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/gists/create/CreateGistView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/gists/create/CreateGistActivity.java @@ -16,7 +16,7 @@ import com.fastaccess.helper.Bundler; import com.fastaccess.helper.InputHelper; import com.fastaccess.provider.markdown.MarkDownProvider; import com.fastaccess.ui.base.BaseActivity; -import com.fastaccess.ui.modules.editor.EditorView; +import com.fastaccess.ui.modules.editor.EditorActivity; import butterknife.BindView; import butterknife.OnClick; @@ -26,7 +26,7 @@ import butterknife.OnTouch; * Created by Kosh on 30 Nov 2016, 11:02 AM */ -public class CreateGistView extends BaseActivity implements CreateGistMvp.View { +public class CreateGistActivity extends BaseActivity implements CreateGistMvp.View { @BindView(R.id.description) TextInputLayout description; @BindView(R.id.fileName) TextInputLayout fileName; @@ -88,7 +88,7 @@ public class CreateGistView extends BaseActivity +public class GistActivity extends BaseActivity implements GistMvp.View { @BindView(R.id.avatarLayout) AvatarLayout avatarLayout; @@ -56,14 +56,14 @@ public class GistView extends BaseActivity private int iconColor; public static Intent createIntent(@NonNull Context context, @NonNull String gistId) { - Intent intent = new Intent(context, GistView.class); + Intent intent = new Intent(context, GistActivity.class); intent.putExtras(Bundler.start().put(BundleConstant.EXTRA, gistId).end()); return intent; } @OnClick(R.id.fab) void onAddComment() { if (pager != null && pager.getAdapter() != null) { - GistCommentsView view = (GistCommentsView) pager.getAdapter().instantiateItem(pager, 1); + GistCommentsFragment view = (GistCommentsFragment) pager.getAdapter().instantiateItem(pager, 1); if (view != null) { view.onStartNewComment(); } diff --git a/app/src/main/java/com/fastaccess/ui/modules/gists/gist/comments/GistCommentsView.java b/app/src/main/java/com/fastaccess/ui/modules/gists/gist/comments/GistCommentsFragment.java similarity index 94% rename from app/src/main/java/com/fastaccess/ui/modules/gists/gist/comments/GistCommentsView.java rename to app/src/main/java/com/fastaccess/ui/modules/gists/gist/comments/GistCommentsFragment.java index 8d89a3dd..a3cc566b 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/gists/gist/comments/GistCommentsView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/gists/gist/comments/GistCommentsFragment.java @@ -19,7 +19,7 @@ import com.fastaccess.helper.Bundler; import com.fastaccess.provider.rest.loadmore.OnLoadMore; import com.fastaccess.ui.adapter.CommentsAdapter; import com.fastaccess.ui.base.BaseFragment; -import com.fastaccess.ui.modules.editor.EditorView; +import com.fastaccess.ui.modules.editor.EditorActivity; import com.fastaccess.ui.widgets.StateLayout; import com.fastaccess.ui.widgets.dialog.MessageDialogView; import com.fastaccess.ui.widgets.recyclerview.DynamicRecyclerView; @@ -34,7 +34,7 @@ import static com.fastaccess.helper.BundleConstant.ExtraTYpe.NEW_GIST_COMMENT_EX * Created by Kosh on 11 Nov 2016, 12:36 PM */ -public class GistCommentsView extends BaseFragment implements GistCommentsMvp.View { +public class GistCommentsFragment extends BaseFragment implements GistCommentsMvp.View { @BindView(R.id.recycler) DynamicRecyclerView recycler; @BindView(R.id.refresh) SwipeRefreshLayout refresh; @@ -44,8 +44,8 @@ public class GistCommentsView extends BaseFragment onLoadMore; - public static GistCommentsView newInstance(@NonNull String gistId) { - GistCommentsView view = new GistCommentsView(); + public static GistCommentsFragment newInstance(@NonNull String gistId) { + GistCommentsFragment view = new GistCommentsFragment(); view.setArguments(Bundler.start().put("gistId", gistId).end()); return view; } @@ -121,7 +121,7 @@ public class GistCommentsView extends BaseFragment implements +public class GistFilesListFragment extends BaseFragment implements GistFilesListMvp.View { @BindView(R.id.recycler) DynamicRecyclerView recycler; @BindView(R.id.refresh) SwipeRefreshLayout refresh; @BindView(R.id.stateLayout) StateLayout stateLayout; - public static GistFilesListView newInstance(@NonNull GithubFileModel gistsModel) { - GistFilesListView view = new GistFilesListView(); + public static GistFilesListFragment newInstance(@NonNull GithubFileModel gistsModel) { + GistFilesListFragment view = new GistFilesListFragment(); view.setArguments(Bundler.start().put(BundleConstant.ITEM, gistsModel).end()); return view; } @@ -85,7 +85,7 @@ public class GistFilesListView extends BaseFragment implements LoginMvp.View { +public class LoginActivity extends BaseActivity implements LoginMvp.View { @BindView(R.id.usernameEditText) TextInputEditText usernameEditText; @@ -101,7 +101,7 @@ public class LoginView extends BaseActivity imple @Override public void onSuccessfullyLoggedIn() { hideProgress(); - Intent intent = new Intent(this, MainView.class); + Intent intent = new Intent(this, MainActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK); startActivity(intent); finishAffinity(); diff --git a/app/src/main/java/com/fastaccess/ui/modules/main/MainView.java b/app/src/main/java/com/fastaccess/ui/modules/main/MainActivity.java similarity index 90% rename from app/src/main/java/com/fastaccess/ui/modules/main/MainView.java rename to app/src/main/java/com/fastaccess/ui/modules/main/MainActivity.java index c07aa5f4..1ed66a2f 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/main/MainView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/main/MainActivity.java @@ -21,22 +21,22 @@ import com.fastaccess.helper.PrefGetter; import com.fastaccess.helper.TypeFaceHelper; import com.fastaccess.helper.ViewHelper; import com.fastaccess.ui.base.BaseActivity; -import com.fastaccess.ui.modules.feeds.FeedsView; +import com.fastaccess.ui.modules.feeds.FeedsFragment; import com.fastaccess.ui.modules.gists.GistsListActivity; import com.fastaccess.ui.modules.main.donation.DonationView; -import com.fastaccess.ui.modules.notification.NotificationActivityView; +import com.fastaccess.ui.modules.notification.NotificationActivity; import com.fastaccess.ui.modules.pinned.PinnedReposActivity; -import com.fastaccess.ui.modules.repos.RepoPagerView; -import com.fastaccess.ui.modules.search.SearchView; +import com.fastaccess.ui.modules.repos.RepoPagerActivity; +import com.fastaccess.ui.modules.search.SearchActivity; import com.fastaccess.ui.modules.settings.SettingsBottomSheetDialog; -import com.fastaccess.ui.modules.user.UserPagerView; +import com.fastaccess.ui.modules.user.UserPagerActivity; import butterknife.BindView; import butterknife.OnClick; import icepick.State; import it.sephiroth.android.library.bottomnavigation.BottomNavigation; -public class MainView extends BaseActivity implements MainMvp.View { +public class MainActivity extends BaseActivity implements MainMvp.View { @State @MainMvp.NavigationType int navType = MainMvp.FEEDS; @BindView(R.id.bottomNavigation) BottomNavigation bottomNavigation; @@ -96,11 +96,11 @@ public class MainView extends BaseActivity implemen onOpenDrawer(); return true; } else if (item.getItemId() == R.id.search) { - startActivity(new Intent(this, SearchView.class)); + startActivity(new Intent(this, SearchActivity.class)); return true; } else if (item.getItemId() == R.id.notifications) { ViewHelper.tintDrawable(item.setIcon(R.drawable.ic_notifications_none).getIcon(), ViewHelper.getIconColor(this)); - startActivity(new Intent(this, NotificationActivityView.class)); + startActivity(new Intent(this, NotificationActivity.class)); return true; } return super.onOptionsItemSelected(item); @@ -141,7 +141,7 @@ public class MainView extends BaseActivity implemen } @Override public void openFasHubRepo() { - startActivity(RepoPagerView.createIntent(this, "FastHub", "k0shk0sh")); + startActivity(RepoPagerActivity.createIntent(this, "FastHub", "k0shk0sh")); } @Override public void onOpenSettings() { @@ -168,7 +168,7 @@ public class MainView extends BaseActivity implemen } @Override public void onOpenProfile() { - startActivity(UserPagerView.createIntent(this, Login.getUser().getLogin())); + startActivity(UserPagerActivity.createIntent(this, Login.getUser().getLogin())); } private void showHideFab() { @@ -204,7 +204,7 @@ public class MainView extends BaseActivity implemen if (savedInstanceState == null) { getSupportFragmentManager() .beginTransaction() - .replace(R.id.container, FeedsView.newInstance(), FeedsView.TAG) + .replace(R.id.container, FeedsFragment.newInstance(), FeedsFragment.TAG) .commit(); } setupNavigationView(navigationView); diff --git a/app/src/main/java/com/fastaccess/ui/modules/main/MainPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/main/MainPresenter.java index 26a46c0e..c95cae75 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/main/MainPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/main/MainPresenter.java @@ -10,9 +10,9 @@ import android.view.MenuItem; import com.fastaccess.R; import com.fastaccess.ui.base.mvp.presenter.BasePresenter; -import com.fastaccess.ui.modules.feeds.FeedsView; +import com.fastaccess.ui.modules.feeds.FeedsFragment; import com.fastaccess.ui.modules.main.issues.pager.MyIssuesPagerView; -import com.fastaccess.ui.modules.main.pullrequests.pager.MyPullsPagerView; +import com.fastaccess.ui.modules.main.pullrequests.pager.MyPullsPagerFragment; import static com.fastaccess.helper.ActivityHelper.getVisibleFragment; import static com.fastaccess.helper.AppHelper.getFragmentByTag; @@ -30,20 +30,20 @@ class MainPresenter extends BasePresenter implements MainMvp.Prese @SuppressWarnings("ConstantConditions") @Override public void onModuleChanged(@NonNull FragmentManager fragmentManager, @MainMvp.NavigationType int type) { Fragment currentVisible = getVisibleFragment(fragmentManager); - FeedsView homeView = (FeedsView) getFragmentByTag(fragmentManager, FeedsView.TAG); - MyPullsPagerView pullRequestView = (MyPullsPagerView) getFragmentByTag(fragmentManager, MyPullsPagerView.TAG); + FeedsFragment homeView = (FeedsFragment) getFragmentByTag(fragmentManager, FeedsFragment.TAG); + MyPullsPagerFragment pullRequestView = (MyPullsPagerFragment) getFragmentByTag(fragmentManager, MyPullsPagerFragment.TAG); MyIssuesPagerView issuesView = (MyIssuesPagerView) getFragmentByTag(fragmentManager, MyIssuesPagerView.TAG); switch (type) { case MainMvp.FEEDS: if (homeView == null) { - onAddAndHide(fragmentManager, FeedsView.newInstance(), currentVisible); + onAddAndHide(fragmentManager, FeedsFragment.newInstance(), currentVisible); } else { onShowHideFragment(fragmentManager, homeView, currentVisible); } break; case MainMvp.PULL_REQUESTS: if (pullRequestView == null) { - onAddAndHide(fragmentManager, MyPullsPagerView.newInstance(), currentVisible); + onAddAndHide(fragmentManager, MyPullsPagerFragment.newInstance(), currentVisible); } else { onShowHideFragment(fragmentManager, pullRequestView, currentVisible); } diff --git a/app/src/main/java/com/fastaccess/ui/modules/main/issues/MyIssuesPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/main/issues/MyIssuesPresenter.java index 4a88c6e0..511570fe 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/main/issues/MyIssuesPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/main/issues/MyIssuesPresenter.java @@ -11,7 +11,7 @@ import com.fastaccess.data.dao.types.IssueState; import com.fastaccess.provider.rest.RepoQueryProvider; import com.fastaccess.provider.rest.RestProvider; import com.fastaccess.ui.base.mvp.presenter.BasePresenter; -import com.fastaccess.ui.modules.repos.issues.issue.details.IssuePagerView; +import com.fastaccess.ui.modules.repos.issues.issue.details.IssuePagerActivity; import java.util.ArrayList; @@ -29,7 +29,7 @@ public class MyIssuesPresenter extends BasePresenter implement @Override public void onItemClick(int position, View v, Issue item) { PullsIssuesParser parser = PullsIssuesParser.getForIssue(item.getHtmlUrl()); if (parser != null) { - v.getContext().startActivity(IssuePagerView.createIntent(v.getContext(), parser.getRepoId(), + v.getContext().startActivity(IssuePagerActivity.createIntent(v.getContext(), parser.getRepoId(), parser.getLogin(), parser.getNumber(), true)); } } diff --git a/app/src/main/java/com/fastaccess/ui/modules/main/pullrequests/MyPullRequestView.java b/app/src/main/java/com/fastaccess/ui/modules/main/pullrequests/MyPullRequestFragment.java similarity index 93% rename from app/src/main/java/com/fastaccess/ui/modules/main/pullrequests/MyPullRequestView.java rename to app/src/main/java/com/fastaccess/ui/modules/main/pullrequests/MyPullRequestFragment.java index e125d861..f935aad2 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/main/pullrequests/MyPullRequestView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/main/pullrequests/MyPullRequestFragment.java @@ -25,7 +25,7 @@ import butterknife.BindView; * Created by Kosh on 25 Mar 2017, 11:48 PM */ -public class MyPullRequestView extends BaseFragment implements MyPullRequestsMvp.View { +public class MyPullRequestFragment extends BaseFragment implements MyPullRequestsMvp.View { @BindView(R.id.recycler) DynamicRecyclerView recycler; @BindView(R.id.refresh) SwipeRefreshLayout refresh; @@ -34,8 +34,8 @@ public class MyPullRequestView extends BaseFragment implements MyPullsPagerMvp.View { +public class MyPullsPagerFragment extends BaseFragment implements MyPullsPagerMvp.View { - public static final String TAG = MyPullsPagerView.class.getSimpleName(); + public static final String TAG = MyPullsPagerFragment.class.getSimpleName(); @BindView(R.id.tabs) TabLayout tabs; @BindView(R.id.pager) ViewPagerView pager; @State int openCount = -1; @State int closeCount = -1; - public static MyPullsPagerView newInstance() { - return new MyPullsPagerView(); + public static MyPullsPagerFragment newInstance() { + return new MyPullsPagerFragment(); } @Override protected int fragmentLayout() { diff --git a/app/src/main/java/com/fastaccess/ui/modules/notification/NotificationActivityView.java b/app/src/main/java/com/fastaccess/ui/modules/notification/NotificationActivity.java similarity index 76% rename from app/src/main/java/com/fastaccess/ui/modules/notification/NotificationActivityView.java rename to app/src/main/java/com/fastaccess/ui/modules/notification/NotificationActivity.java index 2bbcf1d2..ddb68174 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/notification/NotificationActivityView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/notification/NotificationActivity.java @@ -10,7 +10,7 @@ import com.fastaccess.helper.AppHelper; import com.fastaccess.helper.Logger; import com.fastaccess.ui.base.BaseActivity; import com.fastaccess.ui.base.mvp.presenter.BasePresenter; -import com.fastaccess.ui.modules.main.MainView; +import com.fastaccess.ui.modules.main.MainActivity; import net.grandcentrix.thirtyinch.TiPresenter; @@ -20,9 +20,9 @@ import butterknife.OnItemSelected; * Created by Kosh on 27 Feb 2017, 12:36 PM */ -public class NotificationActivityView extends BaseActivity { +public class NotificationActivity extends BaseActivity { - private NotificationsView notificationsView; + private NotificationsFragment notificationsFragment; private boolean userSelectedSpinner = false; @Override protected int layout() { @@ -63,15 +63,15 @@ public class NotificationActivityView extends BaseActivity { @Override public void onBackPressed() { Logger.e(isTaskRoot()); if (isTaskRoot()) { - startActivity(new Intent(this, MainView.class)); + startActivity(new Intent(this, MainActivity.class)); } super.onBackPressed(); } - public NotificationsView getNotificationsView() { - if (notificationsView == null) { - notificationsView = (NotificationsView) getSupportFragmentManager().findFragmentById(R.id.notificationFragment); + public NotificationsFragment getNotificationsView() { + if (notificationsFragment == null) { + notificationsFragment = (NotificationsFragment) getSupportFragmentManager().findFragmentById(R.id.notificationFragment); } - return notificationsView; + return notificationsFragment; } } diff --git a/app/src/main/java/com/fastaccess/ui/modules/notification/NotificationsView.java b/app/src/main/java/com/fastaccess/ui/modules/notification/NotificationsFragment.java similarity index 96% rename from app/src/main/java/com/fastaccess/ui/modules/notification/NotificationsView.java rename to app/src/main/java/com/fastaccess/ui/modules/notification/NotificationsFragment.java index 8942b6ff..fe473bcb 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/notification/NotificationsView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/notification/NotificationsFragment.java @@ -33,7 +33,7 @@ import butterknife.BindView; * Created by Kosh on 20 Feb 2017, 8:50 PM */ -public class NotificationsView extends BaseFragment +public class NotificationsFragment extends BaseFragment implements NotificationsMvp.View { @BindView(R.id.recycler) DynamicRecyclerView recycler; @@ -43,8 +43,8 @@ public class NotificationsView extends BaseFragment implements PinnedReposMvp.View { +public class PinnedReposFragment extends BaseFragment implements PinnedReposMvp.View { - public static final String TAG = PinnedReposView.class.getSimpleName(); + public static final String TAG = PinnedReposFragment.class.getSimpleName(); @BindView(R.id.recycler) DynamicRecyclerView recycler; @BindView(R.id.refresh) AppbarRefreshLayout refresh; @BindView(R.id.stateLayout) StateLayout stateLayout; private PinnedReposAdapter adapter; - public static PinnedReposView newInstance() { - return new PinnedReposView(); + public static PinnedReposFragment newInstance() { + return new PinnedReposFragment(); } @Override public void onNotifyAdapter() { diff --git a/app/src/main/java/com/fastaccess/ui/modules/pinned/PinnedReposPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/pinned/PinnedReposPresenter.java index 7ae5ad5b..185d5c43 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/pinned/PinnedReposPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/pinned/PinnedReposPresenter.java @@ -7,7 +7,7 @@ import com.fastaccess.data.dao.NameParser; import com.fastaccess.data.dao.model.AbstractPinnedRepos; import com.fastaccess.data.dao.model.PinnedRepos; import com.fastaccess.ui.base.mvp.presenter.BasePresenter; -import com.fastaccess.ui.modules.repos.RepoPagerView; +import com.fastaccess.ui.modules.repos.RepoPagerActivity; import java.util.ArrayList; @@ -41,7 +41,7 @@ public class PinnedReposPresenter extends BasePresenter imp } @Override public void onItemClick(int position, View v, PinnedRepos item) { - RepoPagerView.startRepoPager(v.getContext(), new NameParser(item.getPinnedRepo().getHtmlUrl())); + RepoPagerActivity.startRepoPager(v.getContext(), new NameParser(item.getPinnedRepo().getHtmlUrl())); } @Override public void onItemLongClick(int position, View v, PinnedRepos item) { diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/ProfilePagerView.java b/app/src/main/java/com/fastaccess/ui/modules/profile/ProfilePagerFragment.java similarity index 84% rename from app/src/main/java/com/fastaccess/ui/modules/profile/ProfilePagerView.java rename to app/src/main/java/com/fastaccess/ui/modules/profile/ProfilePagerFragment.java index 9fd9ac03..b2ade1cd 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/ProfilePagerView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/ProfilePagerFragment.java @@ -20,15 +20,15 @@ import butterknife.BindView; * Created by Kosh on 03 Dec 2016, 8:00 AM */ -public class ProfilePagerView extends BaseFragment implements ProfilePagerMvp.View { +public class ProfilePagerFragment extends BaseFragment implements ProfilePagerMvp.View { - public static final String TAG = ProfilePagerView.class.getSimpleName(); + public static final String TAG = ProfilePagerFragment.class.getSimpleName(); @BindView(R.id.tabs) TabLayout tabs; @BindView(R.id.pager) ViewPagerView pager; - public static ProfilePagerView newInstance(@NonNull String login) { - ProfilePagerView profileView = new ProfilePagerView(); + public static ProfilePagerFragment newInstance(@NonNull String login) { + ProfilePagerFragment profileView = new ProfilePagerFragment(); profileView.setArguments(Bundler.start().put(BundleConstant.EXTRA, login).end()); return profileView; } diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/followers/ProfileFollowersView.java b/app/src/main/java/com/fastaccess/ui/modules/profile/followers/ProfileFollowersFragment.java similarity index 91% rename from app/src/main/java/com/fastaccess/ui/modules/profile/followers/ProfileFollowersView.java rename to app/src/main/java/com/fastaccess/ui/modules/profile/followers/ProfileFollowersFragment.java index d27bdc47..00592cb0 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/followers/ProfileFollowersView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/followers/ProfileFollowersFragment.java @@ -22,7 +22,7 @@ import butterknife.BindView; * Created by Kosh on 03 Dec 2016, 3:56 PM */ -public class ProfileFollowersView extends BaseFragment implements ProfileFollowersMvp.View { +public class ProfileFollowersFragment extends BaseFragment implements ProfileFollowersMvp.View { @BindView(R.id.recycler) DynamicRecyclerView recycler; @BindView(R.id.refresh) SwipeRefreshLayout refresh; @@ -30,8 +30,8 @@ public class ProfileFollowersView extends BaseFragment onLoadMore; private UsersAdapter adapter; - public static ProfileFollowersView newInstance(@NonNull String username) { - ProfileFollowersView view = new ProfileFollowersView(); + public static ProfileFollowersFragment newInstance(@NonNull String username) { + ProfileFollowersFragment view = new ProfileFollowersFragment(); view.setArguments(Bundler.start().put(BundleConstant.EXTRA, username).end()); return view; } diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/following/ProfileFollowingView.java b/app/src/main/java/com/fastaccess/ui/modules/profile/following/ProfileFollowingFragment.java similarity index 91% rename from app/src/main/java/com/fastaccess/ui/modules/profile/following/ProfileFollowingView.java rename to app/src/main/java/com/fastaccess/ui/modules/profile/following/ProfileFollowingFragment.java index b76d23a5..3f359d41 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/following/ProfileFollowingView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/following/ProfileFollowingFragment.java @@ -22,7 +22,7 @@ import butterknife.BindView; * Created by Kosh on 03 Dec 2016, 3:56 PM */ -public class ProfileFollowingView extends BaseFragment implements ProfileFollowingMvp.View { +public class ProfileFollowingFragment extends BaseFragment implements ProfileFollowingMvp.View { @BindView(R.id.recycler) DynamicRecyclerView recycler; @BindView(R.id.refresh) SwipeRefreshLayout refresh; @@ -30,8 +30,8 @@ public class ProfileFollowingView extends BaseFragment onLoadMore; private UsersAdapter adapter; - public static ProfileFollowingView newInstance(@NonNull String username) { - ProfileFollowingView view = new ProfileFollowingView(); + public static ProfileFollowingFragment newInstance(@NonNull String username) { + ProfileFollowingFragment view = new ProfileFollowingFragment(); view.setArguments(Bundler.start().put(BundleConstant.EXTRA, username).end()); return view; } diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/gists/ProfileGistsView.java b/app/src/main/java/com/fastaccess/ui/modules/profile/gists/ProfileGistsFragment.java similarity index 90% rename from app/src/main/java/com/fastaccess/ui/modules/profile/gists/ProfileGistsView.java rename to app/src/main/java/com/fastaccess/ui/modules/profile/gists/ProfileGistsFragment.java index ad35a6d3..3a53b7a8 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/gists/ProfileGistsView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/gists/ProfileGistsFragment.java @@ -16,7 +16,7 @@ import com.fastaccess.helper.Bundler; import com.fastaccess.provider.rest.loadmore.OnLoadMore; import com.fastaccess.ui.adapter.GistsAdapter; import com.fastaccess.ui.base.BaseFragment; -import com.fastaccess.ui.modules.gists.gist.GistView; +import com.fastaccess.ui.modules.gists.gist.GistActivity; import com.fastaccess.ui.widgets.StateLayout; import com.fastaccess.ui.widgets.recyclerview.DynamicRecyclerView; @@ -26,7 +26,7 @@ import butterknife.BindView; * Created by Kosh on 11 Nov 2016, 12:36 PM */ -public class ProfileGistsView extends BaseFragment implements ProfileGistsMvp.View { +public class ProfileGistsFragment extends BaseFragment implements ProfileGistsMvp.View { @BindView(R.id.recycler) DynamicRecyclerView recycler; @BindView(R.id.refresh) SwipeRefreshLayout refresh; @@ -35,8 +35,8 @@ public class ProfileGistsView extends BaseFragment onLoadMore; - public static ProfileGistsView newInstance(@NonNull String login) { - ProfileGistsView view = new ProfileGistsView(); + public static ProfileGistsFragment newInstance(@NonNull String login) { + ProfileGistsFragment view = new ProfileGistsFragment(); view.setArguments(Bundler.start().put(BundleConstant.EXTRA, login).end()); return view; } @@ -111,7 +111,7 @@ public class ProfileGistsView extends BaseFragment +public class OrgProfileOverviewFragment extends BaseFragment implements OrgProfileOverviewMvp.View { @BindView(R.id.avatarLayout) AvatarLayout avatarLayout; @@ -38,8 +38,8 @@ public class OrgProfileOverviewView extends BaseFragment implements OrgFeedsMvp.View { +public class OrgFeedsFragment extends BaseFragment implements OrgFeedsMvp.View { @BindView(R.id.recycler) DynamicRecyclerView recycler; @BindView(R.id.refresh) SwipeRefreshLayout refresh; @@ -41,8 +41,8 @@ public class OrgFeedsView extends BaseFragment onLoadMore; - public static OrgFeedsView newInstance(@NonNull String org) { - OrgFeedsView view = new OrgFeedsView(); + public static OrgFeedsFragment newInstance(@NonNull String org) { + OrgFeedsFragment view = new OrgFeedsFragment(); view.setArguments(Bundler.start().put(BundleConstant.EXTRA, org).end()); return view; } diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/org/feeds/OrgFeedsPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/profile/org/feeds/OrgFeedsPresenter.java index 9fc8371c..1a101d70 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/org/feeds/OrgFeedsPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/org/feeds/OrgFeedsPresenter.java @@ -17,7 +17,7 @@ import com.fastaccess.data.dao.types.EventsType; import com.fastaccess.provider.rest.RestProvider; import com.fastaccess.provider.scheme.SchemeParser; import com.fastaccess.ui.base.mvp.presenter.BasePresenter; -import com.fastaccess.ui.modules.repos.RepoPagerView; +import com.fastaccess.ui.modules.repos.RepoPagerActivity; import java.util.ArrayList; @@ -90,7 +90,7 @@ class OrgFeedsPresenter extends BasePresenter implements OrgFe @Override public void onItemClick(int position, View v, Event item) { if (item.getType() == EventsType.ForkEvent) { NameParser parser = new NameParser(item.getPayload().getForkee().getHtmlUrl()); - RepoPagerView.startRepoPager(v.getContext(), parser); + RepoPagerActivity.startRepoPager(v.getContext(), parser); } else { PayloadModel payloadModel = item.getPayload(); if (payloadModel != null) { diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/org/members/OrgMembersView.java b/app/src/main/java/com/fastaccess/ui/modules/profile/org/members/OrgMembersFragment.java similarity index 92% rename from app/src/main/java/com/fastaccess/ui/modules/profile/org/members/OrgMembersView.java rename to app/src/main/java/com/fastaccess/ui/modules/profile/org/members/OrgMembersFragment.java index 6b31a189..577b7aaa 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/org/members/OrgMembersView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/org/members/OrgMembersFragment.java @@ -22,7 +22,7 @@ import butterknife.BindView; * Created by Kosh on 03 Dec 2016, 3:56 PM */ -public class OrgMembersView extends BaseFragment implements OrgMembersMvp.View { +public class OrgMembersFragment extends BaseFragment implements OrgMembersMvp.View { @BindView(R.id.recycler) DynamicRecyclerView recycler; @BindView(R.id.refresh) SwipeRefreshLayout refresh; @@ -30,8 +30,8 @@ public class OrgMembersView extends BaseFragment onLoadMore; private UsersAdapter adapter; - public static OrgMembersView newInstance(@NonNull String username) { - OrgMembersView view = new OrgMembersView(); + public static OrgMembersFragment newInstance(@NonNull String username) { + OrgMembersFragment view = new OrgMembersFragment(); view.setArguments(Bundler.start().put(BundleConstant.EXTRA, username).end()); return view; } diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/org/repos/OrgReposView.java b/app/src/main/java/com/fastaccess/ui/modules/profile/org/repos/OrgReposFragment.java similarity index 93% rename from app/src/main/java/com/fastaccess/ui/modules/profile/org/repos/OrgReposView.java rename to app/src/main/java/com/fastaccess/ui/modules/profile/org/repos/OrgReposFragment.java index 44f45f7f..73ecd93e 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/org/repos/OrgReposView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/org/repos/OrgReposFragment.java @@ -22,7 +22,7 @@ import butterknife.BindView; * Created by Kosh on 03 Dec 2016, 3:56 PM */ -public class OrgReposView extends BaseFragment implements OrgReposMvp.View { +public class OrgReposFragment extends BaseFragment implements OrgReposMvp.View { @BindView(R.id.recycler) DynamicRecyclerView recycler; @BindView(R.id.refresh) SwipeRefreshLayout refresh; @@ -30,8 +30,8 @@ public class OrgReposView extends BaseFragment onLoadMore; private ReposAdapter adapter; - public static OrgReposView newInstance(@NonNull String username) { - OrgReposView view = new OrgReposView(); + public static OrgReposFragment newInstance(@NonNull String username) { + OrgReposFragment view = new OrgReposFragment(); view.setArguments(Bundler.start().put(BundleConstant.EXTRA, username).end()); return view; } diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/org/repos/OrgReposPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/profile/org/repos/OrgReposPresenter.java index 02f9c24c..70b63412 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/org/repos/OrgReposPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/org/repos/OrgReposPresenter.java @@ -9,7 +9,7 @@ import com.fastaccess.data.dao.model.Repo; import com.fastaccess.helper.RxHelper; import com.fastaccess.provider.rest.RestProvider; import com.fastaccess.ui.base.mvp.presenter.BasePresenter; -import com.fastaccess.ui.modules.repos.RepoPagerView; +import com.fastaccess.ui.modules.repos.RepoPagerActivity; import java.util.ArrayList; @@ -90,7 +90,7 @@ class OrgReposPresenter extends BasePresenter implements OrgRe } @Override public void onItemClick(int position, View v, Repo item) { - RepoPagerView.startRepoPager(v.getContext(), new NameParser(item.getHtmlUrl())); + RepoPagerActivity.startRepoPager(v.getContext(), new NameParser(item.getHtmlUrl())); } @Override public void onItemLongClick(int position, View v, Repo item) { diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/org/teams/OrgTeamView.java b/app/src/main/java/com/fastaccess/ui/modules/profile/org/teams/OrgTeamFragment.java similarity index 93% rename from app/src/main/java/com/fastaccess/ui/modules/profile/org/teams/OrgTeamView.java rename to app/src/main/java/com/fastaccess/ui/modules/profile/org/teams/OrgTeamFragment.java index 39ab683f..4412e30c 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/org/teams/OrgTeamView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/org/teams/OrgTeamFragment.java @@ -22,7 +22,7 @@ import butterknife.BindView; * Created by Kosh on 03 Dec 2016, 3:56 PM */ -public class OrgTeamView extends BaseFragment implements OrgTeamMvp.View { +public class OrgTeamFragment extends BaseFragment implements OrgTeamMvp.View { @BindView(R.id.recycler) DynamicRecyclerView recycler; @BindView(R.id.refresh) SwipeRefreshLayout refresh; @@ -30,8 +30,8 @@ public class OrgTeamView extends BaseFragment private OnLoadMore onLoadMore; private TeamsAdapter adapter; - public static OrgTeamView newInstance(@NonNull String username) { - OrgTeamView view = new OrgTeamView(); + public static OrgTeamFragment newInstance(@NonNull String username) { + OrgTeamFragment view = new OrgTeamFragment(); view.setArguments(Bundler.start().put(BundleConstant.EXTRA, username).end()); return view; } diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/org/teams/OrgTeamPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/profile/org/teams/OrgTeamPresenter.java index c9fe0e6c..8c3d601a 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/org/teams/OrgTeamPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/org/teams/OrgTeamPresenter.java @@ -7,7 +7,7 @@ import android.view.View; import com.fastaccess.data.dao.TeamsModel; import com.fastaccess.provider.rest.RestProvider; import com.fastaccess.ui.base.mvp.presenter.BasePresenter; -import com.fastaccess.ui.modules.profile.org.teams.details.TeamPagerView; +import com.fastaccess.ui.modules.profile.org.teams.details.TeamPagerActivity; import java.util.ArrayList; @@ -80,7 +80,7 @@ class OrgTeamPresenter extends BasePresenter implements OrgTeam } @Override public void onItemClick(int position, View v, TeamsModel item) { - TeamPagerView.startActivity(v.getContext(), item.getId(), item.getName()); + TeamPagerActivity.startActivity(v.getContext(), item.getId(), item.getName()); } @Override public void onItemLongClick(int position, View v, TeamsModel item) { diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/org/teams/details/TeamPagerView.java b/app/src/main/java/com/fastaccess/ui/modules/profile/org/teams/details/TeamPagerActivity.java similarity index 95% rename from app/src/main/java/com/fastaccess/ui/modules/profile/org/teams/details/TeamPagerView.java rename to app/src/main/java/com/fastaccess/ui/modules/profile/org/teams/details/TeamPagerActivity.java index bd8c0ef8..765add10 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/org/teams/details/TeamPagerView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/org/teams/details/TeamPagerActivity.java @@ -25,7 +25,7 @@ import icepick.State; * Created by Kosh on 03 Apr 2017, 10:08 PM */ -public class TeamPagerView extends BaseActivity { +public class TeamPagerActivity extends BaseActivity { @State long id; @State String name; @@ -34,7 +34,7 @@ public class TeamPagerView extends BaseActivity { @BindView(R.id.tabbedPager) ViewPagerView pager; public static void startActivity(@NonNull Context context, long id, @NonNull String name) { - Intent intent = new Intent(context, TeamPagerView.class); + Intent intent = new Intent(context, TeamPagerActivity.class); intent.putExtras(Bundler .start() .put(BundleConstant.ID, id) diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/org/teams/details/members/TeamMembersView.java b/app/src/main/java/com/fastaccess/ui/modules/profile/org/teams/details/members/TeamMembersFragment.java similarity index 93% rename from app/src/main/java/com/fastaccess/ui/modules/profile/org/teams/details/members/TeamMembersView.java rename to app/src/main/java/com/fastaccess/ui/modules/profile/org/teams/details/members/TeamMembersFragment.java index 547c1c76..2656a8b8 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/org/teams/details/members/TeamMembersView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/org/teams/details/members/TeamMembersFragment.java @@ -22,7 +22,7 @@ import butterknife.BindView; * Created by Kosh on 03 Dec 2016, 3:56 PM */ -public class TeamMembersView extends BaseFragment implements TeamMembersMvp.View { +public class TeamMembersFragment extends BaseFragment implements TeamMembersMvp.View { @BindView(R.id.recycler) DynamicRecyclerView recycler; @BindView(R.id.refresh) SwipeRefreshLayout refresh; @@ -30,8 +30,8 @@ public class TeamMembersView extends BaseFragment onLoadMore; private UsersAdapter adapter; - public static TeamMembersView newInstance(@NonNull Long id) { - TeamMembersView view = new TeamMembersView(); + public static TeamMembersFragment newInstance(@NonNull Long id) { + TeamMembersFragment view = new TeamMembersFragment(); view.setArguments(Bundler.start().put(BundleConstant.EXTRA, id).end()); return view; } diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/org/teams/details/repos/TeamReposView.java b/app/src/main/java/com/fastaccess/ui/modules/profile/org/teams/details/repos/TeamReposFragment.java similarity index 93% rename from app/src/main/java/com/fastaccess/ui/modules/profile/org/teams/details/repos/TeamReposView.java rename to app/src/main/java/com/fastaccess/ui/modules/profile/org/teams/details/repos/TeamReposFragment.java index a78f881c..4b267043 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/org/teams/details/repos/TeamReposView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/org/teams/details/repos/TeamReposFragment.java @@ -22,7 +22,7 @@ import butterknife.BindView; * Created by Kosh on 03 Dec 2016, 3:56 PM */ -public class TeamReposView extends BaseFragment implements TeamReposMvp.View { +public class TeamReposFragment extends BaseFragment implements TeamReposMvp.View { @BindView(R.id.recycler) DynamicRecyclerView recycler; @BindView(R.id.refresh) SwipeRefreshLayout refresh; @@ -30,8 +30,8 @@ public class TeamReposView extends BaseFragment onLoadMore; private ReposAdapter adapter; - public static TeamReposView newInstance(long id) { - TeamReposView view = new TeamReposView(); + public static TeamReposFragment newInstance(long id) { + TeamReposFragment view = new TeamReposFragment(); view.setArguments(Bundler.start().put(BundleConstant.EXTRA, id).end()); return view; } diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/org/teams/details/repos/TeamReposPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/profile/org/teams/details/repos/TeamReposPresenter.java index db02a226..cd801cd6 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/org/teams/details/repos/TeamReposPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/org/teams/details/repos/TeamReposPresenter.java @@ -8,7 +8,7 @@ import com.fastaccess.data.dao.NameParser; import com.fastaccess.data.dao.model.Repo; import com.fastaccess.provider.rest.RestProvider; import com.fastaccess.ui.base.mvp.presenter.BasePresenter; -import com.fastaccess.ui.modules.repos.RepoPagerView; +import com.fastaccess.ui.modules.repos.RepoPagerActivity; import java.util.ArrayList; @@ -75,7 +75,7 @@ class TeamReposPresenter extends BasePresenter implements Tea } @Override public void onItemClick(int position, View v, Repo item) { - RepoPagerView.startRepoPager(v.getContext(), new NameParser(item.getHtmlUrl())); + RepoPagerActivity.startRepoPager(v.getContext(), new NameParser(item.getHtmlUrl())); } @Override public void onItemLongClick(int position, View v, Repo item) { diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/overview/ProfileOverviewView.java b/app/src/main/java/com/fastaccess/ui/modules/profile/overview/ProfileOverviewFragment.java similarity index 95% rename from app/src/main/java/com/fastaccess/ui/modules/profile/overview/ProfileOverviewView.java rename to app/src/main/java/com/fastaccess/ui/modules/profile/overview/ProfileOverviewFragment.java index dba958d0..9173f4a6 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/overview/ProfileOverviewView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/overview/ProfileOverviewFragment.java @@ -29,7 +29,7 @@ import icepick.State; * Created by Kosh on 03 Dec 2016, 9:16 AM */ -public class ProfileOverviewView extends BaseFragment implements ProfileOverviewMvp.View { +public class ProfileOverviewFragment extends BaseFragment implements ProfileOverviewMvp.View { @BindView(R.id.username) FontTextView username; @BindView(R.id.description) FontTextView description; @@ -47,8 +47,8 @@ public class ProfileOverviewView extends BaseFragment implements ProfileReposMvp.View { +public class ProfileReposFragment extends BaseFragment implements ProfileReposMvp.View { @BindView(R.id.recycler) DynamicRecyclerView recycler; @BindView(R.id.refresh) SwipeRefreshLayout refresh; @@ -30,8 +30,8 @@ public class ProfileReposView extends BaseFragment onLoadMore; private ReposAdapter adapter; - public static ProfileReposView newInstance(@NonNull String username) { - ProfileReposView view = new ProfileReposView(); + public static ProfileReposFragment newInstance(@NonNull String username) { + ProfileReposFragment view = new ProfileReposFragment(); view.setArguments(Bundler.start().put(BundleConstant.EXTRA, username).end()); return view; } diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/repos/ProfileReposPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/profile/repos/ProfileReposPresenter.java index cea5370f..3fcc4db6 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/repos/ProfileReposPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/repos/ProfileReposPresenter.java @@ -11,7 +11,7 @@ import com.fastaccess.data.dao.model.Repo; import com.fastaccess.helper.RxHelper; import com.fastaccess.provider.rest.RestProvider; import com.fastaccess.ui.base.mvp.presenter.BasePresenter; -import com.fastaccess.ui.modules.repos.RepoPagerView; +import com.fastaccess.ui.modules.repos.RepoPagerActivity; import java.util.ArrayList; @@ -98,7 +98,7 @@ class ProfileReposPresenter extends BasePresenter implemen } @Override public void onItemClick(int position, View v, Repo item) { - RepoPagerView.startRepoPager(v.getContext(), new NameParser(item.getHtmlUrl())); + RepoPagerActivity.startRepoPager(v.getContext(), new NameParser(item.getHtmlUrl())); } @Override public void onItemLongClick(int position, View v, Repo item) { diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/starred/ProfileStarredView.java b/app/src/main/java/com/fastaccess/ui/modules/profile/starred/ProfileStarredFragment.java similarity index 92% rename from app/src/main/java/com/fastaccess/ui/modules/profile/starred/ProfileStarredView.java rename to app/src/main/java/com/fastaccess/ui/modules/profile/starred/ProfileStarredFragment.java index c41d772e..d17da66e 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/starred/ProfileStarredView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/starred/ProfileStarredFragment.java @@ -22,7 +22,7 @@ import butterknife.BindView; * Created by Kosh on 03 Dec 2016, 3:56 PM */ -public class ProfileStarredView extends BaseFragment implements ProfileStarredMvp.View { +public class ProfileStarredFragment extends BaseFragment implements ProfileStarredMvp.View { @BindView(R.id.recycler) DynamicRecyclerView recycler; @BindView(R.id.refresh) SwipeRefreshLayout refresh; @@ -30,8 +30,8 @@ public class ProfileStarredView extends BaseFragment onLoadMore; private ReposAdapter adapter; - public static ProfileStarredView newInstance(@NonNull String username) { - ProfileStarredView view = new ProfileStarredView(); + public static ProfileStarredFragment newInstance(@NonNull String username) { + ProfileStarredFragment view = new ProfileStarredFragment(); view.setArguments(Bundler.start().put(BundleConstant.EXTRA, username).end()); return view; } diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/starred/ProfileStarredPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/profile/starred/ProfileStarredPresenter.java index 55ae58c7..9b5ad3a3 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/starred/ProfileStarredPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/starred/ProfileStarredPresenter.java @@ -10,7 +10,7 @@ import com.fastaccess.helper.Logger; import com.fastaccess.helper.RxHelper; import com.fastaccess.provider.rest.RestProvider; import com.fastaccess.ui.base.mvp.presenter.BasePresenter; -import com.fastaccess.ui.modules.repos.RepoPagerView; +import com.fastaccess.ui.modules.repos.RepoPagerActivity; import java.util.ArrayList; @@ -92,7 +92,7 @@ class ProfileStarredPresenter extends BasePresenter impl } @Override public void onItemClick(int position, View v, Repo item) { - RepoPagerView.startRepoPager(v.getContext(), new NameParser(item.getHtmlUrl())); + RepoPagerActivity.startRepoPager(v.getContext(), new NameParser(item.getHtmlUrl())); } @Override public void onItemLongClick(int position, View v, Repo item) { diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/RepoPagerView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/RepoPagerActivity.java similarity index 92% rename from app/src/main/java/com/fastaccess/ui/modules/repos/RepoPagerView.java rename to app/src/main/java/com/fastaccess/ui/modules/repos/RepoPagerActivity.java index 02a2266c..d5bb992f 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/repos/RepoPagerView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/repos/RepoPagerActivity.java @@ -33,12 +33,12 @@ import com.fastaccess.helper.TypeFaceHelper; import com.fastaccess.helper.ViewHelper; import com.fastaccess.provider.tasks.git.GithubActionService; import com.fastaccess.ui.base.BaseActivity; -import com.fastaccess.ui.modules.filter.chooser.FilterChooserDialogView; -import com.fastaccess.ui.modules.filter.issues.FilterIssuesActivityView; -import com.fastaccess.ui.modules.main.MainView; -import com.fastaccess.ui.modules.repos.code.RepoCodePagerView; -import com.fastaccess.ui.modules.repos.issues.RepoIssuesPagerView; -import com.fastaccess.ui.modules.repos.pull_requests.RepoPullRequestPagerView; +import com.fastaccess.ui.modules.filter.chooser.FilterChooserBottomSheetDialog; +import com.fastaccess.ui.modules.filter.issues.FilterIssuesActivity; +import com.fastaccess.ui.modules.main.MainActivity; +import com.fastaccess.ui.modules.repos.code.RepoCodePagerFragment; +import com.fastaccess.ui.modules.repos.issues.RepoIssuesPagerFragment; +import com.fastaccess.ui.modules.repos.pull_requests.RepoPullRequestPagerFragment; import com.fastaccess.ui.widgets.AvatarLayout; import com.fastaccess.ui.widgets.FontTextView; import com.fastaccess.ui.widgets.ForegroundImageView; @@ -59,7 +59,7 @@ import uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt; * Created by Kosh on 09 Dec 2016, 4:17 PM */ -public class RepoPagerView extends BaseActivity implements RepoPagerMvp.View { +public class RepoPagerActivity extends BaseActivity implements RepoPagerMvp.View { @BindView(R.id.avatarLayout) AvatarLayout avatarLayout; @BindView(R.id.headerTitle) FontTextView title; @@ -104,7 +104,7 @@ public class RepoPagerView extends BaseActivity implements Rep @Override public void onModuleChanged(@NonNull FragmentManager fragmentManager, @RepoPagerMvp.RepoNavigationType int type) { Fragment currentVisible = getVisibleFragment(fragmentManager); - RepoCodePagerView codePagerView = (RepoCodePagerView) AppHelper.getFragmentByTag(fragmentManager, RepoCodePagerView.TAG); - RepoIssuesPagerView repoIssuesPagerView = (RepoIssuesPagerView) AppHelper.getFragmentByTag(fragmentManager, RepoIssuesPagerView.TAG); - RepoPullRequestPagerView pullRequestPagerView = (RepoPullRequestPagerView) AppHelper.getFragmentByTag(fragmentManager, - RepoPullRequestPagerView.TAG); + RepoCodePagerFragment codePagerView = (RepoCodePagerFragment) AppHelper.getFragmentByTag(fragmentManager, RepoCodePagerFragment.TAG); + RepoIssuesPagerFragment repoIssuesPagerView = (RepoIssuesPagerFragment) AppHelper.getFragmentByTag(fragmentManager, RepoIssuesPagerFragment.TAG); + RepoPullRequestPagerFragment pullRequestPagerView = (RepoPullRequestPagerFragment) AppHelper.getFragmentByTag(fragmentManager, + RepoPullRequestPagerFragment.TAG); if (getRepo() == null) { sendToView(RepoPagerMvp.View::onFinishActivity); return; @@ -189,7 +189,7 @@ class RepoPagerPresenter extends BasePresenter implements Rep switch (type) { case RepoPagerMvp.CODE: if (codePagerView == null) { - onAddAndHide(fragmentManager, RepoCodePagerView.newInstance(repoId(), login(), + onAddAndHide(fragmentManager, RepoCodePagerFragment.newInstance(repoId(), login(), getRepo().getUrl(), getRepo().getDefaultBranch()), currentVisible); } else { onShowHideFragment(fragmentManager, codePagerView, currentVisible); @@ -201,14 +201,14 @@ class RepoPagerPresenter extends BasePresenter implements Rep return; } if (repoIssuesPagerView == null) { - onAddAndHide(fragmentManager, RepoIssuesPagerView.newInstance(repoId(), login()), currentVisible); + onAddAndHide(fragmentManager, RepoIssuesPagerFragment.newInstance(repoId(), login()), currentVisible); } else { onShowHideFragment(fragmentManager, repoIssuesPagerView, currentVisible); } break; case RepoPagerMvp.PULL_REQUEST: if (pullRequestPagerView == null) { - onAddAndHide(fragmentManager, RepoPullRequestPagerView.newInstance(repoId(), login()), currentVisible); + onAddAndHide(fragmentManager, RepoPullRequestPagerFragment.newInstance(repoId(), login()), currentVisible); } else { onShowHideFragment(fragmentManager, pullRequestPagerView, currentVisible); } diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/code/RepoCodePagerView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/code/RepoCodePagerFragment.java similarity index 81% rename from app/src/main/java/com/fastaccess/ui/modules/repos/code/RepoCodePagerView.java rename to app/src/main/java/com/fastaccess/ui/modules/repos/code/RepoCodePagerFragment.java index 11c2b91d..d2e58ef8 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/repos/code/RepoCodePagerView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/repos/code/RepoCodePagerFragment.java @@ -16,7 +16,7 @@ import com.fastaccess.helper.InputHelper; import com.fastaccess.helper.ViewHelper; import com.fastaccess.ui.adapter.FragmentsPagerAdapter; import com.fastaccess.ui.base.BaseFragment; -import com.fastaccess.ui.modules.repos.code.files.paths.RepoFilePathView; +import com.fastaccess.ui.modules.repos.code.files.paths.RepoFilePathFragment; import com.fastaccess.ui.widgets.SpannableBuilder; import com.fastaccess.ui.widgets.ViewPagerView; @@ -26,15 +26,15 @@ import butterknife.BindView; * Created by Kosh on 31 Dec 2016, 1:36 AM */ -public class RepoCodePagerView extends BaseFragment implements RepoCodePagerMvp.View { - public static final String TAG = RepoCodePagerView.class.getSimpleName(); +public class RepoCodePagerFragment extends BaseFragment implements RepoCodePagerMvp.View { + public static final String TAG = RepoCodePagerFragment.class.getSimpleName(); @BindView(R.id.tabs) TabLayout tabs; @BindView(R.id.pager) ViewPagerView pager; - public static RepoCodePagerView newInstance(@NonNull String repoId, @NonNull String login, - @NonNull String htmlLink, @NonNull String defaultBranch) { - RepoCodePagerView view = new RepoCodePagerView(); + public static RepoCodePagerFragment newInstance(@NonNull String repoId, @NonNull String login, + @NonNull String htmlLink, @NonNull String defaultBranch) { + RepoCodePagerFragment view = new RepoCodePagerFragment(); view.setArguments(Bundler.start() .put(BundleConstant.ID, repoId) .put(BundleConstant.EXTRA, login) @@ -70,12 +70,12 @@ public class RepoCodePagerView extends BaseFragment implements RepoCommitsMvp.View { +public class RepoCommitsFragment extends BaseFragment implements RepoCommitsMvp.View { @BindView(R.id.recycler) DynamicRecyclerView recycler; @BindView(R.id.refresh) SwipeRefreshLayout refresh; @BindView(R.id.stateLayout) StateLayout stateLayout; @@ -45,8 +45,8 @@ public class RepoCommitsView extends BaseFragment implements } @Override public void onItemClick(int position, View v, Commit item) { - CommitPagerView.createIntentForOffline(v.getContext(), item); + CommitPagerActivity.createIntentForOffline(v.getContext(), item); } @Override public void onItemLongClick(int position, View v, Commit item) { diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/code/commit/details/CommitPagerView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/code/commit/details/CommitPagerActivity.java similarity index 94% rename from app/src/main/java/com/fastaccess/ui/modules/repos/code/commit/details/CommitPagerView.java rename to app/src/main/java/com/fastaccess/ui/modules/repos/code/commit/details/CommitPagerActivity.java index 2210781c..1bd07a81 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/repos/code/commit/details/CommitPagerView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/repos/code/commit/details/CommitPagerActivity.java @@ -26,8 +26,8 @@ import com.fastaccess.helper.ViewHelper; import com.fastaccess.provider.scheme.SchemeParser; import com.fastaccess.ui.adapter.FragmentsPagerAdapter; import com.fastaccess.ui.base.BaseActivity; -import com.fastaccess.ui.modules.repos.RepoPagerView; -import com.fastaccess.ui.modules.repos.code.commit.details.comments.CommitCommentsView; +import com.fastaccess.ui.modules.repos.RepoPagerActivity; +import com.fastaccess.ui.modules.repos.code.commit.details.comments.CommitCommentsFragments; import com.fastaccess.ui.widgets.AvatarLayout; import com.fastaccess.ui.widgets.FontTextView; import com.fastaccess.ui.widgets.ViewPagerView; @@ -42,7 +42,7 @@ import butterknife.OnClick; * Created by Kosh on 10 Dec 2016, 9:23 AM */ -public class CommitPagerView extends BaseActivity implements CommitPagerMvp.View { +public class CommitPagerActivity extends BaseActivity implements CommitPagerMvp.View { @BindView(R.id.avatarLayout) AvatarLayout avatarLayout; @BindView(R.id.headerTitle) FontTextView title; @@ -63,7 +63,7 @@ public class CommitPagerView extends BaseActivity implements CommitCommentsMvp.View { +public class CommitCommentsFragments extends BaseFragment implements CommitCommentsMvp.View { @BindView(R.id.recycler) DynamicRecyclerView recycler; @BindView(R.id.refresh) SwipeRefreshLayout refresh; @@ -41,8 +41,8 @@ public class CommitCommentsView extends BaseFragment implements CommitFilesMvp.View { +public class CommitFilesFragment extends BaseFragment implements CommitFilesMvp.View { @BindView(R.id.recycler) DynamicRecyclerView recycler; @BindView(R.id.refresh) AppbarRefreshLayout refresh; @@ -33,8 +33,8 @@ public class CommitFilesView extends BaseFragment files = new Hashtable<>(); diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/code/contributors/RepoContributorsView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/code/contributors/RepoContributorsFragment.java similarity index 91% rename from app/src/main/java/com/fastaccess/ui/modules/repos/code/contributors/RepoContributorsView.java rename to app/src/main/java/com/fastaccess/ui/modules/repos/code/contributors/RepoContributorsFragment.java index d9b23a95..e981fdc3 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/repos/code/contributors/RepoContributorsView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/repos/code/contributors/RepoContributorsFragment.java @@ -22,7 +22,7 @@ import butterknife.BindView; * Created by Kosh on 03 Dec 2016, 3:56 PM */ -public class RepoContributorsView extends BaseFragment implements RepoContributorsMvp.View { +public class RepoContributorsFragment extends BaseFragment implements RepoContributorsMvp.View { @BindView(R.id.recycler) DynamicRecyclerView recycler; @BindView(R.id.refresh) SwipeRefreshLayout refresh; @@ -30,8 +30,8 @@ public class RepoContributorsView extends BaseFragment implements RepoFilesMvp.View { +public class RepoFilesFragment extends BaseFragment implements RepoFilesMvp.View { @BindView(R.id.recycler) DynamicRecyclerView recycler; @BindView(R.id.refresh) AppbarRefreshLayout refresh; @BindView(R.id.stateLayout) StateLayout stateLayout; private RepoFilesAdapter adapter; - private RepoFilePathView parentFragment; + private RepoFilePathFragment parentFragment; @Override public void onNotifyAdapter() { hideProgress(); @@ -66,7 +66,7 @@ public class RepoFilesView extends BaseFragment implements RepoFilePathMvp.View { +public class RepoFilePathFragment extends BaseFragment implements RepoFilePathMvp.View { @BindView(R.id.recycler) RecyclerView recycler; @BindView(R.id.toParentFolder) View toParentFolder; @@ -48,17 +48,17 @@ public class RepoFilePathView extends BaseFragment implements ViewerMvp.View { +public class ViewerFragment extends BaseFragment implements ViewerMvp.View { - public static final String TAG = ViewerView.class.getSimpleName(); + public static final String TAG = ViewerFragment.class.getSimpleName(); @BindView(R.id.webView) PrettifyWebView webView; @BindView(R.id.stateLayout) StateLayout stateLayout; @State boolean isWrap = PrefGetter.isWrapCode(); - public static ViewerView newInstance(@NonNull String url) { + public static ViewerFragment newInstance(@NonNull String url) { return newInstance(url, false); } - public static ViewerView newInstance(@NonNull String url, boolean isRepo) { + public static ViewerFragment newInstance(@NonNull String url, boolean isRepo) { return newInstance(Bundler.start() .put(BundleConstant.ITEM, url) .put(BundleConstant.EXTRA, isRepo) .end()); } - private static ViewerView newInstance(@NonNull Bundle bundle) { - ViewerView fragmentView = new ViewerView(); + private static ViewerFragment newInstance(@NonNull Bundle bundle) { + ViewerFragment fragmentView = new ViewerFragment(); fragmentView.setArguments(bundle); return fragmentView; } diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/code/releases/RepoReleasesView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/code/releases/RepoReleasesFragment.java similarity index 95% rename from app/src/main/java/com/fastaccess/ui/modules/repos/code/releases/RepoReleasesView.java rename to app/src/main/java/com/fastaccess/ui/modules/repos/code/releases/RepoReleasesFragment.java index 0d8daa7f..216fe033 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/repos/code/releases/RepoReleasesView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/repos/code/releases/RepoReleasesFragment.java @@ -36,15 +36,15 @@ import uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt; * Created by Kosh on 03 Dec 2016, 3:56 PM */ -public class RepoReleasesView extends BaseFragment implements RepoReleasesMvp.View { +public class RepoReleasesFragment extends BaseFragment implements RepoReleasesMvp.View { @BindView(R.id.recycler) DynamicRecyclerView recycler; @BindView(R.id.refresh) SwipeRefreshLayout refresh; @BindView(R.id.stateLayout) StateLayout stateLayout; private OnLoadMore onLoadMore; private ReleasesAdapter adapter; - public static RepoReleasesView newInstance(@NonNull String repoId, @NonNull String login) { - RepoReleasesView view = new RepoReleasesView(); + public static RepoReleasesFragment newInstance(@NonNull String repoId, @NonNull String login) { + RepoReleasesFragment view = new RepoReleasesFragment(); view.setArguments(Bundler.start() .put(BundleConstant.ID, repoId) .put(BundleConstant.EXTRA, login) diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/assignees/AssigneesView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/assignees/AssigneesDialogFragment.java similarity index 93% rename from app/src/main/java/com/fastaccess/ui/modules/repos/extras/assignees/AssigneesView.java rename to app/src/main/java/com/fastaccess/ui/modules/repos/extras/assignees/AssigneesDialogFragment.java index f6b09405..cf4ee66d 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/assignees/AssigneesView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/assignees/AssigneesDialogFragment.java @@ -32,7 +32,7 @@ import icepick.State; * Created by Kosh on 22 Feb 2017, 7:23 PM */ -public class AssigneesView extends BaseDialogFragment implements AssigneesMvp.View { +public class AssigneesDialogFragment extends BaseDialogFragment implements AssigneesMvp.View { @BindView(R.id.title) FontTextView title; @BindView(R.id.recycler) DynamicRecyclerView recycler; @@ -56,8 +56,8 @@ public class AssigneesView extends BaseDialogFragment models) { - AssigneesView fragment = new AssigneesView(); + public static AssigneesDialogFragment newInstance(@NonNull List models) { + AssigneesDialogFragment fragment = new AssigneesDialogFragment(); fragment.setArguments(Bundler.start().putParcelableArrayList(BundleConstant.ITEM, (ArrayList) models).end()); return fragment; } diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/labels/LabelsView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/labels/LabelsDialogFragment.java similarity index 90% rename from app/src/main/java/com/fastaccess/ui/modules/repos/extras/labels/LabelsView.java rename to app/src/main/java/com/fastaccess/ui/modules/repos/extras/labels/LabelsDialogFragment.java index 5fdf3d38..22f673b1 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/labels/LabelsView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/labels/LabelsDialogFragment.java @@ -17,7 +17,7 @@ import com.fastaccess.helper.Bundler; import com.fastaccess.helper.InputHelper; import com.fastaccess.ui.adapter.LabelsAdapter; import com.fastaccess.ui.base.BaseDialogFragment; -import com.fastaccess.ui.modules.repos.extras.labels.create.CreateLableView; +import com.fastaccess.ui.modules.repos.extras.labels.create.CreateLabelDialogFragment; import com.fastaccess.ui.widgets.FontTextView; import com.fastaccess.ui.widgets.recyclerview.DynamicRecyclerView; @@ -35,7 +35,7 @@ import icepick.State; * Created by Kosh on 22 Feb 2017, 7:23 PM */ -public class LabelsView extends BaseDialogFragment implements LabelsMvp.View { +public class LabelsDialogFragment extends BaseDialogFragment implements LabelsMvp.View { @BindView(R.id.title) FontTextView title; @BindView(R.id.recycler) DynamicRecyclerView recycler; @@ -44,9 +44,9 @@ public class LabelsView extends BaseDialogFragment models, @Nullable LabelListModel selectedLabels, - @NonNull String repo, @NonNull String login) { - LabelsView fragment = new LabelsView(); + public static LabelsDialogFragment newInstance(@NonNull List models, @Nullable LabelListModel selectedLabels, + @NonNull String repo, @NonNull String login) { + LabelsDialogFragment fragment = new LabelsDialogFragment(); fragment.setArguments(Bundler.start() .putParcelableArrayList(BundleConstant.ITEM, (ArrayList) models) .putParcelableArrayList(BundleConstant.EXTRA, selectedLabels) @@ -60,7 +60,7 @@ public class LabelsView extends BaseDialogFragment implements CreateLabelMvp.View { +public class CreateLabelDialogFragment extends BaseDialogFragment implements CreateLabelMvp.View { @BindView(R.id.toolbar) Toolbar toolbar; @BindView(R.id.name) TextInputLayout name; @@ -34,8 +34,8 @@ public class CreateLableView extends BaseDialogFragment implements MilestoneMvp.View { - public static final String TAG = MilestoneView.class.getSimpleName(); +public class MilestoneDialogFragment extends BaseFragment implements MilestoneMvp.View { + public static final String TAG = MilestoneDialogFragment.class.getSimpleName(); @BindView(R.id.toolbar) Toolbar toolbar; @BindView(R.id.appbar) AppBarLayout appbar; @@ -38,8 +38,8 @@ public class MilestoneView extends BaseFragment +public class CreateMilestoneDialogFragment extends BaseDialogFragment implements CreateMilestoneMvp.View, DatePickerCallback { - public static final String TAG = CreateMilestoneView.class.getSimpleName(); + public static final String TAG = CreateMilestoneDialogFragment.class.getSimpleName(); @BindView(R.id.toolbar) Toolbar toolbar; @BindView(R.id.title) TextInputLayout title; @@ -39,8 +39,8 @@ public class CreateMilestoneView extends BaseDialogFragment implements RepoIssuesPagerMvp.View { +public class RepoIssuesPagerFragment extends BaseFragment implements RepoIssuesPagerMvp.View { - public static final String TAG = RepoIssuesPagerView.class.getSimpleName(); + public static final String TAG = RepoIssuesPagerFragment.class.getSimpleName(); @BindView(R.id.tabs) TabLayout tabs; @BindView(R.id.pager) ViewPagerView pager; @State int openCount = -1; @State int closeCount = -1; - public static RepoIssuesPagerView newInstance(@NonNull String repoId, @NonNull String login) { - RepoIssuesPagerView view = new RepoIssuesPagerView(); + public static RepoIssuesPagerFragment newInstance(@NonNull String repoId, @NonNull String login) { + RepoIssuesPagerFragment view = new RepoIssuesPagerFragment(); view.setArguments(Bundler.start() .put(BundleConstant.ID, repoId) .put(BundleConstant.EXTRA, login) @@ -67,7 +67,7 @@ public class RepoIssuesPagerView extends BaseFragment implements CreateIssueMvp.View { +public class CreateIssueActivity extends BaseActivity implements CreateIssueMvp.View { @BindView(R.id.title) TextInputLayout title; @BindView(R.id.description) FontTextView description; @@ -48,7 +48,7 @@ public class CreateIssueView extends BaseActivity implements RepoIssuesMvp.View { +public class RepoClosedIssuesFragment extends BaseFragment implements RepoIssuesMvp.View { @BindView(R.id.recycler) DynamicRecyclerView recycler; @BindView(R.id.refresh) SwipeRefreshLayout refresh; @BindView(R.id.stateLayout) StateLayout stateLayout; @@ -39,8 +39,8 @@ public class RepoClosedIssuesView extends BaseFragment implements RepoIssuesMvp.View { +public class RepoOpenedIssuesFragment extends BaseFragment implements RepoIssuesMvp.View { @BindView(R.id.recycler) DynamicRecyclerView recycler; @BindView(R.id.refresh) SwipeRefreshLayout refresh; @BindView(R.id.stateLayout) StateLayout stateLayout; @@ -42,8 +42,8 @@ public class RepoOpenedIssuesView extends BaseFragment implements IssuePagerMvp.View { +public class IssuePagerActivity extends BaseActivity implements IssuePagerMvp.View { @BindView(R.id.startGist) ForegroundImageView startGist; @BindView(R.id.forkGist) ForegroundImageView forkGist; @@ -73,7 +73,7 @@ public class IssuePagerView extends BaseActivity items) { hideProgress(); - LabelsView.newInstance(items, getPresenter().getIssue() != null ? getPresenter().getIssue().getLabels() : null, + LabelsDialogFragment.newInstance(items, getPresenter().getIssue() != null ? getPresenter().getIssue().getLabels() : null, getPresenter().getRepoId(), getPresenter().getLogin()) - .show(getSupportFragmentManager(), "LabelsView"); + .show(getSupportFragmentManager(), "LabelsDialogFragment"); } @Override public void onUpdateTimeline() { showMessage(R.string.success, R.string.labels_added_successfully); - IssueTimelineView issueDetailsView = (IssueTimelineView) pager.getAdapter().instantiateItem(pager, 0); + IssueTimelineFragment issueDetailsView = (IssueTimelineFragment) pager.getAdapter().instantiateItem(pager, 0); if (issueDetailsView != null) { issueDetailsView.onRefresh(); } @@ -303,8 +303,8 @@ public class IssuePagerView extends BaseActivity items) { hideProgress(); - AssigneesView.newInstance(items) - .show(getSupportFragmentManager(), "AssigneesView"); + AssigneesDialogFragment.newInstance(items) + .show(getSupportFragmentManager(), "AssigneesDialogFragment"); } @Override public void onMileStoneSelected(@NonNull MilestoneModel milestoneModel) { @@ -330,7 +330,7 @@ public class IssuePagerView extends BaseActivity implements IssueTimelineMvp.View { +public class IssueTimelineFragment extends BaseFragment implements IssueTimelineMvp.View { @BindView(R.id.recycler) DynamicRecyclerView recycler; @BindView(R.id.refresh) AppbarRefreshLayout refresh; @@ -45,8 +45,8 @@ public class IssueTimelineView extends BaseFragment implements +public class RepoPullRequestPagerFragment extends BaseFragment implements RepoPullRequestPagerMvp.View { - public static final String TAG = RepoPullRequestPagerView.class.getSimpleName(); + public static final String TAG = RepoPullRequestPagerFragment.class.getSimpleName(); @BindView(R.id.tabs) TabLayout tabs; @BindView(R.id.pager) ViewPagerView pager; @@ -35,8 +35,8 @@ public class RepoPullRequestPagerView extends BaseFragment implements RepoPullRequestMvp.View { +public class RepoPullRequestFragment extends BaseFragment implements RepoPullRequestMvp.View { @BindView(R.id.recycler) DynamicRecyclerView recycler; @BindView(R.id.refresh) SwipeRefreshLayout refresh; @BindView(R.id.stateLayout) StateLayout stateLayout; @@ -37,8 +37,8 @@ public class RepoPullRequestView extends BaseFragment implements PullRequestPagerMvp.View { +public class PullRequestPagerActivity extends BaseActivity implements PullRequestPagerMvp.View { @BindView(R.id.startGist) ForegroundImageView startGist; @BindView(R.id.forkGist) ForegroundImageView forkGist; @@ -74,7 +74,7 @@ public class PullRequestPagerView extends BaseActivity items) { hideProgress(); - LabelsView.newInstance(items, getPresenter().getPullRequest() != null ? getPresenter().getPullRequest().getLabels() : null, + LabelsDialogFragment.newInstance(items, getPresenter().getPullRequest() != null ? getPresenter().getPullRequest().getLabels() : null, getPresenter().getRepoId(), getPresenter().getLogin()) - .show(getSupportFragmentManager(), "LabelsView"); + .show(getSupportFragmentManager(), "LabelsDialogFragment"); } @Override public void onUpdateMenu() { @@ -336,7 +336,7 @@ public class PullRequestPagerView extends BaseActivity items) { hideProgress(); - AssigneesView.newInstance(items) - .show(getSupportFragmentManager(), "AssigneesView"); + AssigneesDialogFragment.newInstance(items) + .show(getSupportFragmentManager(), "AssigneesDialogFragment"); } @Override public void onMileStoneSelected(@NonNull MilestoneModel milestoneModel) { @@ -360,7 +360,7 @@ public class PullRequestPagerView extends BaseActivity +public class PullRequestCommitsFragment extends BaseFragment implements PullRequestCommitsMvp.View { @BindView(R.id.recycler) DynamicRecyclerView recycler; @@ -31,8 +31,8 @@ public class PullRequestCommitsView extends BaseFragment +public class PullRequestFilesFragment extends BaseFragment implements PullRequestFilesMvp.View { @BindView(R.id.recycler) DynamicRecyclerView recycler; @@ -35,8 +35,8 @@ public class PullRequestFilesView extends BaseFragment } @Override public void onItemLongClick(int position, View v, CommitFileModel item) { - v.getContext().startActivity(CommitPagerView.createIntent(v.getContext(), repoId, login, Uri.parse(item.getContentsUrl()) + v.getContext().startActivity(CommitPagerActivity.createIntent(v.getContext(), repoId, login, Uri.parse(item.getContentsUrl()) .getQueryParameter("ref"))); } } diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/timeline/timeline/PullRequestTimelineView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/timeline/timeline/PullRequestTimelineFragment.java similarity index 93% rename from app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/timeline/timeline/PullRequestTimelineView.java rename to app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/timeline/timeline/PullRequestTimelineFragment.java index c82913d1..97db90d9 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/timeline/timeline/PullRequestTimelineView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/timeline/timeline/PullRequestTimelineFragment.java @@ -22,8 +22,8 @@ import com.fastaccess.provider.rest.loadmore.OnLoadMore; import com.fastaccess.ui.adapter.IssuePullsTimelineAdapter; import com.fastaccess.ui.adapter.viewholder.TimelineCommentsViewHolder; import com.fastaccess.ui.base.BaseFragment; -import com.fastaccess.ui.modules.editor.EditorView; -import com.fastaccess.ui.modules.repos.reactions.ReactionsDialogView; +import com.fastaccess.ui.modules.editor.EditorActivity; +import com.fastaccess.ui.modules.repos.reactions.ReactionsDialogFragment; import com.fastaccess.ui.widgets.AppbarRefreshLayout; import com.fastaccess.ui.widgets.StateLayout; import com.fastaccess.ui.widgets.dialog.MessageDialogView; @@ -36,7 +36,7 @@ import icepick.State; * Created by Kosh on 31 Mar 2017, 7:35 PM */ -public class PullRequestTimelineView extends BaseFragment implements +public class PullRequestTimelineFragment extends BaseFragment implements PullRequestTimelineMvp.View { @BindView(R.id.recycler) DynamicRecyclerView recycler; @@ -46,8 +46,8 @@ public class PullRequestTimelineView extends BaseFragment +public class MergePullRequestDialogFragment extends BaseDialogFragment implements MergePullReqeustMvp.View { @BindView(R.id.title) TextInputLayout title; private MergePullReqeustMvp.MergeCallback mergeCallback; - public static MergePullRequestView newInstance(@Nullable String title) { - MergePullRequestView view = new MergePullRequestView(); + public static MergePullRequestDialogFragment newInstance(@Nullable String title) { + MergePullRequestDialogFragment view = new MergePullRequestDialogFragment(); view.setArguments(Bundler.start() .put(BundleConstant.EXTRA, title) .end()); diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/reactions/ReactionsDialogView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/reactions/ReactionsDialogFragment.java similarity index 92% rename from app/src/main/java/com/fastaccess/ui/modules/repos/reactions/ReactionsDialogView.java rename to app/src/main/java/com/fastaccess/ui/modules/repos/reactions/ReactionsDialogFragment.java index 1d3661e2..3e30431a 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/repos/reactions/ReactionsDialogView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/repos/reactions/ReactionsDialogFragment.java @@ -27,7 +27,7 @@ import butterknife.BindView; * Created by Kosh on 11 Apr 2017, 11:30 AM */ -public class ReactionsDialogView extends BaseDialogFragment +public class ReactionsDialogFragment extends BaseDialogFragment implements ReactionsDialogMvp.View { @BindView(R.id.toolbar) Toolbar toolbar; @@ -38,8 +38,8 @@ public class ReactionsDialogView extends BaseDialogFragment implements SearchMvp.View { +public class SearchActivity extends BaseActivity implements SearchMvp.View { @BindView(R.id.searchEditText) FontAutoCompleteEditText searchEditText; @BindView(R.id.clear) ForegroundImageView clear; diff --git a/app/src/main/java/com/fastaccess/ui/modules/search/SearchPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/search/SearchPresenter.java index 68b5e7d0..dc0cc73d 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/search/SearchPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/search/SearchPresenter.java @@ -10,10 +10,10 @@ import com.fastaccess.data.dao.model.SearchHistory; import com.fastaccess.helper.AppHelper; import com.fastaccess.helper.InputHelper; import com.fastaccess.ui.base.mvp.presenter.BasePresenter; -import com.fastaccess.ui.modules.search.code.SearchCodeView; -import com.fastaccess.ui.modules.search.issues.SearchIssuesView; -import com.fastaccess.ui.modules.search.repos.SearchReposView; -import com.fastaccess.ui.modules.search.users.SearchUsersView; +import com.fastaccess.ui.modules.search.code.SearchCodeFragment; +import com.fastaccess.ui.modules.search.issues.SearchIssuesFragment; +import com.fastaccess.ui.modules.search.repos.SearchReposFragment; +import com.fastaccess.ui.modules.search.users.SearchUsersFragment; import java.util.ArrayList; @@ -47,10 +47,10 @@ class SearchPresenter extends BasePresenter implements SearchMvp editText.dismissDropDown(); AppHelper.hideKeyboard(editText); String query = InputHelper.toString(editText); - SearchReposView repos = (SearchReposView) viewPager.getAdapter().instantiateItem(viewPager, 0); - SearchUsersView users = (SearchUsersView) viewPager.getAdapter().instantiateItem(viewPager, 1); - SearchIssuesView issues = (SearchIssuesView) viewPager.getAdapter().instantiateItem(viewPager, 2); - SearchCodeView code = (SearchCodeView) viewPager.getAdapter().instantiateItem(viewPager, 3); + SearchReposFragment repos = (SearchReposFragment) viewPager.getAdapter().instantiateItem(viewPager, 0); + SearchUsersFragment users = (SearchUsersFragment) viewPager.getAdapter().instantiateItem(viewPager, 1); + SearchIssuesFragment issues = (SearchIssuesFragment) viewPager.getAdapter().instantiateItem(viewPager, 2); + SearchCodeFragment code = (SearchCodeFragment) viewPager.getAdapter().instantiateItem(viewPager, 3); repos.onSetSearchQuery(query); users.onSetSearchQuery(query); issues.onSetSearchQuery(query); diff --git a/app/src/main/java/com/fastaccess/ui/modules/search/code/SearchCodeView.java b/app/src/main/java/com/fastaccess/ui/modules/search/code/SearchCodeFragment.java similarity index 91% rename from app/src/main/java/com/fastaccess/ui/modules/search/code/SearchCodeView.java rename to app/src/main/java/com/fastaccess/ui/modules/search/code/SearchCodeFragment.java index 330125fb..ef29c722 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/search/code/SearchCodeView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/search/code/SearchCodeFragment.java @@ -13,7 +13,7 @@ import com.fastaccess.helper.InputHelper; import com.fastaccess.provider.rest.loadmore.OnLoadMore; import com.fastaccess.ui.adapter.SearchCodeAdapter; import com.fastaccess.ui.base.BaseFragment; -import com.fastaccess.ui.modules.code.CodeViewerView; +import com.fastaccess.ui.modules.code.CodeViewerActivity; import com.fastaccess.ui.widgets.StateLayout; import com.fastaccess.ui.widgets.recyclerview.DynamicRecyclerView; @@ -24,7 +24,7 @@ import icepick.State; * Created by Kosh on 03 Dec 2016, 3:56 PM */ -public class SearchCodeView extends BaseFragment implements SearchCodeMvp.View { +public class SearchCodeFragment extends BaseFragment implements SearchCodeMvp.View { @State String searchQuery; @BindView(R.id.recycler) DynamicRecyclerView recycler; @@ -33,8 +33,8 @@ public class SearchCodeView extends BaseFragment onLoadMore; private SearchCodeAdapter adapter; - public static SearchCodeView newInstance() { - return new SearchCodeView(); + public static SearchCodeFragment newInstance() { + return new SearchCodeFragment(); } @Override public void onNotifyAdapter() { @@ -116,7 +116,7 @@ public class SearchCodeView extends BaseFragment implements SearchIssuesMvp.View { +public class SearchIssuesFragment extends BaseFragment implements SearchIssuesMvp.View { @State String searchQuery; @BindView(R.id.recycler) DynamicRecyclerView recycler; @@ -31,8 +31,8 @@ public class SearchIssuesView extends BaseFragment onLoadMore; private IssuesAdapter adapter; - public static SearchIssuesView newInstance() { - return new SearchIssuesView(); + public static SearchIssuesFragment newInstance() { + return new SearchIssuesFragment(); } @Override public void onNotifyAdapter() { diff --git a/app/src/main/java/com/fastaccess/ui/modules/search/issues/SearchIssuesPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/search/issues/SearchIssuesPresenter.java index acf75400..169ada59 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/search/issues/SearchIssuesPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/search/issues/SearchIssuesPresenter.java @@ -8,8 +8,8 @@ import com.fastaccess.data.dao.PullsIssuesParser; import com.fastaccess.data.dao.model.Issue; import com.fastaccess.provider.rest.RestProvider; import com.fastaccess.ui.base.mvp.presenter.BasePresenter; -import com.fastaccess.ui.modules.repos.issues.issue.details.IssuePagerView; -import com.fastaccess.ui.modules.repos.pull_requests.pull_request.details.PullRequestPagerView; +import com.fastaccess.ui.modules.repos.issues.issue.details.IssuePagerActivity; +import com.fastaccess.ui.modules.repos.pull_requests.pull_request.details.PullRequestPagerActivity; import java.util.ArrayList; @@ -72,13 +72,13 @@ class SearchIssuesPresenter extends BasePresenter implemen if (item.getPullRequest() == null) { PullsIssuesParser parser = PullsIssuesParser.getForIssue(item.getHtmlUrl()); if (parser != null) { - v.getContext().startActivity(IssuePagerView.createIntent(v.getContext(), parser.getRepoId(), + v.getContext().startActivity(IssuePagerActivity.createIntent(v.getContext(), parser.getRepoId(), parser.getLogin(), parser.getNumber(), true)); } } else { PullsIssuesParser parser = PullsIssuesParser.getForPullRequest(item.getHtmlUrl()); if (parser != null) { - v.getContext().startActivity(PullRequestPagerView.createIntent(v.getContext(), parser.getRepoId(), + v.getContext().startActivity(PullRequestPagerActivity.createIntent(v.getContext(), parser.getRepoId(), parser.getLogin(), parser.getNumber(), true)); } } diff --git a/app/src/main/java/com/fastaccess/ui/modules/search/repos/SearchReposView.java b/app/src/main/java/com/fastaccess/ui/modules/search/repos/SearchReposFragment.java similarity index 94% rename from app/src/main/java/com/fastaccess/ui/modules/search/repos/SearchReposView.java rename to app/src/main/java/com/fastaccess/ui/modules/search/repos/SearchReposFragment.java index 73038c49..5f93bcca 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/search/repos/SearchReposView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/search/repos/SearchReposFragment.java @@ -22,7 +22,7 @@ import icepick.State; * Created by Kosh on 03 Dec 2016, 3:56 PM */ -public class SearchReposView extends BaseFragment implements SearchReposMvp.View { +public class SearchReposFragment extends BaseFragment implements SearchReposMvp.View { @State String searchQuery; @BindView(R.id.recycler) DynamicRecyclerView recycler; @@ -31,8 +31,8 @@ public class SearchReposView extends BaseFragment onLoadMore; private ReposAdapter adapter; - public static SearchReposView newInstance() { - return new SearchReposView(); + public static SearchReposFragment newInstance() { + return new SearchReposFragment(); } @Override public void onNotifyAdapter() { diff --git a/app/src/main/java/com/fastaccess/ui/modules/search/repos/SearchReposPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/search/repos/SearchReposPresenter.java index 0c2afcdb..24b0cab7 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/search/repos/SearchReposPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/search/repos/SearchReposPresenter.java @@ -8,7 +8,7 @@ import com.fastaccess.data.dao.NameParser; import com.fastaccess.data.dao.model.Repo; import com.fastaccess.provider.rest.RestProvider; import com.fastaccess.ui.base.mvp.presenter.BasePresenter; -import com.fastaccess.ui.modules.repos.RepoPagerView; +import com.fastaccess.ui.modules.repos.RepoPagerActivity; import java.util.ArrayList; @@ -68,7 +68,7 @@ class SearchReposPresenter extends BasePresenter implements } @Override public void onItemClick(int position, View v, Repo item) { - RepoPagerView.startRepoPager(v.getContext(), new NameParser(item.getHtmlUrl())); + RepoPagerActivity.startRepoPager(v.getContext(), new NameParser(item.getHtmlUrl())); } @Override public void onItemLongClick(int position, View v, Repo item) { diff --git a/app/src/main/java/com/fastaccess/ui/modules/search/users/SearchUsersView.java b/app/src/main/java/com/fastaccess/ui/modules/search/users/SearchUsersFragment.java similarity index 94% rename from app/src/main/java/com/fastaccess/ui/modules/search/users/SearchUsersView.java rename to app/src/main/java/com/fastaccess/ui/modules/search/users/SearchUsersFragment.java index 5e631f50..bfb95eeb 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/search/users/SearchUsersView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/search/users/SearchUsersFragment.java @@ -22,7 +22,7 @@ import icepick.State; * Created by Kosh on 03 Dec 2016, 3:56 PM */ -public class SearchUsersView extends BaseFragment implements SearchUsersMvp.View { +public class SearchUsersFragment extends BaseFragment implements SearchUsersMvp.View { @State String searchQuery; @BindView(R.id.recycler) DynamicRecyclerView recycler; @BindView(R.id.refresh) SwipeRefreshLayout refresh; @@ -30,8 +30,8 @@ public class SearchUsersView extends BaseFragment onLoadMore; private UsersAdapter adapter; - public static SearchUsersView newInstance() { - return new SearchUsersView(); + public static SearchUsersFragment newInstance() { + return new SearchUsersFragment(); } @Override public void onNotifyAdapter() { diff --git a/app/src/main/java/com/fastaccess/ui/modules/user/UserPagerView.java b/app/src/main/java/com/fastaccess/ui/modules/user/UserPagerActivity.java similarity index 95% rename from app/src/main/java/com/fastaccess/ui/modules/user/UserPagerView.java rename to app/src/main/java/com/fastaccess/ui/modules/user/UserPagerActivity.java index 94db25aa..7aee133a 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/user/UserPagerView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/user/UserPagerActivity.java @@ -23,7 +23,7 @@ import icepick.State; * Created by Kosh on 03 Dec 2016, 8:00 AM */ -public class UserPagerView extends BaseActivity implements UserPagerMvp.View { +public class UserPagerActivity extends BaseActivity implements UserPagerMvp.View { @BindView(R.id.tabs) TabLayout tabs; @@ -44,7 +44,7 @@ public class UserPagerView extends BaseActivity + tools:context="com.fastaccess.ui.modules.main.MainActivity"> + tools:context=".ui.modules.login.LoginActivity">