Skip to content

Commit

Permalink
Merge pull request #12 from Semper-Viventem/develop
Browse files Browse the repository at this point in the history
Fix name of attach method. Update libraries
  • Loading branch information
Semper-Viventem authored Aug 17, 2018
2 parents c030ad5 + 63d210b commit a02d2a6
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ This library makes it easy to implement a [Backdrop](https://material.io/design/
*For support library:*
```groovy
dependencies {
implementation 'ru.semper-viventem.backdrop:backdrop:0.1.2'
implementation 'ru.semper-viventem.backdrop:backdrop:0.1.3'
}
```
*For Android X:*
```groovy
dependencies {
implementation 'ru.semper-viventem.backdrop:backdrop:0.1.2_x'
implementation 'ru.semper-viventem.backdrop:backdrop:0.1.3_x'
}
```
**JitPack:**
Expand Down Expand Up @@ -97,8 +97,8 @@ fun <T : CoordinatorLayout.Behavior<*>> View.findBehavior(): T = layoutParams.ru
val backdropBehavior: BackdropBehavior = foregroundContainer.findBehavior() // find behavior

with(backdropBehavior) {
attacheBackContainer(R.id.backContainer) // set back container
attacheToolbar(R.id.toolbar) // set toolbar
attachBackContainer(R.id.backContainer) // set back container
attachToolbar(R.id.toolbar) // set toolbar

// set navigation icons for toolbar
setClosedIcon(R.drawable.ic_menu)
Expand Down
2 changes: 1 addition & 1 deletion backdrop/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ext {
siteUrl = 'https://github.com/Semper-Viventem/BackdropView'
gitUrl = 'https://github.com/Semper-Viventem/BackdropView'

libraryVersion = '0.1.2'
libraryVersion = '0.1.3'

developerId = 'semper-viventem'
developerName = 'constantine'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,11 @@ class BackdropBehavior : CoordinatorLayout.Behavior<View> {
this.closedIconId = iconRes
}

fun attacheToolbar(@IdRes toolbarId: Int) {
fun attachToolbar(@IdRes toolbarId: Int) {
this.toolbarId = toolbarId
}

fun attacheBackContainer(@IdRes backContainerId: Int) {
fun attachBackContainer(@IdRes backContainerId: Int) {
this.backContainerId = backContainerId
}

Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.2.41'
ext.kotlin_version = '1.2.50'
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.3'
classpath 'com.android.tools.build:gradle:3.1.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
}
}
Expand Down
4 changes: 2 additions & 2 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ android {
}

ext {
supportVersion = '28.0.0-alpha3'
supportVersion = '28.0.0-rc01'
retrofitVersion = '2.2.0'
conductorVersion = "2.1.4"
playServicesVersion = "15.0.0"
Expand All @@ -56,7 +56,7 @@ dependencies {
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
// Logging
implementation 'com.jakewharton.timber:timber:4.5.1'
implementation 'com.jakewharton.timber:timber:4.7.1'
// Images
implementation 'com.github.bumptech.glide:glide:4.6.1'
kapt 'com.github.bumptech.glide:compiler:4.7.1'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ class MainActivity : AppCompatActivity() {

backdropBehavior = foregroundContainer.findBehavior()
with(backdropBehavior) {
attacheBackContainer(R.id.backContainer)
attacheToolbar(R.id.toolbar)
attachBackContainer(R.id.backContainer)
attachToolbar(R.id.toolbar)
}
with(toolbar) {
setTitle(R.string.app_name)
Expand Down

0 comments on commit a02d2a6

Please sign in to comment.