Skip to content

Commit f6ec122

Browse files
committed
Moved member variables and their annotations into one line
1 parent 5df0d1b commit f6ec122

14 files changed

+33
-65
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,8 @@
1717
*/
1818
public class BootstrapServiceProvider {
1919

20-
@Inject
21-
ApiKeyProvider keyProvider;
22-
@Inject
23-
UserAgentProvider userAgentProvider;
20+
@Inject ApiKeyProvider keyProvider;
21+
@Inject UserAgentProvider userAgentProvider;
2422

2523
/**
2624
* Get service for configured key provider

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
*/
2222
public class ApiKeyProvider {
2323

24-
@Inject
25-
AccountManager accountManager;
24+
@Inject AccountManager accountManager;
2625

2726
/**
2827
* This call blocks, so shouldn't be called on the UI thread

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,9 @@ public class BootstrapAuthenticatorActivity extends SherlockAccountAuthenticator
8484

8585
private AccountManager accountManager;
8686

87-
@InjectView(id.et_email)
88-
AutoCompleteTextView emailText;
89-
@InjectView(id.et_password)
90-
EditText passwordText;
91-
@InjectView(id.b_signin)
92-
Button signinButton;
87+
@InjectView(id.et_email) AutoCompleteTextView emailText;
88+
@InjectView(id.et_password) EditText passwordText;
89+
@InjectView(id.b_signin) Button signinButton;
9390

9491
private TextWatcher watcher = validationTextWatcher();
9592

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,8 @@
2525

2626
public class TimerService extends Service {
2727

28-
@Inject
29-
protected Bus BUS;
30-
@Inject
31-
NotificationManager notificationManager;
28+
@Inject protected Bus BUS;
29+
@Inject NotificationManager notificationManager;
3230

3331
private boolean timerRunning = false;
3432
private boolean timerStarted;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ public long getSeconds() {
2525
@Override
2626
public String toString() {
2727
return new StringBuilder("")
28-
.append("Millis: " + getMillis())
28+
.append("Millis: ").append(getMillis())
2929
.append(", ")
30-
.append("Seconds: " + getSeconds())
30+
.append("Seconds: ").append(getSeconds())
3131
.toString();
3232
}
3333

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,10 @@
1717

1818

1919
public class UserAgentProvider implements Provider<String> {
20-
@Inject
21-
protected ApplicationInfo appInfo;
22-
@Inject
23-
protected PackageInfo info;
24-
@Inject
25-
protected TelephonyManager telephonyManager;
26-
@Inject
27-
protected ClassLoader classLoader;
20+
@Inject protected ApplicationInfo appInfo;
21+
@Inject protected PackageInfo info;
22+
@Inject protected TelephonyManager telephonyManager;
23+
@Inject protected ClassLoader classLoader;
2824

2925
protected String userAgent;
3026

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void setContentView(int layoutResId) {
3636
public boolean onOptionsItemSelected(MenuItem item) {
3737
switch (item.getItemId()) {
3838
case android.R.id.home: // This is the home button in the top left corner of the screen.
39-
// Dont call finish! Because activity could have been started by an outside activity and the home button would not operated as expected!
39+
// Don't call finish! Because activity could have been started by an outside activity and the home button would not operated as expected!
4040
Intent homeIntent = new Intent(this, CarouselActivity.class);
4141
homeIntent.addFlags(FLAG_ACTIVITY_CLEAR_TOP | FLAG_ACTIVITY_SINGLE_TOP);
4242
startActivity(homeIntent);

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

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,13 @@
2424

2525
public class BootstrapTimerActivity extends BootstrapFragmentActivity implements View.OnClickListener {
2626

27-
@Inject
28-
Bus BUS;
29-
30-
@InjectView(R.id.chronometer)
31-
protected TextView chronometer;
32-
@InjectView(R.id.start)
33-
protected Button start;
34-
@InjectView(R.id.stop)
35-
protected Button stop;
36-
@InjectView(R.id.pause)
37-
protected Button pause;
38-
@InjectView(R.id.resume)
39-
protected Button resume;
27+
@Inject Bus BUS;
28+
29+
@InjectView(R.id.chronometer) protected TextView chronometer;
30+
@InjectView(R.id.start) protected Button start;
31+
@InjectView(R.id.stop) protected Button stop;
32+
@InjectView(R.id.pause) protected Button pause;
33+
@InjectView(R.id.resume) protected Button resume;
4034

4135
@Override
4236
protected void onCreate(Bundle savedInstanceState) {

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,10 @@
3030
*/
3131
public class CarouselActivity extends BootstrapFragmentActivity {
3232

33-
@InjectView(R.id.tpi_header)
34-
TitlePageIndicator indicator;
35-
@InjectView(R.id.vp_pages)
36-
ViewPager pager;
33+
@InjectView(R.id.tpi_header) TitlePageIndicator indicator;
34+
@InjectView(R.id.vp_pages) ViewPager pager;
3735

38-
@Inject
39-
BootstrapServiceProvider serviceProvider;
36+
@Inject BootstrapServiceProvider serviceProvider;
4037

4138
private boolean userHasAuthenticated = false;
4239

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,8 @@
2323

2424
public class CheckInsListFragment extends ItemListFragment<CheckIn> {
2525

26-
@Inject
27-
protected BootstrapServiceProvider serviceProvider;
28-
@Inject
29-
protected LogoutService logoutService;
26+
@Inject protected BootstrapServiceProvider serviceProvider;
27+
@Inject protected LogoutService logoutService;
3028

3129
@Override
3230
public void onCreate(Bundle savedInstanceState) {

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,8 @@ public class NewsActivity extends BootstrapActivity {
1414

1515
protected News newsItem;
1616

17-
@InjectView(R.id.tv_title)
18-
protected TextView title;
19-
@InjectView(R.id.tv_content)
20-
protected TextView content;
17+
@InjectView(R.id.tv_title) protected TextView title;
18+
@InjectView(R.id.tv_content) protected TextView content;
2119

2220
@Override
2321
protected void onCreate(Bundle savedInstanceState) {

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,8 @@
1414

1515
public class UserActivity extends BootstrapActivity {
1616

17-
@InjectView(R.id.iv_avatar)
18-
protected ImageView avatar;
19-
@InjectView(R.id.tv_name)
20-
protected TextView name;
17+
@InjectView(R.id.iv_avatar) protected ImageView avatar;
18+
@InjectView(R.id.tv_name) protected TextView name;
2119

2220
protected User user;
2321

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,8 @@
2424

2525
public class UserListFragment extends ItemListFragment<User> {
2626

27-
@Inject
28-
BootstrapServiceProvider serviceProvider;
29-
@Inject
30-
LogoutService logoutService;
27+
@Inject BootstrapServiceProvider serviceProvider;
28+
@Inject LogoutService logoutService;
3129

3230

3331
@Override
@@ -41,8 +39,6 @@ public void onActivityCreated(Bundle savedInstanceState) {
4139
super.onActivityCreated(savedInstanceState);
4240

4341
setEmptyText(R.string.no_users);
44-
45-
4642
}
4743

4844
@Override

app/src/main/java/com/donnfelker/android/bootstrap/ui/view/CapitalizedTextView.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717
public class CapitalizedTextView extends Button {
1818

19-
private static final boolean SANS_ICE_CREAM = Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH;
2019
private static final boolean IS_GINGERBREAD = Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD;
2120

2221
private static final String TAG = "Typefaces";

0 commit comments

Comments
 (0)