Skip to content

Commit 702d7a0

Browse files
JawnnypooJawnnypoo
committed
Repackaging part 2
1 parent d36d4a1 commit 702d7a0

10 files changed

+34
-29
lines changed

‎login/src/main/java/com/parse/ui/login/ParseLoginActivity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*
2020
*/
2121

22-
package com.parse.ui;
22+
package com.parse.ui.login;
2323

2424
import android.annotation.TargetApi;
2525
import android.app.ProgressDialog;
@@ -36,6 +36,7 @@
3636

3737
import com.parse.Parse;
3838
import com.parse.facebook.ParseFacebookUtils;
39+
import com.parse.ui.R;
3940

4041
/**
4142
* Encapsulates the Parse login flow. The user can log in by username/password,

‎login/src/main/java/com/parse/ui/login/ParseLoginBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*
2020
*/
2121

22-
package com.parse.ui;
22+
package com.parse.ui.login;
2323

2424
import android.content.Context;
2525
import android.content.Intent;

‎login/src/main/java/com/parse/ui/login/ParseLoginConfig.java

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*
2020
*/
2121

22-
package com.parse.ui;
22+
package com.parse.ui.login;
2323

2424
import android.content.Context;
2525
import android.content.res.Resources.NotFoundException;
@@ -38,26 +38,26 @@
3838
* Configurations for the ParseLoginActivity.
3939
*/
4040
public class ParseLoginConfig {
41-
public static final String APP_LOGO = "com.parse.ui.ParseLoginActivity.APP_LOGO";
42-
public static final String PARSE_LOGIN_ENABLED = "com.parse.ui.ParseLoginActivity.PARSE_LOGIN_ENABLED";
43-
public static final String PARSE_LOGIN_BUTTON_TEXT = "com.parse.ui.ParseLoginActivity.PARSE_LOGIN_BUTTON_TEXT";
44-
public static final String PARSE_SIGNUP_BUTTON_TEXT = "com.parse.ui.ParseLoginActivity.PARSE_SIGNUP_BUTTON_TEXT";
45-
public static final String PARSE_LOGIN_HELP_TEXT = "com.parse.ui.ParseLoginActivity.PARSE_LOGIN_HELP_TEXT";
46-
public static final String PARSE_LOGIN_INVALID_CREDENTIALS_TOAST_TEXT = "com.parse.ui.ParseLoginActivity.PARSE_LOGIN_INVALID_CREDENTIALS_TEXT";
47-
public static final String PARSE_LOGIN_EMAIL_AS_USERNAME = "com.parse.ui.ParseLoginActivity.PARSE_LOGIN_EMAIL_AS_USERNAME";
48-
public static final String PARSE_SIGNUP_MIN_PASSWORD_LENGTH = "com.parse.ui.ParseLoginActivity.PARSE_SIGNUP_MIN_PASSWORD_LENGTH";
49-
public static final String PARSE_SIGNUP_SUBMIT_BUTTON_TEXT = "com.parse.ui.ParseLoginActivity.PARSE_SIGNUP_SUBMIT_BUTTON_TEXT";
50-
public static final String PARSE_SIGNUP_NAME_FIELD_ENABLED = "com.parse.ui.ParseLoginActivity.PARSE_SIGNUP_NAME_FIELD_ENABLED";
51-
public static final String FACEBOOK_LOGIN_ENABLED = "com.parse.ui.ParseLoginActivity.FACEBOOK_LOGIN_ENABLED";
52-
public static final String FACEBOOK_LOGIN_BUTTON_TEXT = "com.parse.ui.ParseLoginActivity.FACEBOOK_LOGIN_BUTTON_TEXT";
53-
public static final String FACEBOOK_LOGIN_PERMISSIONS = "com.parse.ui.ParseLoginActivity.FACEBOOK_LOGIN_PERMISSIONS";
54-
public static final String TWITTER_LOGIN_ENABLED = "com.parse.ui.ParseLoginActivity.TWITTER_LOGIN_ENABLED";
55-
public static final String TWITTER_LOGIN_BUTTON_TEXT = "com.parse.ui.ParseLoginActivity.TWITTER_LOGIN_BUTTON_TEXT";
41+
public static final String APP_LOGO = "com.parse.ui.login.ParseLoginActivity.APP_LOGO";
42+
public static final String PARSE_LOGIN_ENABLED = "com.parse.ui.login.ParseLoginActivity.PARSE_LOGIN_ENABLED";
43+
public static final String PARSE_LOGIN_BUTTON_TEXT = "com.parse.ui.login.ParseLoginActivity.PARSE_LOGIN_BUTTON_TEXT";
44+
public static final String PARSE_SIGNUP_BUTTON_TEXT = "com.parse.ui.login.ParseLoginActivity.PARSE_SIGNUP_BUTTON_TEXT";
45+
public static final String PARSE_LOGIN_HELP_TEXT = "com.parse.ui.login.ParseLoginActivity.PARSE_LOGIN_HELP_TEXT";
46+
public static final String PARSE_LOGIN_INVALID_CREDENTIALS_TOAST_TEXT = "com.parse.ui.login.ParseLoginActivity.PARSE_LOGIN_INVALID_CREDENTIALS_TEXT";
47+
public static final String PARSE_LOGIN_EMAIL_AS_USERNAME = "com.parse.ui.login.ParseLoginActivity.PARSE_LOGIN_EMAIL_AS_USERNAME";
48+
public static final String PARSE_SIGNUP_MIN_PASSWORD_LENGTH = "com.parse.ui.login.ParseLoginActivity.PARSE_SIGNUP_MIN_PASSWORD_LENGTH";
49+
public static final String PARSE_SIGNUP_SUBMIT_BUTTON_TEXT = "com.parse.ui.login.ParseLoginActivity.PARSE_SIGNUP_SUBMIT_BUTTON_TEXT";
50+
public static final String PARSE_SIGNUP_NAME_FIELD_ENABLED = "com.parse.ui.login.ParseLoginActivity.PARSE_SIGNUP_NAME_FIELD_ENABLED";
51+
public static final String FACEBOOK_LOGIN_ENABLED = "com.parse.ui.login.ParseLoginActivity.FACEBOOK_LOGIN_ENABLED";
52+
public static final String FACEBOOK_LOGIN_BUTTON_TEXT = "com.parse.ui.login.ParseLoginActivity.FACEBOOK_LOGIN_BUTTON_TEXT";
53+
public static final String FACEBOOK_LOGIN_PERMISSIONS = "com.parse.ui.login.ParseLoginActivity.FACEBOOK_LOGIN_PERMISSIONS";
54+
public static final String TWITTER_LOGIN_ENABLED = "com.parse.ui.login.ParseLoginActivity.TWITTER_LOGIN_ENABLED";
55+
public static final String TWITTER_LOGIN_BUTTON_TEXT = "com.parse.ui.login.ParseLoginActivity.TWITTER_LOGIN_BUTTON_TEXT";
5656

5757
// For internally serializing to/from string array (the public analog above is for resource from activity meta-data).
58-
private static final String FACEBOOK_LOGIN_PERMISSIONS_STRING_ARRAY = "com.parse.ui.ParseLoginActivity.FACEBOOK_LOGIN_PERMISSIONS_STRING_ARRAY";
58+
private static final String FACEBOOK_LOGIN_PERMISSIONS_STRING_ARRAY = "com.parse.ui.login.ParseLoginActivity.FACEBOOK_LOGIN_PERMISSIONS_STRING_ARRAY";
5959

60-
private static final String LOG_TAG = "com.parse.ui.ParseLoginConfig";
60+
private static final String LOG_TAG = "com.parse.ui.login.ParseLoginConfig";
6161

6262
// Use boxed types so that we can differentiate between a setting not set,
6363
// versus its default value. This is useful for merging options set from code

‎login/src/main/java/com/parse/ui/login/ParseLoginDispatchActivity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*
2020
*/
2121

22-
package com.parse.ui;
22+
package com.parse.ui.login;
2323

2424
import android.app.Activity;
2525
import android.content.Intent;
@@ -28,6 +28,7 @@
2828

2929
import com.parse.Parse;
3030
import com.parse.ParseUser;
31+
import com.parse.ui.R;
3132

3233
/**
3334
* Activity that starts ParseLoginActivity if the user is not logged in.

‎login/src/main/java/com/parse/ui/login/ParseLoginFragment.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*
2020
*/
2121

22-
package com.parse.ui;
22+
package com.parse.ui.login;
2323

2424
import android.app.Activity;
2525
import android.content.Context;
@@ -44,6 +44,7 @@
4444
import com.parse.facebook.ParseFacebookUtils;
4545
import com.parse.twitter.ParseTwitterUtils;
4646
import com.parse.twitter.Twitter;
47+
import com.parse.ui.R;
4748

4849
import org.json.JSONObject;
4950

‎login/src/main/java/com/parse/ui/login/ParseLoginFragmentBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*
2020
*/
2121

22-
package com.parse.ui;
22+
package com.parse.ui.login;
2323

2424
import android.annotation.TargetApi;
2525
import android.os.Build;

‎login/src/main/java/com/parse/ui/login/ParseLoginHelpFragment.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*
2020
*/
2121

22-
package com.parse.ui;
22+
package com.parse.ui.login;
2323

2424
import android.app.Activity;
2525
import android.os.Bundle;
@@ -35,6 +35,7 @@
3535
import com.parse.ParseException;
3636
import com.parse.ParseUser;
3737
import com.parse.RequestPasswordResetCallback;
38+
import com.parse.ui.R;
3839

3940
/**
4041
* Fragment for the login help screen for resetting the user's password.

‎login/src/main/java/com/parse/ui/login/ParseOnLoadingListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*
2020
*/
2121

22-
package com.parse.ui;
22+
package com.parse.ui.login;
2323

2424
public interface ParseOnLoadingListener {
2525
public void onLoadingStart(boolean showSpinner);

‎login/src/main/java/com/parse/ui/login/ParseOnLoginSuccessListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*
2020
*/
2121

22-
package com.parse.ui;
22+
package com.parse.ui.login;
2323

2424
public interface ParseOnLoginSuccessListener {
2525
public void onLoginSuccess();

‎login/src/main/java/com/parse/ui/login/ParseSignupFragment.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*
2020
*/
2121

22-
package com.parse.ui;
22+
package com.parse.ui.login;
2323

2424
import android.app.Activity;
2525
import android.os.Bundle;
@@ -36,13 +36,14 @@
3636
import com.parse.ParseObject;
3737
import com.parse.ParseUser;
3838
import com.parse.SignUpCallback;
39+
import com.parse.ui.R;
3940

4041
/**
4142
* Fragment for the user signup screen.
4243
*/
4344
public class ParseSignupFragment extends ParseLoginFragmentBase implements OnClickListener {
44-
public static final String USERNAME = "com.parse.ui.ParseSignupFragment.USERNAME";
45-
public static final String PASSWORD = "com.parse.ui.ParseSignupFragment.PASSWORD";
45+
public static final String USERNAME = "com.parse.ui.login.ParseSignupFragment.USERNAME";
46+
public static final String PASSWORD = "com.parse.ui.login.ParseSignupFragment.PASSWORD";
4647

4748
private EditText usernameField;
4849
private EditText passwordField;

0 commit comments

Comments
 (0)