diff --git a/app/build.gradle b/app/build.gradle index 3c01bd7..a6a1ca5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -26,11 +26,13 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') 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' + androidTestImplementation 'androidx.test:runner:1.2.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' - implementation "com.android.support:appcompat-v7:$rootProject.supportLibraryVersion" - implementation "com.android.support:design:$rootProject.supportLibraryVersion" + implementation "androidx.appcompat:appcompat:$rootProject.appcompat" + implementation "com.google.android.material:material:$rootProject.design" + implementation "androidx.databinding:databinding-common:3.4.1" implementation project(':widget') // implementation 'com.github.ittianyu:BottomNavigationViewEx:2.0.4' diff --git a/app/src/androidTest/java/com/ittianyu/bottomnavigationviewexsample/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/ittianyu/bottomnavigationviewexsample/ExampleInstrumentedTest.java index 9ac0039..ed21041 100644 --- a/app/src/androidTest/java/com/ittianyu/bottomnavigationviewexsample/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/ittianyu/bottomnavigationviewexsample/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package com.ittianyu.bottomnavigationviewexsample; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.platform.app.InstrumentationRegistry; import org.junit.Test; import org.junit.runner.RunWith; @@ -19,7 +19,7 @@ public class ExampleInstrumentedTest { @Test public void useAppContext() throws Exception { // Context of the app under test. - Context appContext = InstrumentationRegistry.getTargetContext(); + Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); assertEquals("com.ittianyu.bottomnavigationviewex", appContext.getPackageName()); } diff --git a/app/src/main/java/com/ittianyu/bottomnavigationviewexsample/common/base/BaseFragment.java b/app/src/main/java/com/ittianyu/bottomnavigationviewexsample/common/base/BaseFragment.java index b5c7883..c041748 100644 --- a/app/src/main/java/com/ittianyu/bottomnavigationviewexsample/common/base/BaseFragment.java +++ b/app/src/main/java/com/ittianyu/bottomnavigationviewexsample/common/base/BaseFragment.java @@ -1,9 +1,9 @@ package com.ittianyu.bottomnavigationviewexsample.common.base; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/ittianyu/bottomnavigationviewexsample/features/MainActivity.java b/app/src/main/java/com/ittianyu/bottomnavigationviewexsample/features/MainActivity.java index 2f094d0..084f92c 100644 --- a/app/src/main/java/com/ittianyu/bottomnavigationviewexsample/features/MainActivity.java +++ b/app/src/main/java/com/ittianyu/bottomnavigationviewexsample/features/MainActivity.java @@ -1,9 +1,9 @@ package com.ittianyu.bottomnavigationviewexsample.features; import android.content.Intent; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.view.View; import com.ittianyu.bottomnavigationviewexsample.R; diff --git a/app/src/main/java/com/ittianyu/bottomnavigationviewexsample/features/badgeview/BadgeViewActivity.java b/app/src/main/java/com/ittianyu/bottomnavigationviewexsample/features/badgeview/BadgeViewActivity.java index c7cd83e..8e137ef 100644 --- a/app/src/main/java/com/ittianyu/bottomnavigationviewexsample/features/badgeview/BadgeViewActivity.java +++ b/app/src/main/java/com/ittianyu/bottomnavigationviewexsample/features/badgeview/BadgeViewActivity.java @@ -1,8 +1,8 @@ package com.ittianyu.bottomnavigationviewexsample.features.badgeview; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.Toast; @@ -20,7 +20,6 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); // setContentView(R.layout.activity_badge_view); bind = DataBindingUtil.setContentView(this, R.layout.activity_badge_view); - initView(); } diff --git a/app/src/main/java/com/ittianyu/bottomnavigationviewexsample/features/centerfab/CenterFabActivity.java b/app/src/main/java/com/ittianyu/bottomnavigationviewexsample/features/centerfab/CenterFabActivity.java index 3cb1bed..6fe0a6c 100644 --- a/app/src/main/java/com/ittianyu/bottomnavigationviewexsample/features/centerfab/CenterFabActivity.java +++ b/app/src/main/java/com/ittianyu/bottomnavigationviewexsample/features/centerfab/CenterFabActivity.java @@ -1,14 +1,14 @@ package com.ittianyu.bottomnavigationviewexsample.features.centerfab; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.design.widget.BottomNavigationView; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentPagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import com.google.android.material.bottomnavigation.BottomNavigationView; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentPagerAdapter; +import androidx.viewpager.widget.ViewPager; +import androidx.appcompat.app.AppCompatActivity; import android.util.Log; import android.view.MenuItem; import android.view.View; diff --git a/app/src/main/java/com/ittianyu/bottomnavigationviewexsample/features/setupwithviewpager/SetupWithViewPagerActivity.java b/app/src/main/java/com/ittianyu/bottomnavigationviewexsample/features/setupwithviewpager/SetupWithViewPagerActivity.java index fa217b4..89b54db 100644 --- a/app/src/main/java/com/ittianyu/bottomnavigationviewexsample/features/setupwithviewpager/SetupWithViewPagerActivity.java +++ b/app/src/main/java/com/ittianyu/bottomnavigationviewexsample/features/setupwithviewpager/SetupWithViewPagerActivity.java @@ -1,13 +1,13 @@ package com.ittianyu.bottomnavigationviewexsample.features.setupwithviewpager; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.design.widget.BottomNavigationView; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentPagerAdapter; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import com.google.android.material.bottomnavigation.BottomNavigationView; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentPagerAdapter; +import androidx.appcompat.app.AppCompatActivity; import android.util.Log; import android.view.MenuItem; diff --git a/app/src/main/java/com/ittianyu/bottomnavigationviewexsample/features/style/StyleActivity.java b/app/src/main/java/com/ittianyu/bottomnavigationviewexsample/features/style/StyleActivity.java index 2b9d170..f9b469e 100644 --- a/app/src/main/java/com/ittianyu/bottomnavigationviewexsample/features/style/StyleActivity.java +++ b/app/src/main/java/com/ittianyu/bottomnavigationviewexsample/features/style/StyleActivity.java @@ -1,11 +1,11 @@ package com.ittianyu.bottomnavigationviewexsample.features.style; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.graphics.Typeface; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.design.widget.BottomNavigationView; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import com.google.android.material.bottomnavigation.BottomNavigationView; +import androidx.appcompat.app.AppCompatActivity; import android.view.MenuItem; import android.widget.Toast; diff --git a/app/src/main/java/com/ittianyu/bottomnavigationviewexsample/features/viewpager/WithViewPagerActivity.java b/app/src/main/java/com/ittianyu/bottomnavigationviewexsample/features/viewpager/WithViewPagerActivity.java index 751468a..c2dd0e2 100644 --- a/app/src/main/java/com/ittianyu/bottomnavigationviewexsample/features/viewpager/WithViewPagerActivity.java +++ b/app/src/main/java/com/ittianyu/bottomnavigationviewexsample/features/viewpager/WithViewPagerActivity.java @@ -1,14 +1,14 @@ package com.ittianyu.bottomnavigationviewexsample.features.viewpager; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.design.widget.BottomNavigationView; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentPagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import com.google.android.material.bottomnavigation.BottomNavigationView; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentPagerAdapter; +import androidx.viewpager.widget.ViewPager; +import androidx.appcompat.app.AppCompatActivity; import android.util.Log; import android.util.SparseIntArray; import android.view.MenuItem; diff --git a/app/src/main/res/layout/activity_center_fab.xml b/app/src/main/res/layout/activity_center_fab.xml index 953e586..a6024fd 100644 --- a/app/src/main/res/layout/activity_center_fab.xml +++ b/app/src/main/res/layout/activity_center_fab.xml @@ -19,13 +19,13 @@ app:itemTextColor="@color/selector_item_primary_color" app:menu="@menu/menu_navigation_center_fab" /> - - -