diff --git a/LICENSE b/LICENSE index 516287f..fcb26be 100644 --- a/LICENSE +++ b/LICENSE @@ -1,12 +1,12 @@ -Copyright (c) 2014, Facebook, Inc. All rights reserved. +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 Facebook. +in connection with the web services and APIs provided by Parse. -As with any software that integrates with the Facebook platform, your use of -this software is subject to the Facebook Developer Principles and Policies -[http://developers.facebook.com/policy/]. This copyright notice shall be +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 diff --git a/ParseLoginSampleBasic/AndroidManifest.xml b/ParseLoginSampleBasic/AndroidManifest.xml index 9ed8e3c..1ad31ea 100644 --- a/ParseLoginSampleBasic/AndroidManifest.xml +++ b/ParseLoginSampleBasic/AndroidManifest.xml @@ -4,8 +4,8 @@ android:versionName="1.0"> + android:minSdkVersion="9" + android:targetSdkVersion="21"/> diff --git a/ParseLoginSampleBasic/build.gradle b/ParseLoginSampleBasic/build.gradle index 6d9193e..e123aac 100644 --- a/ParseLoginSampleBasic/build.gradle +++ b/ParseLoginSampleBasic/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'android' dependencies { - compile 'com.facebook.android:facebook-android-sdk:3.21.0' + compile 'com.facebook.android:facebook-android-sdk:3.21.1' compile project(':ParseLoginUI') compile 'com.android.support:support-v4:21.0.0' } diff --git a/ParseLoginSampleBasic/src/com/parse/loginsample/basic/SampleApplication.java b/ParseLoginSampleBasic/src/com/parse/loginsample/basic/SampleApplication.java index ac6665e..ef425ef 100644 --- a/ParseLoginSampleBasic/src/com/parse/loginsample/basic/SampleApplication.java +++ b/ParseLoginSampleBasic/src/com/parse/loginsample/basic/SampleApplication.java @@ -1,13 +1,13 @@ /* - * Copyright (c) 2014, Facebook, Inc. All rights reserved. + * 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 Facebook. + * in connection with the web services and APIs provided by Parse. * - * As with any software that integrates with the Facebook platform, your use of - * this software is subject to the Facebook Developer Principles and Policies - * [http://developers.facebook.com/policy/]. This copyright notice shall be + * 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 diff --git a/ParseLoginSampleBasic/src/com/parse/loginsample/basic/SampleProfileActivity.java b/ParseLoginSampleBasic/src/com/parse/loginsample/basic/SampleProfileActivity.java index 3cf9570..6167d0f 100644 --- a/ParseLoginSampleBasic/src/com/parse/loginsample/basic/SampleProfileActivity.java +++ b/ParseLoginSampleBasic/src/com/parse/loginsample/basic/SampleProfileActivity.java @@ -1,13 +1,13 @@ /* - * Copyright (c) 2014, Facebook, Inc. All rights reserved. + * 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 Facebook. + * in connection with the web services and APIs provided by Parse. * - * As with any software that integrates with the Facebook platform, your use of - * this software is subject to the Facebook Developer Principles and Policies - * [http://developers.facebook.com/policy/]. This copyright notice shall be + * 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 diff --git a/ParseLoginSampleCodeCustomization/AndroidManifest.xml b/ParseLoginSampleCodeCustomization/AndroidManifest.xml index b13e09b..6eb1fe2 100644 --- a/ParseLoginSampleCodeCustomization/AndroidManifest.xml +++ b/ParseLoginSampleCodeCustomization/AndroidManifest.xml @@ -4,8 +4,8 @@ android:versionName="1.0"> + android:minSdkVersion="9" + android:targetSdkVersion="21"/> diff --git a/ParseLoginSampleCodeCustomization/build.gradle b/ParseLoginSampleCodeCustomization/build.gradle index 6d9193e..e123aac 100644 --- a/ParseLoginSampleCodeCustomization/build.gradle +++ b/ParseLoginSampleCodeCustomization/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'android' dependencies { - compile 'com.facebook.android:facebook-android-sdk:3.21.0' + compile 'com.facebook.android:facebook-android-sdk:3.21.1' compile project(':ParseLoginUI') compile 'com.android.support:support-v4:21.0.0' } diff --git a/ParseLoginSampleCodeCustomization/src/com/parse/loginsample/codecustomization/SampleApplication.java b/ParseLoginSampleCodeCustomization/src/com/parse/loginsample/codecustomization/SampleApplication.java index 4698e89..9ad0b34 100644 --- a/ParseLoginSampleCodeCustomization/src/com/parse/loginsample/codecustomization/SampleApplication.java +++ b/ParseLoginSampleCodeCustomization/src/com/parse/loginsample/codecustomization/SampleApplication.java @@ -1,13 +1,13 @@ /* - * Copyright (c) 2014, Facebook, Inc. All rights reserved. + * 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 Facebook. + * in connection with the web services and APIs provided by Parse. * - * As with any software that integrates with the Facebook platform, your use of - * this software is subject to the Facebook Developer Principles and Policies - * [http://developers.facebook.com/policy/]. This copyright notice shall be + * 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 diff --git a/ParseLoginSampleCodeCustomization/src/com/parse/loginsample/codecustomization/SampleProfileActivity.java b/ParseLoginSampleCodeCustomization/src/com/parse/loginsample/codecustomization/SampleProfileActivity.java index c1064c3..5d29918 100644 --- a/ParseLoginSampleCodeCustomization/src/com/parse/loginsample/codecustomization/SampleProfileActivity.java +++ b/ParseLoginSampleCodeCustomization/src/com/parse/loginsample/codecustomization/SampleProfileActivity.java @@ -1,13 +1,13 @@ /* - * Copyright (c) 2014, Facebook, Inc. All rights reserved. + * 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 Facebook. + * in connection with the web services and APIs provided by Parse. * - * As with any software that integrates with the Facebook platform, your use of - * this software is subject to the Facebook Developer Principles and Policies - * [http://developers.facebook.com/policy/]. This copyright notice shall be + * 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 diff --git a/ParseLoginSampleLayoutOverride/AndroidManifest.xml b/ParseLoginSampleLayoutOverride/AndroidManifest.xml index 342ade8..81aac10 100644 --- a/ParseLoginSampleLayoutOverride/AndroidManifest.xml +++ b/ParseLoginSampleLayoutOverride/AndroidManifest.xml @@ -4,8 +4,8 @@ android:versionName="1.0"> + android:minSdkVersion="9" + android:targetSdkVersion="21"/> diff --git a/ParseLoginSampleLayoutOverride/build.gradle b/ParseLoginSampleLayoutOverride/build.gradle index 6d9193e..e123aac 100644 --- a/ParseLoginSampleLayoutOverride/build.gradle +++ b/ParseLoginSampleLayoutOverride/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'android' dependencies { - compile 'com.facebook.android:facebook-android-sdk:3.21.0' + compile 'com.facebook.android:facebook-android-sdk:3.21.1' compile project(':ParseLoginUI') compile 'com.android.support:support-v4:21.0.0' } diff --git a/ParseLoginSampleLayoutOverride/src/com/parse/loginsample/layoutoverride/SampleApplication.java b/ParseLoginSampleLayoutOverride/src/com/parse/loginsample/layoutoverride/SampleApplication.java index 08bf554..874eb66 100644 --- a/ParseLoginSampleLayoutOverride/src/com/parse/loginsample/layoutoverride/SampleApplication.java +++ b/ParseLoginSampleLayoutOverride/src/com/parse/loginsample/layoutoverride/SampleApplication.java @@ -1,13 +1,13 @@ /* - * Copyright (c) 2014, Facebook, Inc. All rights reserved. + * 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 Facebook. + * in connection with the web services and APIs provided by Parse. * - * As with any software that integrates with the Facebook platform, your use of - * this software is subject to the Facebook Developer Principles and Policies - * [http://developers.facebook.com/policy/]. This copyright notice shall be + * 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 diff --git a/ParseLoginSampleLayoutOverride/src/com/parse/loginsample/layoutoverride/SampleProfileActivity.java b/ParseLoginSampleLayoutOverride/src/com/parse/loginsample/layoutoverride/SampleProfileActivity.java index a8c7da6..8cacde0 100644 --- a/ParseLoginSampleLayoutOverride/src/com/parse/loginsample/layoutoverride/SampleProfileActivity.java +++ b/ParseLoginSampleLayoutOverride/src/com/parse/loginsample/layoutoverride/SampleProfileActivity.java @@ -1,13 +1,13 @@ /* - * Copyright (c) 2014, Facebook, Inc. All rights reserved. + * 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 Facebook. + * in connection with the web services and APIs provided by Parse. * - * As with any software that integrates with the Facebook platform, your use of - * this software is subject to the Facebook Developer Principles and Policies - * [http://developers.facebook.com/policy/]. This copyright notice shall be + * 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 diff --git a/ParseLoginSampleWithDispatchActivity/AndroidManifest.xml b/ParseLoginSampleWithDispatchActivity/AndroidManifest.xml index 4deb964..698b845 100644 --- a/ParseLoginSampleWithDispatchActivity/AndroidManifest.xml +++ b/ParseLoginSampleWithDispatchActivity/AndroidManifest.xml @@ -4,8 +4,8 @@ android:versionName="1.0"> + android:minSdkVersion="9" + android:targetSdkVersion="21"/> diff --git a/ParseLoginSampleWithDispatchActivity/build.gradle b/ParseLoginSampleWithDispatchActivity/build.gradle index 6d9193e..e123aac 100644 --- a/ParseLoginSampleWithDispatchActivity/build.gradle +++ b/ParseLoginSampleWithDispatchActivity/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'android' dependencies { - compile 'com.facebook.android:facebook-android-sdk:3.21.0' + compile 'com.facebook.android:facebook-android-sdk:3.21.1' compile project(':ParseLoginUI') compile 'com.android.support:support-v4:21.0.0' } diff --git a/ParseLoginSampleWithDispatchActivity/src/com/parse/loginsample/withdispatchactivity/SampleApplication.java b/ParseLoginSampleWithDispatchActivity/src/com/parse/loginsample/withdispatchactivity/SampleApplication.java index 568c069..7d3c5fc 100644 --- a/ParseLoginSampleWithDispatchActivity/src/com/parse/loginsample/withdispatchactivity/SampleApplication.java +++ b/ParseLoginSampleWithDispatchActivity/src/com/parse/loginsample/withdispatchactivity/SampleApplication.java @@ -1,13 +1,13 @@ /* - * Copyright (c) 2014, Facebook, Inc. All rights reserved. + * 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 Facebook. + * in connection with the web services and APIs provided by Parse. * - * As with any software that integrates with the Facebook platform, your use of - * this software is subject to the Facebook Developer Principles and Policies - * [http://developers.facebook.com/policy/]. This copyright notice shall be + * 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 diff --git a/ParseLoginSampleWithDispatchActivity/src/com/parse/loginsample/withdispatchactivity/SampleDispatchActivity.java b/ParseLoginSampleWithDispatchActivity/src/com/parse/loginsample/withdispatchactivity/SampleDispatchActivity.java index 0d653c2..a3f1cd7 100644 --- a/ParseLoginSampleWithDispatchActivity/src/com/parse/loginsample/withdispatchactivity/SampleDispatchActivity.java +++ b/ParseLoginSampleWithDispatchActivity/src/com/parse/loginsample/withdispatchactivity/SampleDispatchActivity.java @@ -1,13 +1,13 @@ /* - * Copyright (c) 2014, Facebook, Inc. All rights reserved. + * 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 Facebook. + * in connection with the web services and APIs provided by Parse. * - * As with any software that integrates with the Facebook platform, your use of - * this software is subject to the Facebook Developer Principles and Policies - * [http://developers.facebook.com/policy/]. This copyright notice shall be + * 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 diff --git a/ParseLoginSampleWithDispatchActivity/src/com/parse/loginsample/withdispatchactivity/SampleProfileActivity.java b/ParseLoginSampleWithDispatchActivity/src/com/parse/loginsample/withdispatchactivity/SampleProfileActivity.java index 19ea60b..3483a3b 100644 --- a/ParseLoginSampleWithDispatchActivity/src/com/parse/loginsample/withdispatchactivity/SampleProfileActivity.java +++ b/ParseLoginSampleWithDispatchActivity/src/com/parse/loginsample/withdispatchactivity/SampleProfileActivity.java @@ -1,13 +1,13 @@ /* - * Copyright (c) 2014, Facebook, Inc. All rights reserved. + * 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 Facebook. + * in connection with the web services and APIs provided by Parse. * - * As with any software that integrates with the Facebook platform, your use of - * this software is subject to the Facebook Developer Principles and Policies - * [http://developers.facebook.com/policy/]. This copyright notice shall be + * 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 diff --git a/ParseLoginUI/AndroidManifest.xml b/ParseLoginUI/AndroidManifest.xml index 6823a3b..47f83a9 100644 --- a/ParseLoginUI/AndroidManifest.xml +++ b/ParseLoginUI/AndroidManifest.xml @@ -4,8 +4,8 @@ android:versionName="1.0" > + android:minSdkVersion="9" + android:targetSdkVersion="21" /> diff --git a/ParseLoginUI/build.gradle b/ParseLoginUI/build.gradle index f9d5a8e..fea9711 100644 --- a/ParseLoginUI/build.gradle +++ b/ParseLoginUI/build.gradle @@ -1,20 +1,20 @@ apply plugin: 'android-library' dependencies { - compile 'com.parse.bolts:bolts-android:1.1.3' + compile 'com.parse.bolts:bolts-android:1.1.4' compile 'com.android.support:support-v4:21.0.0' compile fileTree(dir: 'libs', include: '*.jar') - provided 'com.facebook.android:facebook-android-sdk:3.21.0' + provided 'com.facebook.android:facebook-android-sdk:3.21.1' } android { - compileSdkVersion rootProject.ext.compileSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion + compileSdkVersion 21 + buildToolsVersion "21.1.1" defaultConfig { - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion + minSdkVersion 9 + targetSdkVersion 21 } sourceSets { diff --git a/ParseLoginUI/libs/Parse-1.7.1.jar b/ParseLoginUI/libs/Parse-1.8.0.jar similarity index 57% rename from ParseLoginUI/libs/Parse-1.7.1.jar rename to ParseLoginUI/libs/Parse-1.8.0.jar index 59fce33..f54239c 100644 Binary files a/ParseLoginUI/libs/Parse-1.7.1.jar and b/ParseLoginUI/libs/Parse-1.8.0.jar differ diff --git a/ParseLoginUI/src/com/parse/ui/ParseLoginActivity.java b/ParseLoginUI/src/com/parse/ui/ParseLoginActivity.java index aa4c912..dc67d18 100644 --- a/ParseLoginUI/src/com/parse/ui/ParseLoginActivity.java +++ b/ParseLoginUI/src/com/parse/ui/ParseLoginActivity.java @@ -1,13 +1,13 @@ /* - * Copyright (c) 2014, Facebook, Inc. All rights reserved. + * 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 Facebook. + * in connection with the web services and APIs provided by Parse. * - * As with any software that integrates with the Facebook platform, your use of - * this software is subject to the Facebook Developer Principles and Policies - * [http://developers.facebook.com/policy/]. This copyright notice shall be + * 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 diff --git a/ParseLoginUI/src/com/parse/ui/ParseLoginBuilder.java b/ParseLoginUI/src/com/parse/ui/ParseLoginBuilder.java index cfa2ac1..d6a5014 100644 --- a/ParseLoginUI/src/com/parse/ui/ParseLoginBuilder.java +++ b/ParseLoginUI/src/com/parse/ui/ParseLoginBuilder.java @@ -1,13 +1,13 @@ /* - * Copyright (c) 2014, Facebook, Inc. All rights reserved. + * 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 Facebook. + * in connection with the web services and APIs provided by Parse. * - * As with any software that integrates with the Facebook platform, your use of - * this software is subject to the Facebook Developer Principles and Policies - * [http://developers.facebook.com/policy/]. This copyright notice shall be + * 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 @@ -21,11 +21,11 @@ package com.parse.ui; -import java.util.Collection; - import android.content.Context; import android.content.Intent; +import java.util.Collection; + public class ParseLoginBuilder { private Context context; diff --git a/ParseLoginUI/src/com/parse/ui/ParseLoginConfig.java b/ParseLoginUI/src/com/parse/ui/ParseLoginConfig.java index 5f42206..ce41899 100644 --- a/ParseLoginUI/src/com/parse/ui/ParseLoginConfig.java +++ b/ParseLoginUI/src/com/parse/ui/ParseLoginConfig.java @@ -1,13 +1,13 @@ /* - * Copyright (c) 2014, Facebook, Inc. All rights reserved. + * 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 Facebook. + * in connection with the web services and APIs provided by Parse. * - * As with any software that integrates with the Facebook platform, your use of - * this software is subject to the Facebook Developer Principles and Policies - * [http://developers.facebook.com/policy/]. This copyright notice shall be + * 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 diff --git a/ParseLoginUI/src/com/parse/ui/ParseLoginDispatchActivity.java b/ParseLoginUI/src/com/parse/ui/ParseLoginDispatchActivity.java index f5cfc1d..7d16308 100644 --- a/ParseLoginUI/src/com/parse/ui/ParseLoginDispatchActivity.java +++ b/ParseLoginUI/src/com/parse/ui/ParseLoginDispatchActivity.java @@ -1,13 +1,13 @@ /* - * Copyright (c) 2014, Facebook, Inc. All rights reserved. + * 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 Facebook. + * in connection with the web services and APIs provided by Parse. * - * As with any software that integrates with the Facebook platform, your use of - * this software is subject to the Facebook Developer Principles and Policies - * [http://developers.facebook.com/policy/]. This copyright notice shall be + * 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 diff --git a/ParseLoginUI/src/com/parse/ui/ParseLoginFragment.java b/ParseLoginUI/src/com/parse/ui/ParseLoginFragment.java index c3028e1..00f6074 100644 --- a/ParseLoginUI/src/com/parse/ui/ParseLoginFragment.java +++ b/ParseLoginUI/src/com/parse/ui/ParseLoginFragment.java @@ -1,13 +1,13 @@ /* - * Copyright (c) 2014, Facebook, Inc. All rights reserved. + * 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 Facebook. + * in connection with the web services and APIs provided by Parse. * - * As with any software that integrates with the Facebook platform, your use of - * this software is subject to the Facebook Developer Principles and Policies - * [http://developers.facebook.com/policy/]. This copyright notice shall be + * 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 diff --git a/ParseLoginUI/src/com/parse/ui/ParseLoginFragmentBase.java b/ParseLoginUI/src/com/parse/ui/ParseLoginFragmentBase.java index 26ed56d..a880ab3 100644 --- a/ParseLoginUI/src/com/parse/ui/ParseLoginFragmentBase.java +++ b/ParseLoginUI/src/com/parse/ui/ParseLoginFragmentBase.java @@ -1,13 +1,13 @@ /* - * Copyright (c) 2014, Facebook, Inc. All rights reserved. + * 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 Facebook. + * in connection with the web services and APIs provided by Parse. * - * As with any software that integrates with the Facebook platform, your use of - * this software is subject to the Facebook Developer Principles and Policies - * [http://developers.facebook.com/policy/]. This copyright notice shall be + * 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 diff --git a/ParseLoginUI/src/com/parse/ui/ParseLoginHelpFragment.java b/ParseLoginUI/src/com/parse/ui/ParseLoginHelpFragment.java index 42186c3..a6ceef2 100644 --- a/ParseLoginUI/src/com/parse/ui/ParseLoginHelpFragment.java +++ b/ParseLoginUI/src/com/parse/ui/ParseLoginHelpFragment.java @@ -1,13 +1,13 @@ /* - * Copyright (c) 2014, Facebook, Inc. All rights reserved. + * 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 Facebook. + * in connection with the web services and APIs provided by Parse. * - * As with any software that integrates with the Facebook platform, your use of - * this software is subject to the Facebook Developer Principles and Policies - * [http://developers.facebook.com/policy/]. This copyright notice shall be + * 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 diff --git a/ParseLoginUI/src/com/parse/ui/ParseOnLoadingListener.java b/ParseLoginUI/src/com/parse/ui/ParseOnLoadingListener.java index 857f7c0..1025289 100644 --- a/ParseLoginUI/src/com/parse/ui/ParseOnLoadingListener.java +++ b/ParseLoginUI/src/com/parse/ui/ParseOnLoadingListener.java @@ -1,13 +1,13 @@ /* - * Copyright (c) 2014, Facebook, Inc. All rights reserved. + * 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 Facebook. + * in connection with the web services and APIs provided by Parse. * - * As with any software that integrates with the Facebook platform, your use of - * this software is subject to the Facebook Developer Principles and Policies - * [http://developers.facebook.com/policy/]. This copyright notice shall be + * 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 diff --git a/ParseLoginUI/src/com/parse/ui/ParseOnLoginSuccessListener.java b/ParseLoginUI/src/com/parse/ui/ParseOnLoginSuccessListener.java index 88e6d8d..4601f56 100644 --- a/ParseLoginUI/src/com/parse/ui/ParseOnLoginSuccessListener.java +++ b/ParseLoginUI/src/com/parse/ui/ParseOnLoginSuccessListener.java @@ -1,13 +1,13 @@ /* - * Copyright (c) 2014, Facebook, Inc. All rights reserved. + * 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 Facebook. + * in connection with the web services and APIs provided by Parse. * - * As with any software that integrates with the Facebook platform, your use of - * this software is subject to the Facebook Developer Principles and Policies - * [http://developers.facebook.com/policy/]. This copyright notice shall be + * 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 diff --git a/ParseLoginUI/src/com/parse/ui/ParseSignupFragment.java b/ParseLoginUI/src/com/parse/ui/ParseSignupFragment.java index 1394321..4e38b66 100644 --- a/ParseLoginUI/src/com/parse/ui/ParseSignupFragment.java +++ b/ParseLoginUI/src/com/parse/ui/ParseSignupFragment.java @@ -1,13 +1,13 @@ /* - * Copyright (c) 2014, Facebook, Inc. All rights reserved. + * 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 Facebook. + * in connection with the web services and APIs provided by Parse. * - * As with any software that integrates with the Facebook platform, your use of - * this software is subject to the Facebook Developer Principles and Policies - * [http://developers.facebook.com/policy/]. This copyright notice shall be + * 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 diff --git a/README.md b/README.md index 0247f44..0177a1e 100644 --- a/README.md +++ b/README.md @@ -6,19 +6,61 @@ To use this project with your app, you should import it as a library project in ![sample screens](http://parseui-android.parseapp.com/images/parse_login_sample_screens.png) -We also provide several sample projects demonstrating how to use the `ParseLoginUI` library. To run these -sample projects, you need to do the following: +### 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.0.2. + +#### Running Sample Projects +To run our sample apps, you need to import this repo as a standalone Gradle project: 1. Clone this repository onto your machine. -2. Import this repository's projects with Android Studio. The project has Maven dependencies on the Facebook SDK and the Bolts framework. Android Studio automatically resolves these. +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 and run the sample project using Android Studio. + * 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 +1. Clone this repository onto your machine. +2. Import `ParseLoginUI` as a module 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. +3. Add the following to the `dependencies` section of app's build.gradle. This adds a module dependency to `ParseLoginUI` (and optional Maven dependency for Facebook SDK). + + compile project(':ParseLoginUI') + + // Uncomment if using Facebook Login + // compile 'com.facebook.android:facebook-android-sdk:3.21.1' + + +4. 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/AndroidManifest.xml). + + + + + + + +5. Specify the following in `res/values/strings.xml` of your app + + YOUR_PARSE_APP_ID + YOUR_PARSE_CLIENT_KEY + +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). ## Documentation -For complete details about this library project, please see our [documentation](http://www.parse.com/docs/android_guide#ui-login) on the Parse website. +For complete details about this library project, please see our [documentation](https://www.parse.com/docs/android_guide#ui-login) 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: @@ -33,40 +75,24 @@ Each screen in the login experience is implemented by a fragment hosted within t 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. -For example, you can directly configure the login experience through the activity meta-data in `AndroidManifest.xml`. - -```xml - - - - - -``` +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](http://www.parse.com/docs/android_guide#ui-login) for additional documentation. +Please see the [Parse website](https://www.parse.com/docs/android_guide#ui-login) for additional documentation. ## Contributing See the CONTRIBUTING file for how to help out. ## License -Copyright (c) 2014, Facebook, Inc. All rights reserved. +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 Facebook. +in connection with the web services and APIs provided by Parse. -As with any software that integrates with the Facebook platform, your use of -this software is subject to the Facebook Developer Principles and Policies -[http://developers.facebook.com/policy/]. This copyright notice shall be +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 diff --git a/build.gradle b/build.gradle index 837a0e4..64a5558 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.12.+' + classpath 'com.android.tools.build:gradle:1.0.0' } } @@ -19,5 +19,5 @@ ext { buildToolsVersion = "21.1.1" minSdkVersion = 9 - targetSdkVersion = 19 + targetSdkVersion = 21 } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9c42b72..9e28f39 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Nov 17 20:23:27 PST 2014 +#Fri Dec 26 11:22:11 PST 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-1.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip