Skip to content

Commit 1fcf6ea

Browse files
committed
Don't save context
1 parent b8b1ce7 commit 1fcf6ea

File tree

7 files changed

+12
-21
lines changed

7 files changed

+12
-21
lines changed

MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/DynamicalAddingActivity.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ private void addEntry() {
7070
data.addDataSet(set);
7171
}
7272

73-
// choose a random dataSet
7473
int randomDataSetIndex = (int) (Math.random() * data.getDataSetCount());
7574
ILineDataSet randomSet = data.getDataSetByIndex(randomDataSetIndex);
7675
float value = (float) (Math.random() * 50) + 50f * (randomDataSetIndex + 1);

MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/fragments/BarChartFrag.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
4545
chart.setDrawGridBackground(false);
4646
chart.setDrawBarShadow(false);
4747

48-
Typeface tf = Typeface.createFromAsset(context.getAssets(), "OpenSans-Light.ttf");
48+
Typeface tf = Typeface.createFromAsset(requireContext().getAssets(), "OpenSans-Light.ttf");
4949

5050
chart.setData(generateBarData(1, 20000, 12));
5151

MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/fragments/ComplexityFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
3737
chart.setData(getComplexity());
3838
chart.animateX(3000);
3939

40-
Typeface tf = Typeface.createFromAsset(context.getAssets(), "OpenSans-Light.ttf");
40+
Typeface tf = Typeface.createFromAsset(requireContext().getAssets(), "OpenSans-Light.ttf");
4141

4242
Legend l = chart.getLegend();
4343
l.setTypeface(tf);

MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/fragments/PieChartFrag.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
3333
chart = v.findViewById(R.id.pieChart1);
3434
chart.getDescription().setEnabled(false);
3535

36-
Typeface tf = Typeface.createFromAsset(context.getAssets(), "OpenSans-Light.ttf");
36+
Typeface tf = Typeface.createFromAsset(requireContext().getAssets(), "OpenSans-Light.ttf");
3737

3838
chart.setCenterTextTypeface(tf);
3939
chart.setCenterText(generateCenterText());

MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/fragments/ScatterChartFrag.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
3434
chart = v.findViewById(R.id.scatterChart1);
3535
chart.getDescription().setEnabled(false);
3636

37-
Typeface tf = Typeface.createFromAsset(context.getAssets(), "OpenSans-Light.ttf");
37+
Typeface tf = Typeface.createFromAsset(requireContext().getAssets(), "OpenSans-Light.ttf");
3838

3939
MyMarkerView mv = new MyMarkerView(getActivity(), R.layout.custom_marker_view);
4040
mv.setChartView(chart); // For bounds control

MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/fragments/SimpleFragment.java

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.xxmassdeveloper.mpchartexample.fragments;
22

3-
import android.content.Context;
43
import android.graphics.Color;
54
import android.graphics.Typeface;
65
import android.os.Bundle;
@@ -34,21 +33,14 @@
3433
public abstract class SimpleFragment extends Fragment {
3534

3635
private Typeface tf;
37-
protected Context context;
38-
39-
@Override
40-
public void onAttach(Context context) {
41-
super.onAttach(context);
42-
this.context = context;
43-
}
4436

4537
public SimpleFragment() {
4638

4739
}
4840

4941
@Override
5042
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
51-
tf = Typeface.createFromAsset(context.getAssets(), "OpenSans-Regular.ttf");
43+
tf = Typeface.createFromAsset(requireContext().getAssets(), "OpenSans-Regular.ttf");
5244
return super.onCreateView(inflater, container, savedInstanceState);
5345
}
5446

@@ -130,8 +122,8 @@ protected PieData generatePieData() {
130122
protected LineData generateLineData() {
131123

132124
ArrayList<ILineDataSet> sets = new ArrayList<>();
133-
LineDataSet ds1 = new LineDataSet(FileUtils.loadEntriesFromAssets(context.getAssets(), "sine.txt"), "Sine function");
134-
LineDataSet ds2 = new LineDataSet(FileUtils.loadEntriesFromAssets(context.getAssets(), "cosine.txt"), "Cosine function");
125+
LineDataSet ds1 = new LineDataSet(FileUtils.loadEntriesFromAssets(requireContext().getAssets(), "sine.txt"), "Sine function");
126+
LineDataSet ds2 = new LineDataSet(FileUtils.loadEntriesFromAssets(requireContext().getAssets(), "cosine.txt"), "Cosine function");
135127

136128
ds1.setLineWidth(2f);
137129
ds2.setLineWidth(2f);
@@ -155,10 +147,10 @@ protected LineData getComplexity() {
155147

156148
ArrayList<ILineDataSet> sets = new ArrayList<>();
157149

158-
LineDataSet ds1 = new LineDataSet(FileUtils.loadEntriesFromAssets(context.getAssets(), "n.txt"), "O(n)");
159-
LineDataSet ds2 = new LineDataSet(FileUtils.loadEntriesFromAssets(context.getAssets(), "nlogn.txt"), "O(nlogn)");
160-
LineDataSet ds3 = new LineDataSet(FileUtils.loadEntriesFromAssets(context.getAssets(), "square.txt"), "O(n\u00B2)");
161-
LineDataSet ds4 = new LineDataSet(FileUtils.loadEntriesFromAssets(context.getAssets(), "three.txt"), "O(n\u00B3)");
150+
LineDataSet ds1 = new LineDataSet(FileUtils.loadEntriesFromAssets(requireContext().getAssets(), "n.txt"), "O(n)");
151+
LineDataSet ds2 = new LineDataSet(FileUtils.loadEntriesFromAssets(requireContext().getAssets(), "nlogn.txt"), "O(nlogn)");
152+
LineDataSet ds3 = new LineDataSet(FileUtils.loadEntriesFromAssets(requireContext().getAssets(), "square.txt"), "O(n\u00B2)");
153+
LineDataSet ds4 = new LineDataSet(FileUtils.loadEntriesFromAssets(requireContext().getAssets(), "three.txt"), "O(n\u00B3)");
162154

163155
ds1.setColor(ColorTemplate.VORDIPLOM_COLORS[0]);
164156
ds2.setColor(ColorTemplate.VORDIPLOM_COLORS[1]);

MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/fragments/SineCosineFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
3737
chart.setData(generateLineData());
3838
chart.animateX(3000);
3939

40-
Typeface tf = Typeface.createFromAsset(context.getAssets(), "OpenSans-Light.ttf");
40+
Typeface tf = Typeface.createFromAsset(requireContext().getAssets(), "OpenSans-Light.ttf");
4141

4242
Legend l = chart.getLegend();
4343
l.setTypeface(tf);

0 commit comments

Comments
 (0)