Skip to content

Commit 6e738bc

Browse files
hannesa2hannesa2
committed
Rename app
1 parent 5f36518 commit 6e738bc

File tree

151 files changed

+332
-231
lines changed

Some content is hidden

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

151 files changed

+332
-231
lines changed

‎.github/workflows/Android-CI.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,23 +62,23 @@ jobs:
6262
if: ${{ always() }}
6363
with:
6464
name: MPChart-Espresso-report-${{ matrix.api }}-${{ matrix.tag }}-${{ matrix.abi }}-${{ matrix.emulatorApi }}
65-
path: MPChartExample/build/reports/androidTests/connected
65+
path: app/build/reports/androidTests/connected
6666
if-no-files-found: error
6767
- name: Archive screenshots
6868
if: ${{ always() }}
6969
uses: actions/upload-artifact@v4
7070
with:
7171
name: MPChart-Screenshots-${{ matrix.api }}-${{ matrix.tag }}-${{ matrix.abi }}-${{ matrix.emulatorApi }}
7272
path: |
73-
MPChartExample/build/outputs/connected_android_test_additional_output/debugAndroidTest/connected
74-
MPChartExample/build/outputs/androidTest-results/connected
73+
app/build/outputs/connected_android_test_additional_output/debugAndroidTest/connected
74+
app/build/outputs/androidTest-results/connected
7575
- name: Compare screenshots
7676
env:
7777
CLASSIC_TOKEN: ${{ secrets.CLASSIC_TOKEN }}
7878
emulatorApi: ${{ matrix.emulatorApi }}
7979
run: |
80-
ls -ls MPChartExample/build/outputs/connected_android_test_additional_output/debugAndroidTest/connected
81-
cp MPChartExample/build/outputs/connected_android_test_additional_output/debugAndroidTest/connected/emulator-5554\ -\ ${{ matrix.emulatorApi }}/* screenshotsToCompare${{ matrix.emulatorApi }}
80+
ls -ls app/build/outputs/connected_android_test_additional_output/debugAndroidTest/connected
81+
cp app/build/outputs/connected_android_test_additional_output/debugAndroidTest/connected/emulator-5554\ -\ ${{ matrix.emulatorApi }}/* screenshotsToCompare${{ matrix.emulatorApi }}
8282
export DISPLAY=:99
8383
sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
8484
./screenShotScript/screenShotCompare.sh

‎MPChartExample/src/main/AndroidManifest.xml‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎MPChartExample/build.gradle‎ renamed to ‎app/build.gradle‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
plugins {
2-
id 'com.android.application'
3-
id 'kotlin-android'
2+
id "com.android.application"
3+
id "kotlin-android"
44
}
55

66
android {
7-
namespace 'com.xxmassdeveloper.mpchartexample'
7+
namespace "info.appdev.chartexample"
88
defaultConfig {
9-
applicationId "com.xxmassdeveloper.mpchartexample"
9+
applicationId "info.appdev.chartexample"
1010
minSdkVersion 21
1111
compileSdk 35
1212
targetSdkVersion 35
1313
versionCode getGitCommitCount()
1414
versionName getTag()
1515
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
16-
testInstrumentationRunnerArguments useTestStorageService: 'true'
16+
testInstrumentationRunnerArguments useTestStorageService: "true"
1717
}
1818
compileOptions {
1919
sourceCompatibility JavaVersion.VERSION_17
2020
targetCompatibility JavaVersion.VERSION_17
2121
}
2222
kotlinOptions {
23-
jvmTarget = '17'
23+
jvmTarget = "17"
2424
}
2525
buildFeatures {
2626
viewBinding true
2727
}
2828
buildTypes {
2929
release {
3030
minifyEnabled false
31-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
31+
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
3232
}
3333
}
3434
// https://stackoverflow.com/a/67635863/1079990
@@ -39,12 +39,12 @@ android {
3939

4040
dependencies {
4141
implementation "androidx.appcompat:appcompat:1.7.0"
42-
implementation 'com.google.android.material:material:1.12.0'
43-
implementation project(':MPChartLib')
42+
implementation "com.google.android.material:material:1.12.0"
43+
implementation project(":MPChartLib")
4444

4545
androidTestImplementation "androidx.test.ext:junit-ktx:1.2.1"
4646
androidTestImplementation "com.github.AppDevNext.Logcat:LogcatCoreLib:3.3.1"
4747
androidTestUtil "androidx.test.services:test-services:1.5.0"
4848
androidTestImplementation "androidx.test.espresso:espresso-core:3.6.1"
49-
androidTestImplementation 'androidx.test.espresso:espresso-intents:3.6.1'
49+
androidTestImplementation "androidx.test.espresso:espresso-intents:3.6.1"
5050
}

‎MPChartExample/proguard-rules.pro‎ renamed to ‎app/proguard-rules.pro‎

File renamed without changes.

‎MPChartExample/src/androidTest/java/com/xxmassdeveloper/mpchartexample/PieTest.kt‎ renamed to ‎app/src/androidTest/java/info/appdev/chartexample/PieTest.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.xxmassdeveloper.mpchartexample
1+
package info.appdev.chartexample
22

33
import android.graphics.Bitmap
44
import android.view.View
@@ -12,6 +12,7 @@ import androidx.test.espresso.matcher.ViewMatchers
1212
import androidx.test.espresso.matcher.ViewMatchers.withId
1313
import androidx.test.ext.junit.rules.activityScenarioRule
1414
import androidx.test.ext.junit.runners.AndroidJUnit4
15+
import com.xxmassdeveloper.mpchartexample.R
1516
import org.hamcrest.Matcher
1617
import org.junit.Rule
1718
import org.junit.Test

‎MPChartExample/src/androidTest/java/com/xxmassdeveloper/mpchartexample/StartTest.kt‎ renamed to ‎app/src/androidTest/java/info/appdev/chartexample/StartTest.kt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.xxmassdeveloper.mpchartexample
1+
package info.appdev.chartexample
22

33
import android.graphics.Bitmap
44
import androidx.test.core.graphics.writeToTestStorage
@@ -17,8 +17,9 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
1717
import androidx.test.ext.junit.rules.activityScenarioRule
1818
import androidx.test.ext.junit.runners.AndroidJUnit4
1919
import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
20-
import com.xxmassdeveloper.mpchartexample.notimportant.DemoBase.Companion.optionMenus
21-
import com.xxmassdeveloper.mpchartexample.notimportant.MainActivity
20+
import com.xxmassdeveloper.mpchartexample.R
21+
import info.appdev.chartexample.notimportant.DemoBase.Companion.optionMenus
22+
import info.appdev.chartexample.notimportant.MainActivity
2223
import info.hannes.timber.DebugFormatTree
2324
import org.hamcrest.CoreMatchers.allOf
2425
import org.hamcrest.CoreMatchers.anything

‎MPChartExample/src/androidTest/java/com/xxmassdeveloper/mpchartexample/ViewPagerTest.kt‎ renamed to ‎app/src/androidTest/java/info/appdev/chartexample/ViewPagerTest.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.xxmassdeveloper.mpchartexample
1+
package info.appdev.chartexample
22

33
import android.graphics.Bitmap
44
import androidx.test.core.graphics.writeToTestStorage
@@ -9,7 +9,8 @@ import androidx.test.espresso.matcher.ViewMatchers
99
import androidx.test.espresso.matcher.ViewMatchers.withId
1010
import androidx.test.ext.junit.rules.activityScenarioRule
1111
import androidx.test.ext.junit.runners.AndroidJUnit4
12-
import com.xxmassdeveloper.mpchartexample.fragments.ViewPagerSimpleChartDemo
12+
import com.xxmassdeveloper.mpchartexample.R
13+
import info.appdev.chartexample.fragments.ViewPagerSimpleChartDemo
1314
import org.junit.Rule
1415
import org.junit.Test
1516
import org.junit.rules.TestName

‎app/src/main/AndroidManifest.xml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
3+
4+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
5+
6+
<application
7+
android:allowBackup="true"
8+
android:hardwareAccelerated="true"
9+
android:icon="@drawable/ic_launcher"
10+
android:label="@string/app_name"
11+
android:theme="@style/AppTheme">
12+
<activity
13+
android:name="info.appdev.chartexample.notimportant.MainActivity"
14+
android:exported="true">
15+
<intent-filter>
16+
<action android:name="android.intent.action.MAIN" />
17+
<action android:name="android.intent.action.VIEW" />
18+
<category android:name="android.intent.category.LAUNCHER" />
19+
</intent-filter>
20+
</activity>
21+
<activity android:name="info.appdev.chartexample.LineChartActivity1" />
22+
<activity android:name="info.appdev.chartexample.LineChartDualAxisActivity" />
23+
<activity android:name="info.appdev.chartexample.LineChartTime" />
24+
<activity android:name="info.appdev.chartexample.BarChartActivity" />
25+
<activity android:name="info.appdev.chartexample.HorizontalBarChartActivity" />
26+
<activity android:name="info.appdev.chartexample.HorizontalBarNegativeChartActivity" />
27+
<activity android:name="info.appdev.chartexample.PieChartActivity" />
28+
<activity android:name="info.appdev.chartexample.PieChartRoundedActivity" />
29+
<activity android:name="info.appdev.chartexample.PiePolylineChartActivity" />
30+
<activity android:name="info.appdev.chartexample.MultiLineChartActivity" />
31+
<activity android:name="info.appdev.chartexample.BarChartActivityMultiDataset" />
32+
<activity android:name="info.appdev.chartexample.DrawChartActivity" />
33+
<activity android:name="info.appdev.chartexample.ScatterChartActivity" />
34+
<activity android:name="info.appdev.chartexample.BubbleChartActivity" />
35+
<activity android:name="info.appdev.chartexample.fragments.ViewPagerSimpleChartDemo" />
36+
<activity android:name="info.appdev.chartexample.ListViewBarChartActivity" />
37+
<activity android:name="info.appdev.chartexample.ListViewMultiChartActivity" />
38+
<activity android:name="info.appdev.chartexample.StackedBarActivity" />
39+
<activity android:name="AnotherBarActivity" />
40+
<activity android:name="info.appdev.chartexample.InvertedLineChartActivity" />
41+
<activity android:name="info.appdev.chartexample.CandleStickChartActivity" />
42+
<activity android:name="info.appdev.chartexample.CubicLineChartActivity" />
43+
<activity android:name="info.appdev.chartexample.RadarChartActivity" />
44+
<activity android:name="info.appdev.chartexample.LineChartActivityColored" />
45+
<activity android:name="info.appdev.chartexample.DynamicalAddingActivity" />
46+
<activity android:name="info.appdev.chartexample.RealtimeLineChartActivity" />
47+
<activity android:name="info.appdev.chartexample.CombinedChartActivity" />
48+
<activity android:name="info.appdev.chartexample.PerformanceLineChart" />
49+
<activity android:name="info.appdev.chartexample.BarChartActivitySinus" />
50+
<activity android:name="info.appdev.chartexample.ScrollViewActivity" />
51+
<activity android:name="info.appdev.chartexample.StackedBarActivityNegative" />
52+
<activity android:name="info.appdev.chartexample.BarChartPositiveNegative" />
53+
<activity android:name="info.appdev.chartexample.FilledLineActivity" />
54+
<activity android:name="info.appdev.chartexample.HalfPieChartActivity" />
55+
<activity android:name="info.appdev.chartexample.SpecificPositionsLineChartActivity" />
56+
</application>
57+
58+
</manifest>

‎MPChartExample/src/main/assets/OpenSans-Bold.ttf‎ renamed to ‎app/src/main/assets/OpenSans-Bold.ttf‎

File renamed without changes.

‎MPChartExample/src/main/assets/OpenSans-BoldItalic.ttf‎ renamed to ‎app/src/main/assets/OpenSans-BoldItalic.ttf‎

File renamed without changes.

0 commit comments

Comments
 (0)