Skip to content

Commit 293e881

Browse files
committed
Adding injection at the correct locations
1 parent b37181c commit 293e881

File tree

8 files changed

+40
-12
lines changed

8 files changed

+40
-12
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.donnfelker.android.bootstrap;
22

33
import android.accounts.AccountManager;
4+
import android.app.NotificationManager;
45
import android.content.Context;
56
import android.content.SharedPreferences;
67
import android.content.pm.ApplicationInfo;
@@ -83,4 +84,9 @@ ClassLoader provideClassLoader(final Context context) {
8384
return context.getClassLoader();
8485
}
8586

87+
@Provides
88+
NotificationManager provideNotificationManager(final Context context) {
89+
return (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
90+
}
91+
8692
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.donnfelker.android.bootstrap.authenticator.BootstrapAuthenticatorActivity;
77
import com.donnfelker.android.bootstrap.authenticator.LogoutService;
88
import com.donnfelker.android.bootstrap.core.CheckIn;
9+
import com.donnfelker.android.bootstrap.core.TimerService;
910
import com.donnfelker.android.bootstrap.ui.BootstrapTimerActivity;
1011
import com.donnfelker.android.bootstrap.ui.CarouselActivity;
1112
import com.donnfelker.android.bootstrap.ui.CheckInsListFragment;
@@ -38,7 +39,8 @@
3839
NewsActivity.class,
3940
NewsListFragment.class,
4041
UserActivity.class,
41-
UserListFragment.class
42+
UserListFragment.class,
43+
TimerService.class
4244
}
4345

4446
)

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,6 @@
1010
*/
1111
public class BootstrapFragmentActivity extends SherlockFragmentActivity {
1212

13-
@Override
14-
public void setContentView(int layoutResId) {
15-
super.setContentView(layoutResId);
13+
// Handle any super class related items here.
1614

17-
// Perform view injection via butter knife
18-
// Doesnt seem like you can inject via a super class. Throws method not found.
19-
//Views.inject(this);
20-
BootstrapApplication.getInstance().inject(this);
21-
}
2215
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import android.widget.Button;
99
import android.widget.TextView;
1010

11+
import com.donnfelker.android.bootstrap.BootstrapApplication;
1112
import com.donnfelker.android.bootstrap.R;
1213
import com.donnfelker.android.bootstrap.core.PauseTimerEvent;
1314
import com.donnfelker.android.bootstrap.core.ResumeTimerEvent;
@@ -38,6 +39,8 @@ protected void onCreate(Bundle savedInstanceState) {
3839

3940
setContentView(R.layout.bootstrap_timer);
4041

42+
BootstrapApplication.getInstance().inject(this);
43+
4144
Views.inject(this);
4245

4346
setTitle(R.string.timer);

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,17 @@ public class CheckInsListFragment extends ItemListFragment<CheckIn> {
2626
@Inject protected BootstrapServiceProvider serviceProvider;
2727
@Inject protected LogoutService logoutService;
2828

29+
@Override
30+
public void onCreate(Bundle savedInstanceState) {
31+
super.onCreate(savedInstanceState);
32+
BootstrapApplication.getInstance().inject(this);
33+
}
34+
2935
@Override
3036
public void onActivityCreated(Bundle savedInstanceState) {
3137
super.onActivityCreated(savedInstanceState);
3238

33-
BootstrapApplication.getInstance().inject(this);
39+
3440
}
3541

3642
@Override

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,20 @@ public class NewsListFragment extends ItemListFragment<News> {
2525
@Inject protected BootstrapServiceProvider serviceProvider;
2626
@Inject protected LogoutService logoutService;
2727

28+
29+
@Override
30+
public void onCreate(Bundle savedInstanceState) {
31+
super.onCreate(savedInstanceState);
32+
BootstrapApplication.getInstance().inject(this);
33+
}
34+
2835
@Override
2936
public void onActivityCreated(Bundle savedInstanceState) {
3037
super.onActivityCreated(savedInstanceState);
3138

3239
setEmptyText(R.string.no_news);
3340

34-
BootstrapApplication.getInstance().inject(this);
41+
3542
}
3643

3744
@Override

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
import android.widget.ImageView;
66
import android.widget.TextView;
77

8+
import com.donnfelker.android.bootstrap.BootstrapApplication;
89
import com.donnfelker.android.bootstrap.R;
910
import com.donnfelker.android.bootstrap.core.AvatarLoader;
1011
import com.donnfelker.android.bootstrap.core.User;
1112
import javax.inject.Inject;
1213

1314
import butterknife.InjectView;
15+
import butterknife.Views;
1416

1517
public class UserActivity extends BootstrapActivity {
1618

@@ -27,6 +29,8 @@ protected void onCreate(Bundle savedInstanceState) {
2729

2830
setContentView(R.layout.user_view);
2931

32+
BootstrapApplication.getInstance().inject(this);
33+
3034
if(getIntent() != null && getIntent().getExtras() != null) {
3135
user = (User) getIntent().getExtras().getSerializable(USER);
3236
}

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,20 @@ public class UserListFragment extends ItemListFragment<User> {
2929
@Inject AvatarLoader avatars;
3030
@Inject LogoutService logoutService;
3131

32+
33+
@Override
34+
public void onCreate(Bundle savedInstanceState) {
35+
super.onCreate(savedInstanceState);
36+
BootstrapApplication.getInstance().inject(this);
37+
}
38+
3239
@Override
3340
public void onActivityCreated(Bundle savedInstanceState) {
3441
super.onActivityCreated(savedInstanceState);
3542

3643
setEmptyText(R.string.no_users);
3744

38-
BootstrapApplication.getInstance().inject(this);
45+
3946
}
4047

4148
@Override

0 commit comments

Comments
 (0)