Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Material Design 1.3.0 Bux Fixed #24

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
17 changes: 10 additions & 7 deletions morph-bottom-navigation-sample/build.gradle
Original file line number Diff line number Diff line change
@@ -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'
}
27 changes: 15 additions & 12 deletions morph-bottom-navigation/build.gradle
Original file line number Diff line number Diff line change
@@ -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}"
}
}
2 changes: 1 addition & 1 deletion morph-bottom-navigation/deploy.gradle
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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 ->