diff --git a/gradle.properties b/gradle.properties index a84cf6f..c54a4f9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -44,7 +44,7 @@ org.gradle.jvmargs=-Xmx1536M GROUP=com.alibaba.android -ARTIFACT=tangram +ARTIFACT=tangram3 VERSION=1 VERSION_NAME=3.5.9.3 PACKAGING_TYPE=aar diff --git a/settings.gradle b/settings.gradle index 4740da8..4c2051e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -23,6 +23,7 @@ */ include ':tangram' +include ':tangram3' include ':examples' File configFile = file('./config.gradle') diff --git a/tangram3/.gitignore b/tangram3/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/tangram3/.gitignore @@ -0,0 +1 @@ +/build diff --git a/tangram3/build.gradle b/tangram3/build.gradle new file mode 100644 index 0000000..91b15e4 --- /dev/null +++ b/tangram3/build.gradle @@ -0,0 +1,152 @@ +/* + * MIT License + * + * Copyright (c) 2018 Alibaba Group + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission 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' + +buildscript { + repositories { + maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' } + maven { url "http://oss.jfrog.org/oss-snapshot-local/" } + mavenCentral() + jcenter() + maven { url 'https://maven.google.com' } + } + + dependencies { + classpath 'com.android.tools.build:gradle:2.3.0' + } +} + +repositories { + maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' } + maven { url "http://oss.jfrog.org/oss-snapshot-local/" } + jcenter() + mavenLocal() + maven { url 'https://maven.google.com' } +} + +ext { + bintrayRepo = 'Tangram' + bintrayName = 'Tangram-Android' + + publishedGroupId = project.hasProperty('GROUP') ? GROUP : '' + libraryName = project.hasProperty('ARTIFACT') ? ARTIFACT : '' + artifact = project.hasProperty('ARTIFACT') ? ARTIFACT : '' + + libraryDescription = 'Tangram is a modular UI solution for building native page dynamically including Tangram for Android, Tangram for iOS and even backend CMS. This project provides the sdk on Android.' + + siteUrl = 'https://github.com/alibaba/Tangram-Android' + gitUrl = 'https://github.com/alibaba/Tangram-Android.git' + + libraryVersion = project.hasProperty('VERSION_NAME') ? VERSION_NAME : '' + + developerId = 'longerian' + developerName = 'longerian' + developerEmail = 'xlhongultimate@gmail.com' + + licenseName = 'MIT' + licenseUrl = 'https://opensource.org/licenses/MIT' + allLicenses = ["MIT"] +} + +def VERSION = System.properties['version'] ?: '10' +def VERSION_NAME = System.properties['versionName'] ?: '0.1.0' + +android { + compileSdkVersion Integer.parseInt(System.properties['compileSdkVersion'] ?: '26') + buildToolsVersion System.properties['buildToolsVersion'] ?: '26.0.2' + + defaultConfig { + minSdkVersion 14 + targetSdkVersion Integer.parseInt(System.properties['targetSdkVersion'] ?: '26') + versionCode Integer.parseInt(VERSION) + versionName VERSION_NAME + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } + + lintOptions { + abortOnError false + } + +} + +configurations.all { + // check for updates every build + resolutionStrategy.cacheChangingModulesFor 60, 'seconds' +} + + +dependencies { + if (project.hasProperty('vlayoutDevMode')) { + println 'compile with vlayout source code' + compile(project(':vlayout')) { + exclude group: 'com.android.support', module: 'recyclerview-v7' + exclude group: 'com.android.support', module: 'support-v4' + exclude group: 'com.android.support', module: 'support-annotations' + } + } else { + compile('com.alibaba.android:vlayout:1.2.40@aar') { + changing = true + } + } + + provided 'io.reactivex.rxjava2:rxjava:2.1.12' + provided 'io.reactivex.rxjava2:rxandroid:2.0.2' + compile 'com.android.support:recyclerview-v7:26.0.2' + compile 'com.android.support:support-v4:26.0.2' + compile 'com.android.support:support-annotations:26.0.2' + compile 'com.alibaba:fastjson:1.1.54.android@jar' + if (project.hasProperty('ultraViewPagerDevMode')) { + println 'compile with ultraViewPager source code' + compile project(':ultraviewpager') + } else { + compile 'com.alibaba.android:ultraviewpager:1.0.7.8@aar' + } +} + +File deployConfig = rootProject.file('jcenterInstall.gradle') +if (deployConfig.exists()) { + apply from: rootProject.file('jcenterInstall.gradle') +} + +deployConfig = rootProject.file('jcenterDeploy.gradle') +if (deployConfig.exists()) { + apply from: rootProject.file('jcenterDeploy.gradle') +} + +deployConfig = rootProject.file('deploy.gradle') +if (deployConfig.exists()) { + apply from: rootProject.file('deploy.gradle') +} \ No newline at end of file diff --git a/tangram3/proguard-rules.pro b/tangram3/proguard-rules.pro new file mode 100644 index 0000000..e0d841d --- /dev/null +++ b/tangram3/proguard-rules.pro @@ -0,0 +1,17 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /Users/longerian/Documents/devtools/android-sdk-macosx/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/tangram3/src/main/AndroidManifest.xml b/tangram3/src/main/AndroidManifest.xml new file mode 100644 index 0000000..6aa3890 --- /dev/null +++ b/tangram3/src/main/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/BaseTangramEngine.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/BaseTangramEngine.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/BaseTangramEngine.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/BaseTangramEngine.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/ComponentRenderManager.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/ComponentRenderManager.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/ComponentRenderManager.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/ComponentRenderManager.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/DefaultResolverRegistry.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/DefaultResolverRegistry.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/DefaultResolverRegistry.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/DefaultResolverRegistry.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/Engine.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/Engine.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/Engine.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/Engine.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/MVHelper.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/MVHelper.java similarity index 96% rename from tangram/src/main/java/com/tmall/wireless/tangram3/MVHelper.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/MVHelper.java index 890ca0f..1317112 100644 --- a/tangram/src/main/java/com/tmall/wireless/tangram3/MVHelper.java +++ b/tangram3/src/main/java/com/tmall/wireless/tangram3/MVHelper.java @@ -29,7 +29,7 @@ import android.view.View; import android.view.ViewGroup; import com.alibaba.android.vlayout.VirtualLayoutManager; -import com.tmall.wireless.tangram.core.R; +import com.tmall.wireless.tangram3.core.R; import com.tmall.wireless.tangram3.core.service.ServiceManager; import com.tmall.wireless.tangram3.dataparser.concrete.BaseCellBinderResolver; import com.tmall.wireless.tangram3.structure.BaseCell; @@ -42,10 +42,10 @@ import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; -import static com.tmall.wireless.tangram.dataparser.concrete.Style.MARGIN_BOTTOM_INDEX; -import static com.tmall.wireless.tangram.dataparser.concrete.Style.MARGIN_LEFT_INDEX; -import static com.tmall.wireless.tangram.dataparser.concrete.Style.MARGIN_RIGHT_INDEX; -import static com.tmall.wireless.tangram.dataparser.concrete.Style.MARGIN_TOP_INDEX; +import static com.tmall.wireless.tangram3.dataparser.concrete.Style.MARGIN_BOTTOM_INDEX; +import static com.tmall.wireless.tangram3.dataparser.concrete.Style.MARGIN_LEFT_INDEX; +import static com.tmall.wireless.tangram3.dataparser.concrete.Style.MARGIN_RIGHT_INDEX; +import static com.tmall.wireless.tangram3.dataparser.concrete.Style.MARGIN_TOP_INDEX; /** * Created by mikeafc on 16/4/25. diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/MVResolver.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/MVResolver.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/MVResolver.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/MVResolver.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/TangramBuilder.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/TangramBuilder.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/TangramBuilder.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/TangramBuilder.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/TangramEngine.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/TangramEngine.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/TangramEngine.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/TangramEngine.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/core/adapter/BinderViewHolder.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/core/adapter/BinderViewHolder.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/core/adapter/BinderViewHolder.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/core/adapter/BinderViewHolder.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/core/adapter/CacheItem.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/core/adapter/CacheItem.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/core/adapter/CacheItem.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/core/adapter/CacheItem.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/core/adapter/GroupBasicAdapter.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/core/adapter/GroupBasicAdapter.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/core/adapter/GroupBasicAdapter.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/core/adapter/GroupBasicAdapter.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/core/adapter/WrapAdapter.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/core/adapter/WrapAdapter.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/core/adapter/WrapAdapter.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/core/adapter/WrapAdapter.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/core/protocol/ControlBinder.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/core/protocol/ControlBinder.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/core/protocol/ControlBinder.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/core/protocol/ControlBinder.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/core/protocol/ControlBinderResolver.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/core/protocol/ControlBinderResolver.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/core/protocol/ControlBinderResolver.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/core/protocol/ControlBinderResolver.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/core/protocol/ElementRenderService.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/core/protocol/ElementRenderService.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/core/protocol/ElementRenderService.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/core/protocol/ElementRenderService.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/core/protocol/LayoutBinder.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/core/protocol/LayoutBinder.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/core/protocol/LayoutBinder.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/core/protocol/LayoutBinder.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/core/protocol/LayoutBinderResolver.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/core/protocol/LayoutBinderResolver.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/core/protocol/LayoutBinderResolver.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/core/protocol/LayoutBinderResolver.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/core/protocol/ViewCreator.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/core/protocol/ViewCreator.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/core/protocol/ViewCreator.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/core/protocol/ViewCreator.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/core/protocol/ViewMounter.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/core/protocol/ViewMounter.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/core/protocol/ViewMounter.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/core/protocol/ViewMounter.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/core/resolver/BaseResolver.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/core/resolver/BaseResolver.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/core/resolver/BaseResolver.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/core/resolver/BaseResolver.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/core/resolver/ClassResolver.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/core/resolver/ClassResolver.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/core/resolver/ClassResolver.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/core/resolver/ClassResolver.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/core/resolver/InstanceResolver.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/core/resolver/InstanceResolver.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/core/resolver/InstanceResolver.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/core/resolver/InstanceResolver.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/core/resolver/Resolver.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/core/resolver/Resolver.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/core/resolver/Resolver.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/core/resolver/Resolver.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/core/service/ServiceManager.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/core/service/ServiceManager.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/core/service/ServiceManager.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/core/service/ServiceManager.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/dataparser/DataParser.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/dataparser/DataParser.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/dataparser/DataParser.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/dataparser/DataParser.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/dataparser/IAdapterBuilder.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/dataparser/IAdapterBuilder.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/dataparser/IAdapterBuilder.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/dataparser/IAdapterBuilder.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/BaseCardBinderResolver.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/BaseCardBinderResolver.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/BaseCardBinderResolver.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/BaseCardBinderResolver.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/BaseCellBinder.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/BaseCellBinder.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/BaseCellBinder.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/BaseCellBinder.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/BaseCellBinderResolver.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/BaseCellBinderResolver.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/BaseCellBinderResolver.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/BaseCellBinderResolver.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/BaseLayoutBinder.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/BaseLayoutBinder.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/BaseLayoutBinder.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/BaseLayoutBinder.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/Card.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/Card.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/Card.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/Card.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/CardResolver.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/CardResolver.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/CardResolver.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/CardResolver.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/Cell.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/Cell.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/Cell.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/Cell.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/ComponentInfo.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/ComponentInfo.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/ComponentInfo.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/ComponentInfo.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/ComponentLifecycle.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/ComponentLifecycle.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/ComponentLifecycle.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/ComponentLifecycle.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/IDelegateCard.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/IDelegateCard.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/IDelegateCard.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/IDelegateCard.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/PojoAdapterBuilder.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/PojoAdapterBuilder.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/PojoAdapterBuilder.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/PojoAdapterBuilder.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/PojoDataParser.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/PojoDataParser.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/PojoDataParser.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/PojoDataParser.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/PojoGroupBasicAdapter.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/PojoGroupBasicAdapter.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/PojoGroupBasicAdapter.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/PojoGroupBasicAdapter.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/Style.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/Style.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/Style.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/Style.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/WrapperCard.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/WrapperCard.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/WrapperCard.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/dataparser/concrete/WrapperCard.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/eventbus/BusSupport.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/eventbus/BusSupport.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/eventbus/BusSupport.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/eventbus/BusSupport.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/eventbus/Dispatcher.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/eventbus/Dispatcher.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/eventbus/Dispatcher.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/eventbus/Dispatcher.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/eventbus/Event.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/eventbus/Event.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/eventbus/Event.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/eventbus/Event.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/eventbus/EventContext.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/eventbus/EventContext.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/eventbus/EventContext.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/eventbus/EventContext.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/eventbus/EventHandlerWrapper.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/eventbus/EventHandlerWrapper.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/eventbus/EventHandlerWrapper.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/eventbus/EventHandlerWrapper.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/eventbus/EventPool.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/eventbus/EventPool.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/eventbus/EventPool.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/eventbus/EventPool.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/eventbus/IDispatcher.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/eventbus/IDispatcher.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/eventbus/IDispatcher.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/eventbus/IDispatcher.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/eventbus/IDispatcherDelegate.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/eventbus/IDispatcherDelegate.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/eventbus/IDispatcherDelegate.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/eventbus/IDispatcherDelegate.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/eventbus/IEventHandlerReceiver.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/eventbus/IEventHandlerReceiver.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/eventbus/IEventHandlerReceiver.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/eventbus/IEventHandlerReceiver.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/eventbus/ReflectedActionFinder.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/eventbus/ReflectedActionFinder.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/eventbus/ReflectedActionFinder.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/eventbus/ReflectedActionFinder.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/ext/BannerListener.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/ext/BannerListener.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/ext/BannerListener.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/ext/BannerListener.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/ext/PullFromEndListener.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/ext/PullFromEndListener.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/ext/PullFromEndListener.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/ext/PullFromEndListener.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/ext/SwipeItemTouchListener.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/ext/SwipeItemTouchListener.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/ext/SwipeItemTouchListener.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/ext/SwipeItemTouchListener.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/structure/BaseCell.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/structure/BaseCell.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/structure/BaseCell.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/structure/BaseCell.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/structure/TemplateInfo.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/structure/TemplateInfo.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/structure/TemplateInfo.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/structure/TemplateInfo.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/structure/ViewCreator.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/structure/ViewCreator.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/structure/ViewCreator.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/structure/ViewCreator.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/BannerCard.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/BannerCard.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/BannerCard.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/BannerCard.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/ColumnCard.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/ColumnCard.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/ColumnCard.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/ColumnCard.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/DoubleColumnCard.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/DoubleColumnCard.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/DoubleColumnCard.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/DoubleColumnCard.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/FiveColumnCard.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/FiveColumnCard.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/FiveColumnCard.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/FiveColumnCard.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/FixCard.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/FixCard.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/FixCard.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/FixCard.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/FixLinearScrollCard.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/FixLinearScrollCard.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/FixLinearScrollCard.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/FixLinearScrollCard.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/FloatCard.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/FloatCard.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/FloatCard.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/FloatCard.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/FlowCard.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/FlowCard.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/FlowCard.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/FlowCard.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/FourColumnCard.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/FourColumnCard.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/FourColumnCard.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/FourColumnCard.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/GridCard.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/GridCard.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/GridCard.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/GridCard.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/LinearCard.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/LinearCard.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/LinearCard.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/LinearCard.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/LinearScrollCard.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/LinearScrollCard.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/LinearScrollCard.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/LinearScrollCard.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/OnePlusNCard.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/OnePlusNCard.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/OnePlusNCard.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/OnePlusNCard.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/PinBottomCard.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/PinBottomCard.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/PinBottomCard.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/PinBottomCard.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/PinTopCard.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/PinTopCard.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/PinTopCard.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/PinTopCard.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/ScrollFixCard.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/ScrollFixCard.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/ScrollFixCard.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/ScrollFixCard.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/SingleColumnCard.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/SingleColumnCard.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/SingleColumnCard.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/SingleColumnCard.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/SlideCard.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/SlideCard.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/SlideCard.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/SlideCard.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/StaggeredCard.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/StaggeredCard.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/StaggeredCard.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/StaggeredCard.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/StickyCard.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/StickyCard.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/StickyCard.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/StickyCard.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/StickyEndCard.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/StickyEndCard.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/StickyEndCard.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/StickyEndCard.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/SwipeCard.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/SwipeCard.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/SwipeCard.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/SwipeCard.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/TripleColumnCard.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/TripleColumnCard.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/TripleColumnCard.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/TripleColumnCard.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/VVCard.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/VVCard.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/VVCard.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/VVCard.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/WrapCellCard.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/WrapCellCard.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/structure/card/WrapCellCard.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/structure/card/WrapCellCard.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/structure/cell/BannerCell.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/structure/cell/BannerCell.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/structure/cell/BannerCell.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/structure/cell/BannerCell.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/structure/cell/LinearScrollCell.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/structure/cell/LinearScrollCell.java similarity index 99% rename from tangram/src/main/java/com/tmall/wireless/tangram3/structure/cell/LinearScrollCell.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/structure/cell/LinearScrollCell.java index 8ead226..3cc174f 100644 --- a/tangram/src/main/java/com/tmall/wireless/tangram3/structure/cell/LinearScrollCell.java +++ b/tangram3/src/main/java/com/tmall/wireless/tangram3/structure/cell/LinearScrollCell.java @@ -28,7 +28,7 @@ import android.graphics.Color; import android.support.v7.widget.RecyclerView; import android.view.ViewGroup; -import com.tmall.wireless.tangram.core.R; +import com.tmall.wireless.tangram3.core.R; import com.tmall.wireless.tangram3.core.adapter.BinderViewHolder; import com.tmall.wireless.tangram3.core.adapter.GroupBasicAdapter; import com.tmall.wireless.tangram3.dataparser.concrete.Style; diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/structure/style/ColumnStyle.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/structure/style/ColumnStyle.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/structure/style/ColumnStyle.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/structure/style/ColumnStyle.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/structure/view/ITangramViewLifeCycle.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/structure/view/ITangramViewLifeCycle.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/structure/view/ITangramViewLifeCycle.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/structure/view/ITangramViewLifeCycle.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/structure/view/SimpleEmptyView.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/structure/view/SimpleEmptyView.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/structure/view/SimpleEmptyView.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/structure/view/SimpleEmptyView.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/structure/viewcreator/ViewHolderCreator.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/structure/viewcreator/ViewHolderCreator.java similarity index 96% rename from tangram/src/main/java/com/tmall/wireless/tangram3/structure/viewcreator/ViewHolderCreator.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/structure/viewcreator/ViewHolderCreator.java index a27e3a4..970dd64 100644 --- a/tangram/src/main/java/com/tmall/wireless/tangram3/structure/viewcreator/ViewHolderCreator.java +++ b/tangram3/src/main/java/com/tmall/wireless/tangram3/structure/viewcreator/ViewHolderCreator.java @@ -32,7 +32,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import com.tmall.wireless.tangram.core.R; +import com.tmall.wireless.tangram3.core.R; import com.tmall.wireless.tangram3.TangramBuilder; import com.tmall.wireless.tangram3.util.LogUtils; @@ -74,7 +74,7 @@ public class ViewHolderCreator * Created by villadora on 15/12/3. */ diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/support/async/CardLoadSupport.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/support/async/CardLoadSupport.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/support/async/CardLoadSupport.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/support/async/CardLoadSupport.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/util/BDE.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/util/BDE.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/util/BDE.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/util/BDE.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/util/IInnerImageSetter.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/util/IInnerImageSetter.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/util/IInnerImageSetter.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/util/IInnerImageSetter.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/util/ImageUtils.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/util/ImageUtils.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/util/ImageUtils.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/util/ImageUtils.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/util/LifeCycleHelper.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/util/LifeCycleHelper.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/util/LifeCycleHelper.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/util/LifeCycleHelper.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/util/LifeCycleProviderImpl.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/util/LifeCycleProviderImpl.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/util/LifeCycleProviderImpl.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/util/LifeCycleProviderImpl.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/util/LifecycleTransformer.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/util/LifecycleTransformer.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/util/LifecycleTransformer.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/util/LifecycleTransformer.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/util/LogUtils.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/util/LogUtils.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/util/LogUtils.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/util/LogUtils.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/util/Preconditions.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/util/Preconditions.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/util/Preconditions.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/util/Preconditions.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/util/Predicate.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/util/Predicate.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/util/Predicate.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/util/Predicate.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/util/TangramViewMetrics.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/util/TangramViewMetrics.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/util/TangramViewMetrics.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/util/TangramViewMetrics.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/util/Utils.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/util/Utils.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/util/Utils.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/util/Utils.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/view/BannerView.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/view/BannerView.java similarity index 99% rename from tangram/src/main/java/com/tmall/wireless/tangram3/view/BannerView.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/view/BannerView.java index d15be1a..8576202 100644 --- a/tangram/src/main/java/com/tmall/wireless/tangram3/view/BannerView.java +++ b/tangram3/src/main/java/com/tmall/wireless/tangram3/view/BannerView.java @@ -46,7 +46,7 @@ import android.widget.LinearLayout; import com.alibaba.android.vlayout.VirtualLayoutManager; import com.tmall.ultraviewpager.TimerHandler; -import com.tmall.wireless.tangram.core.R; +import com.tmall.wireless.tangram3.core.R; import com.tmall.wireless.tangram3.core.adapter.BinderViewHolder; import com.tmall.wireless.tangram3.core.adapter.GroupBasicAdapter; import com.tmall.wireless.tangram3.dataparser.concrete.Style; diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/view/BannerViewPager.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/view/BannerViewPager.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/view/BannerViewPager.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/view/BannerViewPager.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/view/HorizontalScrollViewExt.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/view/HorizontalScrollViewExt.java similarity index 100% rename from tangram/src/main/java/com/tmall/wireless/tangram3/view/HorizontalScrollViewExt.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/view/HorizontalScrollViewExt.java diff --git a/tangram/src/main/java/com/tmall/wireless/tangram3/view/LinearScrollView.java b/tangram3/src/main/java/com/tmall/wireless/tangram3/view/LinearScrollView.java similarity index 99% rename from tangram/src/main/java/com/tmall/wireless/tangram3/view/LinearScrollView.java rename to tangram3/src/main/java/com/tmall/wireless/tangram3/view/LinearScrollView.java index 7a3ba9d..9414912 100644 --- a/tangram/src/main/java/com/tmall/wireless/tangram3/view/LinearScrollView.java +++ b/tangram3/src/main/java/com/tmall/wireless/tangram3/view/LinearScrollView.java @@ -46,7 +46,7 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; -import com.tmall.wireless.tangram.core.R; +import com.tmall.wireless.tangram3.core.R; import com.tmall.wireless.tangram3.TangramEngine; import com.tmall.wireless.tangram3.core.adapter.BinderViewHolder; import com.tmall.wireless.tangram3.core.adapter.GroupBasicAdapter; diff --git a/tangram3/src/main/res/drawable/tangram_linearscrollview_indicator.xml b/tangram3/src/main/res/drawable/tangram_linearscrollview_indicator.xml new file mode 100644 index 0000000..23769ce --- /dev/null +++ b/tangram3/src/main/res/drawable/tangram_linearscrollview_indicator.xml @@ -0,0 +1,34 @@ + + + + + + + + + \ No newline at end of file diff --git a/tangram3/src/main/res/drawable/tangram_linearscrollview_indicator_bg.xml b/tangram3/src/main/res/drawable/tangram_linearscrollview_indicator_bg.xml new file mode 100644 index 0000000..affa96b --- /dev/null +++ b/tangram3/src/main/res/drawable/tangram_linearscrollview_indicator_bg.xml @@ -0,0 +1,34 @@ + + + + + + + + + \ No newline at end of file diff --git a/tangram3/src/main/res/layout/tangram_linearscrollview.xml b/tangram3/src/main/res/layout/tangram_linearscrollview.xml new file mode 100644 index 0000000..89f4743 --- /dev/null +++ b/tangram3/src/main/res/layout/tangram_linearscrollview.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/tangram3/src/main/res/layout/tangram_linearscrollview_parent.xml b/tangram3/src/main/res/layout/tangram_linearscrollview_parent.xml new file mode 100644 index 0000000..1fff3a2 --- /dev/null +++ b/tangram3/src/main/res/layout/tangram_linearscrollview_parent.xml @@ -0,0 +1,37 @@ + + + + + + + \ No newline at end of file diff --git a/tangram3/src/main/res/values/ids.xml b/tangram3/src/main/res/values/ids.xml new file mode 100644 index 0000000..061b41c --- /dev/null +++ b/tangram3/src/main/res/values/ids.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + \ No newline at end of file