Merge pull request #65 from ParsePlatform/wangmengyan.reorgainze_package

Reorgainze ParseUI

Author: wangmengyan95

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)

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)

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)

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)

ParseLoginUI/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
+    }
+}

ParseLoginUI/src/androidTest/AndroidManifest.xml

@@ -0,0 +1,24 @@
+<!--
+  ~  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.
+  ~
+  -->
+
+<manifest package="com.parse.ui">
+    <application />
+</manifest>

ParseLoginUI/src/main/AndroidManifest.xml

@@ -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();

ParseUI-Login/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
+    }
+}

ParseLoginUI/libs/ParseFacebookUtilsV4-1.10.1.jar renamed to ParseUI-Login/libs/ParseFacebookUtilsV4-1.10.1.jar

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~  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.
+  ~
+  -->
+
+<manifest
+    package="com.parse"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <application>
+        <activity
+        android:name=".TestActivity"
+        android:screenOrientation="portrait" />
+    </application>
+</manifest>

ParseLoginUI/libs/ParseTwitterUtils-1.10.1.jar renamed to ParseUI-Login/libs/ParseTwitterUtils-1.10.1.jar

@@ -26,7 +26,7 @@
 import android.content.Context;
 import android.test.ActivityInstrumentationTestCase2;
 
-public abstract class BaseActivityInstrumentationTestCase2<T extends android.app.Activity>
+public abstract class BaseActivityInstrumentationTestCase2<T extends Activity>
     extends ActivityInstrumentationTestCase2<T> {
 
   protected Activity activity = null;

ParseUI-Login/src/main/AndroidManifest.xml

@@ -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;

ParseLoginUI/src/main/java/com/parse/ui/ParseLoginActivity.java renamed to ParseUI-Login/src/main/java/com/parse/ui/ParseLoginActivity.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;

ParseLoginUI/src/main/java/com/parse/ui/ParseLoginBuilder.java renamed to ParseUI-Login/src/main/java/com/parse/ui/ParseLoginBuilder.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

ParseLoginUI/src/main/java/com/parse/ui/ParseLoginConfig.java renamed to ParseUI-Login/src/main/java/com/parse/ui/ParseLoginConfig.java

@@ -0,0 +1,24 @@
+<!--
+  ~  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.
+
+  -->
+
+<manifest package="com.parse.widget">
+    <application />
+</manifest>