Skip to content

Commit 377d256

Browse files
committed
- Fixed round layout
- Gradle tweaks
1 parent 3b6b382 commit 377d256

3 files changed

Lines changed: 17 additions & 22 deletions

File tree

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:1.0.1'
8+
classpath 'com.android.tools.build:gradle:1.1.0'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

library/build.gradle

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apply plugin: 'maven'
44
group = 'org.jraf'
55
ext.groupPath = group.replace('.', '/')
66
ext.artifactId = 'android-wear-color-picker'
7-
version = '1.0.0'
7+
version = '1.0.1'
88

99
android {
1010
compileSdkVersion 22
@@ -41,7 +41,7 @@ uploadArchives {
4141

4242
android.libraryVariants.all { variant ->
4343
task("generate${variant.name.capitalize()}Javadoc", type: Javadoc) {
44-
description "Generates Javadoc for $variant.name."
44+
description "Generate Javadoc for $variant.name."
4545
source = variant.javaCompile.source
4646
ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"
4747
classpath = files(variant.javaCompile.classpath.files) + files(ext.androidJar)
@@ -70,9 +70,11 @@ android.libraryVariants.all { variant ->
7070
}
7171

7272
// Use "gradle install" to deploy the aar to your local maven repository, as well as the javadoc and the source jars
73-
task install(dependsOn: ["assembleRelease", "uploadArchives", "jarReleaseSources", "jarReleaseJavadoc"]) << {
74-
description "Make the library, generate a source jar, generate a javadoc jar, and copy everything to the local maven repository"
75-
73+
// noinspection GroovyAssignabilityCheck
74+
task install(
75+
group: 'install',
76+
description: 'Make the library, generate a source jar, generate a javadoc jar, and copy everything to the local maven repository',
77+
dependsOn: ['assembleRelease', 'uploadArchives', 'jarReleaseSources', 'jarReleaseJavadoc']) << {
7678
// Copy the sources jar
7779
println("Copying " + buildDir.getPath() + "/libs/library-${version}-sources.jar" + " to " + "${repositories.mavenLocal().getUrl()}/${groupPath}/${artifactId}/${version}" + "/${artifactId}-${version}-sources.jar")
7880
copy {

library/src/main/res/layout/awcp_color_pick.xml

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,19 @@
2222
See the License for the specific language governing permissions and
2323
limitations under the License.
2424
-->
25-
<android.support.wearable.view.BoxInsetLayout
25+
<FrameLayout
2626
xmlns:android="http://schemas.android.com/apk/res/android"
27-
xmlns:app="http://schemas.android.com/apk/res-auto"
2827
android:layout_width="match_parent"
2928
android:layout_height="match_parent">
3029

31-
<FrameLayout
30+
<org.jraf.android.androidwearcolorpicker.view.ColorPickView
31+
android:id="@+id/awcp_colorPick"
3232
android:layout_width="match_parent"
33-
android:layout_height="match_parent"
34-
app:layout_box="all">
33+
android:layout_height="match_parent" />
3534

36-
<org.jraf.android.androidwearcolorpicker.view.ColorPickView
37-
android:id="@+id/awcp_colorPick"
38-
android:layout_width="match_parent"
39-
android:layout_height="match_parent" />
40-
41-
<View
42-
android:id="@+id/awcp_confirmLayer"
43-
android:layout_width="match_parent"
44-
android:layout_height="match_parent" />
45-
</FrameLayout>
35+
<View
36+
android:id="@+id/awcp_confirmLayer"
37+
android:layout_width="match_parent"
38+
android:layout_height="match_parent" />
39+
</FrameLayout>
4640

47-
</android.support.wearable.view.BoxInsetLayout>

0 commit comments

Comments
 (0)