Skip to content

Commit 397eea9

Browse files
Mattia PRIMAVERATunous
Mattia PRIMAVERA
authored and
Tunous
committed
Extract hard-coded bundle params names
1 parent a2d62a0 commit 397eea9

34 files changed

+442
-299
lines changed

‎app/src/main/java/com/gh4a/fragment/CollaboratorListFragment.java

+7-4
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,22 @@
1818

1919
public class CollaboratorListFragment extends PagedDataBaseFragment<User> implements
2020
RootAdapter.OnItemClickListener<User> {
21+
private static final String EXTRA_OWNER = "owner";
22+
private static final String EXTRA_REPO = "repo";
23+
2124
public static CollaboratorListFragment newInstance(String owner, String repo) {
2225
CollaboratorListFragment f = new CollaboratorListFragment();
2326
Bundle args = new Bundle();
24-
args.putString("owner", owner);
25-
args.putString("repo", repo);
27+
args.putString(EXTRA_OWNER, owner);
28+
args.putString(EXTRA_REPO, repo);
2629
f.setArguments(args);
2730
return f;
2831
}
2932

3033
@Override
3134
protected Single<Response<Page<User>>> loadPage(int page, boolean bypassCache) {
32-
String owner = getArguments().getString("owner");
33-
String repo = getArguments().getString("repo");
35+
String owner = getArguments().getString(EXTRA_OWNER);
36+
String repo = getArguments().getString(EXTRA_REPO);
3437
final RepositoryCollaboratorService service =
3538
ServiceFactory.get(RepositoryCollaboratorService.class, bypassCache);
3639
return service.getCollaborators(owner, repo, page);

‎app/src/main/java/com/gh4a/fragment/CommitCompareFragment.java

+27-20
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515
*/
1616
package com.gh4a.fragment;
1717

18-
import java.net.HttpURLConnection;
19-
import java.util.ArrayList;
20-
import java.util.List;
21-
2218
import android.app.Activity;
2319
import android.content.Intent;
2420
import android.os.Bundle;
@@ -36,10 +32,23 @@
3632
import com.meisolsson.githubsdk.model.CommitCompare;
3733
import com.meisolsson.githubsdk.service.repositories.RepositoryCommitService;
3834

35+
import java.net.HttpURLConnection;
36+
import java.util.ArrayList;
37+
import java.util.List;
38+
3939
import io.reactivex.Single;
4040

4141
public class CommitCompareFragment extends ListDataBaseFragment<Commit> implements
4242
RootAdapter.OnItemClickListener<Commit> {
43+
private static final String EXTRA_OWNER = "owner";
44+
private static final String EXTRA_REPO = "repo";
45+
private static final String EXTRA_BASE = "base";
46+
private static final String EXTRA_BASE_LABEL = "base_label";
47+
private static final String EXTRA_HEAD = "head";
48+
private static final String EXTRA_HEAD_LABEL = "head_label";
49+
private static final String EXTRA_PR = "pr";
50+
private static final int REQUEST_COMMIT = 2000;
51+
4352
public static CommitCompareFragment newInstance(String repoOwner, String repoName,
4453
String baseRef, String headRef) {
4554
return newInstance(repoOwner, repoName, -1, null, baseRef, null, headRef);
@@ -49,21 +58,19 @@ public static CommitCompareFragment newInstance(String repoOwner, String repoNam
4958
int pullRequestNumber, String baseRefLabel, String baseRef,
5059
String headRefLabel, String headRef) {
5160
Bundle args = new Bundle();
52-
args.putString("owner", repoOwner);
53-
args.putString("repo", repoName);
54-
args.putString("base", baseRef);
55-
args.putString("base_label", baseRefLabel);
56-
args.putString("head", headRef);
57-
args.putString("head_label", headRefLabel);
58-
args.putInt("pr", pullRequestNumber);
61+
args.putString(EXTRA_OWNER, repoOwner);
62+
args.putString(EXTRA_REPO, repoName);
63+
args.putString(EXTRA_BASE, baseRef);
64+
args.putString(EXTRA_BASE_LABEL, baseRefLabel);
65+
args.putString(EXTRA_HEAD, headRef);
66+
args.putString(EXTRA_HEAD_LABEL, headRefLabel);
67+
args.putInt(EXTRA_PR, pullRequestNumber);
5968

6069
CommitCompareFragment f = new CommitCompareFragment();
6170
f.setArguments(args);
6271
return f;
6372
}
6473

65-
private static final int REQUEST_COMMIT = 2000;
66-
6774
private String mRepoOwner;
6875
private String mRepoName;
6976
private String mBase;
@@ -77,13 +84,13 @@ public void onCreate(Bundle savedInstanceState) {
7784
super.onCreate(savedInstanceState);
7885

7986
Bundle args = getArguments();
80-
mRepoOwner = args.getString("owner");
81-
mRepoName = args.getString("repo");
82-
mBase = args.getString("base");
83-
mBaseLabel = args.getString("base_label");
84-
mHead = args.getString("head");
85-
mHeadLabel = args.getString("head_label");
86-
mPullRequestNumber = args.getInt("pr", -1);
87+
mRepoOwner = args.getString(EXTRA_OWNER);
88+
mRepoName = args.getString(EXTRA_REPO);
89+
mBase = args.getString(EXTRA_BASE);
90+
mBaseLabel = args.getString(EXTRA_BASE_LABEL);
91+
mHead = args.getString(EXTRA_HEAD);
92+
mHeadLabel = args.getString(EXTRA_HEAD_LABEL);
93+
mPullRequestNumber = args.getInt(EXTRA_PR, -1);
8794
}
8895

8996
@Override

‎app/src/main/java/com/gh4a/fragment/CommitFragment.java

+25-16
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,30 @@
3939
import java.util.List;
4040

4141
public class CommitFragment extends LoadingFragmentBase implements OnClickListener {
42+
private static final String EXTRA_OWNER = "owner";
43+
private static final String EXTRA_REPO = "repo";
44+
private static final String EXTRA_SHA = "sha";
45+
private static final String EXTRA_COMMIT = "commit";
46+
private static final String EXTRA_COMMENTS = "comments";
47+
private static final String STATUS_ADDED = "added";
48+
private static final String STATUS_MODIFIED = "modified";
49+
private static final String STATUS_RENAMED = "renamed";
50+
private static final String STATUS_REMOVED = "removed";
51+
private static final int REQUEST_DIFF_VIEWER = 1000;
52+
4253
public static CommitFragment newInstance(String repoOwner, String repoName, String commitSha,
4354
Commit commit, List<GitComment> comments) {
4455
CommitFragment f = new CommitFragment();
4556

4657
Bundle args = new Bundle();
47-
args.putString("owner", repoOwner);
48-
args.putString("repo", repoName);
49-
args.putString("sha", commitSha);
58+
args.putString(EXTRA_OWNER, repoOwner);
59+
args.putString(EXTRA_REPO, repoName);
60+
args.putString(EXTRA_SHA, commitSha);
5061
// Commit objects can be huge, depending on the number of patches attached to it.
5162
// In order to avoid TransactionTooLargeExceptions being thrown when the activity we're
5263
// attached to is recreated, store the data in compressed form
53-
IntentUtils.putParcelableToBundleCompressed(args, "commit", commit, 100000);
54-
args.putParcelableArrayList("comments", new ArrayList<>(comments));
64+
IntentUtils.putParcelableToBundleCompressed(args, EXTRA_COMMIT, commit, 100000);
65+
args.putParcelableArrayList(EXTRA_COMMENTS, new ArrayList<>(comments));
5566
f.setArguments(args);
5667
return f;
5768
}
@@ -60,8 +71,6 @@ public interface CommentUpdateListener {
6071
void onCommentsUpdated();
6172
}
6273

63-
private static final int REQUEST_DIFF_VIEWER = 1000;
64-
6574
private String mRepoOwner;
6675
private String mRepoName;
6776
private String mObjectSha;
@@ -73,11 +82,11 @@ public interface CommentUpdateListener {
7382
public void onCreate(Bundle savedInstanceState) {
7483
super.onCreate(savedInstanceState);
7584
Bundle args = getArguments();
76-
mRepoOwner = args.getString("owner");
77-
mRepoName = args.getString("repo");
78-
mObjectSha = args.getString("sha");
79-
mCommit = IntentUtils.readCompressedParcelableFromBundle(args, "commit");
80-
mComments = args.getParcelableArrayList("comments");
85+
mRepoOwner = args.getString(EXTRA_OWNER);
86+
mRepoName = args.getString(EXTRA_REPO);
87+
mObjectSha = args.getString(EXTRA_SHA);
88+
mCommit = IntentUtils.readCompressedParcelableFromBundle(args, EXTRA_COMMIT);
89+
mComments = args.getParcelableArrayList(EXTRA_COMMENTS);
8190
}
8291

8392
@Override
@@ -197,19 +206,19 @@ protected void fillStats(List<GitHubFile> files, List<? extends PositionalCommen
197206
final LinearLayout parent;
198207

199208
switch (file.status()) {
200-
case "added":
209+
case STATUS_ADDED:
201210
parent = llAdded;
202211
added++;
203212
break;
204-
case "modified":
213+
case STATUS_MODIFIED:
205214
parent = llChanged;
206215
changed++;
207216
break;
208-
case "renamed":
217+
case STATUS_RENAMED:
209218
parent = llRenamed;
210219
renamed++;
211220
break;
212-
case "removed":
221+
case STATUS_REMOVED:
213222
parent = llDeleted;
214223
deleted++;
215224
break;

‎app/src/main/java/com/gh4a/fragment/CommitListFragment.java

+12-8
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ public interface ContextSelectionCallback {
5252

5353
private static final int REQUEST_COMMIT = 2000;
5454
private static final int MENU_SELECT_AS_BASE = Menu.FIRST + 2;
55+
private static final String EXTRA_OWNER = "owner";
56+
private static final String EXTRA_REPO = "repo";
57+
private static final String EXTRA_REF = "ref";
58+
private static final String EXTRA_PATH = "path";
5559

5660
private String mRepoOwner;
5761
private String mRepoName;
@@ -71,10 +75,10 @@ public static CommitListFragment newInstance(String repoOwner, String repoName,
7175
CommitListFragment f = new CommitListFragment();
7276

7377
Bundle args = new Bundle();
74-
args.putString("owner", repoOwner);
75-
args.putString("repo", repoName);
76-
args.putString("ref", ref);
77-
args.putString("path", filePath);
78+
args.putString(EXTRA_OWNER, repoOwner);
79+
args.putString(EXTRA_REPO, repoName);
80+
args.putString(EXTRA_REF, ref);
81+
args.putString(EXTRA_PATH, filePath);
7882
f.setArguments(args);
7983

8084
return f;
@@ -83,10 +87,10 @@ public static CommitListFragment newInstance(String repoOwner, String repoName,
8387
@Override
8488
public void onCreate(Bundle savedInstanceState) {
8589
super.onCreate(savedInstanceState);
86-
mRepoOwner = getArguments().getString("owner");
87-
mRepoName = getArguments().getString("repo");
88-
mRef = getArguments().getString("ref");
89-
mFilePath = getArguments().getString("path");
90+
mRepoOwner = getArguments().getString(EXTRA_OWNER);
91+
mRepoName = getArguments().getString(EXTRA_REPO);
92+
mRef = getArguments().getString(EXTRA_REF);
93+
mFilePath = getArguments().getString(EXTRA_PATH);
9094
}
9195

9296
@Override

‎app/src/main/java/com/gh4a/fragment/CommitNoteFragment.java

+23-15
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,14 @@ public class CommitNoteFragment extends ListDataBaseFragment<GitComment> impleme
3939
CommitNoteAdapter.OnCommentAction<GitComment>,
4040
EditorBottomSheet.Callback, EditorBottomSheet.Listener {
4141

42+
private static final String EXTRA_OWNER = "owner";
43+
private static final String EXTRA_REPO = "repo";
44+
private static final String EXTRA_SHA = "sha";
45+
private static final String EXTRA_COMMIT_AUTHOR = "commit_author";
46+
private static final String EXTRA_COMMITTER = "committer";
47+
private static final String EXTRA_COMMENTS = "comments";
48+
private static final String EXTRA_INITIAL_COMMENT = "initial_comment";
49+
4250
public static CommitNoteFragment newInstance(String repoOwner, String repoName,
4351
String commitSha, Commit commit,
4452
List<GitComment> allComments, IntentUtils.InitialCommentMarker initialComment) {
@@ -53,13 +61,13 @@ public static CommitNoteFragment newInstance(String repoOwner, String repoName,
5361
}
5462

5563
Bundle args = new Bundle();
56-
args.putString("owner", repoOwner);
57-
args.putString("repo", repoName);
58-
args.putString("sha", commitSha);
59-
args.putParcelable("commit_author", commit.author());
60-
args.putParcelable("committer", commit.committer());
61-
args.putParcelableArrayList("comments", comments);
62-
args.putParcelable("initial_comment", initialComment);
64+
args.putString(EXTRA_OWNER, repoOwner);
65+
args.putString(EXTRA_REPO, repoName);
66+
args.putString(EXTRA_SHA, commitSha);
67+
args.putParcelable(EXTRA_COMMIT_AUTHOR, commit.author());
68+
args.putParcelable(EXTRA_COMMITTER, commit.committer());
69+
args.putParcelableArrayList(EXTRA_COMMENTS, comments);
70+
args.putParcelable(EXTRA_INITIAL_COMMENT, initialComment);
6371

6472
f.setArguments(args);
6573
return f;
@@ -85,13 +93,13 @@ public interface CommentUpdateListener {
8593
public void onCreate(Bundle savedInstanceState) {
8694
super.onCreate(savedInstanceState);
8795
Bundle args = getArguments();
88-
mRepoOwner = args.getString("owner");
89-
mRepoName = args.getString("repo");
90-
mObjectSha = args.getString("sha");
91-
mCommitAuthor = args.getParcelable("commit_author");
92-
mCommitter = args.getParcelable("committer");
93-
mInitialComment = args.getParcelable("initial_comment");
94-
args.remove("initial_comment");
96+
mRepoOwner = args.getString(EXTRA_OWNER);
97+
mRepoName = args.getString(EXTRA_REPO);
98+
mObjectSha = args.getString(EXTRA_SHA);
99+
mCommitAuthor = args.getParcelable(EXTRA_COMMIT_AUTHOR);
100+
mCommitter = args.getParcelable(EXTRA_COMMITTER);
101+
mInitialComment = args.getParcelable(EXTRA_INITIAL_COMMENT);
102+
args.remove(EXTRA_INITIAL_COMMENT);
95103
}
96104

97105
@Override
@@ -227,7 +235,7 @@ protected int getEmptyTextResId() {
227235

228236
@Override
229237
protected Single<List<GitComment>> onCreateDataSingle(boolean bypassCache) {
230-
List<GitComment> comments = getArguments().getParcelableArrayList("comments");
238+
List<GitComment> comments = getArguments().getParcelableArrayList(EXTRA_COMMENTS);
231239
if (comments != null && !comments.isEmpty()) {
232240
return Single.just(comments);
233241
}

‎app/src/main/java/com/gh4a/fragment/ContentListContainerFragment.java

+11-7
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@ public interface CommitSelectionCallback {
5454
private static final String STATE_KEY_DIR_STACK = "dir_stack";
5555
private static final String STATE_KEY_CONTENT_CACHE_PREFIX = "content_cache_";
5656
private static final String STATE_KEY_INITIAL_PATH = "initial_path";
57+
private static final String EXTRA_REPOSITORY = "repository";
58+
private static final String EXTRA_REF = "ref";
59+
private static final String EXTRA_INITIAL_PATH = "initialpath";
60+
private static final int LOADER_MODULEMAP = 100;
5761

5862
private RxLoader mRxLoader;
5963
private PathBreadcrumbs mBreadcrumbs;
@@ -81,9 +85,9 @@ public static ContentListContainerFragment newInstance(Repository repository,
8185
ContentListContainerFragment f = new ContentListContainerFragment();
8286

8387
Bundle args = new Bundle();
84-
args.putParcelable("repository", repository);
85-
args.putString("ref", ref);
86-
args.putString("initialpath", initialPath);
88+
args.putParcelable(EXTRA_REPOSITORY, repository);
89+
args.putString(EXTRA_REF, ref);
90+
args.putString(EXTRA_INITIAL_PATH, initialPath);
8791
f.setArguments(args);
8892
return f;
8993
}
@@ -93,8 +97,8 @@ public void onCreate(Bundle savedInstanceState) {
9397
super.onCreate(savedInstanceState);
9498

9599
mRxLoader = new RxLoader(getActivity(), getLoaderManager());
96-
mRepository = getArguments().getParcelable("repository");
97-
mSelectedRef = getArguments().getString("ref");
100+
mRepository = getArguments().getParcelable(EXTRA_REPOSITORY);
101+
mSelectedRef = getArguments().getString(EXTRA_REF);
98102
mStateSaved = false;
99103

100104
if (savedInstanceState != null) {
@@ -115,7 +119,7 @@ public void onCreate(Bundle savedInstanceState) {
115119
} else {
116120
mDirStack.push("");
117121

118-
String initialPath = getArguments().getString("initialpath");
122+
String initialPath = getArguments().getString(EXTRA_INITIAL_PATH);
119123
if (initialPath != null) {
120124
mInitialPathToLoad = new ArrayList<>();
121125
int pos = initialPath.indexOf("/");
@@ -152,7 +156,7 @@ public void onRefresh() {
152156
}
153157

154158
public void setRef(String ref) {
155-
getArguments().putString("ref", ref);
159+
getArguments().putString(EXTRA_REF, ref);
156160
mSelectedRef = ref;
157161
mGitModuleMap = null;
158162

‎app/src/main/java/com/gh4a/fragment/ContentListFragment.java

+11-7
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ public class ContentListFragment extends ListDataBaseFragment<Content> implement
5353
RootAdapter.OnItemClickListener<Content> {
5454
private static final int MENU_HISTORY = Menu.FIRST + 1;
5555
private static final int REQUEST_FILE_HISTORY = 1000;
56+
private static final String EXTRA_REPO = "repo";
57+
private static final String EXTRA_PATH = "path";
58+
private static final String EXTRA_REF = "ref";
59+
private static final String EXTRA_CONTENTS = "contents";
5660

5761
private static final Comparator<Content> COMPARATOR = (lhs, rhs) -> {
5862
boolean lhsIsDir = lhs.type() == ContentType.Directory;
@@ -89,10 +93,10 @@ public static ContentListFragment newInstance(Repository repository,
8993
ContentListFragment f = new ContentListFragment();
9094

9195
Bundle args = new Bundle();
92-
args.putString("path", path != null ? path : "");
93-
args.putString("ref", ref);
94-
args.putParcelable("repo", repository);
95-
args.putParcelableArrayList("contents", contents);
96+
args.putString(EXTRA_PATH, path != null ? path : "");
97+
args.putString(EXTRA_REF, ref);
98+
args.putParcelable(EXTRA_REPO, repository);
99+
args.putParcelableArrayList(EXTRA_CONTENTS, contents);
96100
f.setArguments(args);
97101

98102
return f;
@@ -101,9 +105,9 @@ public static ContentListFragment newInstance(Repository repository,
101105
@Override
102106
public void onCreate(Bundle savedInstanceState) {
103107
super.onCreate(savedInstanceState);
104-
mRepository = getArguments().getParcelable("repo");
105-
mPath = getArguments().getString("path");
106-
mRef = getArguments().getString("ref");
108+
mRepository = getArguments().getParcelable(EXTRA_REPO);
109+
mPath = getArguments().getString(EXTRA_PATH);
110+
mRef = getArguments().getString(EXTRA_REF);
107111
if (StringUtils.isBlank(mRef)) {
108112
mRef = mRepository.defaultBranch();
109113
}

0 commit comments

Comments
 (0)