Skip to content

Commit 2070079

Browse files
canyinghaocanyinghao
committed
Merge branch 'androidx'
# Conflicts: # app/build.gradle # build.gradle # canrefresh/build.gradle # canrefresh/src/main/java/com/canyinghao/canrefresh/CanRefreshLayout.java # gradle.properties # gradle/wrapper/gradle-wrapper.properties
2 parents ee96620 + 2736098 commit 2070079

Some content is hidden

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

41 files changed

+414
-361
lines changed

‎app/build.gradle

+11-12
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
apply plugin: 'com.android.application'
2-
//apply plugin: 'android-apt'
3-
apply plugin: 'com.jakewharton.butterknife'
42
android {
53
compileSdkVersion 28
64
buildToolsVersion "28.0.3"
75

86
defaultConfig {
97
applicationId "com.canyinghao.canrefreshdemo"
10-
minSdkVersion 24
11-
targetSdkVersion 26
8+
minSdkVersion 14
9+
targetSdkVersion 23
1210
versionCode 1
1311
versionName "1.0"
1412
}
@@ -25,14 +23,15 @@ repositories {
2523
}
2624
}
2725
dependencies {
28-
implementation fileTree(dir: 'libs', include: ['*.jar'])
29-
implementation 'com.android.support:appcompat-v7:28.0.0'
30-
implementation 'com.android.support:design:28.0.0'
31-
implementation 'com.canyinghao:canadapter:1.3.1'
32-
implementation 'com.jakewharton:butterknife:9.0.0'
33-
annotationProcessor 'com.jakewharton:butterknife-compiler:9.0.0'
34-
implementation 'com.canyinghao:canrecyclerview:1.1.5'
35-
implementation project(':canrefresh')
26+
compile fileTree(dir: 'libs', include: ['*.jar'])
27+
implementation 'androidx.appcompat:appcompat:1.0.2'
28+
implementation 'androidx.recyclerview:recyclerview:1.0.0'
29+
implementation 'com.google.android.material:material:1.0.0'
30+
implementation 'androidx.annotation:annotation:1.1.0'
31+
compile 'com.canyinghao:canadapter:5.0.0'
32+
33+
compile 'com.canyinghao:canrecyclerview:5.0.0'
34+
compile project(':canrefresh')
3635

3736

3837
}

‎app/src/main/java/com/canyinghao/canrefreshdemo/ui/BaseFragment.java

+4-14
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,14 @@
11
package com.canyinghao.canrefreshdemo.ui;
22

33
import android.app.Activity;
4-
import android.content.res.TypedArray;
54
import android.os.Bundle;
6-
import android.support.annotation.Nullable;
7-
import android.support.v4.app.Fragment;
8-
import android.util.TypedValue;
95
import android.view.LayoutInflater;
106
import android.view.View;
117
import android.view.ViewGroup;
128

9+
import androidx.annotation.Nullable;
10+
import androidx.fragment.app.Fragment;
1311

14-
import com.canyinghao.canrefreshdemo.R;
15-
16-
import java.lang.reflect.Field;
17-
18-
import butterknife.Unbinder;
1912

2013

2114
public abstract class BaseFragment extends Fragment {
@@ -27,7 +20,7 @@ public abstract class BaseFragment extends Fragment {
2720

2821
public LayoutInflater mInflater;
2922

30-
protected Unbinder unbinder;
23+
3124

3225
@Override
3326
public void onCreate(Bundle savedInstanceState) {
@@ -106,10 +99,7 @@ public View getRootView() {
10699

107100
@Override
108101
public void onDestroy() {
109-
if (unbinder != null) {
110-
unbinder.unbind();
111-
unbinder = null;
112-
}
102+
113103
super.onDestroy();
114104
context = null;
115105
mInflater = null;

‎app/src/main/java/com/canyinghao/canrefreshdemo/ui/CooActivity.java

+27-20
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
package com.canyinghao.canrefreshdemo.ui;
22

33
import android.os.Bundle;
4-
import android.support.annotation.Nullable;
5-
import android.support.design.widget.AppBarLayout;
6-
import android.support.design.widget.CollapsingToolbarLayout;
7-
import android.support.design.widget.CoordinatorLayout;
8-
import android.support.v7.app.AppCompatActivity;
9-
import android.support.v7.widget.LinearLayoutManager;
10-
import android.support.v7.widget.RecyclerView;
11-
import android.support.v7.widget.Toolbar;
124
import android.widget.ImageView;
135

146
import com.canyinghao.canadapter.CanHolderHelper;
@@ -18,41 +10,56 @@
1810
import com.canyinghao.canrefresh.shapeloading.ShapeLoadingRefreshView;
1911
import com.canyinghao.canrefreshdemo.R;
2012
import com.canyinghao.canrefreshdemo.model.MainBean;
13+
import com.google.android.material.appbar.AppBarLayout;
14+
import com.google.android.material.appbar.CollapsingToolbarLayout;
15+
16+
import androidx.annotation.Nullable;
17+
import androidx.appcompat.app.AppCompatActivity;
18+
import androidx.appcompat.widget.Toolbar;
19+
import androidx.coordinatorlayout.widget.CoordinatorLayout;
20+
import androidx.recyclerview.widget.LinearLayoutManager;
21+
import androidx.recyclerview.widget.RecyclerView;
2122

22-
import butterknife.BindView;
23-
import butterknife.ButterKnife;
2423

2524
/**
2625
* Created by canyinghao on 16/6/29.
2726
*/
2827
public class CooActivity extends AppCompatActivity implements CanRefreshLayout.OnRefreshListener, CanRefreshLayout.OnLoadMoreListener {
2928

3029

31-
@BindView(R.id.can_refresh_footer)
30+
3231
RotateRefreshView canRefreshFooter;
33-
@BindView(R.id.header)
32+
3433
ImageView header;
35-
@BindView(R.id.toolbar)
34+
3635
Toolbar toolbar;
37-
@BindView(R.id.toolbarlayout)
36+
3837
CollapsingToolbarLayout toolbarlayout;
39-
@BindView(R.id.appbar)
38+
4039
AppBarLayout appbar;
41-
@BindView(R.id.can_scroll_view)
40+
4241
RecyclerView recyclerView;
43-
@BindView(R.id.can_content_view)
42+
4443
CoordinatorLayout canContentView;
45-
@BindView(R.id.refresh)
44+
4645
CanRefreshLayout refresh;
4746
CanRVAdapter adapter;
48-
@BindView(R.id.can_refresh_header)
47+
4948
ShapeLoadingRefreshView canRefreshHeader;
5049

5150
@Override
5251
protected void onCreate(@Nullable Bundle savedInstanceState) {
5352
super.onCreate(savedInstanceState);
5453
setContentView(R.layout.activity_coo);
55-
ButterKnife.bind(this);
54+
canRefreshFooter = findViewById(R.id.can_refresh_footer);
55+
header = findViewById(R.id.header);
56+
toolbar = findViewById(R.id.toolbar);
57+
toolbarlayout = findViewById(R.id.toolbarlayout);
58+
appbar = findViewById(R.id.appbar);
59+
recyclerView = findViewById(R.id.can_scroll_view);
60+
canContentView = findViewById(R.id.can_content_view);
61+
refresh = findViewById(R.id.refresh);
62+
canRefreshHeader = findViewById(R.id.can_refresh_header);
5663

5764

5865
refresh.setOnLoadMoreListener(this);

‎app/src/main/java/com/canyinghao/canrefreshdemo/ui/CooActivity2.java

+32-27
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,70 @@
11
package com.canyinghao.canrefreshdemo.ui;
22

3+
import android.annotation.SuppressLint;
34
import android.os.Bundle;
4-
import android.support.annotation.Nullable;
5-
import android.support.design.widget.AppBarLayout;
6-
import android.support.design.widget.CollapsingToolbarLayout;
7-
import android.support.design.widget.CoordinatorLayout;
8-
import android.support.v4.app.Fragment;
9-
import android.support.v4.app.FragmentManager;
10-
import android.support.v4.app.FragmentPagerAdapter;
11-
import android.support.v4.view.ViewPager;
12-
import android.support.v7.app.AppCompatActivity;
13-
import android.support.v7.widget.LinearLayoutManager;
14-
import android.support.v7.widget.RecyclerView;
15-
import android.support.v7.widget.Toolbar;
165
import android.widget.ImageView;
176

18-
import com.canyinghao.canadapter.CanHolderHelper;
19-
import com.canyinghao.canadapter.CanRVAdapter;
207
import com.canyinghao.canrefresh.CanRefreshLayout;
218
import com.canyinghao.canrefresh.classic.RotateRefreshView;
229
import com.canyinghao.canrefresh.shapeloading.ShapeLoadingRefreshView;
2310
import com.canyinghao.canrefreshdemo.R;
24-
import com.canyinghao.canrefreshdemo.model.MainBean;
11+
import com.google.android.material.appbar.AppBarLayout;
12+
import com.google.android.material.appbar.CollapsingToolbarLayout;
2513

2614
import java.util.ArrayList;
2715
import java.util.List;
2816

29-
import butterknife.BindView;
30-
import butterknife.ButterKnife;
17+
import androidx.annotation.Nullable;
18+
import androidx.appcompat.app.AppCompatActivity;
19+
import androidx.appcompat.widget.Toolbar;
20+
import androidx.coordinatorlayout.widget.CoordinatorLayout;
21+
import androidx.fragment.app.Fragment;
22+
import androidx.fragment.app.FragmentManager;
23+
import androidx.fragment.app.FragmentPagerAdapter;
24+
import androidx.viewpager.widget.ViewPager;
25+
3126

3227
/**
3328
* Created by canyinghao on 16/6/29.
3429
*/
3530
public class CooActivity2 extends AppCompatActivity implements CanRefreshLayout.OnRefreshListener, CanRefreshLayout.OnLoadMoreListener {
3631

3732

38-
@BindView(R.id.can_refresh_footer)
33+
3934
RotateRefreshView canRefreshFooter;
40-
@BindView(R.id.header)
35+
4136
ImageView header;
42-
@BindView(R.id.toolbar)
37+
4338
Toolbar toolbar;
44-
@BindView(R.id.toolbarlayout)
39+
4540
CollapsingToolbarLayout toolbarlayout;
46-
@BindView(R.id.appbar)
41+
4742
AppBarLayout appbar;
48-
@BindView(R.id.can_scroll_view)
43+
4944
ViewPager viewPager;
50-
@BindView(R.id.can_content_view)
45+
5146
CoordinatorLayout canContentView;
52-
@BindView(R.id.refresh)
47+
5348
CanRefreshLayout refresh;
5449

55-
@BindView(R.id.can_refresh_header)
50+
5651
ShapeLoadingRefreshView canRefreshHeader;
5752

53+
@SuppressLint("WrongViewCast")
5854
@Override
5955
protected void onCreate(@Nullable Bundle savedInstanceState) {
6056
super.onCreate(savedInstanceState);
6157
setContentView(R.layout.activity_coo2);
62-
ButterKnife.bind(this);
58+
59+
canRefreshFooter = findViewById(R.id.can_refresh_footer);
60+
header = findViewById(R.id.header);
61+
toolbar = findViewById(R.id.toolbar);
62+
toolbarlayout = findViewById(R.id.toolbarlayout);
63+
appbar = findViewById(R.id.appbar);
64+
viewPager = findViewById(R.id.can_scroll_view);
65+
canContentView = findViewById(R.id.can_content_view);
66+
refresh = findViewById(R.id.refresh);
67+
canRefreshHeader = findViewById(R.id.can_refresh_header);
6368

6469

6570
refresh.setOnLoadMoreListener(this);

‎app/src/main/java/com/canyinghao/canrefreshdemo/ui/CustomActivity.java

+12-13
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
import android.app.Dialog;
55
import android.content.DialogInterface;
66
import android.os.Bundle;
7-
import android.support.v7.app.AlertDialog;
8-
import android.support.v7.app.AppCompatActivity;
97
import android.view.LayoutInflater;
108
import android.view.View;
119
import android.view.ViewGroup;
@@ -20,16 +18,16 @@
2018
import com.canyinghao.canrefresh.yalantis.YalantisPhoenixRefreshView;
2119
import com.canyinghao.canrefreshdemo.R;
2220

23-
import butterknife.BindView;
24-
import butterknife.ButterKnife;
25-
import butterknife.OnClick;
21+
import androidx.appcompat.app.AlertDialog;
22+
import androidx.appcompat.app.AppCompatActivity;
23+
2624

2725
/**
2826
* Created by canyinghao on 16/1/24.
2927
*/
3028
public class CustomActivity extends AppCompatActivity implements CanRefreshLayout.OnRefreshListener, CanRefreshLayout.OnLoadMoreListener{
3129

32-
@BindView(R.id.refresh)
30+
3331
CanRefreshLayout refresh;
3432

3533
int headStyle;
@@ -48,7 +46,7 @@ protected void onCreate(Bundle savedInstanceState) {
4846
super.onCreate(savedInstanceState);
4947
setContentView(R.layout.fragment_linear);
5048

51-
ButterKnife.bind(this);
49+
refresh = findViewById(R.id.refresh);
5250

5351
context =this;
5452
initView();
@@ -63,18 +61,19 @@ private void initView() {
6361
refresh.setOnLoadMoreListener(this);
6462
refresh.setOnRefreshListener(this);
6563

64+
findViewById(R.id.iv).setOnClickListener(new View.OnClickListener() {
65+
@Override
66+
public void onClick(View view) {
67+
showConfigDialog();
68+
}
69+
});
70+
6671
// showConfigDialog();
6772
}
6873

6974

70-
@OnClick({R.id.iv})
71-
public void click(View v){
72-
73-
showConfigDialog();
7475

7576

76-
}
77-
7877

7978
private void showConfigDialog() {
8079
if (dialog == null) {

‎app/src/main/java/com/canyinghao/canrefreshdemo/ui/LinearLayoutFragment.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
package com.canyinghao.canrefreshdemo.ui;
22

33
import android.os.Bundle;
4-
import android.support.v4.app.Fragment;
54
import android.view.LayoutInflater;
65
import android.view.View;
76
import android.view.ViewGroup;
87

98
import com.canyinghao.canrefresh.CanRefreshLayout;
109
import com.canyinghao.canrefreshdemo.R;
1110

12-
import butterknife.BindView;
13-
import butterknife.ButterKnife;
11+
import androidx.fragment.app.Fragment;
1412

1513

1614
/**
@@ -19,7 +17,7 @@
1917
public class LinearLayoutFragment extends Fragment implements CanRefreshLayout.OnRefreshListener, CanRefreshLayout.OnLoadMoreListener {
2018

2119

22-
@BindView(R.id.refresh)
20+
2321
CanRefreshLayout refresh;
2422

2523

@@ -30,7 +28,7 @@ public class LinearLayoutFragment extends Fragment implements CanRefreshLayout.O
3028
public View onCreateView(LayoutInflater inflater, ViewGroup container,
3129
Bundle savedInstanceState) {
3230
View v = inflater.inflate(R.layout.fragment_linear, container, false);
33-
ButterKnife.bind(this, v);
31+
refresh = v.findViewById(R.id.refresh);
3432
initView(v);
3533
return v;
3634
}

0 commit comments

Comments
 (0)