diff --git a/.idea/misc.xml b/.idea/misc.xml index 7158618..586fd4e 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -27,17 +27,7 @@ - - - - - - - - - - - + diff --git a/README.md b/README.md index 11fbf9a..01abcae 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ For more Android-like segmented control, check [Radio Real Button](https://githu ###### You can also apply your custom drawable on button group ![7](https://cloud.githubusercontent.com/assets/20969019/21565978/ec2fb698-cea6-11e6-8ae9-54326e3ebdf4.gif)
-###### It is now possible to drag selector (not available for the last released version, but you can download the project to achieve that.) +###### It is now possible to drag selector ![8](https://cloud.githubusercontent.com/assets/20969019/24909871/6b0a8b10-1ece-11e7-8686-df8276f1ae15.gif) @@ -43,13 +43,11 @@ and: ```gradle dependencies { - compile 'com.github.ceryle:SegmentedButton:v1.2.2' + compile 'com.github.ceryle:SegmentedButton:v2.0.0' } ``` ## Customization -###### Transparent Background -Sorry, you cannot set group's background transparent. Reason is, in group there are three layers on top of the other. One layer is for selection and two are for background and foreground. If you change one of them, you will see that segmented button will look abnormal, something will be missing. Not recommended. ### Some Attributes diff --git a/build.gradle b/build.gradle index e8fc89b..d022d19 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.1' + classpath 'com.android.tools.build:gradle:3.0.0-alpha9' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5821ddf..1540144 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Mar 03 09:15:59 EET 2017 +#Mon Aug 07 02:27:44 EET 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-rc-1-all.zip diff --git a/library/proguard-rules.pro b/library/proguard-rules.pro deleted file mode 100644 index 8dde354..0000000 --- a/library/proguard-rules.pro +++ /dev/null @@ -1,17 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in C:\Users\egeak\Documents\Programming\Android_SDK/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/library/src/main/java/co/ceryle/segmentedbutton/BackgroundHelper.java b/library/src/main/java/co/ceryle/segmentedbutton/BackgroundHelper.java index 5e39228..7b32a73 100644 --- a/library/src/main/java/co/ceryle/segmentedbutton/BackgroundHelper.java +++ b/library/src/main/java/co/ceryle/segmentedbutton/BackgroundHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 Ege Aker + * Copyright (C) 2016 ceryle * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/library/src/main/java/co/ceryle/segmentedbutton/BackgroundView.java b/library/src/main/java/co/ceryle/segmentedbutton/BackgroundView.java index 09f9dc2..b2bf62d 100644 --- a/library/src/main/java/co/ceryle/segmentedbutton/BackgroundView.java +++ b/library/src/main/java/co/ceryle/segmentedbutton/BackgroundView.java @@ -1,9 +1,7 @@ package co.ceryle.segmentedbutton; import android.content.Context; -import android.os.Build; import android.support.annotation.Nullable; -import android.support.annotation.RequiresApi; import android.util.AttributeSet; import android.view.View; @@ -20,11 +18,6 @@ public BackgroundView(Context context, @Nullable AttributeSet attrs, int defStyl super(context, attrs, defStyleAttr); } - @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) - public BackgroundView(Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); - } - @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { int w = 0, h = 0; diff --git a/library/src/main/java/co/ceryle/segmentedbutton/ConversionHelper.java b/library/src/main/java/co/ceryle/segmentedbutton/ConversionHelper.java index e59530b..eec343f 100644 --- a/library/src/main/java/co/ceryle/segmentedbutton/ConversionHelper.java +++ b/library/src/main/java/co/ceryle/segmentedbutton/ConversionHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 Ege Aker + * Copyright (C) 2016 ceryle * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/library/src/main/java/co/ceryle/segmentedbutton/RippleHelper.java b/library/src/main/java/co/ceryle/segmentedbutton/RippleHelper.java index 9a82bc8..2660718 100644 --- a/library/src/main/java/co/ceryle/segmentedbutton/RippleHelper.java +++ b/library/src/main/java/co/ceryle/segmentedbutton/RippleHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 Ege Aker + * Copyright (C) 2016 ceryle * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/library/src/main/java/co/ceryle/segmentedbutton/RoundHelper.java b/library/src/main/java/co/ceryle/segmentedbutton/RoundHelper.java index f2ce2b9..5ce8bb2 100644 --- a/library/src/main/java/co/ceryle/segmentedbutton/RoundHelper.java +++ b/library/src/main/java/co/ceryle/segmentedbutton/RoundHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 Ege Aker + * Copyright (C) 2016 ceryle * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/library/src/main/java/co/ceryle/segmentedbutton/SegmentedButton.java b/library/src/main/java/co/ceryle/segmentedbutton/SegmentedButton.java index c53ca4f..6ca0141 100644 --- a/library/src/main/java/co/ceryle/segmentedbutton/SegmentedButton.java +++ b/library/src/main/java/co/ceryle/segmentedbutton/SegmentedButton.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 Ege Aker + * Copyright (C) 2016 ceryle * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/library/src/main/java/co/ceryle/segmentedbutton/SegmentedButtonGroup.java b/library/src/main/java/co/ceryle/segmentedbutton/SegmentedButtonGroup.java index ed3a07b..8004938 100644 --- a/library/src/main/java/co/ceryle/segmentedbutton/SegmentedButtonGroup.java +++ b/library/src/main/java/co/ceryle/segmentedbutton/SegmentedButtonGroup.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 Ege Aker + * Copyright (C) 2016 ceryle * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/sample/proguard-rules.pro b/sample/proguard-rules.pro deleted file mode 100644 index 8dde354..0000000 --- a/sample/proguard-rules.pro +++ /dev/null @@ -1,17 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in C:\Users\egeak\Documents\Programming\Android_SDK/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 *; -#}