Skip to content

Commit

Permalink
Use common lib for RoboGuice-ActionBarSherlock types
Browse files Browse the repository at this point in the history
Both RoboGuice and ActionBarSherlock require the use of base activities,
so we're using copies of the RoboGuice classes that extend the *ABS*
base classes, rather than the normal Android classes.

https://github.com/rtyley/roboguice-sherlock
  • Loading branch information
rtyley committed Mar 13, 2012
1 parent 169bf9b commit 04b3c00
Show file tree
Hide file tree
Showing 8 changed files with 7 additions and 283 deletions.
18 changes: 3 additions & 15 deletions app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,21 +51,9 @@
<version>2.1</version>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>3.0</version>
<classifier>no_aop</classifier>
</dependency>
<dependency>
<groupId>org.roboguice</groupId>
<artifactId>roboguice</artifactId>
<version>2.0b4</version>
<exclusions>
<exclusion>
<groupId>android.support</groupId>
<artifactId>compatibility-v4</artifactId>
</exclusion>
</exclusions>
<groupId>com.github.rtyley</groupId>
<artifactId>roboguice-sherlock</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>com.actionbarsherlock</groupId>
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import android.os.Bundle;

import com.github.mobile.gauges.R.layout;
import com.github.mobile.gauges.roboguice.RoboSherlockFragmentActivity;
import com.github.rtyley.android.sherlock.roboguice.activity.RoboSherlockFragmentActivity;

/**
* Activity to display list of gauge summaries
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import com.github.mobile.gauges.R.id;
import com.github.mobile.gauges.R.layout;
import com.github.mobile.gauges.core.Gauge;
import com.github.mobile.gauges.roboguice.RoboSherlockFragmentActivity;
import com.github.rtyley.android.sherlock.roboguice.activity.RoboSherlockFragmentActivity;
import com.viewpagerindicator.TitlePageIndicator;

import roboguice.inject.InjectExtra;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
import com.actionbarsherlock.view.MenuItem;
import com.github.mobile.gauges.R.id;
import com.github.mobile.gauges.R.menu;
import com.github.rtyley.android.sherlock.roboguice.fragment.RoboSherlockListFragment;
import com.madgag.android.listviews.ViewHoldingListAdapter;
import com.github.mobile.gauges.roboguice.RoboSherlockListFragment;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
import com.github.mobile.gauges.R.id;
import com.github.mobile.gauges.R.layout;
import com.github.mobile.gauges.core.Gauge;
import com.github.mobile.gauges.roboguice.RoboSherlockFragmentActivity;
import com.github.mobile.gauges.ui.GaugeListLoader;
import com.github.rtyley.android.sherlock.roboguice.activity.RoboSherlockFragmentActivity;
import com.google.inject.Inject;

import java.util.Collection;
Expand Down

0 comments on commit 04b3c00

Please sign in to comment.