Skip to content

Commit f4f5255

Browse files
author
private
committed
feat: androidx support
1 parent 6a24060 commit f4f5255

File tree

128 files changed

+322
-332
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+322
-332
lines changed

‎build.gradle

+3-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
google()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.0.1'
9+
classpath 'com.android.tools.build:gradle:3.2.1'
1010
// classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
1111
}
1212
}
@@ -23,10 +23,9 @@ task clean(type: Delete) {
2323
}
2424

2525
ext {
26-
compileSdkVersion = 27
27-
buildToolsVersion = "27.0.2"
26+
compileSdkVersion = 28
2827
minSdkVersion = 14
2928
targetSdkVersion = compileSdkVersion
3029

31-
v4Version = "27.1.1"
30+
appCompatVersion = "1.1.0-alpha01"
3231
}

‎demo/build.gradle

+10-11
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ static def gitLatestTag() {
1212

1313
android {
1414
compileSdkVersion rootProject.compileSdkVersion
15-
buildToolsVersion rootProject.buildToolsVersion
1615

1716
defaultConfig {
1817
applicationId "me.yokeyword.sample"
@@ -52,17 +51,17 @@ android {
5251
}
5352

5453
dependencies {
55-
compile fileTree(include: ['*.jar'], dir: 'libs')
56-
testCompile 'junit:junit:4.12'
57-
compile "com.android.support:appcompat-v7:$rootProject.v4Version"
58-
compile "com.android.support:design:$rootProject.v4Version"
59-
compile "com.android.support:cardview-v7:$rootProject.v4Version"
60-
compile "com.android.support:recyclerview-v7:$rootProject.v4Version"
61-
compile project(':fragmentation')
62-
compile project(':fragmentation_swipeback')
54+
implementation fileTree(include: ['*.jar'], dir: 'libs')
55+
testImplementation 'junit:junit:4.12'
56+
api "androidx.appcompat:appcompat:$rootProject.appCompatVersion"
57+
implementation 'com.google.android.material:material:1.1.0-alpha02'
58+
implementation 'androidx.cardview:cardview:1.0.0'
59+
implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha01'
60+
api project(':fragmentation')
61+
api project(':fragmentation_swipeback')
6362
// EventBus
64-
compile project(':eventbus_activity_scope')
65-
compile 'org.greenrobot:eventbus:3.0.0'
63+
api project(':eventbus_activity_scope')
64+
implementation 'org.greenrobot:eventbus:3.0.0'
6665
// apt 'org.greenrobot:eventbus-annotation-processor:3.0.1'
6766
}
6867

‎demo/src/main/java/me/yokeyword/sample/EnterActivity.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import android.content.Intent;
44
import android.os.Bundle;
5-
import android.support.annotation.Nullable;
6-
import android.support.v7.app.AppCompatActivity;
7-
import android.support.v7.widget.Toolbar;
5+
import androidx.annotation.Nullable;
6+
import androidx.appcompat.app.AppCompatActivity;
7+
import androidx.appcompat.widget.Toolbar;
88
import android.view.View;
99

1010
import me.yokeyword.sample.demo_flow.MainActivity;

‎demo/src/main/java/me/yokeyword/sample/demo_flow/MainActivity.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import android.content.Intent;
44
import android.os.Bundle;
5-
import android.support.design.widget.NavigationView;
6-
import android.support.v4.view.GravityCompat;
7-
import android.support.v4.widget.DrawerLayout;
8-
import android.support.v7.app.ActionBarDrawerToggle;
5+
import com.google.android.material.navigation.NavigationView;
6+
import androidx.core.view.GravityCompat;
7+
import androidx.drawerlayout.widget.DrawerLayout;
8+
import androidx.appcompat.app.ActionBarDrawerToggle;
99
import android.view.MenuItem;
1010
import android.view.View;
1111
import android.widget.ImageView;

‎demo/src/main/java/me/yokeyword/sample/demo_flow/adapter/DiscoverFragmentAdapter.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package me.yokeyword.sample.demo_flow.adapter;
22

3-
import android.support.v4.app.Fragment;
4-
import android.support.v4.app.FragmentManager;
5-
import android.support.v4.app.FragmentPagerAdapter;
3+
import androidx.fragment.app.Fragment;
4+
import androidx.fragment.app.FragmentManager;
5+
import androidx.fragment.app.FragmentPagerAdapter;
66

77
import me.yokeyword.sample.demo_flow.ui.fragment.discover.PagerChildFragment;
88

‎demo/src/main/java/me/yokeyword/sample/demo_flow/adapter/HomeAdapter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package me.yokeyword.sample.demo_flow.adapter;
22

33
import android.content.Context;
4-
import android.support.v7.widget.RecyclerView;
4+
import androidx.recyclerview.widget.RecyclerView;
55
import android.view.LayoutInflater;
66
import android.view.View;
77
import android.view.ViewGroup;

‎demo/src/main/java/me/yokeyword/sample/demo_flow/adapter/MenuAdapter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import android.content.Context;
44
import android.graphics.Color;
5-
import android.support.v7.widget.RecyclerView;
5+
import androidx.recyclerview.widget.RecyclerView;
66
import android.util.SparseBooleanArray;
77
import android.view.LayoutInflater;
88
import android.view.View;

‎demo/src/main/java/me/yokeyword/sample/demo_flow/adapter/PagerAdapter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package me.yokeyword.sample.demo_flow.adapter;
22

33
import android.content.Context;
4-
import android.support.v7.widget.RecyclerView;
4+
import androidx.recyclerview.widget.RecyclerView;
55
import android.view.LayoutInflater;
66
import android.view.View;
77
import android.view.ViewGroup;

‎demo/src/main/java/me/yokeyword/sample/demo_flow/base/BaseBackFragment.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package me.yokeyword.sample.demo_flow.base;
22

3-
import android.support.v7.widget.Toolbar;
3+
import androidx.appcompat.widget.Toolbar;
44
import android.view.View;
55

66
import me.yokeyword.sample.R;

‎demo/src/main/java/me/yokeyword/sample/demo_flow/base/BaseMainFragment.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package me.yokeyword.sample.demo_flow.base;
22

33
import android.content.Context;
4-
import android.support.v7.widget.Toolbar;
4+
import androidx.appcompat.widget.Toolbar;
55
import android.view.View;
66

77
import me.yokeyword.sample.R;

‎demo/src/main/java/me/yokeyword/sample/demo_flow/base/MySupportActivity.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package me.yokeyword.sample.demo_flow.base;
22

33
import android.os.Bundle;
4-
import android.support.annotation.NonNull;
5-
import android.support.annotation.Nullable;
6-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.annotation.NonNull;
5+
import androidx.annotation.Nullable;
6+
import androidx.appcompat.app.AppCompatActivity;
77
import android.view.MotionEvent;
88

99
import me.yokeyword.fragmentation.ExtraTransaction;

‎demo/src/main/java/me/yokeyword/sample/demo_flow/base/MySupportFragment.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import android.app.Activity;
44
import android.content.Intent;
55
import android.os.Bundle;
6-
import android.support.annotation.Nullable;
7-
import android.support.v4.app.Fragment;
8-
import android.support.v4.app.FragmentActivity;
6+
import androidx.annotation.Nullable;
7+
import androidx.fragment.app.Fragment;
8+
import androidx.fragment.app.FragmentActivity;
99
import android.view.View;
1010
import android.view.animation.Animation;
1111

‎demo/src/main/java/me/yokeyword/sample/demo_flow/ui/fragment/CycleFragment.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package me.yokeyword.sample.demo_flow.ui.fragment;
22

33
import android.os.Bundle;
4-
import android.support.annotation.Nullable;
5-
import android.support.v7.widget.Toolbar;
4+
import androidx.annotation.Nullable;
5+
import androidx.appcompat.widget.Toolbar;
66
import android.view.LayoutInflater;
77
import android.view.View;
88
import android.view.ViewGroup;

‎demo/src/main/java/me/yokeyword/sample/demo_flow/ui/fragment/account/LoginFragment.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import android.content.Context;
44
import android.os.Bundle;
5-
import android.support.annotation.Nullable;
6-
import android.support.v7.widget.Toolbar;
5+
import androidx.annotation.Nullable;
6+
import androidx.appcompat.widget.Toolbar;
77
import android.text.TextUtils;
88
import android.view.LayoutInflater;
99
import android.view.View;

‎demo/src/main/java/me/yokeyword/sample/demo_flow/ui/fragment/account/RegisterFragment.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import android.content.Context;
44
import android.os.Bundle;
5-
import android.support.annotation.Nullable;
6-
import android.support.v7.widget.Toolbar;
5+
import androidx.annotation.Nullable;
6+
import androidx.appcompat.widget.Toolbar;
77
import android.text.TextUtils;
88
import android.view.LayoutInflater;
99
import android.view.View;

‎demo/src/main/java/me/yokeyword/sample/demo_flow/ui/fragment/discover/DiscoverFragment.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package me.yokeyword.sample.demo_flow.ui.fragment.discover;
22

33
import android.os.Bundle;
4-
import android.support.annotation.Nullable;
5-
import android.support.design.widget.TabLayout;
6-
import android.support.v4.view.ViewPager;
7-
import android.support.v7.widget.Toolbar;
4+
import androidx.annotation.Nullable;
5+
import com.google.android.material.tabs.TabLayout;
6+
import androidx.viewpager.widget.ViewPager;
7+
import androidx.appcompat.widget.Toolbar;
88
import android.view.LayoutInflater;
99
import android.view.View;
1010
import android.view.ViewGroup;

‎demo/src/main/java/me/yokeyword/sample/demo_flow/ui/fragment/discover/PagerChildFragment.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package me.yokeyword.sample.demo_flow.ui.fragment.discover;
22

33
import android.os.Bundle;
4-
import android.support.v7.widget.LinearLayoutManager;
5-
import android.support.v7.widget.RecyclerView;
4+
import androidx.recyclerview.widget.LinearLayoutManager;
5+
import androidx.recyclerview.widget.RecyclerView;
66
import android.view.LayoutInflater;
77
import android.view.View;
88
import android.view.ViewGroup;

‎demo/src/main/java/me/yokeyword/sample/demo_flow/ui/fragment/home/DetailFragment.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package me.yokeyword.sample.demo_flow.ui.fragment.home;
22

33
import android.os.Bundle;
4-
import android.support.annotation.Nullable;
5-
import android.support.design.widget.FloatingActionButton;
6-
import android.support.v7.widget.Toolbar;
4+
import androidx.annotation.Nullable;
5+
import com.google.android.material.floatingactionbutton.FloatingActionButton;
6+
import androidx.appcompat.widget.Toolbar;
77
import android.view.LayoutInflater;
88
import android.view.View;
99
import android.view.ViewGroup;

‎demo/src/main/java/me/yokeyword/sample/demo_flow/ui/fragment/home/HomeFragment.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package me.yokeyword.sample.demo_flow.ui.fragment.home;
22

33
import android.os.Bundle;
4-
import android.support.v4.view.GravityCompat;
5-
import android.support.v7.widget.LinearLayoutManager;
6-
import android.support.v7.widget.PopupMenu;
7-
import android.support.v7.widget.RecyclerView;
8-
import android.support.v7.widget.Toolbar;
4+
import androidx.core.view.GravityCompat;
5+
import androidx.recyclerview.widget.LinearLayoutManager;
6+
import androidx.appcompat.widget.PopupMenu;
7+
import androidx.recyclerview.widget.RecyclerView;
8+
import androidx.appcompat.widget.Toolbar;
99
import android.view.LayoutInflater;
1010
import android.view.MenuItem;
1111
import android.view.View;

‎demo/src/main/java/me/yokeyword/sample/demo_flow/ui/fragment/home/ModifyDetailFragment.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package me.yokeyword.sample.demo_flow.ui.fragment.home;
22

33
import android.os.Bundle;
4-
import android.support.annotation.Nullable;
5-
import android.support.v7.widget.Toolbar;
4+
import androidx.annotation.Nullable;
5+
import androidx.appcompat.widget.Toolbar;
66
import android.view.LayoutInflater;
77
import android.view.View;
88
import android.view.ViewGroup;

‎demo/src/main/java/me/yokeyword/sample/demo_flow/ui/fragment/shop/ContentFragment.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33

44
import android.os.Bundle;
5-
import android.support.annotation.Nullable;
5+
import androidx.annotation.Nullable;
66
import android.view.LayoutInflater;
77
import android.view.View;
88
import android.view.ViewGroup;

‎demo/src/main/java/me/yokeyword/sample/demo_flow/ui/fragment/shop/MenuListFragment.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package me.yokeyword.sample.demo_flow.ui.fragment.shop;
22

33
import android.os.Bundle;
4-
import android.support.annotation.Nullable;
5-
import android.support.v7.widget.LinearLayoutManager;
6-
import android.support.v7.widget.RecyclerView;
4+
import androidx.annotation.Nullable;
5+
import androidx.recyclerview.widget.LinearLayoutManager;
6+
import androidx.recyclerview.widget.RecyclerView;
77
import android.view.LayoutInflater;
88
import android.view.View;
99
import android.view.ViewGroup;

‎demo/src/main/java/me/yokeyword/sample/demo_flow/ui/fragment/shop/ShopFragment.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package me.yokeyword.sample.demo_flow.ui.fragment.shop;
22

33
import android.os.Bundle;
4-
import android.support.annotation.Nullable;
5-
import android.support.v7.widget.Toolbar;
4+
import androidx.annotation.Nullable;
5+
import androidx.appcompat.widget.Toolbar;
66
import android.view.LayoutInflater;
77
import android.view.View;
88
import android.view.ViewGroup;

‎demo/src/main/java/me/yokeyword/sample/demo_flow/ui/fragment_swipe_back/BaseSwipeBackFragment.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package me.yokeyword.sample.demo_flow.ui.fragment_swipe_back;
22

3-
import android.support.v7.widget.Toolbar;
3+
import androidx.appcompat.widget.Toolbar;
44
import android.view.View;
55

66
import me.yokeyword.fragmentation_swipeback.SwipeBackFragment;

‎demo/src/main/java/me/yokeyword/sample/demo_flow/ui/fragment_swipe_back/FirstSwipeBackFragment.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package me.yokeyword.sample.demo_flow.ui.fragment_swipe_back;
22

33
import android.os.Bundle;
4-
import android.support.annotation.Nullable;
5-
import android.support.v7.widget.Toolbar;
4+
import androidx.annotation.Nullable;
5+
import androidx.appcompat.widget.Toolbar;
66
import android.view.LayoutInflater;
77
import android.view.View;
88
import android.view.ViewGroup;

‎demo/src/main/java/me/yokeyword/sample/demo_flow/ui/fragment_swipe_back/RecyclerSwipeBackFragment.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package me.yokeyword.sample.demo_flow.ui.fragment_swipe_back;
22

33
import android.os.Bundle;
4-
import android.support.v7.widget.LinearLayoutManager;
5-
import android.support.v7.widget.RecyclerView;
6-
import android.support.v7.widget.Toolbar;
4+
import androidx.recyclerview.widget.LinearLayoutManager;
5+
import androidx.recyclerview.widget.RecyclerView;
6+
import androidx.appcompat.widget.Toolbar;
77
import android.view.LayoutInflater;
88
import android.view.View;
99
import android.view.ViewGroup;

‎demo/src/main/java/me/yokeyword/sample/demo_wechat/MainActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package me.yokeyword.sample.demo_wechat;
22

33
import android.os.Bundle;
4-
import android.support.annotation.Nullable;
4+
import androidx.annotation.Nullable;
55

66
import me.yokeyword.fragmentation.SupportActivity;
77
import me.yokeyword.fragmentation.anim.DefaultHorizontalAnimator;

‎demo/src/main/java/me/yokeyword/sample/demo_wechat/adapter/ChatAdapter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package me.yokeyword.sample.demo_wechat.adapter;
22

33
import android.content.Context;
4-
import android.support.v7.widget.RecyclerView;
4+
import androidx.recyclerview.widget.RecyclerView;
55
import android.view.LayoutInflater;
66
import android.view.View;
77
import android.view.ViewGroup;

‎demo/src/main/java/me/yokeyword/sample/demo_wechat/adapter/HomeAdapter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package me.yokeyword.sample.demo_wechat.adapter;
22

33
import android.content.Context;
4-
import android.support.v7.widget.RecyclerView;
4+
import androidx.recyclerview.widget.RecyclerView;
55
import android.view.LayoutInflater;
66
import android.view.View;
77
import android.view.ViewGroup;

‎demo/src/main/java/me/yokeyword/sample/demo_wechat/adapter/MsgAdapter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package me.yokeyword.sample.demo_wechat.adapter;
22

33
import android.content.Context;
4-
import android.support.v7.widget.RecyclerView;
4+
import androidx.recyclerview.widget.RecyclerView;
55
import android.view.LayoutInflater;
66
import android.view.View;
77
import android.view.ViewGroup;

‎demo/src/main/java/me/yokeyword/sample/demo_wechat/adapter/PagerAdapter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package me.yokeyword.sample.demo_wechat.adapter;
22

33
import android.content.Context;
4-
import android.support.v7.widget.RecyclerView;
4+
import androidx.recyclerview.widget.RecyclerView;
55
import android.view.LayoutInflater;
66
import android.view.View;
77
import android.view.ViewGroup;

‎demo/src/main/java/me/yokeyword/sample/demo_wechat/adapter/WechatPagerFragmentAdapter.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package me.yokeyword.sample.demo_wechat.adapter;
22

3-
import android.support.v4.app.Fragment;
4-
import android.support.v4.app.FragmentManager;
5-
import android.support.v4.app.FragmentPagerAdapter;
3+
import androidx.fragment.app.Fragment;
4+
import androidx.fragment.app.FragmentManager;
5+
import androidx.fragment.app.FragmentPagerAdapter;
66

77
import me.yokeyword.sample.demo_wechat.ui.fragment.second.FirstPagerFragment;
88
import me.yokeyword.sample.demo_wechat.ui.fragment.second.OtherPagerFragment;

0 commit comments

Comments
 (0)