diff --git a/.travis.yml b/.travis.yml index f1b2b9d..5430e20 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,41 +1,21 @@ branches: only: - master - - /^\d+\.\d+\.\d+$/ # regex + - /^v4-\d+\.\d+\.\d+$/ # regex + language: android -sudo: false + jdk: - oraclejdk8 -android: - components: - - tools - - platform-tools - - build-tools-25.0.2 - - android-25 - - android-22 - - extra-android-support - - extra-android-m2repository - - sys-img-armeabi-v7a-android-22 - -before_script: - - echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a - - emulator -avd test -no-skin -no-audio -no-window & - - android-wait-for-emulator - - adb shell input keyevent 82 & +before_install: + - mkdir "$ANDROID_HOME/licenses" || true + - echo "d56f5187479451eabf01fb78af6dfcb131a6481e" > "$ANDROID_HOME/licenses/android-sdk-license" script: - - ./gradlew clean connectedCheck + - ./gradlew clean build cache: directories: - $HOME/.gradle - - $HOME/.m2/repository - -deploy: - provider: script - script: ./gradlew bintrayUpload - skip_cleanup: true - on: - branch: master - tags: true + - $HOME/.m2/repository \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index 7299866..0000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,29 +0,0 @@ -# Contributing to ParseUI -We want to make contributing to this project as easy and transparent as possible. - -## Pull Requests -We actively welcome your pull requests. - -1. Fork the repo and create your branch from `master`. -2. If you've added code that should be tested, add tests -3. If you've changed APIs, update the documentation. -4. Ensure the test suite passes. -5. Make sure your code lints. -6. If you haven't already, complete the Contributor License Agreement ("CLA"). - -## Contributor License Agreement ("CLA") -In order to accept your pull request, we need you to submit a CLA. You only need to do this once to work on any of Facebook's open source projects. - -Complete your CLA here: - -## Issues -We use GitHub issues to track public bugs. Please ensure your description is clear and has sufficient instructions to be able to reproduce the issue. - -Facebook has a [bounty program](https://www.facebook.com/whitehat/) for the safe disclosure of security bugs. In those cases, please go through the process outlined on that page and do not file a public issue. - -## Coding Style -* Most importantly, match the existing code style as much as possible. -* Try to keep lines under 100 characters, if possible. - -## License -By contributing to ParseUI, you agree that your contributions will be licensed under its license. \ No newline at end of file diff --git a/ParseLoginSampleBasic/build.gradle b/ParseLoginSampleBasic/build.gradle index 35e2e57..794c009 100644 --- a/ParseLoginSampleBasic/build.gradle +++ b/ParseLoginSampleBasic/build.gradle @@ -1,21 +1,22 @@ -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(':ParseUI-Login') - compile rootProject.ext.androidSupport - compile rootProject.ext.parse - compile rootProject.ext.parseFacebookUtils - compile rootProject.ext.parseTwitterUtils -} +apply plugin: 'com.android.application' android { compileSdkVersion rootProject.ext.compileSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion } + lintOptions { + abortOnError false + } +} + +dependencies { + // rootProject.ext.* variables are defined in project gradle file, you can also use path here. + implementation project(':login') + implementation rootProject.ext.androidSupport + implementation rootProject.ext.parse + implementation rootProject.ext.parseFacebookUtils + implementation rootProject.ext.parseTwitterUtils } diff --git a/ParseLoginSampleBasic/src/main/AndroidManifest.xml b/ParseLoginSampleBasic/src/main/AndroidManifest.xml index e151a73..dfe5c32 100644 --- a/ParseLoginSampleBasic/src/main/AndroidManifest.xml +++ b/ParseLoginSampleBasic/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - - + package="com.parse.loginsample.basic"> - - - - + + - + - + + android:name="com.parse.ui.login.ParseLoginActivity.PARSE_LOGIN_ENABLED" + android:value="true" /> + android:name="com.parse.ui.login.ParseLoginActivity.PARSE_LOGIN_EMAIL_AS_USERNAME" + android:value="true" /> + android:name="com.parse.ui.login.ParseLoginActivity.FACEBOOK_LOGIN_ENABLED" + android:value="true" /> + android:name="com.parse.ui.login.ParseLoginActivity.TWITTER_LOGIN_ENABLED" + android:value="true" /> - + android:value="@string/facebook_app_id" /> diff --git a/ParseLoginSampleBasic/src/main/java/com/parse/loginsample/basic/SampleApplication.java b/ParseLoginSampleBasic/src/main/java/com/parse/loginsample/basic/SampleApplication.java index 61e0860..965c5cf 100644 --- a/ParseLoginSampleBasic/src/main/java/com/parse/loginsample/basic/SampleApplication.java +++ b/ParseLoginSampleBasic/src/main/java/com/parse/loginsample/basic/SampleApplication.java @@ -24,23 +24,25 @@ import android.app.Application; import com.parse.Parse; -import com.parse.ParseFacebookUtils; -import com.parse.ParseTwitterUtils; +import com.parse.facebook.ParseFacebookUtils; +import com.parse.twitter.ParseTwitterUtils; public class SampleApplication extends Application { - @Override - public void onCreate() { - super.onCreate(); - // Required - Initialize the Parse SDK - Parse.initialize(this); + @Override + public void onCreate() { + super.onCreate(); + // Required - Initialize the Parse SDK + Parse.Configuration configuration = new Parse.Configuration.Builder(this) + .build(); + Parse.initialize(configuration); - Parse.setLogLevel(Parse.LOG_LEVEL_DEBUG); + Parse.setLogLevel(Parse.LOG_LEVEL_DEBUG); - ParseFacebookUtils.initialize(this); + ParseFacebookUtils.initialize(this); - // Optional - If you don't want to allow Twitter login, you can - // remove this line (and other related ParseTwitterUtils calls) - ParseTwitterUtils.initialize(getString(R.string.twitter_consumer_key), - getString(R.string.twitter_consumer_secret)); - } + // Optional - If you don't want to allow Twitter login, you can + // remove this line (and other related ParseTwitterUtils calls) + ParseTwitterUtils.initialize(getString(R.string.twitter_consumer_key), + getString(R.string.twitter_consumer_secret)); + } } diff --git a/ParseLoginSampleBasic/src/main/java/com/parse/loginsample/basic/SampleProfileActivity.java b/ParseLoginSampleBasic/src/main/java/com/parse/loginsample/basic/SampleProfileActivity.java index 6167d0f..60e24a9 100644 --- a/ParseLoginSampleBasic/src/main/java/com/parse/loginsample/basic/SampleProfileActivity.java +++ b/ParseLoginSampleBasic/src/main/java/com/parse/loginsample/basic/SampleProfileActivity.java @@ -29,7 +29,7 @@ import android.widget.TextView; import com.parse.ParseUser; -import com.parse.ui.ParseLoginBuilder; +import com.parse.ui.login.ParseLoginBuilder; /** * Shows the user profile. This simple activity can function regardless of whether the user diff --git a/ParseLoginSampleCodeCustomization/build.gradle b/ParseLoginSampleCodeCustomization/build.gradle index 35e2e57..794c009 100644 --- a/ParseLoginSampleCodeCustomization/build.gradle +++ b/ParseLoginSampleCodeCustomization/build.gradle @@ -1,21 +1,22 @@ -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(':ParseUI-Login') - compile rootProject.ext.androidSupport - compile rootProject.ext.parse - compile rootProject.ext.parseFacebookUtils - compile rootProject.ext.parseTwitterUtils -} +apply plugin: 'com.android.application' android { compileSdkVersion rootProject.ext.compileSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion } + lintOptions { + abortOnError false + } +} + +dependencies { + // rootProject.ext.* variables are defined in project gradle file, you can also use path here. + implementation project(':login') + implementation rootProject.ext.androidSupport + implementation rootProject.ext.parse + implementation rootProject.ext.parseFacebookUtils + implementation rootProject.ext.parseTwitterUtils } diff --git a/ParseLoginSampleCodeCustomization/src/main/AndroidManifest.xml b/ParseLoginSampleCodeCustomization/src/main/AndroidManifest.xml index 47308cc..9233b8b 100644 --- a/ParseLoginSampleCodeCustomization/src/main/AndroidManifest.xml +++ b/ParseLoginSampleCodeCustomization/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - - + package="com.parse.loginsample.codecustomization" + android:versionCode="1" + android:versionName="1.0"> - - - - + + - + - + - - + android:launchMode="singleTop"> + android:value="@string/facebook_app_id" /> diff --git a/ParseLoginSampleCodeCustomization/src/main/java/com/parse/loginsample/codecustomization/SampleApplication.java b/ParseLoginSampleCodeCustomization/src/main/java/com/parse/loginsample/codecustomization/SampleApplication.java index a186c51..0b4d39f 100644 --- a/ParseLoginSampleCodeCustomization/src/main/java/com/parse/loginsample/codecustomization/SampleApplication.java +++ b/ParseLoginSampleCodeCustomization/src/main/java/com/parse/loginsample/codecustomization/SampleApplication.java @@ -24,23 +24,25 @@ import android.app.Application; import com.parse.Parse; -import com.parse.ParseFacebookUtils; -import com.parse.ParseTwitterUtils; +import com.parse.facebook.ParseFacebookUtils; +import com.parse.twitter.ParseTwitterUtils; public class SampleApplication extends Application { - @Override - public void onCreate() { - super.onCreate(); - // Required - Initialize the Parse SDK - Parse.initialize(this); + @Override + public void onCreate() { + super.onCreate(); + // Required - Initialize the Parse SDK + Parse.Configuration configuration = new Parse.Configuration.Builder(this) + .build(); + Parse.initialize(configuration); - Parse.setLogLevel(Parse.LOG_LEVEL_DEBUG); + Parse.setLogLevel(Parse.LOG_LEVEL_DEBUG); - ParseFacebookUtils.initialize(this); + ParseFacebookUtils.initialize(this); - // Optional - If you don't want to allow Twitter login, you can - // remove this line (and other related ParseTwitterUtils calls) - ParseTwitterUtils.initialize(getString(R.string.twitter_consumer_key), - getString(R.string.twitter_consumer_secret)); - } + // Optional - If you don't want to allow Twitter login, you can + // remove this line (and other related ParseTwitterUtils calls) + ParseTwitterUtils.initialize(getString(R.string.twitter_consumer_key), + getString(R.string.twitter_consumer_secret)); + } } diff --git a/ParseLoginSampleCodeCustomization/src/main/java/com/parse/loginsample/codecustomization/SampleProfileActivity.java b/ParseLoginSampleCodeCustomization/src/main/java/com/parse/loginsample/codecustomization/SampleProfileActivity.java index 5d29918..2bef354 100644 --- a/ParseLoginSampleCodeCustomization/src/main/java/com/parse/loginsample/codecustomization/SampleProfileActivity.java +++ b/ParseLoginSampleCodeCustomization/src/main/java/com/parse/loginsample/codecustomization/SampleProfileActivity.java @@ -30,7 +30,7 @@ import android.widget.TextView; import com.parse.ParseUser; -import com.parse.ui.ParseLoginBuilder; +import com.parse.ui.login.ParseLoginBuilder; import java.util.Arrays; diff --git a/ParseLoginSampleLayoutOverride/build.gradle b/ParseLoginSampleLayoutOverride/build.gradle index 35e2e57..794c009 100644 --- a/ParseLoginSampleLayoutOverride/build.gradle +++ b/ParseLoginSampleLayoutOverride/build.gradle @@ -1,21 +1,22 @@ -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(':ParseUI-Login') - compile rootProject.ext.androidSupport - compile rootProject.ext.parse - compile rootProject.ext.parseFacebookUtils - compile rootProject.ext.parseTwitterUtils -} +apply plugin: 'com.android.application' android { compileSdkVersion rootProject.ext.compileSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion } + lintOptions { + abortOnError false + } +} + +dependencies { + // rootProject.ext.* variables are defined in project gradle file, you can also use path here. + implementation project(':login') + implementation rootProject.ext.androidSupport + implementation rootProject.ext.parse + implementation rootProject.ext.parseFacebookUtils + implementation rootProject.ext.parseTwitterUtils } diff --git a/ParseLoginSampleLayoutOverride/src/main/AndroidManifest.xml b/ParseLoginSampleLayoutOverride/src/main/AndroidManifest.xml index 44a70d3..56ffd1b 100644 --- a/ParseLoginSampleLayoutOverride/src/main/AndroidManifest.xml +++ b/ParseLoginSampleLayoutOverride/src/main/AndroidManifest.xml @@ -19,13 +19,7 @@ ~ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --> - - + package="com.parse.loginsample.layoutoverride"> @@ -47,27 +41,22 @@ - - + package="com.parse.loginsample.withdispatchactivity"> - - - - + + - + - + + android:launchMode="singleTop" /> + android:name="com.parse.ui.login.ParseLoginActivity.PARSE_LOGIN_ENABLED" + android:value="true" /> + android:name="com.parse.ui.login.ParseLoginActivity.PARSE_LOGIN_EMAIL_AS_USERNAME" + android:value="true" /> + android:name="com.parse.ui.login.ParseLoginActivity.FACEBOOK_LOGIN_ENABLED" + android:value="true" /> + android:name="com.parse.ui.login.ParseLoginActivity.TWITTER_LOGIN_ENABLED" + android:value="true" /> - + android:value="@string/facebook_app_id" /> diff --git a/ParseLoginSampleWithDispatchActivity/src/main/java/com/parse/loginsample/withdispatchactivity/SampleApplication.java b/ParseLoginSampleWithDispatchActivity/src/main/java/com/parse/loginsample/withdispatchactivity/SampleApplication.java index dc1799b..accaeca 100644 --- a/ParseLoginSampleWithDispatchActivity/src/main/java/com/parse/loginsample/withdispatchactivity/SampleApplication.java +++ b/ParseLoginSampleWithDispatchActivity/src/main/java/com/parse/loginsample/withdispatchactivity/SampleApplication.java @@ -24,23 +24,25 @@ import android.app.Application; import com.parse.Parse; -import com.parse.ParseFacebookUtils; -import com.parse.ParseTwitterUtils; +import com.parse.facebook.ParseFacebookUtils; +import com.parse.twitter.ParseTwitterUtils; public class SampleApplication extends Application { - @Override - public void onCreate() { - super.onCreate(); - // Required - Initialize the Parse SDK - Parse.initialize(this); + @Override + public void onCreate() { + super.onCreate(); + // Required - Initialize the Parse SDK + Parse.Configuration configuration = new Parse.Configuration.Builder(this) + .build(); + Parse.initialize(configuration); - Parse.setLogLevel(Parse.LOG_LEVEL_DEBUG); + Parse.setLogLevel(Parse.LOG_LEVEL_DEBUG); - ParseFacebookUtils.initialize(this); + ParseFacebookUtils.initialize(this); - // Optional - If you don't want to allow Twitter login, you can - // remove this line (and other related ParseTwitterUtils calls) - ParseTwitterUtils.initialize(getString(R.string.twitter_consumer_key), - getString(R.string.twitter_consumer_secret)); - } + // Optional - If you don't want to allow Twitter login, you can + // remove this line (and other related ParseTwitterUtils calls) + ParseTwitterUtils.initialize(getString(R.string.twitter_consumer_key), + getString(R.string.twitter_consumer_secret)); + } } diff --git a/ParseLoginSampleWithDispatchActivity/src/main/java/com/parse/loginsample/withdispatchactivity/SampleDispatchActivity.java b/ParseLoginSampleWithDispatchActivity/src/main/java/com/parse/loginsample/withdispatchactivity/SampleDispatchActivity.java index a3f1cd7..a23ff02 100644 --- a/ParseLoginSampleWithDispatchActivity/src/main/java/com/parse/loginsample/withdispatchactivity/SampleDispatchActivity.java +++ b/ParseLoginSampleWithDispatchActivity/src/main/java/com/parse/loginsample/withdispatchactivity/SampleDispatchActivity.java @@ -21,7 +21,7 @@ package com.parse.loginsample.withdispatchactivity; -import com.parse.ui.ParseLoginDispatchActivity; +import com.parse.ui.login.ParseLoginDispatchActivity; public class SampleDispatchActivity extends ParseLoginDispatchActivity { diff --git a/ParseUI-Login/build.gradle b/ParseUI-Login/build.gradle deleted file mode 100644 index bc84647..0000000 --- a/ParseUI-Login/build.gradle +++ /dev/null @@ -1,223 +0,0 @@ -/* - * 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. - * - */ - -import com.android.builder.core.BuilderConstants - -apply plugin: 'com.android.library' - -version = rootProject.ext.commonLibVersion -group = 'com.parse' - -ext { - projName = 'ParseUI-Login-Android' - projArtifact = 'parseui-login-android' - projDescription = 'A library contains login user interfaces for building apps with the Parse Android SDK.' - projGitLink = 'https://github.com/ParsePlatform/ParseUI-Android' -} - -dependencies { - compile rootProject.ext.androidSupport - compile rootProject.ext.parse - - provided rootProject.ext.facebookSDK - provided rootProject.ext.parseFacebookUtils - provided rootProject.ext.parseTwitterUtils -} - -android { - compileSdkVersion rootProject.ext.compileSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion - - defaultConfig { - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion - versionName project.version - versionCode 1 - } -} - -android.libraryVariants.all { variant -> - def name = variant.buildType.name - - def javadocTask = task("javadoc${variant.name.capitalize()}", type: Javadoc) { - description "Generates Javadoc for $variant.name." - source = variant.javaCompile.source - ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar" - classpath = files(variant.javaCompile.classpath.files) + files(ext.androidJar) - - options.linksOffline("http://d.android.com/reference", "${android.sdkDirectory}/docs/reference") - options.links("http://boltsframework.github.io/docs/android/") - - exclude '**/BuildConfig.java' - exclude '**/R.java' - exclude '**/internal/**' - exclude '**/oauth/**' - } - - def javadocJarTask = task("javadocJar${variant.name.capitalize()}", type: Jar, dependsOn: "javadoc${variant.name.capitalize()}") { - classifier = 'javadoc' - from javadocTask.destinationDir - } - - if (name.equals(BuilderConstants.RELEASE)) { - artifacts.add('archives', javadocJarTask); - } -} - -//region Maven - -apply plugin: 'maven' -apply plugin: 'signing' - -def isSnapshot = version.endsWith('-SNAPSHOT') -def ossrhUsername = hasProperty('NEXUS_USERNAME') ? NEXUS_USERNAME : System.getenv('CI_NEXUS_USERNAME') -def ossrhPassword = hasProperty('NEXUS_PASSWORD') ? NEXUS_PASSWORD : System.getenv('CI_NEXUS_PASSWORD') - -def pomConfig = { - scm { - connection 'scm:git@github.com:ParsePlatform/ParseUI-Android.git' - developerConnection 'scm:git@github.com:ParsePlatform/ParseUI-Android.git' - url 'https://github.com/ParsePlatform/ParseUI-Android' - } - - licenses { - license { - name 'Platform License' - url 'https://github.com/ParsePlatform/ParseUI-Android/blob/master/LICENSE' - distribution 'repo' - } - } - - developers { - developer { - id 'parse' - name 'Parse' - } - } -} - -uploadArchives { - repositories.mavenDeployer { - beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } - - repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") { - authentication(userName: ossrhUsername, password: ossrhPassword) - } - - snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") { - authentication(userName: ossrhUsername, password: ossrhPassword) - } - - def basePom = { - name "ParseUI-Android" - packaging 'aar' - artifactId projArtifact - description projDescription - url projGitLink - } - - pom.project basePom << pomConfig - } -} - -signing { - required { !isSnapshot && gradle.taskGraph.hasTask("uploadArchives") } - sign configurations.archives -} - - -task androidSourcesJar(type: Jar) { - classifier = 'sources' - from android.sourceSets.main.java.sourceFiles -} - -artifacts { - archives androidSourcesJar -} - -//endregion - -apply plugin: 'com.jfrog.bintray' - -bintray { - user = System.getenv('BINTRAY_USER') - key = System.getenv('BINTRAY_API_KEY') - - publications = ["MyPublication"] - - publish = true - pkg { - repo = 'maven' - name = 'ParseUI-Android' - userOrg = 'parse' - licenses = ['BSD'] - vcsUrl = projGitLink - version { - name = project.version - desc = projDescription - released = new Date() - vcsTag = project.version - - // Sonatype username/passwrod must be set for this operation to happen - mavenCentralSync { - sync = true - user = ossrhUsername - password = ossrhPassword - close = '1' // release automatically - } - } - } -} - -// Create the publication with the pom configuration: -apply plugin: 'maven-publish' - -publishing { - publications { - MyPublication(MavenPublication) { - groupId group - artifactId projArtifact - artifacts = [androidSourcesJar, bundleRelease] - version version - pom.withXml { - def root = asNode() - root.appendNode('description', projDescription) - root.appendNode('name', projName) - root.appendNode('url', projGitLink) - root.children().last() + pomConfig - - // maven-publish workaround to include dependencies - def dependenciesNode = asNode().appendNode('dependencies') - - //Iterate over the compile dependencies (we don't want the test ones), adding a node for each - configurations.compile.allDependencies.each { - def dependencyNode = dependenciesNode.appendNode('dependency') - dependencyNode.appendNode('groupId', it.group) - dependencyNode.appendNode('artifactId', it.name) - dependencyNode.appendNode('version', it.version) - } - - } - } - } -} - -// End of Bintray plugin diff --git a/ParseUI-Widget-Sample/build.gradle b/ParseUI-Widget-Sample/build.gradle index 18d8475..b50ea62 100644 --- a/ParseUI-Widget-Sample/build.gradle +++ b/ParseUI-Widget-Sample/build.gradle @@ -2,7 +2,6 @@ apply plugin: 'com.android.application' android { compileSdkVersion rootProject.ext.compileSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { minSdkVersion rootProject.ext.minSdkVersion @@ -11,17 +10,12 @@ android { versionCode 1 versionName "1.0" } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } + lintOptions { + abortOnError false } } dependencies { - compile "com.android.support:appcompat-v7:${supportLibVersion}" - compile project(':ParseUI-Widget') - - testCompile 'junit:junit:4.12' + implementation "com.android.support:appcompat-v7:${supportLibVersion}" + implementation project(':widget') } diff --git a/ParseUI-Widget-Sample/src/main/AndroidManifest.xml b/ParseUI-Widget-Sample/src/main/AndroidManifest.xml index 37ac933..0821c7c 100644 --- a/ParseUI-Widget-Sample/src/main/AndroidManifest.xml +++ b/ParseUI-Widget-Sample/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ - + @@ -19,18 +19,14 @@ android:name="com.parse.CLIENT_KEY" android:value="@string/parse_client_key" /> - + - + - + - diff --git a/ParseUI-Widget-Sample/src/main/java/com/parse/ui/widget/sample/ListActivity.java b/ParseUI-Widget-Sample/src/main/java/com/parse/ui/widget/sample/ListActivity.java deleted file mode 100644 index 08a0595..0000000 --- a/ParseUI-Widget-Sample/src/main/java/com/parse/ui/widget/sample/ListActivity.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.parse.ui.widget.sample; - -import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; -import android.util.Log; -import android.widget.ListView; -import android.widget.Toast; - -import com.parse.ParseException; -import com.parse.ParseObject; -import com.parse.ParseQuery; -import com.parse.ParseQueryAdapter; - -import java.util.List; - - -public class ListActivity extends AppCompatActivity { - - private static final String TAG = "ListActivity"; - - @Override - protected void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_list); - - ListView listView = (ListView) findViewById(R.id.list); - - ParseQueryAdapter adapter = new ParseQueryAdapter<>(this, - new ParseQueryAdapter.QueryFactory() { - @Override - public ParseQuery create() { - return ParseQuery.getQuery("Contact") - .orderByAscending("name") - .setCachePolicy(ParseQuery.CachePolicy.CACHE_THEN_NETWORK); - } - }, android.R.layout.simple_list_item_1); - adapter.setTextKey("name"); - adapter.addOnQueryLoadListener(new ParseQueryAdapter.OnQueryLoadListener() { - @Override - public void onLoading() { - Log.d(TAG, "loading"); - } - - @Override - public void onLoaded(List objects, Exception e) { - Log.d(TAG, "loaded"); - if (e != null - && e instanceof ParseException - && ((ParseException) e).getCode() != ParseException.CACHE_MISS) { - Toast.makeText(ListActivity.this, "Error: " + e.getMessage(), Toast.LENGTH_LONG).show(); - } - } - }); - listView.setAdapter(adapter); - } -} diff --git a/ParseUI-Widget-Sample/src/main/java/com/parse/ui/widget/sample/MainActivity.java b/ParseUI-Widget-Sample/src/main/java/com/parse/ui/widget/sample/MainActivity.java index be09b6e..a62fbf5 100644 --- a/ParseUI-Widget-Sample/src/main/java/com/parse/ui/widget/sample/MainActivity.java +++ b/ParseUI-Widget-Sample/src/main/java/com/parse/ui/widget/sample/MainActivity.java @@ -1,33 +1,13 @@ package com.parse.ui.widget.sample; -import android.content.Intent; -import android.support.v7.app.AppCompatActivity; import android.os.Bundle; -import android.view.View; - -public class MainActivity extends AppCompatActivity implements View.OnClickListener { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - - findViewById(R.id.sample_list).setOnClickListener(this); - } +import android.support.v7.app.AppCompatActivity; - //region OnClickListener +public class MainActivity extends AppCompatActivity { - @Override - public void onClick(View v) { - int id = v.getId(); - switch (id) { - case R.id.sample_list: { - Intent intent = new Intent(this, ListActivity.class); - startActivity(intent); - break; - } + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); } - } - - //endregion } diff --git a/ParseUI-Widget-Sample/src/main/java/com/parse/ui/widget/sample/MyApplication.java b/ParseUI-Widget-Sample/src/main/java/com/parse/ui/widget/sample/MyApplication.java index 315c5b2..d67532f 100644 --- a/ParseUI-Widget-Sample/src/main/java/com/parse/ui/widget/sample/MyApplication.java +++ b/ParseUI-Widget-Sample/src/main/java/com/parse/ui/widget/sample/MyApplication.java @@ -6,10 +6,12 @@ public class MyApplication extends Application { - @Override - public void onCreate() { - super.onCreate(); + @Override + public void onCreate() { + super.onCreate(); - Parse.initialize(this); - } + Parse.Configuration configuration = new Parse.Configuration.Builder(this) + .build(); + Parse.initialize(configuration); + } } diff --git a/ParseUI-Widget-Sample/src/main/res/layout/activity_main.xml b/ParseUI-Widget-Sample/src/main/res/layout/activity_main.xml index 87dc282..e268ddc 100644 --- a/ParseUI-Widget-Sample/src/main/res/layout/activity_main.xml +++ b/ParseUI-Widget-Sample/src/main/res/layout/activity_main.xml @@ -11,9 +11,4 @@ android:orientation="vertical" tools:context="com.parse.ui.widget.sample.MainActivity"> -