diff --git a/ParseLoginSampleBasic/build.gradle b/ParseLoginSampleBasic/build.gradle index c6ddb33..1d8f935 100644 --- a/ParseLoginSampleBasic/build.gradle +++ b/ParseLoginSampleBasic/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'android' dependencies { // rootProject.ext.* variables are defined in project gradle file, you can also use path here. compile rootProject.ext.facebookSDK - compile project(':ParseLoginUI') + compile project(':ParseUI-Login') compile rootProject.ext.androidSupport compile rootProject.ext.parse compile files(rootProject.ext.parseFacebookUtilsPath) diff --git a/ParseLoginSampleCodeCustomization/build.gradle b/ParseLoginSampleCodeCustomization/build.gradle index c6ddb33..1d8f935 100644 --- a/ParseLoginSampleCodeCustomization/build.gradle +++ b/ParseLoginSampleCodeCustomization/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'android' dependencies { // rootProject.ext.* variables are defined in project gradle file, you can also use path here. compile rootProject.ext.facebookSDK - compile project(':ParseLoginUI') + compile project(':ParseUI-Login') compile rootProject.ext.androidSupport compile rootProject.ext.parse compile files(rootProject.ext.parseFacebookUtilsPath) diff --git a/ParseLoginSampleLayoutOverride/build.gradle b/ParseLoginSampleLayoutOverride/build.gradle index c6ddb33..1d8f935 100644 --- a/ParseLoginSampleLayoutOverride/build.gradle +++ b/ParseLoginSampleLayoutOverride/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'android' dependencies { // rootProject.ext.* variables are defined in project gradle file, you can also use path here. compile rootProject.ext.facebookSDK - compile project(':ParseLoginUI') + compile project(':ParseUI-Login') compile rootProject.ext.androidSupport compile rootProject.ext.parse compile files(rootProject.ext.parseFacebookUtilsPath) diff --git a/ParseLoginSampleWithDispatchActivity/build.gradle b/ParseLoginSampleWithDispatchActivity/build.gradle index c6ddb33..1d8f935 100644 --- a/ParseLoginSampleWithDispatchActivity/build.gradle +++ b/ParseLoginSampleWithDispatchActivity/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'android' dependencies { // rootProject.ext.* variables are defined in project gradle file, you can also use path here. compile rootProject.ext.facebookSDK - compile project(':ParseLoginUI') + compile project(':ParseUI-Login') compile rootProject.ext.androidSupport compile rootProject.ext.parse compile files(rootProject.ext.parseFacebookUtilsPath) diff --git a/ParseLoginUI/build.gradle b/ParseLoginUI/build.gradle deleted file mode 100644 index 8bc41c0..0000000 --- a/ParseLoginUI/build.gradle +++ /dev/null @@ -1,26 +0,0 @@ -apply plugin: 'android-library' - -dependencies { - compile 'com.parse.bolts:bolts-android:1.2.1' - compile 'com.android.support:support-v4:22.0.0' - compile 'com.parse:parse-android:1.10.1' - - provided 'com.facebook.android:facebook-android-sdk:4.0.1' - provided files("$rootProject.projectDir/ParseLoginUI/libs/ParseFacebookUtilsV4-1.10.1.jar") - provided files("$rootProject.projectDir/ParseLoginUI/libs/ParseTwitterUtils-1.10.1.jar") - - androidTestCompile 'com.google.dexmaker:dexmaker:1.2' - androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2' - androidTestCompile 'org.mockito:mockito-core:1.10.19' - androidTestCompile 'org.skyscreamer:jsonassert:1.2.3' -} - -android { - compileSdkVersion 21 - buildToolsVersion "21.1.1" - - defaultConfig { - minSdkVersion 9 - targetSdkVersion 21 - } -} diff --git a/ParseLoginUI/src/androidTest/AndroidManifest.xml b/ParseLoginUI/src/androidTest/AndroidManifest.xml deleted file mode 100644 index c06fd1f..0000000 --- a/ParseLoginUI/src/androidTest/AndroidManifest.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - diff --git a/ParseLoginUI/src/main/AndroidManifest.xml b/ParseLoginUI/src/main/AndroidManifest.xml deleted file mode 100644 index 9c1f128..0000000 --- a/ParseLoginUI/src/main/AndroidManifest.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - diff --git a/ParseUI-Login/build.gradle b/ParseUI-Login/build.gradle new file mode 100644 index 0000000..15de9d0 --- /dev/null +++ b/ParseUI-Login/build.gradle @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2014, Parse, LLC. All rights reserved. + * + * You are hereby granted a non-exclusive, worldwide, royalty-free license to use, + * copy, modify, and distribute this software in source code or binary form for use + * in connection with the web services and APIs provided by Parse. + * + * As with any software that integrates with the Parse platform, your use of + * this software is subject to the Parse Terms of Service + * [https://www.parse.com/about/terms]. This copyright notice shall be + * included in all copies or substantial portions of the software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + */ + +apply plugin: 'android-library' + +dependencies { + compile 'com.android.support:support-v4:22.0.0' + compile 'com.parse:parse-android:1.10.1' + + provided 'com.facebook.android:facebook-android-sdk:4.0.1' + provided files("$rootProject.projectDir/ParseUI-Login/libs/ParseFacebookUtilsV4-1.10.1.jar") + provided files("$rootProject.projectDir/ParseUI-Login/libs/ParseTwitterUtils-1.10.1.jar") +} + +android { + compileSdkVersion 21 + buildToolsVersion "21.1.1" + + defaultConfig { + minSdkVersion 9 + targetSdkVersion 21 + } +} diff --git a/ParseLoginUI/libs/ParseFacebookUtilsV4-1.10.1.jar b/ParseUI-Login/libs/ParseFacebookUtilsV4-1.10.1.jar similarity index 100% rename from ParseLoginUI/libs/ParseFacebookUtilsV4-1.10.1.jar rename to ParseUI-Login/libs/ParseFacebookUtilsV4-1.10.1.jar diff --git a/ParseLoginUI/libs/ParseTwitterUtils-1.10.1.jar b/ParseUI-Login/libs/ParseTwitterUtils-1.10.1.jar similarity index 100% rename from ParseLoginUI/libs/ParseTwitterUtils-1.10.1.jar rename to ParseUI-Login/libs/ParseTwitterUtils-1.10.1.jar diff --git a/ParseUI-Login/src/main/AndroidManifest.xml b/ParseUI-Login/src/main/AndroidManifest.xml new file mode 100644 index 0000000..c80df81 --- /dev/null +++ b/ParseUI-Login/src/main/AndroidManifest.xml @@ -0,0 +1,24 @@ + + + + + diff --git a/ParseLoginUI/src/main/java/com/parse/ui/ParseLoginActivity.java b/ParseUI-Login/src/main/java/com/parse/ui/ParseLoginActivity.java similarity index 100% rename from ParseLoginUI/src/main/java/com/parse/ui/ParseLoginActivity.java rename to ParseUI-Login/src/main/java/com/parse/ui/ParseLoginActivity.java diff --git a/ParseLoginUI/src/main/java/com/parse/ui/ParseLoginBuilder.java b/ParseUI-Login/src/main/java/com/parse/ui/ParseLoginBuilder.java similarity index 100% rename from ParseLoginUI/src/main/java/com/parse/ui/ParseLoginBuilder.java rename to ParseUI-Login/src/main/java/com/parse/ui/ParseLoginBuilder.java diff --git a/ParseLoginUI/src/main/java/com/parse/ui/ParseLoginConfig.java b/ParseUI-Login/src/main/java/com/parse/ui/ParseLoginConfig.java similarity index 100% rename from ParseLoginUI/src/main/java/com/parse/ui/ParseLoginConfig.java rename to ParseUI-Login/src/main/java/com/parse/ui/ParseLoginConfig.java diff --git a/ParseLoginUI/src/main/java/com/parse/ui/ParseLoginDispatchActivity.java b/ParseUI-Login/src/main/java/com/parse/ui/ParseLoginDispatchActivity.java similarity index 100% rename from ParseLoginUI/src/main/java/com/parse/ui/ParseLoginDispatchActivity.java rename to ParseUI-Login/src/main/java/com/parse/ui/ParseLoginDispatchActivity.java diff --git a/ParseLoginUI/src/main/java/com/parse/ui/ParseLoginFragment.java b/ParseUI-Login/src/main/java/com/parse/ui/ParseLoginFragment.java similarity index 99% rename from ParseLoginUI/src/main/java/com/parse/ui/ParseLoginFragment.java rename to ParseUI-Login/src/main/java/com/parse/ui/ParseLoginFragment.java index bec7979..d43a282 100644 --- a/ParseLoginUI/src/main/java/com/parse/ui/ParseLoginFragment.java +++ b/ParseUI-Login/src/main/java/com/parse/ui/ParseLoginFragment.java @@ -36,7 +36,6 @@ import com.facebook.AccessToken; import com.facebook.GraphRequest; import com.facebook.GraphResponse; - import com.parse.LogInCallback; import com.parse.ParseException; import com.parse.ParseFacebookUtils; @@ -162,7 +161,7 @@ private void setUpParseLoginAndSignup() { parseLoginButton.setText(config.getParseLoginButtonText()); } - parseLoginButton.setOnClickListener(new View.OnClickListener() { + parseLoginButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { String username = usernameField.getText().toString(); diff --git a/ParseLoginUI/src/main/java/com/parse/ui/ParseLoginFragmentBase.java b/ParseUI-Login/src/main/java/com/parse/ui/ParseLoginFragmentBase.java similarity index 100% rename from ParseLoginUI/src/main/java/com/parse/ui/ParseLoginFragmentBase.java rename to ParseUI-Login/src/main/java/com/parse/ui/ParseLoginFragmentBase.java diff --git a/ParseLoginUI/src/main/java/com/parse/ui/ParseLoginHelpFragment.java b/ParseUI-Login/src/main/java/com/parse/ui/ParseLoginHelpFragment.java similarity index 100% rename from ParseLoginUI/src/main/java/com/parse/ui/ParseLoginHelpFragment.java rename to ParseUI-Login/src/main/java/com/parse/ui/ParseLoginHelpFragment.java diff --git a/ParseLoginUI/src/main/java/com/parse/ui/ParseOnLoadingListener.java b/ParseUI-Login/src/main/java/com/parse/ui/ParseOnLoadingListener.java similarity index 100% rename from ParseLoginUI/src/main/java/com/parse/ui/ParseOnLoadingListener.java rename to ParseUI-Login/src/main/java/com/parse/ui/ParseOnLoadingListener.java diff --git a/ParseLoginUI/src/main/java/com/parse/ui/ParseOnLoginSuccessListener.java b/ParseUI-Login/src/main/java/com/parse/ui/ParseOnLoginSuccessListener.java similarity index 100% rename from ParseLoginUI/src/main/java/com/parse/ui/ParseOnLoginSuccessListener.java rename to ParseUI-Login/src/main/java/com/parse/ui/ParseOnLoginSuccessListener.java diff --git a/ParseLoginUI/src/main/java/com/parse/ui/ParseSignupFragment.java b/ParseUI-Login/src/main/java/com/parse/ui/ParseSignupFragment.java similarity index 100% rename from ParseLoginUI/src/main/java/com/parse/ui/ParseSignupFragment.java rename to ParseUI-Login/src/main/java/com/parse/ui/ParseSignupFragment.java diff --git a/ParseLoginUI/src/main/res/color/com_parse_ui_parse_login_help_button_label_selector.xml b/ParseUI-Login/src/main/res/color/com_parse_ui_parse_login_help_button_label_selector.xml similarity index 100% rename from ParseLoginUI/src/main/res/color/com_parse_ui_parse_login_help_button_label_selector.xml rename to ParseUI-Login/src/main/res/color/com_parse_ui_parse_login_help_button_label_selector.xml diff --git a/ParseLoginUI/src/main/res/drawable-xxhdpi/com_parse_ui_app_logo.png b/ParseUI-Login/src/main/res/drawable-xxhdpi/com_parse_ui_app_logo.png similarity index 100% rename from ParseLoginUI/src/main/res/drawable-xxhdpi/com_parse_ui_app_logo.png rename to ParseUI-Login/src/main/res/drawable-xxhdpi/com_parse_ui_app_logo.png diff --git a/ParseLoginUI/src/main/res/drawable-xxhdpi/com_parse_ui_facebook_login_logo.png b/ParseUI-Login/src/main/res/drawable-xxhdpi/com_parse_ui_facebook_login_logo.png similarity index 100% rename from ParseLoginUI/src/main/res/drawable-xxhdpi/com_parse_ui_facebook_login_logo.png rename to ParseUI-Login/src/main/res/drawable-xxhdpi/com_parse_ui_facebook_login_logo.png diff --git a/ParseLoginUI/src/main/res/drawable-xxhdpi/com_parse_ui_twitter_login_logo.png b/ParseUI-Login/src/main/res/drawable-xxhdpi/com_parse_ui_twitter_login_logo.png similarity index 100% rename from ParseLoginUI/src/main/res/drawable-xxhdpi/com_parse_ui_twitter_login_logo.png rename to ParseUI-Login/src/main/res/drawable-xxhdpi/com_parse_ui_twitter_login_logo.png diff --git a/ParseLoginUI/src/main/res/drawable/com_parse_ui_facebook_login_button_background_selector.xml b/ParseUI-Login/src/main/res/drawable/com_parse_ui_facebook_login_button_background_selector.xml similarity index 100% rename from ParseLoginUI/src/main/res/drawable/com_parse_ui_facebook_login_button_background_selector.xml rename to ParseUI-Login/src/main/res/drawable/com_parse_ui_facebook_login_button_background_selector.xml diff --git a/ParseLoginUI/src/main/res/drawable/com_parse_ui_parse_login_button_background_selector.xml b/ParseUI-Login/src/main/res/drawable/com_parse_ui_parse_login_button_background_selector.xml similarity index 100% rename from ParseLoginUI/src/main/res/drawable/com_parse_ui_parse_login_button_background_selector.xml rename to ParseUI-Login/src/main/res/drawable/com_parse_ui_parse_login_button_background_selector.xml diff --git a/ParseLoginUI/src/main/res/drawable/com_parse_ui_twitter_login_button_background_selector.xml b/ParseUI-Login/src/main/res/drawable/com_parse_ui_twitter_login_button_background_selector.xml similarity index 100% rename from ParseLoginUI/src/main/res/drawable/com_parse_ui_twitter_login_button_background_selector.xml rename to ParseUI-Login/src/main/res/drawable/com_parse_ui_twitter_login_button_background_selector.xml diff --git a/ParseLoginUI/src/main/res/layout-land/com_parse_ui_parse_login_fragment.xml b/ParseUI-Login/src/main/res/layout-land/com_parse_ui_parse_login_fragment.xml similarity index 100% rename from ParseLoginUI/src/main/res/layout-land/com_parse_ui_parse_login_fragment.xml rename to ParseUI-Login/src/main/res/layout-land/com_parse_ui_parse_login_fragment.xml diff --git a/ParseLoginUI/src/main/res/layout-land/com_parse_ui_parse_login_help_fragment.xml b/ParseUI-Login/src/main/res/layout-land/com_parse_ui_parse_login_help_fragment.xml similarity index 100% rename from ParseLoginUI/src/main/res/layout-land/com_parse_ui_parse_login_help_fragment.xml rename to ParseUI-Login/src/main/res/layout-land/com_parse_ui_parse_login_help_fragment.xml diff --git a/ParseLoginUI/src/main/res/layout-land/com_parse_ui_parse_signup_fragment.xml b/ParseUI-Login/src/main/res/layout-land/com_parse_ui_parse_signup_fragment.xml similarity index 100% rename from ParseLoginUI/src/main/res/layout-land/com_parse_ui_parse_signup_fragment.xml rename to ParseUI-Login/src/main/res/layout-land/com_parse_ui_parse_signup_fragment.xml diff --git a/ParseLoginUI/src/main/res/layout/com_parse_ui_parse_login_app_logo.xml b/ParseUI-Login/src/main/res/layout/com_parse_ui_parse_login_app_logo.xml similarity index 100% rename from ParseLoginUI/src/main/res/layout/com_parse_ui_parse_login_app_logo.xml rename to ParseUI-Login/src/main/res/layout/com_parse_ui_parse_login_app_logo.xml diff --git a/ParseLoginUI/src/main/res/layout/com_parse_ui_parse_login_form.xml b/ParseUI-Login/src/main/res/layout/com_parse_ui_parse_login_form.xml similarity index 100% rename from ParseLoginUI/src/main/res/layout/com_parse_ui_parse_login_form.xml rename to ParseUI-Login/src/main/res/layout/com_parse_ui_parse_login_form.xml diff --git a/ParseLoginUI/src/main/res/layout/com_parse_ui_parse_login_fragment.xml b/ParseUI-Login/src/main/res/layout/com_parse_ui_parse_login_fragment.xml similarity index 100% rename from ParseLoginUI/src/main/res/layout/com_parse_ui_parse_login_fragment.xml rename to ParseUI-Login/src/main/res/layout/com_parse_ui_parse_login_fragment.xml diff --git a/ParseLoginUI/src/main/res/layout/com_parse_ui_parse_login_help_form.xml b/ParseUI-Login/src/main/res/layout/com_parse_ui_parse_login_help_form.xml similarity index 100% rename from ParseLoginUI/src/main/res/layout/com_parse_ui_parse_login_help_form.xml rename to ParseUI-Login/src/main/res/layout/com_parse_ui_parse_login_help_form.xml diff --git a/ParseLoginUI/src/main/res/layout/com_parse_ui_parse_login_help_fragment.xml b/ParseUI-Login/src/main/res/layout/com_parse_ui_parse_login_help_fragment.xml similarity index 100% rename from ParseLoginUI/src/main/res/layout/com_parse_ui_parse_login_help_fragment.xml rename to ParseUI-Login/src/main/res/layout/com_parse_ui_parse_login_help_fragment.xml diff --git a/ParseLoginUI/src/main/res/layout/com_parse_ui_parse_login_third_party_section.xml b/ParseUI-Login/src/main/res/layout/com_parse_ui_parse_login_third_party_section.xml similarity index 100% rename from ParseLoginUI/src/main/res/layout/com_parse_ui_parse_login_third_party_section.xml rename to ParseUI-Login/src/main/res/layout/com_parse_ui_parse_login_third_party_section.xml diff --git a/ParseLoginUI/src/main/res/layout/com_parse_ui_parse_signup_form.xml b/ParseUI-Login/src/main/res/layout/com_parse_ui_parse_signup_form.xml similarity index 100% rename from ParseLoginUI/src/main/res/layout/com_parse_ui_parse_signup_form.xml rename to ParseUI-Login/src/main/res/layout/com_parse_ui_parse_signup_form.xml diff --git a/ParseLoginUI/src/main/res/layout/com_parse_ui_parse_signup_fragment.xml b/ParseUI-Login/src/main/res/layout/com_parse_ui_parse_signup_fragment.xml similarity index 100% rename from ParseLoginUI/src/main/res/layout/com_parse_ui_parse_signup_fragment.xml rename to ParseUI-Login/src/main/res/layout/com_parse_ui_parse_signup_fragment.xml diff --git a/ParseLoginUI/src/main/res/values-es/strings.xml b/ParseUI-Login/src/main/res/values-es/strings.xml similarity index 100% rename from ParseLoginUI/src/main/res/values-es/strings.xml rename to ParseUI-Login/src/main/res/values-es/strings.xml diff --git a/ParseLoginUI/src/main/res/values/colors.xml b/ParseUI-Login/src/main/res/values/colors.xml similarity index 100% rename from ParseLoginUI/src/main/res/values/colors.xml rename to ParseUI-Login/src/main/res/values/colors.xml diff --git a/ParseLoginUI/src/main/res/values/dimens.xml b/ParseUI-Login/src/main/res/values/dimens.xml similarity index 100% rename from ParseLoginUI/src/main/res/values/dimens.xml rename to ParseUI-Login/src/main/res/values/dimens.xml diff --git a/ParseLoginUI/src/main/res/values/strings.xml b/ParseUI-Login/src/main/res/values/strings.xml similarity index 100% rename from ParseLoginUI/src/main/res/values/strings.xml rename to ParseUI-Login/src/main/res/values/strings.xml diff --git a/ParseLoginUI/src/main/res/values/styles.xml b/ParseUI-Login/src/main/res/values/styles.xml similarity index 100% rename from ParseLoginUI/src/main/res/values/styles.xml rename to ParseUI-Login/src/main/res/values/styles.xml diff --git a/ParseUI-Widget/build.gradle b/ParseUI-Widget/build.gradle new file mode 100644 index 0000000..43a06e1 --- /dev/null +++ b/ParseUI-Widget/build.gradle @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2014, Parse, LLC. All rights reserved. + * + * You are hereby granted a non-exclusive, worldwide, royalty-free license to use, + * copy, modify, and distribute this software in source code or binary form for use + * in connection with the web services and APIs provided by Parse. + * + * As with any software that integrates with the Parse platform, your use of + * this software is subject to the Parse Terms of Service + * [https://www.parse.com/about/terms]. This copyright notice shall be + * included in all copies or substantial portions of the software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +apply plugin: 'com.android.library' + +dependencies { + compile 'com.parse:parse-android:1.10.1' + + androidTestCompile 'com.google.dexmaker:dexmaker:1.2' + androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2' + androidTestCompile 'org.mockito:mockito-core:1.10.19' + androidTestCompile 'org.skyscreamer:jsonassert:1.2.3' +} + +android { + compileSdkVersion 21 + buildToolsVersion "21.1.1" + + defaultConfig { + minSdkVersion 9 + targetSdkVersion 21 + } +} diff --git a/ParseUI-Widget/src/androidTest/AndroidManifest.xml b/ParseUI-Widget/src/androidTest/AndroidManifest.xml new file mode 100644 index 0000000..7fb7557 --- /dev/null +++ b/ParseUI-Widget/src/androidTest/AndroidManifest.xml @@ -0,0 +1,31 @@ + + + + + + + + diff --git a/ParseLoginUI/src/androidTest/java/com/parse/BaseActivityInstrumentationTestCase2.java b/ParseUI-Widget/src/androidTest/java/com/parse/BaseActivityInstrumentationTestCase2.java similarity index 98% rename from ParseLoginUI/src/androidTest/java/com/parse/BaseActivityInstrumentationTestCase2.java rename to ParseUI-Widget/src/androidTest/java/com/parse/BaseActivityInstrumentationTestCase2.java index ac36416..ae3d74a 100644 --- a/ParseLoginUI/src/androidTest/java/com/parse/BaseActivityInstrumentationTestCase2.java +++ b/ParseUI-Widget/src/androidTest/java/com/parse/BaseActivityInstrumentationTestCase2.java @@ -26,7 +26,7 @@ import android.content.Context; import android.test.ActivityInstrumentationTestCase2; -public abstract class BaseActivityInstrumentationTestCase2 +public abstract class BaseActivityInstrumentationTestCase2 extends ActivityInstrumentationTestCase2 { protected Activity activity = null; diff --git a/ParseLoginUI/src/androidTest/java/com/parse/ParseImageViewTest.java b/ParseUI-Widget/src/androidTest/java/com/parse/ParseImageViewTest.java similarity index 99% rename from ParseLoginUI/src/androidTest/java/com/parse/ParseImageViewTest.java rename to ParseUI-Widget/src/androidTest/java/com/parse/ParseImageViewTest.java index 0ede3ce..e84fc48 100644 --- a/ParseLoginUI/src/androidTest/java/com/parse/ParseImageViewTest.java +++ b/ParseUI-Widget/src/androidTest/java/com/parse/ParseImageViewTest.java @@ -28,7 +28,7 @@ import android.graphics.drawable.Drawable; import android.test.InstrumentationTestCase; -import com.parse.ui.test.R; +import com.parse.widget.test.R; import java.io.ByteArrayOutputStream; import java.util.Arrays; diff --git a/ParseLoginUI/src/androidTest/java/com/parse/ParseQueryAdapterOfflineEnabledTest.java b/ParseUI-Widget/src/androidTest/java/com/parse/ParseQueryAdapterOfflineEnabledTest.java similarity index 100% rename from ParseLoginUI/src/androidTest/java/com/parse/ParseQueryAdapterOfflineEnabledTest.java rename to ParseUI-Widget/src/androidTest/java/com/parse/ParseQueryAdapterOfflineEnabledTest.java diff --git a/ParseLoginUI/src/androidTest/java/com/parse/ParseQueryAdapterTest.java b/ParseUI-Widget/src/androidTest/java/com/parse/ParseQueryAdapterTest.java similarity index 99% rename from ParseLoginUI/src/androidTest/java/com/parse/ParseQueryAdapterTest.java rename to ParseUI-Widget/src/androidTest/java/com/parse/ParseQueryAdapterTest.java index 582bfc8..a29bb4e 100644 --- a/ParseLoginUI/src/androidTest/java/com/parse/ParseQueryAdapterTest.java +++ b/ParseUI-Widget/src/androidTest/java/com/parse/ParseQueryAdapterTest.java @@ -29,8 +29,6 @@ import com.parse.ParseQuery.CachePolicy; import com.parse.ParseQueryAdapter.OnQueryLoadListener; import com.parse.ParseQueryAdapter.QueryFactory; -import com.parse.ui.TestActivity; -import com.parse.ui.test.R; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -43,6 +41,8 @@ import bolts.Capture; import bolts.Task; +import com.parse.widget.test.R; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/ParseLoginUI/src/androidTest/java/com/parse/ui/TestActivity.java b/ParseUI-Widget/src/androidTest/java/com/parse/TestActivity.java similarity index 96% rename from ParseLoginUI/src/androidTest/java/com/parse/ui/TestActivity.java rename to ParseUI-Widget/src/androidTest/java/com/parse/TestActivity.java index f1b50f8..2bd8fba 100644 --- a/ParseLoginUI/src/androidTest/java/com/parse/ui/TestActivity.java +++ b/ParseUI-Widget/src/androidTest/java/com/parse/TestActivity.java @@ -19,10 +19,9 @@ * */ -package com.parse.ui; +package com.parse; import android.app.Activity; -import android.os.Bundle; /** * This is a blank Activity placeholder class for test, used to get the ParseQueryAdapterTest diff --git a/ParseLoginUI/src/androidTest/res/drawable/icon.png b/ParseUI-Widget/src/androidTest/res/drawable/icon.png similarity index 100% rename from ParseLoginUI/src/androidTest/res/drawable/icon.png rename to ParseUI-Widget/src/androidTest/res/drawable/icon.png diff --git a/ParseLoginUI/src/androidTest/res/layout/view_item.xml b/ParseUI-Widget/src/androidTest/res/layout/view_item.xml similarity index 100% rename from ParseLoginUI/src/androidTest/res/layout/view_item.xml rename to ParseUI-Widget/src/androidTest/res/layout/view_item.xml diff --git a/ParseUI-Widget/src/main/AndroidManifest.xml b/ParseUI-Widget/src/main/AndroidManifest.xml new file mode 100644 index 0000000..aab263e --- /dev/null +++ b/ParseUI-Widget/src/main/AndroidManifest.xml @@ -0,0 +1,24 @@ + + + + + diff --git a/ParseLoginUI/src/main/java/com/parse/ParseImageView.java b/ParseUI-Widget/src/main/java/com/parse/ParseImageView.java similarity index 100% rename from ParseLoginUI/src/main/java/com/parse/ParseImageView.java rename to ParseUI-Widget/src/main/java/com/parse/ParseImageView.java diff --git a/ParseLoginUI/src/main/java/com/parse/ParseQueryAdapter.java b/ParseUI-Widget/src/main/java/com/parse/ParseQueryAdapter.java similarity index 100% rename from ParseLoginUI/src/main/java/com/parse/ParseQueryAdapter.java rename to ParseUI-Widget/src/main/java/com/parse/ParseQueryAdapter.java diff --git a/README.md b/README.md index d90f719..246eb95 100644 --- a/README.md +++ b/README.md @@ -1,87 +1,35 @@ -# ParseUI -## Overview -This project contains the `ParseLoginUI` library for building login and signup flows with the Parse Android SDK. -You can easily configure the look and feel of the login screens by either specifying XML configurations or constructing an Intent in code. -To use this project with your app, you should import it as a library project in Android Studio. +# Parse SDK for Android -![sample screens](http://parseui-android.parseapp.com/images/parse_login_sample_screens.png) +This project contains two libraries, `ParseUI-Login` and `ParseUI-Widget`. -### Getting Started -We built several sample apps demonstrating how to use the `ParseLoginUI` library. Before importing -this library into your app, we recommend that you run these sample apps to become familiar with its -functionality and customizations. In this section, we describe Android Studio instructions for -running the sample apps (as a standalone project), and importing the `ParseLoginUI` library into -your own app. These instructions were last tested on Android Studio 1.1.0. +The `ParseUI-Login` library is used for building login and signup flows with the Parse Android SDK. You can easily configure the look and feel of the login screens by either specifying XML configurations or constructing an Intent in code. -#### Running Sample Projects -To run our sample apps, you need to import this repo as a standalone Gradle project: +The `ParseUI-Widget` library provides several useful UI widgets which integrate with [Parse SDK](https://github.com/ParsePlatform/Parse-SDK-Android) seamlessly. -1. Clone this repository onto your machine. -2. Import this repository's project with Android Studio (File > Import Project > `ParseUI-Android` folder). The project has Maven dependencies on the Facebook SDK and the Bolts framework. Android Studio automatically resolves these via Gradle. -3. Specify the following in `res/values/strings.xml` of each sample project: - * parse_app_id and parse_client_key - * facebook_app_id - * twitter_consumer_key and twitter_consumer_secret -4. Build (Tools > Android > Sync Project with Gradle Files) and run the sample apps using Android Studio. -#### Importing into Your App +## Import to your project 1. Clone this repository onto your machine. 2. Configure Parse SDK by following this [tutorial](https://www.parse.com/apps/quickstart#parse_data/mobile/android/native/existing). -3. Import `ParseLoginUI` as a module into your app's Android Studio Project +3. Import `ParseUI-Login` and `ParseUI-Widget` as modules into your app's Android Studio Project * File > Import Module in Android Studio - * In the New Module pop-up, set the source directory to the `ParseUI-Android/ParseLoginUI` folder within the cloned repo. - + * In the New Module pop-up, set the source directory to the `ParseUI-Android/ParseUI-Login` and `ParseUI-Android/ParseUI-Widget` folder within the cloned repo. 4. Add the following to the `dependencies` section of your app's build.gradle. - // Module dependency on ParseLoginUI library sources - compile project(':ParseLoginUI') - - // Uncomment if using Facebook Login (optional Maven dependency) - // compile 'com.facebook.android:facebook-android-sdk:4.0.1' - // compile files('YOUR_PROJECT_LIBS_PATH/ParseFacebookUtilsV4-1.10.0.jar') - -5. Add the following to your `AndroidManifest.xml` within the `` section. You can see a complete example in our [sample app](https://github.com/ParsePlatform/ParseUI-Android/blob/master/ParseLoginSampleBasic/src/main/AndroidManifest.xml). - - - - - - - -6. Specify the following in `res/values/strings.xml` of your app + ```grovvy + // Module dependency on ParseUI libraries sources + compile project(':ParseUI-Login') + compile project(':ParseUI-Widget') - YOUR_PARSE_APP_ID - YOUR_PARSE_CLIENT_KEY + // Uncomment if using Facebook Login (optional Maven dependency) + // compile 'com.facebook.android:facebook-android-sdk:4.0.1' + // compile files('YOUR_PROJECT_LIBS_PATH/ParseFacebookUtilsV4-1.10.0.jar') + ``` -For an example of setting up Facebook and Twitter integrations, please see `AndroidManfest.xml` and `res/values/strings.xml` in our [sample app](https://github.com/ParsePlatform/ParseUI-Android/blob/master/ParseLoginSampleBasic). +## Usage +Please check the tutorial in our [wiki](https://github.com/ParsePlatform/ParseUI-Android/wiki); ## Documentation For complete details about this library project, please see our [documentation](https://www.parse.com/docs/android/guide#user-interface-parseloginui) on the Parse website. -We'll discuss some highlights here. - -To start the login flow from your own activity, you launch the `ParseLoginActivity` with two lines of code: - -```java -ParseLoginBuilder builder = new ParseLoginBuilder(MyActivity.this); -startActivityForResult(builder.build(), 0); -``` - -`ParseLoginActivity` will guide the user through the login experience, where the user can also sign up or reset a forgotten password. -Each screen in the login experience is implemented by a fragment hosted within this activity. -When `ParseLoginActivity` finishes, you can check `ParseUser.getCurrentUser()` in your own activity to see whether the user actually logged in. - -This library is ultra-customizable, allowing you to configure the login experience through either XML or code. -As shown in the Getting Started section, you can directly configure the login experience through the activity -meta-data in `AndroidManifest.xml`. - -Please see the [Parse website](https://www.parse.com/docs/android/guide#user-interface-parseloginui) for additional documentation. ## Contributing See the CONTRIBUTING file for how to help out. @@ -94,7 +42,8 @@ copy, modify, and distribute this software in source code or binary form for use in connection with the web services and APIs provided by Parse. As with any software that integrates with the Parse platform, your use of -this software is subject to the [Parse Terms of Service](https://www.parse.com/about/terms). This copyright notice shall be +this software is subject to the [Parse Terms of Service] +(https://www.parse.com/about/terms). This copyright notice shall be included in all copies or substantial portions of the software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR @@ -102,4 +51,4 @@ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/build.gradle b/build.gradle index ca937c0..7dfd35d 100644 --- a/build.gradle +++ b/build.gradle @@ -25,6 +25,6 @@ ext { androidSupport = 'com.android.support:support-v4:22.0.0' bolts = 'com.parse.bolts:bolts-android:1.2.1' parse = 'com.parse:parse-android:1.10.1' - parseFacebookUtilsPath = "$rootProject.projectDir/ParseLoginUI/libs/ParseFacebookUtilsV4-1.10.1.jar" - parseTwitterUtilsPath = "$rootProject.projectDir/ParseLoginUI/libs/ParseTwitterUtils-1.10.1.jar" + parseFacebookUtilsPath = "$rootProject.projectDir/ParseUI-Login/libs/ParseFacebookUtilsV4-1.10.1.jar" + parseTwitterUtilsPath = "$rootProject.projectDir/ParseUI-Login/libs/ParseTwitterUtils-1.10.1.jar" } diff --git a/settings.gradle b/settings.gradle index 036e858..f8d56a2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,7 +1,10 @@ rootProject.name = 'ParseAndroidUI' -// Parse Login UI Library -include ':ParseLoginUI' +// Parse UI Login Library +include ':ParseUI-Widget' + +// Parse UI Widget Library +include ':ParseUI-Login' // Sample Projects include ':ParseLoginSampleBasic'