Skip to content

Improvements #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
StephaneBg wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Improvements #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ada3a4c
Improve gradle support.
StephaneBg Oct 4, 2014
0b8cc4e
Fix pressed color.
StephaneBg Oct 5, 2014
ba38ffc
Fix animation.
StephaneBg Oct 10, 2014
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
12 changes: 1 addition & 11 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,10 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:0.12.+'
classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.+'
classpath 'com.android.tools.build:gradle:0.13.0'
}
}

ext {
compileSdkVersion = 19
buildToolsVersion = "19.1.0"
}

def isReleaseBuild() {
return version.contains("SNAPSHOT") == false
}

allprojects {
version = VERSION_NAME
group = GROUP
Expand Down
32 changes: 10 additions & 22 deletions example/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,15 @@
buildscript {
repositories {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:0.12.+'
}
}
apply plugin: 'android'

repositories {
mavenCentral()
}
apply plugin: 'com.android.application'

android {
compileSdkVersion 19
buildToolsVersion "19.1"

compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION

defaultConfig {
minSdkVersion 11
targetSdkVersion 19
versionCode 1
versionName "1.0"
minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION)
targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
versionName project.VERSION_NAME
versionCode Integer.parseInt(project.VERSION_CODE)
}

buildTypes {
Expand All @@ -32,7 +21,6 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
compile 'com.android.support:appcompat-v7:19.1.0'
compile 'com.github.markushi:circlebutton:1.1'
compile 'com.android.support:appcompat-v7:20.0.0'
compile project(':library')
}
71 changes: 29 additions & 42 deletions example/src/main/res/layout/fragment_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,32 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:gravity="center">

<LinearLayout
android:layout_gravity="center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical">
<at.markushi.ui.CircleButton
android:id="@+id/button0"
android:layout_width="match_parent"
android:layout_height="64dip"
android:layout_marginBottom="8dip"
android:src="@drawable/ic_action_tick"
app:cb_color="#99CC00"/>

<at.markushi.ui.CircleButton
android:id="@+id/button0"
android:layout_width="match_parent"
android:layout_height="64dip"
android:layout_centerHorizontal="true"
android:layout_alignParentBottom="true"
android:layout_marginBottom="8dip"
android:src="@drawable/ic_action_tick"
app:cb_color="#99CC00" />
<at.markushi.ui.CircleButton
android:id="@+id/button1"
android:layout_width="64dip"
android:layout_height="64dip"
android:layout_marginBottom="8dip"
android:src="@drawable/ic_action_tick"
app:cb_color="#FFBB33"/>

<at.markushi.ui.CircleButton
android:id="@+id/button1"
android:layout_width="64dip"
android:layout_height="64dip"
android:layout_centerHorizontal="true"
android:layout_alignParentBottom="true"
android:layout_marginBottom="8dip"
android:src="@drawable/ic_action_tick"
app:cb_color="#FFBB33" />

<at.markushi.ui.CircleButton
android:id="@+id/button2"
android:layout_width="64dip"
android:layout_height="64dip"
android:layout_centerHorizontal="true"
android:layout_alignParentBottom="true"
android:layout_marginBottom="8dip"
android:src="@drawable/ic_action_tick"
app:cb_color="#FF4444" />

</LinearLayout>
</FrameLayout>
<at.markushi.ui.CircleButton
android:id="@+id/button2"
android:layout_width="64dip"
android:layout_height="64dip"
android:layout_marginBottom="8dip"
android:src="@drawable/ic_action_tick"
app:cb_color="#FF4444"/>
</LinearLayout>
14 changes: 4 additions & 10 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,7 @@ VERSION_NAME=1.1
VERSION_CODE=2
GROUP=com.github.markushi

POM_DESCRIPTION=Circle Button Android Library
POM_URL=https://github.com/markushi/android-circlebutton
POM_SCM_URL=https://github.com/markushi/android-circlebutton
POM_SCM_CONNECTION=scm:[email protected]:markushi/android-circlebutton.git
POM_SCM_DEV_CONNECTION=scm:[email protected]:markushi/android-circlebutton.git
POM_LICENCE_NAME=The Apache Software License, Version 2.0
POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
POM_LICENCE_DIST=repo
POM_DEVELOPER_ID=markushi
POM_DEVELOPER_NAME=Markus Hintersteiner
ANDROID_BUILD_MIN_SDK_VERSION=11
ANDROID_BUILD_TARGET_SDK_VERSION=20
ANDROID_BUILD_SDK_VERSION=20
ANDROID_BUILD_TOOLS_VERSION=20.0.0
Binary file added gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
6 changes: 6 additions & 0 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#Sat Oct 04 11:42:44 CEST 2014
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-2.1-all.zip
164 changes: 164 additions & 0 deletions gradlew
View file
Open in desktop

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

Loading