File tree Expand file tree Collapse file tree 3 files changed +10
-10
lines changed
src/main/java/org/buffer/android/components Expand file tree Collapse file tree 3 files changed +10
-10
lines changed Original file line number Diff line number Diff line change @@ -7,10 +7,10 @@ apply plugin: 'kotlin-android-extensions'
7
7
apply plugin : ' com.novoda.bintray-release'
8
8
9
9
android {
10
- compileSdkVersion 28
10
+ compileSdkVersion 29
11
11
defaultConfig {
12
12
minSdkVersion 19
13
- targetSdkVersion 28
13
+ targetSdkVersion 29
14
14
}
15
15
buildTypes {
16
16
release {
@@ -26,8 +26,8 @@ android {
26
26
27
27
dependencies {
28
28
implementation" org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version "
29
- implementation ' androidx.appcompat:appcompat:1.0 .0'
30
- implementation ' com.google.android.material:material:1.0 .0'
29
+ implementation ' androidx.appcompat:appcompat:1.1 .0'
30
+ implementation ' com.google.android.material:material:1.1 .0'
31
31
implementation ' com.github.bufferapp:CounterView:115e659a89'
32
32
}
33
33
@@ -36,7 +36,7 @@ publish {
36
36
userOrg = ' buffer'
37
37
groupId = ' org.buffer.android'
38
38
artifactId = ' android-components'
39
- publishVersion = ' 0.3 '
39
+ publishVersion = ' 0.4 '
40
40
desc = ' An Android library for frequently used UI components'
41
41
website = ' https://github.com/bufferapp/android-components'
42
42
}
Original file line number Diff line number Diff line change @@ -7,12 +7,13 @@ import androidx.core.content.ContextCompat
7
7
import androidx.appcompat.widget.AppCompatButton
8
8
import android.util.AttributeSet
9
9
import android.view.Gravity.CENTER
10
+ import com.google.android.material.button.MaterialButton
10
11
11
12
class RoundedButton @JvmOverloads constructor(
12
13
context : Context ,
13
14
attrs : AttributeSet ? = null ,
14
15
defStyleAttr : Int = 0
15
- ) : AppCompatButton (context, attrs, defStyleAttr) {
16
+ ) : MaterialButton (context, attrs, defStyleAttr) {
16
17
17
18
init {
18
19
setBackground(attrs)
@@ -22,8 +23,7 @@ class RoundedButton @JvmOverloads constructor(
22
23
}
23
24
24
25
private fun setBackground (attrs : AttributeSet ? = null) {
25
- val style = ButtonStyle .fromIdentifier(getStyleIdentifierFromStyleableAttributes(attrs))
26
- when (style) {
26
+ when (ButtonStyle .fromIdentifier(getStyleIdentifierFromStyleableAttributes(attrs))) {
27
27
ButtonStyle .DARK -> {
28
28
setTextColor(ContextCompat .getColorStateList(context,
29
29
R .color.selector_dark_button_text))
Original file line number Diff line number Diff line change 1
1
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2
2
3
3
buildscript {
4
- ext. kotlin_version = ' 1.3.41 '
4
+ ext. kotlin_version = ' 1.3.61 '
5
5
repositories {
6
6
google()
7
7
maven { url ' https://maven.fabric.io/public' }
@@ -10,7 +10,7 @@ buildscript {
10
10
jcenter()
11
11
}
12
12
dependencies {
13
- classpath ' com.android.tools.build:gradle:3.5.1 '
13
+ classpath ' com.android.tools.build:gradle:3.5.3 '
14
14
classpath " org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version "
15
15
classpath ' com.novoda:bintray-release:0.9.1'
16
16
You can’t perform that action at this time.
0 commit comments