Skip to content

Commit

Permalink
release 2.1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
hupei committed Apr 24, 2017
1 parent d11a903 commit e7e076b
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 9 deletions.
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

# 引入
```xml
compile 'com.mylhyl:circleDialog:2.1.2'
compile 'com.mylhyl:circleDialog:2.1.4'
```

eclipse 可以[点击这里下载aar文件](http://jcenter.bintray.com/com/mylhyl/circleDialog/), 然后用zip解压取出jar包
Expand Down Expand Up @@ -75,13 +75,17 @@ eclipse 可以[点击这里下载aar文件](http://jcenter.bintray.com/com/mylhy
#注意
* 继承基类`BaseCircleDialog`背景为透明,自定义layout时按需求设置背景

QQ交流群:435173211
QQ交流群:553426264
点击链接加入群【Android-CircleDialog】:https://jq.qq.com/?_wv=1027&k=47ptoki
<img src="preview/qrcode.gif"/>

#感谢
[AutoLayout-Android](https://github.com/DTHeaven/AutoLayout-Android)

# 版本

> 2.1.4 minSdkVersion 15
> 2.1.2 修复已知Bug
> 2.1.1 修复`BaseCircleDialog`横竖屏恢复参数
Expand Down
3 changes: 1 addition & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ dependencies {
})
compile 'com.android.support:appcompat-v7:23.4.0'
testCompile 'junit:junit:4.12'
// compile project(':circledialog')
compile 'com.mylhyl:circleDialog:2.1.2'
compile project(':circledialog')
compile 'com.mylhyl:cygadapter:1.1.0'
}
6 changes: 3 additions & 3 deletions circledialog/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ android {
compileSdkVersion 23
buildToolsVersion "23.0.3"
defaultConfig {
minSdkVersion 16
minSdkVersion 15
targetSdkVersion 23
versionCode 1
versionName "2017.4.5"
versionName "2017.4.24"
}
buildTypes {
release {
Expand All @@ -33,7 +33,7 @@ publish {
userOrg = 'mylhyl'
groupId = 'com.mylhyl'
artifactId = 'circleDialog'
version = '2.1.2'
version = '2.1.4'
description = 'circleDialog ios style'
website = "https://github.com/mylhyl/Android-CircleDialog"
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import android.app.Dialog;
import android.content.Context;
import android.graphics.Color;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.ColorInt;
import android.support.annotation.FloatRange;
Expand Down Expand Up @@ -94,9 +95,14 @@ public void onSaveInstanceState(Bundle outState) {
}

@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle
savedInstanceState) {
View view = createView(getContext(), inflater, container);
view.setBackground(new CircleDrawable(mBackgroundColor, mRadius));
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
view.setBackground(new CircleDrawable(mBackgroundColor, mRadius));
} else {
view.setBackgroundDrawable(new CircleDrawable(mBackgroundColor, mRadius));
}
view.setAlpha(mAlpha);
return view;
}
Expand Down
Binary file added preview/qrcode.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit e7e076b

Please sign in to comment.