Skip to content

Commit 29fa105

Browse files
committed
use androidx
1 parent 9969959 commit 29fa105

67 files changed

Lines changed: 124 additions & 123 deletions

File tree

Some content is hidden

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

app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ android {
2828

2929
dependencies {
3030
implementation fileTree(include: ['*.jar'], dir: 'libs')
31-
implementation 'com.android.support:appcompat-v7:28.0.0'
32-
implementation 'com.android.support:recyclerview-v7:28.0.0'
31+
implementation 'androidx.appcompat:appcompat:1.0.0'
32+
implementation 'androidx.recyclerview:recyclerview:1.0.0'
3333
testImplementation 'junit:junit:4.12'
34-
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
34+
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
3535
implementation 'com.airbnb.android:epoxy:2.19.0'
3636
implementation 'com.airbnb.android:epoxy-databinding:2.19.0'
3737
// Add the annotation processor if you are using Epoxy's annotations (recommended)

app/src/main/java/cn/jingzhuan/lib/chart/demo/BarChartClickableModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package cn.jingzhuan.lib.chart.demo;
22

3-
import android.databinding.ViewDataBinding;
3+
import androidx.databinding.ViewDataBinding;
44
import android.graphics.Color;
55
import android.view.View;
66
import android.view.ViewGroup;

app/src/main/java/cn/jingzhuan/lib/chart/demo/BarChartModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package cn.jingzhuan.lib.chart.demo
22

3-
import android.databinding.ViewDataBinding
3+
import androidx.databinding.ViewDataBinding
44
import android.graphics.Color
55
import android.view.View
66
import android.view.ViewGroup

app/src/main/java/cn/jingzhuan/lib/chart/demo/CandlestickChartModel.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package cn.jingzhuan.lib.chart.demo;
22

3-
import android.databinding.ViewDataBinding;
3+
import androidx.databinding.ViewDataBinding;
44
import android.graphics.Color;
5-
import android.support.annotation.NonNull;
5+
import androidx.annotation.NonNull;
66
import android.view.View;
77
import android.view.ViewGroup;
88
import cn.jingzhuan.lib.chart.base.Chart;
@@ -12,7 +12,7 @@
1212
import cn.jingzhuan.lib.chart.demo.databinding.LayoutCombineChartBinding;
1313
import cn.jingzhuan.lib.chart.event.HighlightStatusChangeListener;
1414
import cn.jingzhuan.lib.chart.event.OnEntryClickListener;
15-
import cn.jingzhuan.lib.chart.renderer.CandlestickDataSetArrowDecorator;
15+
1616
import com.airbnb.epoxy.DataBindingEpoxyModel;
1717
import com.airbnb.epoxy.EpoxyAttribute;
1818
import com.airbnb.epoxy.EpoxyModelClass;

app/src/main/java/cn/jingzhuan/lib/chart/demo/ChartViewPagerAdapter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import android.annotation.SuppressLint;
44
import android.content.Context;
5-
import android.support.annotation.NonNull;
6-
import android.support.v4.view.PagerAdapter;
7-
import android.support.v7.widget.RecyclerView;
5+
import androidx.annotation.NonNull;
6+
import androidx.viewpager.widget.PagerAdapter;
7+
import androidx.recyclerview.widget.RecyclerView;
88
import android.view.LayoutInflater;
99
import android.view.View;
1010
import android.view.ViewGroup;

app/src/main/java/cn/jingzhuan/lib/chart/demo/CombineChartModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package cn.jingzhuan.lib.chart.demo;
22

3-
import android.databinding.ViewDataBinding;
3+
import androidx.databinding.ViewDataBinding;
44
import android.graphics.Color;
55

66
import android.view.View;

app/src/main/java/cn/jingzhuan/lib/chart/demo/LineChartModel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package cn.jingzhuan.lib.chart.demo;
22

3-
import android.databinding.ViewDataBinding;
3+
import androidx.databinding.ViewDataBinding;
44

5-
import android.support.annotation.NonNull;
5+
import androidx.annotation.NonNull;
66
import android.view.View;
77
import android.view.ViewGroup;
88
import cn.jingzhuan.lib.chart.Viewport;

app/src/main/java/cn/jingzhuan/lib/chart/demo/MainActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package cn.jingzhuan.lib.chart.demo;
22

3-
import android.support.v7.app.AppCompatActivity;
3+
import androidx.appcompat.app.AppCompatActivity;
44
import android.os.Bundle;
5-
import android.support.v7.widget.RecyclerView;
5+
import androidx.recyclerview.widget.RecyclerView;
66

77
public class MainActivity extends AppCompatActivity {
88

app/src/main/java/cn/jingzhuan/lib/chart/demo/MinuteChartModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package cn.jingzhuan.lib.chart.demo;
22

3-
import android.databinding.ViewDataBinding;
3+
import androidx.databinding.ViewDataBinding;
44
import android.graphics.Color;
55
import android.graphics.LinearGradient;
66
import android.graphics.Shader;

app/src/main/java/cn/jingzhuan/lib/chart/demo/ScatterChart2Model.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package cn.jingzhuan.lib.chart.demo;
22

3-
import android.databinding.ViewDataBinding;
3+
import androidx.databinding.ViewDataBinding;
44
import android.graphics.Canvas;
55
import android.graphics.Paint;
66
import android.graphics.drawable.Drawable;
7-
import android.support.v7.content.res.AppCompatResources;
7+
import androidx.appcompat.content.res.AppCompatResources;
88
import android.widget.Toast;
99
import cn.jingzhuan.lib.chart.base.Chart;
1010
import cn.jingzhuan.lib.chart.data.ScatterDataSet;

0 commit comments

Comments
 (0)