diff --git a/.gitignore b/.gitignore index 3c71575..6ac2e3f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,17 @@ -.gradle -gradle* -/gradle -/local.properties -.idea/* -.DS_Store +*.iml +*.apk +*.DS_Store + +/*.png + +/.gradle +/.idea /build /captures -app/build/ -/libraries/ -/gen/ -/release -*.iml \ No newline at end of file +/gradle +/gradlew +/gradlew.bat +/local.properties + +/app/build +/library/build \ No newline at end of file diff --git a/LICENSE b/LICENSE index 5f431ec..1b86e35 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015 Raphaël Bussa +Copyright (c) 2017 Raphaël Bussa Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/app/.gitignore b/app/.gitignore deleted file mode 100644 index 796b96d..0000000 --- a/app/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/app/app-release.apk b/app/app-release.apk deleted file mode 100644 index 61ad99f..0000000 Binary files a/app/app-release.apk and /dev/null differ diff --git a/app/build.gradle b/app/build.gradle index ab8366f..08d89bc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,16 +1,42 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2017 Raphaël Bussa + * + * 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.application' android { - compileSdkVersion 23 - buildToolsVersion '23.0.3' + + compileSdkVersion var.compileSdk + buildToolsVersion var.buildTools defaultConfig { applicationId "rebus.header.view.sample" - minSdkVersion 8 - targetSdkVersion 23 - versionCode 3 - versionName "1.1.1" + minSdkVersion var.minSdk + targetSdkVersion var.targetSdk + versionCode 1 + versionName "${var.version}" } + buildTypes { release { minifyEnabled false @@ -20,8 +46,9 @@ android { } dependencies { - compile project(':headerview') - compile 'com.android.support:appcompat-v7:23.4.0' - compile 'com.android.support:design:23.4.0' - compile 'com.squareup.picasso:picasso:2.5.2' + compile project(':library') + compile "com.android.support:appcompat-v7:${var.supportLib}" + compile "com.android.support:design:${var.supportLib}" + + compile 'com.github.bumptech.glide:glide:3.7.0' } diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 61f4730..fd8637f 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -1,6 +1,6 @@ # Add project specific ProGuard rules here. # By default, the flags in this file are appended to flags specified -# in C:\Users\Raphaël\AppData\Local\Android\sdk/tools/proguard/proguard-android.txt +# in /Users/raphaelbussa/Library/Android/sdk/tools/proguard/proguard-android.txt # You can edit the include path and order by changing the proguardFiles # directive in build.gradle. # diff --git a/app/src/androidTest/java/rebus/header/view/sample/ApplicationTest.java b/app/src/androidTest/java/rebus/header/view/sample/ApplicationTest.java deleted file mode 100644 index a0bee04..0000000 --- a/app/src/androidTest/java/rebus/header/view/sample/ApplicationTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package rebus.header.view.sample; - -import android.app.Application; -import android.test.ApplicationTestCase; - -/** - * Testing Fundamentals - */ -public class ApplicationTest extends ApplicationTestCase { - public ApplicationTest() { - super(Application.class); - } -} \ No newline at end of file diff --git a/app/src/androidTest/java/rebus/header/view/sample/ExampleInstrumentedTest.java b/app/src/androidTest/java/rebus/header/view/sample/ExampleInstrumentedTest.java new file mode 100644 index 0000000..b479db8 --- /dev/null +++ b/app/src/androidTest/java/rebus/header/view/sample/ExampleInstrumentedTest.java @@ -0,0 +1,5 @@ +package rebus.header.view.sample; + +public class ExampleInstrumentedTest { + +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8d4a5f8..bf4e016 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,7 +2,7 @@ - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_header_below_toolbar.xml b/app/src/main/res/layout/activity_header_below_toolbar.xml deleted file mode 100644 index ee264e5..0000000 --- a/app/src/main/res/layout/activity_header_below_toolbar.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_header_compact.xml b/app/src/main/res/layout/activity_header_compact.xml deleted file mode 100644 index 6ab6990..0000000 --- a/app/src/main/res/layout/activity_header_compact.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_header_compact_below_toolbar.xml b/app/src/main/res/layout/activity_header_compact_below_toolbar.xml deleted file mode 100644 index ee264e5..0000000 --- a/app/src/main/res/layout/activity_header_compact_below_toolbar.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 6a3ea46..8d099e9 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,7 +1,8 @@ + - + android:fitsSystemWindows="true"> - + android:layout_height="match_parent"> -