Skip to content

Commit 0d883e8

Browse files
authored
Merge pull request #89 from Yalantis/develop
Develop
2 parents 2718f00 + 1a2b3d1 commit 0d883e8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+8
-4
lines changed

build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlin_version = '1.3.11'
2+
ext.kotlin_version = '1.3.20'
33

44
repositories {
55
google()
@@ -16,6 +16,7 @@ allprojects {
1616
repositories {
1717
google()
1818
jcenter()
19+
maven { url 'https://jitpack.io' }
1920
}
2021
}
2122

lib/src/main/java/com/yalantis/contextmenu/lib/extensions/Context.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,14 @@ internal fun Context.getItemTextView(
6262
getDimension(R.dimen.text_start_end_padding_small),
6363
0
6464
)
65-
setTextColor(getColorCompat(textColor))
6665

6766
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
6867
setTextAppearance(context, styleResId)
6968
} else {
7069
setTextAppearance(styleResId)
7170
}
71+
72+
setTextColor(getColorCompat(textColor))
7273
}
7374

7475
internal fun Context.getItemImageButton(menuItem: MenuObject): ImageView =
File renamed without changes.

app/build.gradle renamed to sample/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,12 @@ android {
2121
}
2222

2323
dependencies {
24-
implementation project(':lib')
24+
implementation fileTree(dir: 'libs', include: ['*.jar'])
2525

2626
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
2727

2828
implementation 'com.android.support:appcompat-v7:28.0.0'
2929
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
30+
31+
implementation 'com.github.Yalantis:Context-Menu.Android:1.1.0'
3032
}

app/src/main/java/com/yalantis/contextmenu/sample/SampleActivity.kt renamed to sample/src/main/java/com/yalantis/contextmenu/sample/SampleActivity.kt

File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)