Use helpers from parent class for setting view fields

Author: kevinsawicki

app/src/main/java/com/github/mobile/ui/commit/CommitCompareListFragment.java

@@ -34,6 +34,7 @@
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
+import com.github.kevinsawicki.wishlist.ViewFinder;
 import com.github.kevinsawicki.wishlist.ViewUtils;
 import com.github.mobile.R.id;
 import com.github.mobile.R.layout;
@@ -57,8 +58,6 @@
 import org.eclipse.egit.github.core.RepositoryCommit;
 import org.eclipse.egit.github.core.RepositoryCommitCompare;
 
-import roboguice.inject.InjectView;
-
 /**
  * Fragment to display a list of commits being compared
  */
@@ -67,10 +66,8 @@ public class CommitCompareListFragment extends DialogFragment implements
 
     private DiffStyler diffStyler;
 
-    @InjectView(android.R.id.list)
     private ListView list;
 
-    @InjectView(id.pb_loading)
     private ProgressBar progress;
 
     private Repository repository;
@@ -211,6 +208,10 @@ private void addFileStatHeader(List<CommitFile> files,
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
+        ViewFinder finder = new ViewFinder(view);
+        list = finder.find(android.R.id.list);
+        progress = finder.find(id.pb_loading);
+
         LayoutInflater inflater = getActivity().getLayoutInflater();
 
         list.setOnItemClickListener(this);

app/src/main/java/com/github/mobile/ui/commit/CommitDiffListFragment.java

@@ -42,6 +42,7 @@
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
+import com.github.kevinsawicki.wishlist.ViewFinder;
 import com.github.kevinsawicki.wishlist.ViewUtils;
 import com.github.mobile.R.id;
 import com.github.mobile.R.layout;
@@ -72,8 +73,6 @@
 import org.eclipse.egit.github.core.Repository;
 import org.eclipse.egit.github.core.RepositoryCommit;
 
-import roboguice.inject.InjectView;
-
 /**
  * Fragment to display commit details with diff output
  */
@@ -82,10 +81,8 @@ public class CommitDiffListFragment extends DialogFragment implements
 
     private DiffStyler diffStyler;
 
-    @InjectView(android.R.id.list)
     private ListView list;
 
-    @InjectView(id.pb_loading)
     private ProgressBar progress;
 
     private Repository repository;
@@ -364,6 +361,10 @@ private void updateItems(List<CommitComment> comments,
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
+        ViewFinder finder = new ViewFinder(view);
+        list = finder.find(android.R.id.list);
+        progress = finder.find(id.pb_loading);
+
         diffStyler = new DiffStyler(getResources());
 
         list.setOnItemClickListener(this);

app/src/main/java/com/github/mobile/ui/gist/GistFileFragment.java

@@ -31,6 +31,7 @@
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
+import com.github.kevinsawicki.wishlist.ViewFinder;
 import com.github.mobile.R.id;
 import com.github.mobile.R.layout;
 import com.github.mobile.R.menu;
@@ -49,15 +50,12 @@
 import org.eclipse.egit.github.core.Gist;
 import org.eclipse.egit.github.core.GistFile;
 
-import roboguice.inject.InjectView;
-
 /**
  * Fragment to display the content of a file in a Gist
  */
 public class GistFileFragment extends DialogFragment implements
         OnSharedPreferenceChangeListener {
 
-    @InjectView(id.wv_code)
     private WebView webView;
 
     private String gistId;
@@ -193,6 +191,9 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
+        ViewFinder finder = new ViewFinder(view);
+        webView = finder.find(id.wv_code);
+
         editor = new SourceEditor(webView);
         editor.setWrap(PreferenceUtils.getCodePreferences(getActivity())
                 .getBoolean(WRAP, false));

app/src/main/java/com/github/mobile/ui/gist/GistFilesViewActivity.java

@@ -44,8 +44,6 @@
 import org.eclipse.egit.github.core.Gist;
 import org.eclipse.egit.github.core.User;
 
-import roboguice.inject.InjectView;
-
 /**
  * Activity to page through the content of all the files in a Gist
  */
@@ -67,13 +65,10 @@ public static Intent createIntent(Gist gist, int position) {
 
     private int initialPosition;
 
-    @InjectView(id.vp_pages)
     private ViewPager pager;
 
-    @InjectView(id.pb_loading)
     private ProgressBar loadingBar;
 
-    @InjectView(id.tpi_header)
     private TitlePageIndicator indicator;
 
     private Gist gist;
@@ -98,6 +93,10 @@ protected void onCreate(Bundle savedInstanceState) {
 
         setContentView(layout.pager_with_title);
 
+        pager = finder.find(id.vp_pages);
+        loadingBar = finder.find(id.pb_loading);
+        indicator = finder.find(id.tpi_header);
+
         if (initialPosition < 0)
             initialPosition = 0;
 

app/src/main/java/com/github/mobile/ui/gist/GistFragment.java

@@ -38,6 +38,7 @@
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
+import com.github.kevinsawicki.wishlist.ViewFinder;
 import com.github.kevinsawicki.wishlist.ViewUtils;
 import com.github.mobile.R.id;
 import com.github.mobile.R.layout;
@@ -70,8 +71,6 @@
 import org.eclipse.egit.github.core.GistFile;
 import org.eclipse.egit.github.core.User;
 
-import roboguice.inject.InjectView;
-
 /**
  * Activity to display an existing Gist
  */
@@ -83,10 +82,8 @@ public class GistFragment extends DialogFragment implements OnItemClickListener
 
     private Gist gist;
 
-    @InjectView(android.R.id.list)
     private ListView list;
 
-    @InjectView(id.pb_loading)
     private ProgressBar progress;
 
     @Inject
@@ -148,6 +145,10 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
+        ViewFinder finder = new ViewFinder(view);
+        list = finder.find(android.R.id.list);
+        progress = finder.find(id.pb_loading);
+
         Activity activity = getActivity();
         adapter = new HeaderFooterListAdapter<CommentListAdapter>(list,
                 new CommentListAdapter(activity.getLayoutInflater(), avatars,

app/src/main/java/com/github/mobile/ui/issue/EditIssueActivity.java

@@ -62,8 +62,6 @@
 import org.eclipse.egit.github.core.service.LabelService;
 import org.eclipse.egit.github.core.service.MilestoneService;
 
-import roboguice.inject.InjectView;
-
 /**
  * Activity to edit or create an issue
  */
@@ -102,28 +100,20 @@ public static Intent createIntent(final Issue issue,
         return builder.toIntent();
     }
 
-    @InjectView(id.et_issue_title)
     private EditText titleText;
 
-    @InjectView(id.et_issue_body)
     private EditText bodyText;
 
-    @InjectView(id.ll_milestone_graph)
     private View milestoneGraph;
 
-    @InjectView(id.tv_milestone)
     private TextView milestoneText;
 
-    @InjectView(id.v_closed)
     private View milestoneClosed;
 
-    @InjectView(id.iv_assignee_avatar)
     private ImageView assigneeAvatar;
 
-    @InjectView(id.tv_assignee_name)
     private TextView assigneeText;
 
-    @InjectView(id.tv_labels)
     private TextView labelsText;
 
     @Inject
@@ -156,6 +146,15 @@ protected void onCreate(Bundle savedInstanceState) {
 
         setContentView(layout.issue_edit);
 
+        titleText = finder.find(id.et_issue_title);
+        bodyText = finder.find(id.et_issue_body);
+        milestoneGraph = finder.find(id.ll_milestone_graph);
+        milestoneText = finder.find(id.tv_milestone);
+        milestoneClosed = finder.find(id.v_closed);
+        assigneeAvatar = finder.find(id.iv_assignee_avatar);
+        assigneeText = finder.find(id.tv_assignee_name);
+        labelsText = finder.find(id.tv_labels);
+
         Intent intent = getIntent();
 
         if (savedInstanceState != null)

app/src/main/java/com/github/mobile/ui/issue/EditIssuesFilterActivity.java

@@ -50,8 +50,6 @@
 import org.eclipse.egit.github.core.service.LabelService;
 import org.eclipse.egit.github.core.service.MilestoneService;
 
-import roboguice.inject.InjectView;
-
 /**
  * Activity to create or edit an issues filter for a repository
  */
@@ -94,16 +92,12 @@ public static Intent createIntent(IssueFilter filter) {
 
     private IssueFilter filter;
 
-    @InjectView(id.tv_labels)
     private TextView labelsText;
 
-    @InjectView(id.tv_milestone)
     private TextView milestoneText;
 
-    @InjectView(id.tv_assignee)
     private TextView assigneeText;
 
-    @InjectView(id.iv_avatar)
     private ImageView avatarView;
 
     @Override
@@ -112,6 +106,11 @@ protected void onCreate(Bundle savedInstanceState) {
 
         setContentView(layout.issues_filter_edit);
 
+        labelsText = finder.find(id.tv_labels);
+        milestoneText = finder.find(id.tv_milestone);
+        assigneeText = finder.find(id.tv_assignee);
+        avatarView = finder.find(id.iv_avatar);
+
         if (savedInstanceState != null)
             filter = (IssueFilter) savedInstanceState
                     .getSerializable(EXTRA_ISSUE_FILTER);

app/src/main/java/com/github/mobile/ui/issue/IssueFragment.java

@@ -50,6 +50,7 @@
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
+import com.github.kevinsawicki.wishlist.ViewFinder;
 import com.github.kevinsawicki.wishlist.ViewUtils;
 import com.github.mobile.R.drawable;
 import com.github.mobile.R.id;
@@ -83,8 +84,6 @@
 import org.eclipse.egit.github.core.RepositoryId;
 import org.eclipse.egit.github.core.User;
 
-import roboguice.inject.InjectView;
-
 /**
  * Fragment to display an issue
  */
@@ -106,10 +105,8 @@ public class IssueFragment extends DialogFragment {
     @Inject
     private IssueStore store;
 
-    @InjectView(android.R.id.list)
     private ListView list;
 
-    @InjectView(id.pb_loading)
     private ProgressBar progress;
 
     private View headerView;
@@ -255,6 +252,10 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
+        ViewFinder finder = new ViewFinder(view);
+        list = finder.find(android.R.id.list);
+        progress = finder.find(id.pb_loading);
+
         LayoutInflater inflater = getLayoutInflater(savedInstanceState);
 
         headerView = inflater.inflate(layout.issue_header, null);

app/src/main/java/com/github/mobile/ui/issue/IssuesViewActivity.java

@@ -48,8 +48,6 @@
 import org.eclipse.egit.github.core.RepositoryIssue;
 import org.eclipse.egit.github.core.User;
 
-import roboguice.inject.InjectView;
-
 /**
  * Activity to display a collection of issues or pull requests in a pager
  */
@@ -146,7 +144,6 @@ public static Intent createIntent(Collection<? extends Issue> issues,
         return builder.toIntent();
     }
 
-    @InjectView(id.vp_pages)
     private ViewPager pager;
 
     private int[] issueNumbers;
@@ -183,6 +180,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
         setContentView(layout.pager);
 
+        pager = finder.find(id.vp_pages);
+
         if (repo != null)
             adapter = new IssuesPagerAdapter(this, repo, issueNumbers);
         else