diff --git a/app/build.gradle b/app/build.gradle index 35b2f51..d7650c0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 + compileSdkVersion rootProject.ext.compileSdkVersion buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { @@ -24,9 +24,9 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - testCompile 'junit:junit:4.12' - compile project(':libk-switchbutton') + implementation fileTree(include: ['*.jar'], dir: 'libs') + testImplementation 'junit:junit:4.12' + implementation project(':libk-switchbutton') // compile 'lib.kingja.switchbutton:switchbutton:1.1.6' - compile "com.android.support:appcompat-v7:$rootProject.ext.supportVersion" + implementation "com.android.support:appcompat-v7:$rootProject.ext.supportVersion" } diff --git a/app/src/main/java/com/kingja/switchbutton/MainActivity.java b/app/src/main/java/com/kingja/switchbutton/MainActivity.java index 849b3a6..fb4d808 100644 --- a/app/src/main/java/com/kingja/switchbutton/MainActivity.java +++ b/app/src/main/java/com/kingja/switchbutton/MainActivity.java @@ -17,6 +17,7 @@ package com.kingja.switchbutton; +import android.graphics.Typeface; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; import android.widget.Toast; @@ -43,8 +44,8 @@ public class MainActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - - ((SwitchMultiButton) findViewById(R.id.switchmultibutton1)).setText(tabTexts1).setOnSwitchListener(onSwitchListener); + Typeface typeface = Typeface.createFromAsset(getAssets(), "fonts/tielanti.ttf"); + ((SwitchMultiButton) findViewById(R.id.switchmultibutton1)).setText(tabTexts1).setOnSwitchListener(onSwitchListener).setTypeface(typeface); ((SwitchMultiButton) findViewById(R.id.switchmultibutton2)).setText("点个Star", "狠心拒绝").setOnSwitchListener(onSwitchListener); ((SwitchMultiButton) findViewById(switchmultibutton3)).setOnSwitchListener(onSwitchListener).setSelectedTab(1); ((SwitchMultiButton) findViewById(R.id.switchmultibutton4)).setText(tabTexts4).setOnSwitchListener(onSwitchListener); diff --git a/build.gradle b/build.gradle index eb1fe92..53b376d 100644 --- a/build.gradle +++ b/build.gradle @@ -3,15 +3,17 @@ apply from:'config.gradle' buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.1.3' } } allprojects { repositories { jcenter() + google() } } diff --git a/config.gradle b/config.gradle index bec55a9..af309cf 100644 --- a/config.gradle +++ b/config.gradle @@ -1,10 +1,10 @@ ext { - compileSdkVersion = 25 - buildToolsVersion = "25.0.3" + compileSdkVersion = 27 + buildToolsVersion = "27.0.3" minSdkVersion = 14 - targetSdkVersion = 25 + targetSdkVersion = 27 versionCode = 5 versionName = "1.1.5" - supportVersion = '25.3.1' + supportVersion = '27.1.1' } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index aedaf6f..69aadc3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Jul 09 18:58:12 CST 2017 +#Mon Jul 30 19:31:53 IRDT 2018 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.4-all.zip diff --git a/libk-switchbutton/build.gradle b/libk-switchbutton/build.gradle index 043dd79..2a88013 100644 --- a/libk-switchbutton/build.gradle +++ b/libk-switchbutton/build.gradle @@ -18,7 +18,7 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile 'junit:junit:4.12' - compile "com.android.support:appcompat-v7:$rootProject.ext.supportVersion" + implementation fileTree(dir: 'libs', include: ['*.jar']) + testImplementation 'junit:junit:4.12' + implementation "com.android.support:appcompat-v7:$rootProject.ext.supportVersion" } diff --git a/libk-switchbutton/src/main/java/lib/kingja/switchbutton/SwitchMultiButton.java b/libk-switchbutton/src/main/java/lib/kingja/switchbutton/SwitchMultiButton.java index d939c37..411fee9 100644 --- a/libk-switchbutton/src/main/java/lib/kingja/switchbutton/SwitchMultiButton.java +++ b/libk-switchbutton/src/main/java/lib/kingja/switchbutton/SwitchMultiButton.java @@ -395,6 +395,18 @@ public SwitchMultiButton setText(String... tagTexts) { throw new IllegalArgumentException("the size of tagTexts should greater then 1"); } } + + /** + * set Typeface for buttons from java code + * + * @param typeface + */ + public void setTypeface(Typeface typeface) { + this.typeface = typeface; + mSelectedTextPaint.setTypeface(typeface); + mUnselectedTextPaint.setTypeface(typeface); + invalidate(); + } /*======================================save and restore======================================*/ @Override