Skip to content

Commit

Permalink
Merge pull request #89 from Yalantis/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
PenzK authored Jan 30, 2019
2 parents 2718f00 + 1a2b3d1 commit 0d883e8
Show file tree
Hide file tree
Showing 63 changed files with 8 additions and 4 deletions.
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
buildscript {
ext.kotlin_version = '1.3.11'
ext.kotlin_version = '1.3.20'

repositories {
google()
Expand All @@ -16,6 +16,7 @@ allprojects {
repositories {
google()
jcenter()
maven { url 'https://jitpack.io' }
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,14 @@ internal fun Context.getItemTextView(
getDimension(R.dimen.text_start_end_padding_small),
0
)
setTextColor(getColorCompat(textColor))

if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
setTextAppearance(context, styleResId)
} else {
setTextAppearance(styleResId)
}

setTextColor(getColorCompat(textColor))
}

internal fun Context.getItemImageButton(menuItem: MenuObject): ImageView =
Expand Down
File renamed without changes.
4 changes: 3 additions & 1 deletion app/build.gradle → sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@ android {
}

dependencies {
implementation project(':lib')
implementation fileTree(dir: 'libs', include: ['*.jar'])

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

implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'

implementation 'com.github.Yalantis:Context-Menu.Android:1.1.0'
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include ':app', ':lib'
include ':sample', ':lib'

0 comments on commit 0d883e8

Please sign in to comment.