Skip to content

Commit 258b635

Browse files
committed
renaming old activity and updating docs a bit
1 parent 067d83c commit 258b635

File tree

4 files changed

+9
-26
lines changed

4 files changed

+9
-26
lines changed

README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,13 +125,13 @@ code in this project is based on the GitHub Gaug.es and GitHub Android app.
125125
Android Bootstrap is built on the awesome [Parse.com API](http://www.parse.com/)
126126
and uses many great open-source libraries from the Android dev community:
127127

128-
* [ActionBarSherlock](https://github.com/JakeWharton/ActionBarSherlock) for a
128+
* [AppCompat](http://www.youtube.com/watch?v=6TGgYqfJnyc) for a
129129
consistent, great looking header across all Android platforms,
130130
[ViewPagerIndicator](https://github.com/JakeWharton/Android-ViewPagerIndicator)
131131
for swiping between fragments and
132132
[NineOldAndroids](https://github.com/JakeWharton/NineOldAndroids) for
133133
view animations - all from [Jake Wharton](http://jakewharton.com/).
134-
* [MenuDrawer](https://github.com/SimonVT/android-menudrawer) for the menu drawer navigation.
134+
* [NavigationDrawer](http://developer.android.com/design/patterns/navigation-drawer.html) for the menu drawer navigation.
135135
* [Dagger](https://github.com/square/dagger) for dependency-injection.
136136
* [ButterKnife](https://github.com/JakeWharton/butterknife) for view injection
137137
* [Otto](https://github.com/square/otto) as the event bus
@@ -145,6 +145,10 @@ and uses many great open-source libraries from the Android dev community:
145145
POJO's for use in the app.
146146

147147

148+
## Contributors
149+
Thank you to all the [contributors](http://www.github.com/donnfelker/android-bootstrap/contributors) on this project. Your help is much appreciated.
150+
151+
148152
## Contributing
149153

150154
Please fork this repository and contribute back using
Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,5 @@
11
package com.donnfelker.android.bootstrap.authenticator;
22

3-
/*
4-
* Originally from:
5-
* https://github.com/rtyley/roboguice-sherlock/blob/master/src/main/java/com/github/rtyley/android/sherlock/android/accounts/SherlockAccountAuthenticatorActivity.java
6-
*
7-
* Copyright (C) 2009 The Android Open Source Project
8-
*
9-
* Licensed under the Apache License, Version 2.0 (the "License");
10-
* you may not use this file except in compliance with the License.
11-
* You may obtain a copy of the License at
12-
*
13-
* http://www.apache.org/licenses/LICENSE-2.0
14-
*
15-
* Unless required by applicable law or agreed to in writing, software
16-
* distributed under the License is distributed on an "AS IS" BASIS,
17-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18-
* See the License for the specific language governing permissions and
19-
* limitations under the License.
20-
*/
21-
223
import android.accounts.AccountAuthenticatorResponse;
234
import android.accounts.AccountManager;
245
import android.os.Bundle;
@@ -28,7 +9,7 @@
289
/**
2910
* Base class for implementing an Activity that is used to help implement an
3011
* AbstractAccountAuthenticator. If the AbstractAccountAuthenticator needs to use an activity
31-
* to handle the request then it can have the activity extend SherlockAccountAuthenticatorActivity.
12+
* to handle the request then it can have the activity extend ActionBarAccountAuthenticatorActivity.
3213
* The AbstractAccountAuthenticator passes in the response to the intent using the following:
3314
* <pre>
3415
* intent.putExtra({@link android.accounts.AccountManager#KEY_ACCOUNT_AUTHENTICATOR_RESPONSE}, response);
@@ -40,7 +21,7 @@
4021
* {@link android.accounts.AccountManager#ERROR_CODE_CANCELED}
4122
* will be called on the response.
4223
*/
43-
public class SherlockAccountAuthenticatorActivity extends ActionBarActivity {
24+
public class ActionBarAccountAuthenticatorActivity extends ActionBarActivity {
4425
private AccountAuthenticatorResponse accountAuthenticatorResponse = null;
4526
private Bundle resultBundle = null;
4627

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
/**
5959
* Activity to authenticate the user against an API (example API on Parse.com)
6060
*/
61-
public class BootstrapAuthenticatorActivity extends SherlockAccountAuthenticatorActivity {
61+
public class BootstrapAuthenticatorActivity extends ActionBarAccountAuthenticatorActivity {
6262

6363
/**
6464
* PARAM_CONFIRM_CREDENTIALS

proguard.cfg

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@
5555
*** startFinalizer(java.lang.Class,java.lang.Object);
5656
}
5757

58-
-keepclassmembers class * extends com.actionbarsherlock.ActionBarSherlock { public <init>(...); }
59-
6058
-keepnames class * implements java.io.Serializable
6159

6260
-keepclassmembers class * implements java.io.Serializable {

0 commit comments

Comments
 (0)