Skip to content
This repository has been archived by the owner on Apr 30, 2020. It is now read-only.

Fixing sample project and switch to gradle dependencies #76

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixing sample project and switch to gradle dependencies #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions MaterialTabTest/.idea/compiler.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions MaterialTabTest/.idea/dictionaries/neokree.xml
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions MaterialTabTest/.idea/encodings.xml
View file
Open in desktop

This file was deleted.

8 changes: 3 additions & 5 deletions MaterialTabTest/.idea/gradle.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

86 changes: 82 additions & 4 deletions MaterialTabTest/.idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions MaterialTabTest/.idea/modules.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions MaterialTabTest/.idea/runConfigurations.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions MaterialTabTest/.idea/scopes/scope_settings.xml
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions MaterialTabTest/.idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions MaterialTabTest/MaterialTabTest.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<module 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="MaterialTabTest" 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">
<component name="FacetManager">
<facet type="java-gradle" name="Java-Gradle">
<configuration>
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
<option name="BUILDABLE" value="false" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="false">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
<output url="file://$MODULE_DIR$/build/classes/main" />
<output-test url="file://$MODULE_DIR$/build/classes/test" />
<exclude-output />
Expand All @@ -17,5 +18,4 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

</module>
0 MaterialTabsModule/.gitignore → ...rialTabTest/MaterialTabsModule/.gitignore
View file
Open in desktop
File renamed without changes.
29 changes: 13 additions & 16 deletions MaterialTabsModule/MaterialTabsModule.iml → ...MaterialTabsModule/MaterialTabsModule.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="MaterialTabTest" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<module external.linked.project.id=":MaterialTabsModule" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="MaterialTabTest" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
Expand All @@ -9,11 +9,15 @@
<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" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugTestSources" />
<afterSyncTasks>
<task>generateDebugSources</task>
<task>generateDebugTestSources</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" />
Expand All @@ -23,8 +27,9 @@
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="false">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" 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/r/debug" isTestSource="false" generated="true" />
Expand Down Expand Up @@ -60,22 +65,15 @@
<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" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
Expand All @@ -84,10 +82,9 @@
</content>
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="android-ui-1.2" level="project" />
<orderEntry type="library" exported="" name="support-annotations-21.0.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-21.0.0" level="project" />
<orderEntry type="library" exported="" name="android-ui-1.2" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-21.0.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-21.0.0" level="project" />
</component>
</module>

</module>
0 MaterialTabsModule/build.gradle → ...alTabTest/MaterialTabsModule/build.gradle
View file
Open in desktop
File renamed without changes.
0 MaterialTabsModule/materialtabs.iml → ...bTest/MaterialTabsModule/materialtabs.iml
View file
Open in desktop
File renamed without changes.
0 MaterialTabsModule/proguard-rules.pro → ...est/MaterialTabsModule/proguard-rules.pro
View file
Open in desktop
File renamed without changes.
0 ...alTabsModule/src/main/AndroidManifest.xml → ...alTabsModule/src/main/AndroidManifest.xml
View file
Open in desktop
File renamed without changes.
0 .../it/neokree/materialtabs/MaterialTab.java → .../it/neokree/materialtabs/MaterialTab.java
View file
Open in desktop
File renamed without changes.
0 ...neokree/materialtabs/MaterialTabHost.java → ...neokree/materialtabs/MaterialTabHost.java
View file
Open in desktop
File renamed without changes.
0 ...ree/materialtabs/MaterialTabListener.java → ...ree/materialtabs/MaterialTabListener.java
View file
Open in desktop
File renamed without changes.
0 ...src/main/res/drawable-hdpi/left_arrow.png → ...src/main/res/drawable-hdpi/left_arrow.png
View file
Open in desktop
File renamed without changes
0 ...rc/main/res/drawable-hdpi/right_arrow.png → ...rc/main/res/drawable-hdpi/right_arrow.png
View file
Open in desktop
File renamed without changes
0 ...src/main/res/drawable-mdpi/left_arrow.png → ...src/main/res/drawable-mdpi/left_arrow.png
View file
Open in desktop
File renamed without changes
0 ...rc/main/res/drawable-mdpi/right_arrow.png → ...rc/main/res/drawable-mdpi/right_arrow.png
View file
Open in desktop
File renamed without changes
0 ...rc/main/res/drawable-xhdpi/left_arrow.png → ...rc/main/res/drawable-xhdpi/left_arrow.png
View file
Open in desktop
File renamed without changes
0 ...c/main/res/drawable-xhdpi/right_arrow.png → ...c/main/res/drawable-xhdpi/right_arrow.png
View file
Open in desktop
File renamed without changes
0 ...c/main/res/drawable-xxhdpi/left_arrow.png → ...c/main/res/drawable-xxhdpi/left_arrow.png
View file
Open in desktop
File renamed without changes
0 .../main/res/drawable-xxhdpi/right_arrow.png → .../main/res/drawable-xxhdpi/right_arrow.png
View file
Open in desktop
File renamed without changes
0 .../main/res/drawable-xxxhdpi/left_arrow.png → .../main/res/drawable-xxxhdpi/left_arrow.png
View file
Open in desktop
File renamed without changes
0 ...main/res/drawable-xxxhdpi/right_arrow.png → ...main/res/drawable-xxxhdpi/right_arrow.png
View file
Open in desktop
File renamed without changes
0 ...dule/src/main/res/layout/material_tab.xml → ...dule/src/main/res/layout/material_tab.xml
View file
Open in desktop
File renamed without changes.
0 ...src/main/res/layout/material_tab_icon.xml → ...src/main/res/layout/material_tab_icon.xml
View file
Open in desktop
File renamed without changes.
0 ...ialTabsModule/src/main/res/layout/tab.xml → ...ialTabsModule/src/main/res/layout/tab.xml
View file
Open in desktop
File renamed without changes.
0 ...bsModule/src/main/res/layout/tab_icon.xml → ...bsModule/src/main/res/layout/tab_icon.xml
View file
Open in desktop
File renamed without changes.
0 ...ule/src/main/res/values-sw600dp/bools.xml → ...ule/src/main/res/values-sw600dp/bools.xml
View file
Open in desktop
File renamed without changes.
0 ...odule/src/main/res/values-sw600dp/ids.xml → ...odule/src/main/res/values-sw600dp/ids.xml
View file
Open in desktop
File renamed without changes.
0 ...lTabsModule/src/main/res/values/attrs.xml → ...lTabsModule/src/main/res/values/attrs.xml
View file
Open in desktop
File renamed without changes.
0 ...lTabsModule/src/main/res/values/bools.xml → ...lTabsModule/src/main/res/values/bools.xml
View file
Open in desktop
File renamed without changes.
0 ...TabsModule/src/main/res/values/dimens.xml → ...TabsModule/src/main/res/values/dimens.xml
View file
Open in desktop
File renamed without changes.
34 changes: 16 additions & 18 deletions MaterialTabTest/app/app.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="MaterialTabTest" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="MaterialTabTest" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
Expand All @@ -9,11 +9,15 @@
<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" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugTestSources" />
<afterSyncTasks>
<task>generateDebugSources</task>
<task>generateDebugTestSources</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" />
Expand All @@ -22,8 +26,9 @@
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="false">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" 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/r/debug" isTestSource="false" generated="true" />
Expand Down Expand Up @@ -60,33 +65,26 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="support-annotations-21.0.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-21.0.0" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-21.0.0" level="project" />
<orderEntry type="module" module-name="MaterialTabsModule" exported="" />
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
<orderEntry type="library" exported="" name="android-ui-1.2" level="project" />
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
<orderEntry type="library" exported="" name="MaterialTabs-0.11" level="project" />
</component>
</module>

</module>
3 changes: 1 addition & 2 deletions MaterialTabTest/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,5 @@ android {

dependencies {
compile 'com.android.support:appcompat-v7:21.0.0'
compile project(':MaterialTabsModule')
//compile 'it.neokree:MaterialTabs:T'
compile 'it.neokree:MaterialTabs:0.11'
}
Loading