Skip to content

Commit 8ab6d82

Browse files
committed
Added support for all ABS Activity classes
#23
1 parent babcde5 commit 8ab6d82

File tree

1 file changed

+22
-5
lines changed

1 file changed

+22
-5
lines changed

extras-abs/src/main/java/com/balysv/materialmenu/extras/abs/MaterialMenuIconSherlock.java

+22-5
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424

2525
import com.actionbarsherlock.app.ActionBar;
2626
import com.actionbarsherlock.app.SherlockActivity;
27+
import com.actionbarsherlock.app.SherlockFragmentActivity;
28+
import com.actionbarsherlock.app.SherlockListActivity;
29+
import com.actionbarsherlock.app.SherlockPreferenceActivity;
2730
import com.balysv.materialmenu.MaterialMenuBase;
2831

2932
import static com.balysv.materialmenu.MaterialMenuDrawable.Stroke;
@@ -41,15 +44,15 @@
4144
*/
4245
public class MaterialMenuIconSherlock extends MaterialMenuBase {
4346

44-
public MaterialMenuIconSherlock(SherlockActivity activity, int color, Stroke stroke) {
47+
public MaterialMenuIconSherlock(Activity activity, int color, Stroke stroke) {
4548
super(activity, color, stroke);
4649
}
4750

48-
public MaterialMenuIconSherlock(SherlockActivity activity, int color, Stroke stroke, int transformDuration) {
51+
public MaterialMenuIconSherlock(Activity activity, int color, Stroke stroke, int transformDuration) {
4952
super(activity, color, stroke, transformDuration);
5053
}
5154

52-
public MaterialMenuIconSherlock(SherlockActivity activity, int color, Stroke stroke, int transformDuration, int pressedDuration) {
55+
public MaterialMenuIconSherlock(Activity activity, int color, Stroke stroke, int transformDuration, int pressedDuration) {
5356
super(activity, color, stroke, transformDuration, pressedDuration);
5457
}
5558

@@ -87,12 +90,26 @@ protected View getActionBarUpView(Activity activity) {
8790

8891
@Override
8992
protected boolean providesActionBar() {
90-
return false;
93+
return true;
9194
}
9295

9396
@Override
9497
protected void setActionBarSettings(Activity activity) {
95-
ActionBar actionBar = ((SherlockActivity) activity).getSupportActionBar();
98+
ActionBar actionBar;
99+
if (activity instanceof SherlockActivity) {
100+
actionBar = ((SherlockActivity) activity).getSupportActionBar();
101+
} else if (activity instanceof SherlockListActivity) {
102+
actionBar = ((SherlockListActivity) activity).getSupportActionBar();
103+
} else if (activity instanceof SherlockFragmentActivity) {
104+
actionBar = ((SherlockFragmentActivity) activity).getSupportActionBar();
105+
} else if (activity instanceof SherlockPreferenceActivity) {
106+
actionBar = ((SherlockPreferenceActivity) activity).getSupportActionBar();
107+
} else {
108+
throw new IllegalArgumentException(
109+
"Activity must extend SherlockActivity, SherlockListActivity," +
110+
"SherlockFragmentActivity or SherlockPreferenceActivity"
111+
);
112+
}
96113
actionBar.setDisplayShowHomeEnabled(true);
97114
actionBar.setHomeButtonEnabled(true);
98115
actionBar.setDisplayHomeAsUpEnabled(false);

0 commit comments

Comments
 (0)