Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/Android-CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,14 @@ jobs:
uses: actions/upload-artifact@v5
if: ${{ always() }}
with:
name: MPChart-Espresso-report-${{ matrix.api }}-${{ matrix.tag }}-${{ matrix.abi }}-${{ matrix.emulatorApi }}
name: Chart-Espresso-report-${{ matrix.api }}-${{ matrix.tag }}-${{ matrix.abi }}-${{ matrix.emulatorApi }}
path: app/build/reports/androidTests/connected
if-no-files-found: error
- name: Archive screenshots
if: ${{ always() }}
uses: actions/upload-artifact@v5
with:
name: MPChart-Screenshots-${{ matrix.api }}-${{ matrix.tag }}-${{ matrix.abi }}-${{ matrix.emulatorApi }}
name: Chart-Screenshots-${{ matrix.api }}-${{ matrix.tag }}-${{ matrix.abi }}-${{ matrix.emulatorApi }}
path: |
app/build/outputs/connected_android_test_additional_output/debugAndroidTest/connected
app/build/outputs/androidTest-results/connected
Expand All @@ -86,7 +86,7 @@ jobs:
if: ${{ always() }}
uses: actions/upload-artifact@v5
with:
name: MPChart-Screenshots-diffs-${{ matrix.api }}-${{ matrix.tag }}-${{ matrix.abi }}-${{ matrix.emulatorApi }}
name: Chart-Screenshots-diffs-${{ matrix.api }}-${{ matrix.tag }}-${{ matrix.abi }}-${{ matrix.emulatorApi }}
path: |
screenshotDiffs
- name: Show git status
Expand Down
2 changes: 1 addition & 1 deletion MPChartLib/proguard-lib.pro
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Whitelist MPAndroidChart
# Whitelist AndroidChart
# Preserve all public classes and methods

-keep class com.github.mikephil.charting.** { *; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
@SuppressWarnings("unused")
public abstract class Chart<T extends ChartData<? extends IDataSet<? extends Entry>>> extends ViewGroup implements ChartInterface {

public static final String LOG_TAG = "MPAndroidChart";
public static final String LOG_TAG = "AndroidChart";

/**
* flag that indicates if logging is enabled or not
Expand Down Expand Up @@ -1443,7 +1443,7 @@ public boolean saveToGallery(String fileName, String subFolderPath, String fileD
* @return returns true if saving was successful, false if not
*/
public boolean saveToGallery(String fileName, int quality) {
return saveToGallery(fileName, "", "MPAndroidChart-Library Save", Bitmap.CompressFormat.PNG, quality);
return saveToGallery(fileName, "", "AndroidChart-Library Save", Bitmap.CompressFormat.PNG, quality);
}

/**
Expand All @@ -1454,7 +1454,7 @@ public boolean saveToGallery(String fileName, int quality) {
* @return returns true if saving was successful, false if not
*/
public boolean saveToGallery(String fileName) {
return saveToGallery(fileName, "", "MPAndroidChart-Library Save", Bitmap.CompressFormat.PNG, 40);
return saveToGallery(fileName, "", "AndroidChart-Library Save", Bitmap.CompressFormat.PNG, 40);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@

/**
* Baseclass of all DataSets for Bar-, Line-, Scatter- and CandleStickChart.
*
* @author Philipp Jahoda
*/
public abstract class BarLineScatterCandleBubbleDataSet<T extends Entry>
extends DataSet<T>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -252,21 +252,21 @@ public boolean removeDataSet(IBarLineScatterCandleBubbleDataSet<? extends Entry>
@Deprecated
@Override
public boolean removeDataSet(int index) {
Log.e("MPAndroidChart", "removeDataSet(int index) not supported for CombinedData");
Log.e("AndroidChart", "removeDataSet(int index) not supported for CombinedData");
return false;
}

@Deprecated
@Override
public boolean removeEntry(Entry e, int dataSetIndex) {
Log.e("MPAndroidChart", "removeEntry(...) not supported for CombinedData");
Log.e("AndroidChart", "removeEntry(...) not supported for CombinedData");
return false;
}

@Deprecated
@Override
public boolean removeEntry(float xValue, int dataSetIndex) {
Log.e("MPAndroidChart", "removeEntry(...) not supported for CombinedData");
Log.e("AndroidChart", "removeEntry(...) not supported for CombinedData");
return false;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public List<IPieDataSet> getDataSets() {
List<IPieDataSet> dataSets = super.getDataSets();

if (dataSets.size() < 1) {
Log.e("MPAndroidChart",
Log.e("AndroidChart",
"Found multiple data sets while pie chart only allows one");
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
*/
public class FileUtils {

private static final String LOG = "MPChart-FileUtils";
private static final String LOG = "Chart-FileUtils";

/**
* Loads a an Array of Entries from a textfile from the sd-card.
Expand Down
Loading
Loading