Skip to content

Commit ca986ec

Browse files
committed
Auto-format, anotations for member variables on same line.
1 parent 8c2b5cd commit ca986ec

23 files changed

+86
-68
lines changed

app/src/main/java/com/donnfelker/android/bootstrap/BootstrapModule.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,20 @@
2525
* Register all of your entry points below.
2626
*/
2727
@Module(
28-
complete = false,
29-
30-
injects = {
31-
BootstrapApplication.class,
32-
BootstrapAuthenticatorActivity.class,
33-
CarouselActivity.class,
34-
BootstrapTimerActivity.class,
35-
CheckInsListFragment.class,
36-
NewsActivity.class,
37-
NewsListFragment.class,
38-
UserActivity.class,
39-
UserListFragment.class,
40-
TimerService.class
41-
}
28+
complete = false,
29+
30+
injects = {
31+
BootstrapApplication.class,
32+
BootstrapAuthenticatorActivity.class,
33+
CarouselActivity.class,
34+
BootstrapTimerActivity.class,
35+
CheckInsListFragment.class,
36+
NewsActivity.class,
37+
NewsListFragment.class,
38+
UserActivity.class,
39+
UserListFragment.class,
40+
TimerService.class
41+
}
4242
)
4343
public class BootstrapModule {
4444

app/src/main/java/com/donnfelker/android/bootstrap/RootModule.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
* Add all the other modules to this one.
77
*/
88
@Module(
9-
includes = {
10-
AndroidModule.class,
11-
BootstrapModule.class
12-
}
9+
includes = {
10+
AndroidModule.class,
11+
BootstrapModule.class
12+
}
1313
)
1414
public class RootModule {
1515
}

app/src/main/java/com/donnfelker/android/bootstrap/authenticator/LogoutService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public Boolean call() throws Exception {
4747
if (aMngrWithContext != null) {
4848
final Account[] accounts = aMngrWithContext
4949
.getAccountsByType(Constants.Auth.BOOTSTRAP_ACCOUNT_TYPE);
50-
if(accounts.length > 0) {
50+
if (accounts.length > 0) {
5151
final AccountManagerFuture<Boolean> removeAccountFuture
5252
= aMngrWithContext.removeAccount(accounts[0], null, null);
5353

app/src/main/java/com/donnfelker/android/bootstrap/authenticator/SherlockAccountAuthenticatorActivity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
* The activity then sets the result that is to be handed to the response via
3737
* {@link #setAccountAuthenticatorResult(android.os.Bundle)}.
3838
* This result will be sent as the result of the request when the activity finishes. If this
39-
* is never set or if it is set to null then error {@link android.accounts.AccountManager#ERROR_CODE_CANCELED}
39+
* is never set or if it is set to null then error
40+
* {@link android.accounts.AccountManager#ERROR_CODE_CANCELED}
4041
* will be called on the response.
4142
*/
4243
public class SherlockAccountAuthenticatorActivity extends ActionBarActivity {

app/src/main/java/com/donnfelker/android/bootstrap/core/BootstrapService.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,12 @@ public class BootstrapService {
2727

2828
/**
2929
* GSON instance to use for all request with date format set up for proper parsing.
30-
*
30+
* <p/>
3131
* You can also configure GSON with different naming policies for your API.
3232
* Maybe your API is Rails API and all json values are lower case with an underscore,
3333
* like this "first_name" instead of "firstName".
3434
* You can configure GSON as such below.
35+
* <p/>
3536
*
3637
* public static final Gson GSON = new GsonBuilder().setDateFormat("yyyy-MM-dd")
3738
* .setFieldNamingPolicy(LOWER_CASE_WITH_UNDERSCORES).create();
@@ -118,7 +119,7 @@ private HttpRequest configure(final HttpRequest request) {
118119
request.connectTimeout(TIMEOUT).readTimeout(TIMEOUT);
119120
request.userAgent(mUserAgentProvider.get());
120121

121-
if(isPostOrPut(request)) {
122+
if (isPostOrPut(request)) {
122123
// All PUT & POST requests to Parse.com api must be in JSON
123124
// https://www.parse.com/docs/rest#general-requests
124125
request.contentType(Constants.Http.CONTENT_TYPE_JSON);

app/src/main/java/com/donnfelker/android/bootstrap/core/TimerService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void onDestroy() {
6969
@Override
7070
public int onStartCommand(Intent intent, int flags, int startId) {
7171

72-
if(!timerStarted) {
72+
if (!timerStarted) {
7373

7474
timerStarted = true;
7575

app/src/main/java/com/donnfelker/android/bootstrap/core/TimerTickEvent.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ public long getSeconds() {
2121
return (millis / 1000);
2222
}
2323

24-
2524
@Override
2625
public String toString() {
2726
return new StringBuilder("")

app/src/main/java/com/donnfelker/android/bootstrap/core/User.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ public class User implements Serializable {
88

99
private static final long serialVersionUID = -7495897652017488896L;
1010

11+
//TODO rename member variables
1112
protected String firstName;
1213
protected String lastName;
1314
protected String username;

app/src/main/java/com/donnfelker/android/bootstrap/core/UserAgentProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818

1919
public class UserAgentProvider implements Provider<String> {
2020

21+
private static final String APP_NAME = "Android Bootstrap";
22+
2123
@Inject protected ApplicationInfo appInfo;
2224
@Inject protected PackageInfo info;
2325
@Inject protected TelephonyManager telephonyManager;
2426
@Inject protected ClassLoader classLoader;
2527

2628
protected String userAgent;
2729

28-
private static final String APP_NAME = "Android Bootstrap";
29-
3030
@Override
3131
public String get() {
3232
if (userAgent == null) {

app/src/main/java/com/donnfelker/android/bootstrap/ui/AlternatingColorListAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public AlternatingColorListAdapter(final int layoutId, final LayoutInflater infl
4242
* @param selectable
4343
*/
4444
public AlternatingColorListAdapter(final int layoutId,
45-
final LayoutInflater inflater, final List<V> items, final boolean selectable) {
45+
final LayoutInflater inflater, final List<V> items, final boolean selectable) {
4646
super(inflater, layoutId);
4747

4848
if (selectable) {

0 commit comments

Comments
 (0)