Skip to content

Commit 3f79bb5

Browse files
PhilJayPhilJay
committed
Fix merge conflicts
2 parents c59e59e + bfcfafe commit 3f79bb5

File tree

147 files changed

+5258
-1720
lines changed

Some content is hidden

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

147 files changed

+5258
-1720
lines changed

‎MPChartExample/AndroidManifest.xml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
</activity>
2727
<activity android:name="LineChartActivity1"></activity> <!-- android:configChanges="keyboardHidden|orientation|screenSize" -->
2828
<activity android:name="LineChartActivity2"></activity>
29-
<activity android:screenOrientation="landscape" android:name="MultipleChartsActivity"></activity>
3029
<activity android:name="BarChartActivity"></activity>
3130
<activity android:name="HorizontalBarChartActivity"></activity>
3231
<activity android:name="PieChartActivity"></activity>
@@ -46,6 +45,15 @@
4645
<activity android:name="RadarChartActivitry"></activity>
4746
<activity android:name="LineChartActivityColored"></activity>
4847
<activity android:name="DynamicalAddingActivity"></activity>
48+
<activity android:name=".realm.RealmDatabaseActivityLine"></activity>
49+
<activity android:name=".realm.RealmDatabaseActivityBar"></activity>
50+
<activity android:name=".realm.RealmDatabaseActivityHorizontalBar"></activity>
51+
<activity android:name=".realm.RealmDatabaseActivityScatter"></activity>
52+
<activity android:name=".realm.RealmDatabaseActivityCandle"></activity>
53+
<activity android:name=".realm.RealmDatabaseActivityBubble"></activity>
54+
<activity android:name=".realm.RealmDatabaseActivityPie"></activity>
55+
<activity android:name=".realm.RealmDatabaseActivityRadar"></activity>
56+
<activity android:name=".realm.RealmMainActivity"></activity>
4957
<activity android:name="RealtimeLineChartActivity"></activity>
5058
<activity android:name="CombinedChartActivity"></activity>
5159
<activity android:name="PerformanceLineChart"></activity>

‎MPChartExample/build.gradle‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,22 @@ buildscript {
3939
}
4040
dependencies {
4141
classpath 'com.android.tools.build:gradle:1.5.0'
42-
4342
// NOTE: Do not place your application dependencies here; they belong
4443
// in the individual module build.gradle files
4544
}
4645
}
4746

4847
repositories {
4948
maven { url "https://jitpack.io" }
49+
maven { // this is for realm-db
50+
url 'http://oss.jfrog.org/artifactory/oss-snapshot-local'
51+
}
5052
}
5153

5254
dependencies {
5355
//compile fileTree(dir: 'libs', include: ['*.jar'])
5456
compile project(':MPChartLib') // remove this if you only imported the example project
5557
compile 'com.android.support:appcompat-v7:23.1.1'
58+
compile 'io.realm:realm-android:0.84.0-SNAPSHOT' // dependency for realm-database API (http://realm.io)
5659
//compile 'com.github.PhilJay:MPAndroidChart:v2.1.1'
5760
}

‎MPChartExample/res/layout/activity_barchart_noseekbar.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:layout_width="match_parent"
4+
android:layout_height="match_parent" >
5+
6+
<com.github.mikephil.charting.charts.BarChart
7+
android:id="@+id/chart1"
8+
android:layout_width="match_parent"
9+
android:layout_height="match_parent" />
10+
11+
</RelativeLayout>

‎MPChartExample/res/layout/activity_bubblechart_noseekbar.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:layout_width="match_parent"
4+
android:layout_height="match_parent" >
5+
6+
<com.github.mikephil.charting.charts.BubbleChart
7+
android:id="@+id/chart1"
8+
android:layout_width="match_parent"
9+
android:layout_height="match_parent" />
10+
11+
</RelativeLayout>

‎MPChartExample/res/layout/activity_candlechart_noseekbar.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:layout_width="match_parent"
4+
android:layout_height="match_parent" >
5+
6+
<com.github.mikephil.charting.charts.CandleStickChart
7+
android:id="@+id/chart1"
8+
android:layout_width="match_parent"
9+
android:layout_height="match_parent" />
10+
11+
</RelativeLayout>

‎MPChartExample/res/layout/activity_horizontalbarchart_noseekbar.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:layout_width="match_parent"
4+
android:layout_height="match_parent" >
5+
6+
<com.github.mikephil.charting.charts.HorizontalBarChart
7+
android:id="@+id/chart1"
8+
android:layout_width="match_parent"
9+
android:layout_height="match_parent" />
10+
11+
</RelativeLayout>

‎MPChartExample/res/layout/activity_piechart_noseekbar.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:layout_width="match_parent"
4+
android:layout_height="match_parent" >
5+
6+
<com.github.mikephil.charting.charts.PieChart
7+
android:id="@+id/chart1"
8+
android:layout_width="match_parent"
9+
android:layout_height="match_parent" />
10+
11+
</RelativeLayout>

‎MPChartExample/res/layout/activity_radarchart_noseekbar.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:layout_width="match_parent"
4+
android:layout_height="match_parent" >
5+
6+
<com.github.mikephil.charting.charts.RadarChart
7+
android:id="@+id/chart1"
8+
android:layout_width="match_parent"
9+
android:layout_height="match_parent" />
10+
11+
</RelativeLayout>

‎MPChartExample/res/layout/activity_scatterchart_noseekbar.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:layout_width="match_parent"
4+
android:layout_height="match_parent" >
5+
6+
<com.github.mikephil.charting.charts.ScatterChart
7+
android:id="@+id/chart1"
8+
android:layout_width="match_parent"
9+
android:layout_height="match_parent" />
10+
11+
</RelativeLayout>

‎MPChartExample/res/layout/list_item.xml‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,22 @@
2222
android:layout_below="@+id/tvName"
2323
android:layout_marginTop="3dp"
2424
android:text="Small Text"
25-
android:textSize="12dp" />
25+
android:textSize="12dp"
26+
android:layout_marginRight="10dp"
27+
android:layout_toLeftOf="@+id/tvNew"
28+
android:layout_toStartOf="@+id/tvNew" />
29+
30+
<TextView
31+
android:layout_width="wrap_content"
32+
android:layout_height="wrap_content"
33+
android:textAppearance="?android:attr/textAppearanceSmall"
34+
android:text="NEW"
35+
android:textColor="#FA6185"
36+
android:id="@+id/tvNew"
37+
android:textSize="12dp"
38+
android:layout_marginRight="5dp"
39+
android:layout_centerVertical="true"
40+
android:layout_alignParentRight="true"
41+
android:layout_alignParentEnd="true" />
2642

2743
</RelativeLayout>

0 commit comments

Comments
 (0)