Skip to content

project: migrate to AndroidX #169

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.

Sign up for GitHub

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

Open
tanliner wants to merge 1 commit into
base: master
Choose a base branch
from
Open

project: migrate to AndroidX #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions ...c/androidTest/java/com/ittianyu/bottomnavigationviewexsample/ExampleInstrumentedTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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());
}
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/ittianyu/bottomnavigationviewexsample/common/base/BaseFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/ittianyu/bottomnavigationviewexsample/features/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
5 changes: 2 additions & 3 deletions .../java/com/ittianyu/bottomnavigationviewexsample/features/badgeview/BadgeViewActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -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();
}

Expand Down
16 changes: 8 additions & 8 deletions .../java/com/ittianyu/bottomnavigationviewexsample/features/centerfab/CenterFabActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
14 changes: 7 additions & 7 deletions .../bottomnavigationviewexsample/features/setupwithviewpager/SetupWithViewPagerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
8 changes: 4 additions & 4 deletions ...src/main/java/com/ittianyu/bottomnavigationviewexsample/features/style/StyleActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
16 changes: 8 additions & 8 deletions ...a/com/ittianyu/bottomnavigationviewexsample/features/viewpager/WithViewPagerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/activity_center_fab.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
app:itemTextColor="@color/selector_item_primary_color"
app:menu="@menu/menu_navigation_center_fab" />

<android.support.v4.view.ViewPager
<androidx.viewpager.widget.ViewPager
android:id="@+id/vp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/bnve" />

<android.support.design.widget.FloatingActionButton
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_with_view_pager.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
app:itemTextColor="@color/selector_item_gray_color"
app:menu="@menu/menu_navigation_with_view_pager" />

<android.support.v4.view.ViewPager
<androidx.viewpager.widget.ViewPager
android:id="@+id/vp"
android:layout_width="match_parent"
android:layout_height="match_parent"
Expand Down
6 changes: 4 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.0'
classpath 'com.android.tools.build:gradle:3.4.1'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -28,9 +28,11 @@ task clean(type: Delete) {

ext {
targetSdkVersion = 28
buildToolsVersion = '28.0.2'
buildToolsVersion = '28.0.3'
compileSdkVersion = 28

// Libraries
supportLibraryVersion = '28.0.0'
appcompat = '1.0.0'
design = '1.0.0-rc01'
}
3 changes: 3 additions & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,6 @@ org.gradle.jvmargs=-Xmx1536m
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true

android.useAndroidX=true
android.enableJetifier=true
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ 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-5.1.1-all.zip
14 changes: 8 additions & 6 deletions widget/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 24
versionName "2.0.4"
versionCode 25
versionName "2.0.5"

testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

}
buildTypes {
Expand All @@ -28,10 +28,12 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
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:design:$rootProject.supportLibraryVersion"
implementation "androidx.appcompat:appcompat:$rootProject.appcompat"
implementation "com.google.android.material:material:$rootProject.design"
}

// 指定编码
Expand Down
6 changes: 3 additions & 3 deletions widget/src/androidTest/java/com/ittianyu/bottomnavigationviewex/ExampleInstrumentedTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.ittianyu.bottomnavigationviewex;

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;
Expand All @@ -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.test", appContext.getPackageName());
}
Expand Down
6 changes: 3 additions & 3 deletions widget/src/main/java/com/ittianyu/bottomnavigationviewex/BottomNavigationViewEx.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
import android.content.Context;
import android.content.res.ColorStateList;
import android.graphics.Typeface;
import android.support.design.internal.BottomNavigationItemView;
import android.support.design.internal.BottomNavigationMenuView;
import android.support.v4.view.ViewPager;
import com.google.android.material.bottomnavigation.BottomNavigationItemView;
import com.google.android.material.bottomnavigation.BottomNavigationMenuView;
import androidx.viewpager.widget.ViewPager;
import android.util.AttributeSet;
import android.view.MenuItem;
import android.widget.ImageView;
Expand Down
22 changes: 11 additions & 11 deletions widget/src/main/java/com/ittianyu/bottomnavigationviewex/BottomNavigationViewInner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
import android.content.res.ColorStateList;
import android.graphics.Paint;
import android.graphics.Typeface;
import android.support.design.internal.BottomNavigationItemView;
import android.support.design.internal.BottomNavigationMenuView;
import android.support.design.internal.ThemeEnforcement;
import android.support.design.widget.BottomNavigationView;
import android.support.v4.view.ViewPager;
import android.support.v7.widget.TintTypedArray;
import com.google.android.material.bottomnavigation.BottomNavigationItemView;
import com.google.android.material.bottomnavigation.BottomNavigationMenuView;
import com.google.android.material.internal.ThemeEnforcement;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import androidx.viewpager.widget.ViewPager;
import androidx.appcompat.widget.TintTypedArray;
import android.util.AttributeSet;
import android.util.SparseIntArray;
import android.util.TypedValue;
Expand Down Expand Up @@ -64,12 +64,12 @@ public BottomNavigationViewInner(Context context, AttributeSet attrs) {
public BottomNavigationViewInner(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
TintTypedArray a = ThemeEnforcement.obtainTintedStyledAttributes(context, attrs,
android.support.design.R.styleable.BottomNavigationView,
defStyleAttr, android.support.design.R.style.Widget_Design_BottomNavigationView,
new int[]{android.support.design.R.styleable.BottomNavigationView_itemTextAppearanceInactive,
android.support.design.R.styleable.BottomNavigationView_itemTextAppearanceActive});
com.google.android.material.R.styleable.BottomNavigationView,
defStyleAttr, com.google.android.material.R.style.Widget_Design_BottomNavigationView,
new int[]{com.google.android.material.R.styleable.BottomNavigationView_itemTextAppearanceInactive,
com.google.android.material.R.styleable.BottomNavigationView_itemTextAppearanceActive});
// clear if you don't have set item icon tint list
if (!a.hasValue(android.support.design.R.styleable.BottomNavigationView_itemIconTint)) {
if (!a.hasValue(com.google.android.material.R.styleable.BottomNavigationView_itemIconTint)) {
clearIconTintColor();
}
a.recycle();
Expand Down