From 71612d5d4aa2588ea39e034b820415506a3a55f2 Mon Sep 17 00:00:00 2001 From: Semper-Viventem Date: Fri, 17 Aug 2018 14:21:16 +0300 Subject: [PATCH] * Update library * Fix name of attach method --- README.md | 4 ++-- backdrop/build.gradle | 4 ++-- .../kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt | 4 ++-- build.gradle | 6 +++--- sample/build.gradle | 4 ++-- .../ru/semper_viventem/backdropview/ui/MainActivity.kt | 6 ++---- 6 files changed, 13 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 0fe02b2..fc3ece9 100644 --- a/README.md +++ b/README.md @@ -97,8 +97,8 @@ fun > 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) diff --git a/backdrop/build.gradle b/backdrop/build.gradle index 0ddf1be..0742ac9 100644 --- a/backdrop/build.gradle +++ b/backdrop/build.gradle @@ -20,7 +20,7 @@ ext { siteUrl = 'https://github.com/Semper-Viventem/BackdropView' gitUrl = 'https://github.com/Semper-Viventem/BackdropView' - libraryVersion = '0.1.2_x' + libraryVersion = '0.1.3_x' developerId = 'semper-viventem' developerName = 'constantine' @@ -64,7 +64,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) // Android X - implementation "androidx.appcompat:appcompat:1.0.0-beta01" + implementation "androidx.appcompat:appcompat:1.0.0-rc01" // Kotlin implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" diff --git a/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt b/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt index 7fecd09..be43dc0 100644 --- a/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt +++ b/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt @@ -93,11 +93,11 @@ class BackdropBehavior : CoordinatorLayout.Behavior { 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 } diff --git a/build.gradle b/build.gradle index ebd7618..e5ea96e 100644 --- a/build.gradle +++ b/build.gradle @@ -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' } } diff --git a/sample/build.gradle b/sample/build.gradle index 109bfac..159796f 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -35,9 +35,9 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') // Android X - implementation "androidx.appcompat:appcompat:1.0.0-beta01" + implementation "androidx.appcompat:appcompat:1.0.0-rc01" implementation "androidx.constraintlayout:constraintlayout:1.1.2" - implementation "com.google.android.material:material:1.0.0-beta01" + implementation "com.google.android.material:material:1.0.0-rc01" // Kotlin implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" diff --git a/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/MainActivity.kt b/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/MainActivity.kt index be3bbc5..eed3e36 100644 --- a/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/MainActivity.kt +++ b/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/MainActivity.kt @@ -4,10 +4,8 @@ import android.os.Bundle import androidx.annotation.IdRes import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment -import kotlinx.android.synthetic.main.activity_main.* import ru.semper_viventem.backdrop.BackdropBehavior import ru.semper_viventem.backdropview.R -import ru.semper_viventem.backdropview.findBehavior import ru.semper_viventem.backdropview.ui.gallery.GalleryScreen import ru.semper_viventem.backdropview.ui.list.ListScreen import ru.semper_viventem.backdropview.ui.text.TextScreen @@ -34,8 +32,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)