diff options
| -rw-r--r-- | .idea/modules.xml | 4 | ||||
| -rw-r--r-- | .idea/modules/app/app.iml | 175 | ||||
| -rw-r--r-- | SmileEssence.iml (renamed from .idea/modules/SmileEssence.iml) | 8 | ||||
| -rw-r--r-- | app/app.iml | 174 | ||||
| -rw-r--r-- | app/build.gradle | 11 | ||||
| -rw-r--r-- | app/src/main/java/net/lacolaco/smileessence/data/Account.java | 5 | ||||
| -rw-r--r-- | build.gradle | 2 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 4 |
8 files changed, 195 insertions, 188 deletions
diff --git a/.idea/modules.xml b/.idea/modules.xml index 0ccf9d10..1ba07729 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,8 +2,8 @@ <project version="4"> <component name="ProjectModuleManager"> <modules> - <module fileurl="file://$PROJECT_DIR$/.idea/modules/SmileEssence.iml" filepath="$PROJECT_DIR$/.idea/modules/SmileEssence.iml" /> - <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/app.iml" /> + <module fileurl="file://$PROJECT_DIR$/SmileEssence.iml" filepath="$PROJECT_DIR$/SmileEssence.iml" /> + <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> </modules> </component> </project>
\ No newline at end of file diff --git a/.idea/modules/app/app.iml b/.idea/modules/app/app.iml deleted file mode 100644 index 62f201c9..00000000 --- a/.idea/modules/app/app.iml +++ /dev/null @@ -1,175 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$/../../../app" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="SmileEssence" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> - <component name="FacetManager"> - <facet type="android-gradle" name="Android-Gradle"> - <configuration> - <option name="GRADLE_PROJECT_PATH" value=":app" /> - </configuration> - </facet> - <facet type="android" name="Android"> - <configuration> - <option name="SELECTED_BUILD_VARIANT" value="debug" /> - <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" /> - <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" /> - <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" /> - <afterSyncTasks> - <task>generateDebugSources</task> - </afterSyncTasks> - <option name="ALLOW_USER_CONFIGURATION" value="false" /> - <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" /> - <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" /> - <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/main/res;file://$MODULE_DIR$/../../../app/src/debug/res" /> - <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" /> - </configuration> - </facet> - </component> - <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/../../../app/build/intermediates/classes/debug" /> - <output-test url="file://$MODULE_DIR$/../../../app/build/intermediates/classes/test/debug" /> - <exclude-output /> - <content url="file://$MODULE_DIR$/../../../app"> - <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kapt/debug" isTestSource="false" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/debug" isTestSource="false" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/r/debug" isTestSource="false" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/aidl/debug" isTestSource="false" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/rs/debug" isTestSource="false" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kapt/debugUnitTest" isTestSource="true" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kapt/debugAndroidTest" isTestSource="true" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/debug" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/res" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/resources" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/assets" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/aidl" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/jni" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/rs" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/res" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/resources" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/assets" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/aidl" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/java" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/jni" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/rs" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/res" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/resources" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/assets" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/aidl" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/kotlin" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/jni" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/rs" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/res" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/resources" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/assets" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/aidl" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/java" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/jni" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/rs" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/res" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/resources" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/assets" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/aidl" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/java" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/jni" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/rs" isTestSource="true" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/assets" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/blame" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/builds" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/bundles" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/classes" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/data-binding-info" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/data-binding-layout-out" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/dependency-cache" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/exploded-aar/com.android.databinding/adapters/1.0-rc5/jars" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/exploded-aar/com.android.databinding/library/1.0-rc5/jars" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/exploded-aar/com.android.support/support-compat/24.2.1/jars" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/exploded-aar/com.android.support/support-core-ui/24.2.1/jars" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/exploded-aar/com.android.support/support-core-utils/24.2.1/jars" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/exploded-aar/com.android.support/support-fragment/24.2.1/jars" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/exploded-aar/com.android.support/support-media-compat/24.2.1/jars" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/exploded-aar/com.android.support/support-v13/24.2.1/jars" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/exploded-aar/com.android.support/support-v4/24.2.1/jars" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/exploded-aar/com.crashlytics.sdk.android/answers/1.3.6/jars" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/exploded-aar/com.crashlytics.sdk.android/beta/1.1.4/jars" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/exploded-aar/com.crashlytics.sdk.android/crashlytics-core/2.3.8/jars" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/exploded-aar/com.crashlytics.sdk.android/crashlytics/2.5.5/jars" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/exploded-aar/com.github.gfx.android.orma/orma-migration/2.6.0/jars" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/exploded-aar/com.github.gfx.android.orma/orma/2.6.0/jars" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/exploded-aar/com.navercorp.pulltorefresh/library/3.3.0-SNAPSHOT/jars" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/exploded-aar/com.squareup.leakcanary/leakcanary-android/1.4/jars" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/exploded-aar/de.keyboardsurfer.android.widget/crouton/1.8.5/jars" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/exploded-aar/io.fabric.sdk.android/fabric/1.3.10/jars" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/incremental" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/incremental-classes" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/incremental-runtime-classes" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/incremental-verifier" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/instant-run-support" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/jniLibs" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/manifests" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/reload-dex" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/res" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/restart-dex" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/rs" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/sourceFolderJavaResources" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/symbols" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/transforms" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/outputs" /> - <excludeFolder url="file://$MODULE_DIR$/../../../app/build/tmp" /> - </content> - <orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" exported="" name="support-v4-24.2.1" level="project" /> - <orderEntry type="library" exported="" name="support-compat-24.2.1" level="project" /> - <orderEntry type="library" exported="" name="support-fragment-24.2.1" level="project" /> - <orderEntry type="library" exported="" name="library-1.0.19" level="project" /> - <orderEntry type="library" exported="" name="commons-io-2.4" level="project" /> - <orderEntry type="library" exported="" name="juniversalchardet-1.0.3" level="project" /> - <orderEntry type="library" exported="" name="haha-2.0.3" level="project" /> - <orderEntry type="library" exported="" name="library-3.3.0-SNAPSHOT" level="project" /> - <orderEntry type="library" exported="" name="leakcanary-analyzer-1.4" level="project" /> - <orderEntry type="library" exported="" name="antlr4-4.5" level="project" /> - <orderEntry type="library" exported="" name="compiler-2.0.0" level="project" /> - <orderEntry type="library" exported="" name="antlr4-runtime-4.5" level="project" /> - <orderEntry type="library" exported="" name="leakcanary-watcher-1.4" level="project" /> - <orderEntry type="library" exported="" name="antlr4-annotations-4.5" level="project" /> - <orderEntry type="library" exported="" name="baseLibrary-2.0.0" level="project" /> - <orderEntry type="library" exported="" name="antlr-runtime-3.5.2" level="project" /> - <orderEntry type="library" exported="" name="org.abego.treelayout.core-1.0.1" level="project" /> - <orderEntry type="library" exported="" name="twitter4j-stream-4.0.5" level="project" /> - <orderEntry type="library" exported="" name="library-1.0-rc5" level="project" /> - <orderEntry type="library" exported="" name="leakcanary-android-1.4" level="project" /> - <orderEntry type="library" exported="" name="fabric-1.3.10" level="project" /> - <orderEntry type="library" exported="" name="support-media-compat-24.2.1" level="project" /> - <orderEntry type="library" exported="" name="support-v13-24.2.1" level="project" /> - <orderEntry type="library" exported="" name="kotlin-stdlib-1.0.3" level="project" /> - <orderEntry type="library" exported="" name="guava-19.0" level="project" /> - <orderEntry type="library" exported="" name="adapters-1.0-rc5" level="project" /> - <orderEntry type="library" exported="" name="support-core-ui-24.2.1" level="project" /> - <orderEntry type="library" exported="" name="rxjava-1.1.9" level="project" /> - <orderEntry type="library" exported="" name="crashlytics-2.5.5" level="project" /> - <orderEntry type="library" exported="" name="orma-annotations-2.6.0" level="project" /> - <orderEntry type="library" exported="" name="orma-2.6.0" level="project" /> - <orderEntry type="library" exported="" name="support-core-utils-24.2.1" level="project" /> - <orderEntry type="library" exported="" name="crashlytics-core-2.3.8" level="project" /> - <orderEntry type="library" exported="" name="beta-1.1.4" level="project" /> - <orderEntry type="library" exported="" name="support-annotations-24.2.1" level="project" /> - <orderEntry type="library" exported="" name="compilerCommon-2.0.0" level="project" /> - <orderEntry type="library" exported="" name="twitter-text-1.13.0" level="project" /> - <orderEntry type="library" exported="" name="twitter4j-media-support-4.0.5" level="project" /> - <orderEntry type="library" exported="" name="ST4-4.0.8" level="project" /> - <orderEntry type="library" exported="" name="crouton-1.8.5" level="project" /> - <orderEntry type="library" exported="" name="orma-migration-2.6.0" level="project" /> - <orderEntry type="library" exported="" name="commons-codec-1.10" level="project" /> - <orderEntry type="library" exported="" name="kotlin-runtime-1.0.3" level="project" /> - <orderEntry type="library" exported="" name="answers-1.3.6" level="project" /> - <orderEntry type="library" exported="" name="twitter4j-core-4.0.5" level="project" /> - </component> -</module>
\ No newline at end of file diff --git a/.idea/modules/SmileEssence.iml b/SmileEssence.iml index db113c90..3296c2a5 100644 --- a/.idea/modules/SmileEssence.iml +++ b/SmileEssence.iml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> -<module external.linked.project.id="SmileEssence" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> +<module external.linked.project.id="SmileEssence" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4"> <component name="FacetManager"> <facet type="java-gradle" name="Java-Gradle"> <configuration> - <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/../../build" /> + <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" /> <option name="BUILDABLE" value="false" /> </configuration> </facet> </component> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> - <content url="file://$MODULE_DIR$/../.."> - <excludeFolder url="file://$MODULE_DIR$/../../.gradle" /> + <content url="file://$MODULE_DIR$"> + <excludeFolder url="file://$MODULE_DIR$/.gradle" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> diff --git a/app/app.iml b/app/app.iml new file mode 100644 index 00000000..11e66cd4 --- /dev/null +++ b/app/app.iml @@ -0,0 +1,174 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4"> + <component name="FacetManager"> + <facet type="android-gradle" name="Android-Gradle"> + <configuration> + <option name="GRADLE_PROJECT_PATH" value=":app" /> + </configuration> + </facet> + <facet type="android" name="Android"> + <configuration> + <option name="SELECTED_BUILD_VARIANT" value="debug" /> + <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" /> + <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" /> + <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" /> + <afterSyncTasks> + <task>generateDebugSources</task> + </afterSyncTasks> + <option name="ALLOW_USER_CONFIGURATION" value="false" /> + <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" /> + <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" /> + <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/debug/res" /> + <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" /> + </configuration> + </facet> + </component> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" /> + <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" /> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debug" isTestSource="false" generated="true" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debugAndroidTest" isTestSource="true" generated="true" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debugUnitTest" isTestSource="true" generated="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/kotlin" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/data-binding-info" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/data-binding-layout-out" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.databinding/adapters/1.2.1/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.databinding/library/1.2.1/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-compat/24.2.1/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-ui/24.2.1/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-utils/24.2.1/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-fragment/24.2.1/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-media-compat/24.2.1/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v13/24.2.1/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/24.2.1/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.crashlytics.sdk.android/answers/1.3.6/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.crashlytics.sdk.android/beta/1.1.4/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.crashlytics.sdk.android/crashlytics-core/2.3.8/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.crashlytics.sdk.android/crashlytics/2.5.5/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.gfx.android.orma/orma-migration/2.6.0/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.gfx.android.orma/orma/2.6.0/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.navercorp.pulltorefresh/library/3.3.0-SNAPSHOT/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.squareup.leakcanary/leakcanary-android/1.4/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/de.keyboardsurfer.android.widget/crouton/1.8.5/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/io.fabric.sdk.android/fabric/1.3.10/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/sourceFolderJavaResources" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" /> + <excludeFolder url="file://$MODULE_DIR$/build/outputs" /> + <excludeFolder url="file://$MODULE_DIR$/build/tmp" /> + </content> + <orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="library" exported="" name="support-v4-24.2.1" level="project" /> + <orderEntry type="library" exported="" name="support-compat-24.2.1" level="project" /> + <orderEntry type="library" exported="" name="support-fragment-24.2.1" level="project" /> + <orderEntry type="library" exported="" name="library-1.0.19" level="project" /> + <orderEntry type="library" exported="" name="juniversalchardet-1.0.3" level="project" /> + <orderEntry type="library" exported="" name="haha-2.0.3" level="project" /> + <orderEntry type="library" exported="" name="library-3.3.0-SNAPSHOT" level="project" /> + <orderEntry type="library" exported="" name="leakcanary-analyzer-1.4" level="project" /> + <orderEntry type="library" exported="" name="twitter4j-stream-support_extended_tweets-SNAPSHOT" level="project" /> + <orderEntry type="library" exported="" name="compiler-2.2.0" level="project" /> + <orderEntry type="library" exported="" name="adapters-1.2.1" level="project" /> + <orderEntry type="library" exported="" name="baseLibrary-2.2.0" level="project" /> + <orderEntry type="library" exported="" name="antlr4-runtime-4.5" level="project" /> + <orderEntry type="library" exported="" name="leakcanary-watcher-1.4" level="project" /> + <orderEntry type="library" exported="" name="leakcanary-android-1.4" level="project" /> + <orderEntry type="library" exported="" name="library-1.2.1" level="project" /> + <orderEntry type="library" exported="" name="fabric-1.3.10" level="project" /> + <orderEntry type="library" exported="" name="support-media-compat-24.2.1" level="project" /> + <orderEntry type="library" exported="" name="support-v13-24.2.1" level="project" /> + <orderEntry type="library" exported="" name="guava-19.0" level="project" /> + <orderEntry type="library" exported="" name="kotlin-stdlib-1.0.3" level="project" /> + <orderEntry type="library" exported="" name="twitter4j-media-support-support_extended_tweets-SNAPSHOT" level="project" /> + <orderEntry type="library" exported="" name="support-core-ui-24.2.1" level="project" /> + <orderEntry type="library" exported="" name="rxjava-1.1.9" level="project" /> + <orderEntry type="library" exported="" name="crashlytics-2.5.5" level="project" /> + <orderEntry type="library" exported="" name="orma-annotations-2.6.0" level="project" /> + <orderEntry type="library" exported="" name="twitter4j-core-support_extended_tweets-SNAPSHOT" level="project" /> + <orderEntry type="library" exported="" name="orma-2.6.0" level="project" /> + <orderEntry type="library" exported="" name="support-core-utils-24.2.1" level="project" /> + <orderEntry type="library" exported="" name="crashlytics-core-2.3.8" level="project" /> + <orderEntry type="library" exported="" name="beta-1.1.4" level="project" /> + <orderEntry type="library" exported="" name="support-annotations-24.2.1" level="project" /> + <orderEntry type="library" exported="" name="twitter-text-1.13.0" level="project" /> + <orderEntry type="library" exported="" name="crouton-1.8.5" level="project" /> + <orderEntry type="library" exported="" name="orma-migration-2.6.0" level="project" /> + <orderEntry type="library" exported="" name="kotlin-runtime-1.0.3" level="project" /> + <orderEntry type="library" exported="" name="answers-1.3.6" level="project" /> + </component> +</module>
\ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 5c72e805..e32407f1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -68,9 +68,13 @@ dependencies { // pull to refresh compile 'com.navercorp.pulltorefresh:library:3.3.0-SNAPSHOT@aar' // t4j - compile 'org.twitter4j:twitter4j-core:4.0.5' - compile 'org.twitter4j:twitter4j-media-support:4.0.5' - compile 'org.twitter4j:twitter4j-stream:4.0.5' + // FIXME: restore after the pull request is merged + // compile 'org.twitter4j:twitter4j-core:4.0.5' + // compile 'org.twitter4j:twitter4j-media-support:4.0.5' + // compile 'org.twitter4j:twitter4j-stream:4.0.5' + compile 'com.github.takke.twitter4j:twitter4j-core:support_extended_tweets-SNAPSHOT' + compile 'com.github.takke.twitter4j:twitter4j-media-support:support_extended_tweets-SNAPSHOT' + compile 'com.github.takke.twitter4j:twitter4j-stream:support_extended_tweets-SNAPSHOT' // twitter-text compile 'com.twitter:twitter-text:1.13.0' // guava @@ -98,4 +102,5 @@ kapt { repositories { mavenCentral() + maven { url "https://jitpack.io" } } diff --git a/app/src/main/java/net/lacolaco/smileessence/data/Account.java b/app/src/main/java/net/lacolaco/smileessence/data/Account.java index 69aee53e..e14250ea 100644 --- a/app/src/main/java/net/lacolaco/smileessence/data/Account.java +++ b/app/src/main/java/net/lacolaco/smileessence/data/Account.java @@ -39,6 +39,7 @@ import twitter4j.TwitterFactory; import twitter4j.TwitterStream; import twitter4j.TwitterStreamFactory; import twitter4j.auth.AccessToken; +import twitter4j.conf.ConfigurationBuilder; import java.util.*; import java.util.concurrent.ConcurrentHashMap; @@ -123,7 +124,9 @@ public class Account { } public Twitter getTwitter() { - Twitter twitter = new TwitterFactory().getInstance(); + ConfigurationBuilder cb = new ConfigurationBuilder(); + cb.setTweetModeExtended(true); + Twitter twitter = new TwitterFactory(cb.build()).getInstance(); twitter.setOAuthAccessToken(new AccessToken(oauthToken, oauthTokenSecret)); return twitter; } diff --git a/build.gradle b/build.gradle index aee04f81..1a138abb 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { maven { url 'https://maven.fabric.io/public' } } dependencies { - classpath 'com.android.tools.build:gradle:2.0.0' + classpath 'com.android.tools.build:gradle:2.2.0' classpath 'me.tatarka:gradle-retrolambda:3.3.0' classpath 'io.fabric.tools:gradle:1.+' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e0352daf..c04d9dcd 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Sep 22 01:04:26 JST 2016 +#Wed Dec 07 21:26:23 JST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip |