From 404c8eeaa93e9b00d02e100a8458cd5871094185 Mon Sep 17 00:00:00 2001 From: Alexander Dadukin Date: Fri, 11 Sep 2020 21:53:24 +0300 Subject: [PATCH 1/4] libraries updated. --- app/build.gradle | 4 ++-- lib-expandablebottombar/build.gradle | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index bac382a..92f0576 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,8 +28,8 @@ dependencies { implementation project(':lib-expandablebottombar') implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'com.google.android.material:material:1.2.0' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'com.google.android.material:material:1.2.1' + implementation 'androidx.constraintlayout:constraintlayout:2.0.1' implementation 'androidx.navigation:navigation-fragment-ktx:2.3.0' implementation 'androidx.navigation:navigation-ui-ktx:2.3.0' diff --git a/lib-expandablebottombar/build.gradle b/lib-expandablebottombar/build.gradle index f7f1737..9b2ea66 100644 --- a/lib-expandablebottombar/build.gradle +++ b/lib-expandablebottombar/build.gradle @@ -38,14 +38,14 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'com.google.android.material:material:1.2.0' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'com.google.android.material:material:1.2.1' + implementation 'androidx.constraintlayout:constraintlayout:2.0.1' implementation 'androidx.navigation:navigation-fragment-ktx:2.3.0' testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation 'androidx.test:rules:1.2.0' - androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test:runner:1.3.0' + androidTestImplementation 'androidx.test:rules:1.3.0' + androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation 'org.hamcrest:hamcrest-library:1.3' testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0' } From 4ccd54c172cad4a62a78f375b466f3d7e3d535e6 Mon Sep 17 00:00:00 2001 From: Alexander Dadukin Date: Fri, 11 Sep 2020 22:09:33 +0300 Subject: [PATCH 2/4] fixed android lint issues. --- app/src/main/AndroidManifest.xml | 2 +- .../ProgrammaticallyCreatedDemoActivity.kt | 2 +- .../main/res/layout/activiy_navigation.xml | 4 +++- app/src/main/res/layout/fragment_one.xml | 4 +++- app/src/main/res/layout/fragment_three.xml | 6 +++-- app/src/main/res/layout/fragment_two.xml | 6 +++-- app/src/main/res/menu/navigation_menu.xml | 3 --- app/src/main/res/values/dimens.xml | 3 --- app/src/main/res/values/strings.xml | 1 - app/src/main/res/values/styles.xml | 2 -- .../ExpandableBottomBarScrollableBehavior.kt | 23 +++++++++++-------- .../ExpandableBottomBarNavigationUI.kt | 2 +- .../utils/AnimationHelper.kt | 4 ++-- 13 files changed, 32 insertions(+), 30 deletions(-) delete mode 100644 app/src/main/res/values/dimens.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 663b186..9bd4bc6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ package="github.com.st235.expandablebottombar"> + bottomBar.onItemReselectedListener = { _, i -> Log.d("ExpandableBottomBar", "OnReselected: ${i.itemId}") } } diff --git a/app/src/main/res/layout/activiy_navigation.xml b/app/src/main/res/layout/activiy_navigation.xml index 4f8937b..cee36a2 100644 --- a/app/src/main/res/layout/activiy_navigation.xml +++ b/app/src/main/res/layout/activiy_navigation.xml @@ -1,6 +1,7 @@ @@ -14,7 +15,8 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" - app:navGraph="@navigation/navigation" /> + app:navGraph="@navigation/navigation" + tools:ignore="FragmentTagUsage" /> @@ -9,6 +10,7 @@ android:text="Hello Fragment 1" android:textColor="#000" android:layout_gravity="center" - android:textSize="22sp" /> + android:textSize="22sp" + tools:ignore="HardcodedText" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_three.xml b/app/src/main/res/layout/fragment_three.xml index f3c4169..6432ce4 100644 --- a/app/src/main/res/layout/fragment_three.xml +++ b/app/src/main/res/layout/fragment_three.xml @@ -1,7 +1,8 @@ + android:layout_height="match_parent" + xmlns:tools="http://schemas.android.com/tools"> + android:textSize="22sp" + tools:ignore="HardcodedText" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_two.xml b/app/src/main/res/layout/fragment_two.xml index 79ac042..754a7e5 100644 --- a/app/src/main/res/layout/fragment_two.xml +++ b/app/src/main/res/layout/fragment_two.xml @@ -1,7 +1,8 @@ + android:layout_height="match_parent" + xmlns:tools="http://schemas.android.com/tools"> + android:textSize="22sp" + tools:ignore="HardcodedText" /> \ No newline at end of file diff --git a/app/src/main/res/menu/navigation_menu.xml b/app/src/main/res/menu/navigation_menu.xml index b0f527a..e533ef9 100644 --- a/app/src/main/res/menu/navigation_menu.xml +++ b/app/src/main/res/menu/navigation_menu.xml @@ -4,20 +4,17 @@ android:id="@+id/fragment1" android:title="@string/text" android:icon="@drawable/ic_home" - app:showAsAction="always" app:exb_color="#FF8888" /> \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml deleted file mode 100644 index 59a0b0c..0000000 --- a/app/src/main/res/values/dimens.xml +++ /dev/null @@ -1,3 +0,0 @@ - - 16dp - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e57a8b6..981bb0c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4,7 +4,6 @@ Likes Bookmarks Settings - CoordinatorLayoutActivity Manually created This showcase demonstrates the basic usage of library.\nSee: https://github.com/st235/ExpandableBottomBar#usage diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 6f6fa1b..0eb88fe 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -8,6 +8,4 @@ @color/colorAccent -