Skip to content

Commit 80b6ad8

Browse files
Merge pull request #10 from Omega-R/develop
Develop
2 parents 8132b77 + 561d52f commit 80b6ad8

File tree

8 files changed

+267
-67
lines changed

8 files changed

+267
-67
lines changed

.idea/codeStyles/Project.xml

Lines changed: 109 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.3.31'
4+
ext.kotlin_version = '1.3.61'
55
repositories {
66
google()
77
jcenter()
88

99
}
1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:3.4.1'
11+
classpath 'com.android.tools.build:gradle:3.6.0'
1212
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1313
// NOTE: Do not place your application dependencies here; they belong
1414
// in the individual module build.gradle files
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sat May 18 15:43:59 MSK 2019
1+
#Mon Mar 02 10:05:02 MSK 2020
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

omegaviwslibs/build.gradle

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ android {
99

1010

1111
defaultConfig {
12-
minSdkVersion 19
12+
minSdkVersion 16
1313
targetSdkVersion 28
1414
versionCode 1
1515
versionName "1.0"
@@ -30,11 +30,12 @@ android {
3030
dependencies {
3131
implementation fileTree(dir: 'libs', include: ['*.jar'])
3232
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
33-
implementation 'com.github.Omega-R.OmegaTypes:omegatypes:1.0.0'
33+
implementation 'com.github.Omega-R.OmegaTypes:omegatypes:2.0.1'
34+
implementation 'de.hdodenhof:circleimageview:3.0.0'
3435

35-
implementation 'androidx.appcompat:appcompat:1.0.2'
36+
implementation 'androidx.appcompat:appcompat:1.1.0'
3637

3738
testImplementation 'junit:junit:4.12'
38-
androidTestImplementation 'androidx.test:runner:1.1.1'
39-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
39+
androidTestImplementation 'androidx.test:runner:1.2.0'
40+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
4041
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package com.omega_r.libs.views
2+
3+
import android.content.Context
4+
import android.graphics.drawable.Drawable
5+
import android.os.Build.VERSION.SDK_INT
6+
import android.os.Build.VERSION_CODES.LOLLIPOP
7+
import android.util.AttributeSet
8+
import de.hdodenhof.circleimageview.CircleImageView
9+
10+
open class OmegaCircleImageView @JvmOverloads constructor(
11+
context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = R.attr.omegaCircleImageViewStyle
12+
) : CircleImageView(context, attrs, defStyleAttr) {
13+
14+
override fun setImageDrawable(drawable: Drawable?) {
15+
super.setImageDrawable(drawable)
16+
if (SDK_INT >= LOLLIPOP) invalidateOutline()
17+
}
18+
19+
}

0 commit comments

Comments
 (0)