From 0993e72de8864d6ecdb0586892ec4a9d07804954 Mon Sep 17 00:00:00 2001 From: soni94066 Date: Sat, 20 Feb 2021 15:23:00 +0530 Subject: [PATCH] Material Design Bux Fixed --- build.gradle | 4 +-- gradle/wrapper/gradle-wrapper.properties | 4 +-- morph-bottom-navigation-sample/build.gradle | 17 +++++++----- morph-bottom-navigation/build.gradle | 27 ++++++++++--------- morph-bottom-navigation/deploy.gradle | 2 +- ...rphBottomNavigationViewTopEdgeTreatment.kt | 2 +- 6 files changed, 31 insertions(+), 25 deletions(-) diff --git a/build.gradle b/build.gradle index d540b14..783fb33 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,13 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.2.50' + ext.kotlin_version = '1.4.30' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.0-alpha18' + classpath 'com.android.tools.build:gradle:4.1.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index dea9a08..ad1e960 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jun 08 13:24:46 CEST 2018 +#Sat Feb 20 15:04:45 IST 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip diff --git a/morph-bottom-navigation-sample/build.gradle b/morph-bottom-navigation-sample/build.gradle index 583b86d..e8771e3 100644 --- a/morph-bottom-navigation-sample/build.gradle +++ b/morph-bottom-navigation-sample/build.gradle @@ -5,11 +5,11 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 28 + compileSdkVersion 30 defaultConfig { applicationId "com.tbuonomo.morphbottomnavigation" minSdkVersion 19 - targetSdkVersion 28 + targetSdkVersion 30 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -20,17 +20,20 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + kotlinOptions { + jvmTarget = '1.8' + } } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.0-alpha3' - androidTestImplementation 'androidx.test:rules:1.1.0-alpha3' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha3' + testImplementation 'junit:junit:4.13.1' + androidTestImplementation 'androidx.test:runner:1.4.0-alpha04' + androidTestImplementation 'androidx.test:rules:1.4.0-alpha04' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0-alpha04' - implementation 'androidx.constraintlayout:constraintlayout:1.1.2' + implementation 'androidx.constraintlayout:constraintlayout:2.0.4' implementation project(':morph-bottom-navigation') // implementation 'com.tbuonomo:morph-bottom-navigation:1.0.1' } diff --git a/morph-bottom-navigation/build.gradle b/morph-bottom-navigation/build.gradle index 910d899..d18f5e4 100644 --- a/morph-bottom-navigation/build.gradle +++ b/morph-bottom-navigation/build.gradle @@ -6,17 +6,17 @@ apply plugin: 'com.jfrog.bintray' apply plugin: 'maven-publish' android { - compileSdkVersion 28 + compileSdkVersion 30 defaultConfig { minSdkVersion 19 - targetSdkVersion 28 + targetSdkVersion 30 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } buildTypes { @@ -25,19 +25,22 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + kotlinOptions { + jvmTarget = '1.8' + } } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:28.0.0-alpha3' - testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + implementation 'androidx.appcompat:appcompat:1.2.0' + testImplementation 'junit:junit:4.13.1' + androidTestImplementation 'androidx.test.ext:junit:1.1.2' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'androidx.core:core-ktx:1.0.0-alpha3' - api 'com.google.android.material:material:1.0.0-alpha3' + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.30" + implementation 'androidx.core:core-ktx:1.3.2' + api 'com.google.android.material:material:1.3.0' api 'com.tbuonomo:magicshapepath:1.0.0-alpha3' } @@ -59,8 +62,8 @@ buildscript { } } dependencies { - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' - classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0' + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5' + classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:${dokka_version}" } } diff --git a/morph-bottom-navigation/deploy.gradle b/morph-bottom-navigation/deploy.gradle index f5a20c4..18d5740 100644 --- a/morph-bottom-navigation/deploy.gradle +++ b/morph-bottom-navigation/deploy.gradle @@ -4,7 +4,7 @@ apply plugin: 'com.jfrog.bintray' ext { groupId = 'com.tbuonomo' // package name of the project artifactId = "morph-bottom-navigation" // module name of the library - libVersion = "1.0.1" + libVersion = "1.0.2" } version = libVersion group = groupId diff --git a/morph-bottom-navigation/src/main/java/com/tbuonomo/morphbottomnavigation/MorphBottomNavigationViewTopEdgeTreatment.kt b/morph-bottom-navigation/src/main/java/com/tbuonomo/morphbottomnavigation/MorphBottomNavigationViewTopEdgeTreatment.kt index afc6ee1..7a3a3c3 100644 --- a/morph-bottom-navigation/src/main/java/com/tbuonomo/morphbottomnavigation/MorphBottomNavigationViewTopEdgeTreatment.kt +++ b/morph-bottom-navigation/src/main/java/com/tbuonomo/morphbottomnavigation/MorphBottomNavigationViewTopEdgeTreatment.kt @@ -26,7 +26,7 @@ class MorphBottomNavigationViewTopEdgeTreatment(private val bottomNavigationMenu var lastSelectedItem: Int = 0 var selectedItem: Int = 0 - override fun getEdgePath(length: Float, interpolation: Float, shapePath: ShapePath) { + override fun getEdgePath(length: Float, center:Float,interpolation: Float, shapePath: ShapePath) { easyShapePath = MagicShapePath.create(0f, morphVerticalOffset, length, morphVerticalOffset) bottomNavigationMenuView.forEachIndexed { i, view ->