Skip to content

Commit ec1f6da

Browse files
JoseAlcerrecaJoseAlcerreca
committed
Formatting nits
1 parent 8e65642 commit ec1f6da

File tree

12 files changed

+44
-36
lines changed

12 files changed

+44
-36
lines changed

‎todo-mvp-loaders/app/src/main/java/com/example/android/architecture/blueprints/todoapp/addedittask/AddEditTaskActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ protected void onCreate(Bundle savedInstanceState) {
4848
actionBar.setDisplayHomeAsUpEnabled(true);
4949
actionBar.setDisplayShowHomeEnabled(true);
5050

51-
AddEditTaskFragment addEditTaskFragment =
52-
(AddEditTaskFragment) getSupportFragmentManager().findFragmentById(R.id.contentFrame);
51+
AddEditTaskFragment addEditTaskFragment = (AddEditTaskFragment) getSupportFragmentManager()
52+
.findFragmentById(R.id.contentFrame);
5353

5454
String taskId = null;
5555
if (addEditTaskFragment == null) {

‎todo-mvp-loaders/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksFragment.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,7 @@ public void onClick(View v) {
142142
swipeRefreshLayout.setColorSchemeColors(
143143
ContextCompat.getColor(getActivity(), R.color.colorPrimary),
144144
ContextCompat.getColor(getActivity(), R.color.colorAccent),
145-
ContextCompat.getColor(getActivity(), R.color.colorPrimaryDark)
146-
);
145+
ContextCompat.getColor(getActivity(), R.color.colorPrimaryDark));
147146
// Set the scrolling view in the custom SwipeRefreshLayout.
148147
swipeRefreshLayout.setScrollUpChild(listView);
149148

‎todo-mvp-loaders/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksPresenter.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,5 +265,4 @@ public void popupItemSelected(int itemId) {
265265
public TasksFilterType getFiltering() {
266266
return mCurrentFiltering;
267267
}
268-
269268
}

‎todo-mvp-loaders/app/src/test/java/com/example/android/architecture/blueprints/todoapp/statistics/StatisticsPresenterTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ public void setupStatisticsPresenter() {
5858
MockitoAnnotations.initMocks(this);
5959

6060
// Get a reference to the class under test
61-
mStatisticsPresenter = new StatisticsPresenter(mStatisticsView, mTasksLoader, mLoaderManager);
61+
mStatisticsPresenter = new StatisticsPresenter(
62+
mStatisticsView, mTasksLoader, mLoaderManager);
6263

6364
// We initialise the tasks to 3, with one active and two completed
6465
TASKS = Lists.newArrayList(new Task("Title1", "Description1"),

‎todo-mvp-loaders/app/src/test/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailPresenterTest.java

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ public void getActiveTaskFromRepositoryAndLoadIntoView() {
7272

7373
// Get a reference to the class under test
7474
mTaskDetailPresenter = new TaskDetailPresenter(
75-
ACTIVE_TASK.getId(), mTasksRepository, mTaskDetailFragment, mTaskLoader, mLoaderManager);
75+
ACTIVE_TASK.getId(), mTasksRepository, mTaskDetailFragment, mTaskLoader,
76+
mLoaderManager);
7677
mTaskDetailPresenter.onLoadFinished(mock(Loader.class), ACTIVE_TASK);
7778

7879
// Then progress indicator is hidden and title, description and completion status are shown
@@ -85,8 +86,8 @@ public void getActiveTaskFromRepositoryAndLoadIntoView() {
8586
@Test
8687
public void getCompletedTaskFromRepositoryAndLoadIntoView() {
8788
// When tasks presenter is asked to open a completed task
88-
mTaskDetailPresenter = new TaskDetailPresenter(
89-
COMPLETED_TASK.getId(), mTasksRepository, mTaskDetailFragment, mTaskLoader, mLoaderManager);
89+
mTaskDetailPresenter = new TaskDetailPresenter(COMPLETED_TASK.getId(), mTasksRepository,
90+
mTaskDetailFragment, mTaskLoader, mLoaderManager);
9091
mTaskDetailPresenter.onLoadFinished(mock(Loader.class), COMPLETED_TASK);
9192

9293
// Then progress indicator is hidden and title, description and completion status are shown
@@ -100,8 +101,8 @@ public void getCompletedTaskFromRepositoryAndLoadIntoView() {
100101
@Test
101102
public void getUnknownTaskFromRepositoryAndLoadIntoView() {
102103
// When loading of an ACTIVE_TASK is requested with an invalid task
103-
mTaskDetailPresenter = new TaskDetailPresenter(
104-
INVALID_TASK_ID, mTasksRepository, mTaskDetailFragment, mTaskLoader, mLoaderManager);
104+
mTaskDetailPresenter = new TaskDetailPresenter(INVALID_TASK_ID, mTasksRepository,
105+
mTaskDetailFragment, mTaskLoader, mLoaderManager);
105106
mTaskDetailPresenter.onLoadFinished(mock(Loader.class), null);
106107

107108
// Then progress indicator is hidden and missing ACTIVE_TASK UI is shown
@@ -111,8 +112,8 @@ public void getUnknownTaskFromRepositoryAndLoadIntoView() {
111112
@Test
112113
public void deleteTask() {
113114
// When the deletion of an ACTIVE_TASK is requested
114-
mTaskDetailPresenter = new TaskDetailPresenter(
115-
ACTIVE_TASK.getId(), mTasksRepository, mTaskDetailFragment, mTaskLoader, mLoaderManager);
115+
mTaskDetailPresenter = new TaskDetailPresenter(ACTIVE_TASK.getId(), mTasksRepository,
116+
mTaskDetailFragment, mTaskLoader, mLoaderManager);
116117
mTaskDetailPresenter.deleteTask();
117118

118119
// Then the repository and the view are notified
@@ -123,8 +124,8 @@ public void deleteTask() {
123124
@Test
124125
public void completeTask() {
125126
// When the presenter is asked to complete the ACTIVE_TASK
126-
mTaskDetailPresenter = new TaskDetailPresenter(
127-
ACTIVE_TASK.getId(), mTasksRepository, mTaskDetailFragment, mTaskLoader, mLoaderManager);
127+
mTaskDetailPresenter = new TaskDetailPresenter(ACTIVE_TASK.getId(), mTasksRepository,
128+
mTaskDetailFragment, mTaskLoader, mLoaderManager);
128129
mTaskDetailPresenter.completeTask();
129130

130131
// Then a request is sent to the repository and the UI is updated
@@ -135,8 +136,8 @@ public void completeTask() {
135136
@Test
136137
public void activateTask() {
137138
// When the presenter is asked to activate the ACTIVE_TASK
138-
mTaskDetailPresenter = new TaskDetailPresenter(
139-
ACTIVE_TASK.getId(), mTasksRepository, mTaskDetailFragment, mTaskLoader, mLoaderManager);
139+
mTaskDetailPresenter = new TaskDetailPresenter(ACTIVE_TASK.getId(), mTasksRepository,
140+
mTaskDetailFragment, mTaskLoader, mLoaderManager);
140141
mTaskDetailPresenter.activateTask();
141142

142143
// Then a request is sent to the repository and the UI is updated
@@ -147,8 +148,8 @@ public void activateTask() {
147148
@Test
148149
public void activeTaskIsShownWhenEditing() {
149150
// When the edit of an ACTIVE_TASK is requested
150-
mTaskDetailPresenter = new TaskDetailPresenter(
151-
ACTIVE_TASK.getId(), mTasksRepository, mTaskDetailFragment, mTaskLoader, mLoaderManager);
151+
mTaskDetailPresenter = new TaskDetailPresenter(ACTIVE_TASK.getId(), mTasksRepository,
152+
mTaskDetailFragment, mTaskLoader, mLoaderManager);
152153
mTaskDetailPresenter.editTask();
153154

154155
// Then the view is notified
@@ -158,8 +159,8 @@ public void activeTaskIsShownWhenEditing() {
158159
@Test
159160
public void invalidTaskIsNotShownWhenEditing() {
160161
// When the edit of an invalid task id is requested
161-
mTaskDetailPresenter = new TaskDetailPresenter(
162-
INVALID_TASK_ID, mTasksRepository, mTaskDetailFragment, mTaskLoader, mLoaderManager);
162+
mTaskDetailPresenter = new TaskDetailPresenter(INVALID_TASK_ID, mTasksRepository,
163+
mTaskDetailFragment, mTaskLoader, mLoaderManager);
163164
mTaskDetailPresenter.editTask();
164165

165166
// Then the edit mode is never started

‎todo-mvp-loaders/app/src/test/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksPresenterTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,13 @@ public void setupTasksPresenter() {
7474
MockitoAnnotations.initMocks(this);
7575

7676
// Get a reference to the class under test
77-
mTasksPresenter = new TasksPresenter(mTasksLoader, mLoaderManager, mTasksRepository, mTasksView);
77+
mTasksPresenter = new TasksPresenter(
78+
mTasksLoader, mLoaderManager, mTasksRepository, mTasksView);
7879

7980
// We initialise the tasks to 3, with one active and two completed
8081
TASKS = Lists.newArrayList(new Task("Title1", "Description1"),
81-
new Task("Title2", "Description2", true), new Task("Title3", "Description3", true)
82+
new Task("Title2", "Description2", true),
83+
new Task("Title3", "Description3", true)
8284
);
8385
}
8486

‎todo-mvp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/statistics/StatisticsActivity.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@ protected void onCreate(Bundle savedInstanceState) {
6565
if (statisticsFragment == null) {
6666
statisticsFragment = StatisticsFragment.newInstance();
6767
ActivityUtils.addFragmentToActivity(getSupportFragmentManager(),
68-
statisticsFragment, R.id.contentFrame
69-
);
68+
statisticsFragment, R.id.contentFrame);
7069
}
7170

7271
new StatisticsPresenter(

‎todo-mvp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/statistics/StatisticsFragment.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,5 +92,4 @@ public void showLoadingStatisticsError() {
9292
public boolean isActive() {
9393
return isAdded();
9494
}
95-
9695
}

‎todo-mvp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/statistics/StatisticsPresenter.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,5 +97,4 @@ public void onDataNotAvailable() {
9797
}
9898
});
9999
}
100-
101100
}

‎todo-mvp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailActivity.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,10 @@ protected void onCreate(Bundle savedInstanceState) {
6262
}
6363

6464
// Create the presenter
65-
new TaskDetailPresenter(taskId, Injection.provideTasksRepository(getApplicationContext()), taskDetailFragment);
65+
new TaskDetailPresenter(
66+
taskId,
67+
Injection.provideTasksRepository(getApplicationContext()),
68+
taskDetailFragment);
6669
}
6770

6871
@Override

‎todo-mvp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailPresenter.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,5 +138,4 @@ private void showTask(Task task) {
138138
}
139139
mTaskDetailView.showCompletionStatus(task.isCompleted());
140140
}
141-
142141
}

‎todo-mvp/app/src/test/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailPresenterTest.java

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ public void setup() {
7575
@Test
7676
public void getActiveTaskFromRepositoryAndLoadIntoView() {
7777
// When tasks presenter is asked to open a task
78-
mTaskDetailPresenter = new TaskDetailPresenter(ACTIVE_TASK.getId(), mTasksRepository, mTaskDetailView);
78+
mTaskDetailPresenter = new TaskDetailPresenter(
79+
ACTIVE_TASK.getId(), mTasksRepository, mTaskDetailView);
7980
mTaskDetailPresenter.start();
8081

8182
// Then task is loaded from model, callback is captured and progress indicator is shown
@@ -95,11 +96,13 @@ public void getActiveTaskFromRepositoryAndLoadIntoView() {
9596

9697
@Test
9798
public void getCompletedTaskFromRepositoryAndLoadIntoView() {
98-
mTaskDetailPresenter = new TaskDetailPresenter(COMPLETED_TASK.getId(), mTasksRepository, mTaskDetailView);
99+
mTaskDetailPresenter = new TaskDetailPresenter(
100+
COMPLETED_TASK.getId(), mTasksRepository, mTaskDetailView);
99101
mTaskDetailPresenter.start();
100102

101103
// Then task is loaded from model, callback is captured and progress indicator is shown
102-
verify(mTasksRepository).getTask(eq(COMPLETED_TASK.getId()), mGetTaskCallbackCaptor.capture());
104+
verify(mTasksRepository).getTask(
105+
eq(COMPLETED_TASK.getId()), mGetTaskCallbackCaptor.capture());
103106
verify(mTaskDetailView).setLoadingIndicator(true);
104107

105108
// When task is finally loaded
@@ -116,7 +119,8 @@ public void getCompletedTaskFromRepositoryAndLoadIntoView() {
116119
@Test
117120
public void getUnknownTaskFromRepositoryAndLoadIntoView() {
118121
// When loading of a task is requested with an invalid task ID.
119-
mTaskDetailPresenter = new TaskDetailPresenter(INVALID_TASK_ID, mTasksRepository, mTaskDetailView);
122+
mTaskDetailPresenter = new TaskDetailPresenter(
123+
INVALID_TASK_ID, mTasksRepository, mTaskDetailView);
120124
mTaskDetailPresenter.start();
121125
verify(mTaskDetailView).showMissingTask();
122126
}
@@ -127,7 +131,8 @@ public void deleteTask() {
127131
Task task = new Task(TITLE_TEST, DESCRIPTION_TEST);
128132

129133
// When the deletion of a task is requested
130-
mTaskDetailPresenter = new TaskDetailPresenter(task.getId(), mTasksRepository, mTaskDetailView);
134+
mTaskDetailPresenter = new TaskDetailPresenter(
135+
task.getId(), mTasksRepository, mTaskDetailView);
131136
mTaskDetailPresenter.deleteTask();
132137

133138
// Then the repository and the view are notified
@@ -139,7 +144,8 @@ public void deleteTask() {
139144
public void completeTask() {
140145
// Given an initialized presenter with an active task
141146
Task task = new Task(TITLE_TEST, DESCRIPTION_TEST);
142-
mTaskDetailPresenter = new TaskDetailPresenter(task.getId(), mTasksRepository, mTaskDetailView);
147+
mTaskDetailPresenter = new TaskDetailPresenter(
148+
task.getId(), mTasksRepository, mTaskDetailView);
143149
mTaskDetailPresenter.start();
144150

145151
// When the presenter is asked to complete the task
@@ -154,7 +160,8 @@ public void completeTask() {
154160
public void activateTask() {
155161
// Given an initialized presenter with a completed task
156162
Task task = new Task(TITLE_TEST, DESCRIPTION_TEST, true);
157-
mTaskDetailPresenter = new TaskDetailPresenter(task.getId(), mTasksRepository, mTaskDetailView);
163+
mTaskDetailPresenter = new TaskDetailPresenter(
164+
task.getId(), mTasksRepository, mTaskDetailView);
158165
mTaskDetailPresenter.start();
159166

160167
// When the presenter is asked to activate the task

0 commit comments

Comments
 (0)