Rename CommonChartActivity to be BasicChartActivity

sample/src/main/AndroidManifest.xml

@@ -22,7 +22,7 @@
         <activity android:name=".basiccontent.SpecialChartActivity" />
         <activity android:name=".basiccontent.CustomStyleChartActivity" />
         <activity android:name=".basiccontent.MixedChartActivity" />
-        <activity android:name=".basiccontent.CommonChartActivity" />
+        <activity android:name=".basiccontent.BasicChartActivity" />
         <activity android:name=".additionalcontent.JSFormatterFunctionActivity" />
         <activity android:name=".additionalcontent.DrawChartWithAAOptionsActivity" />
         <activity android:name=".additionalcontent.EvaluateJSStringFunctionActivity" />

sample/src/main/java/com/github/aachartmodel/aainfographics/demo/basiccontent/CommonChartActivity.kt → sample/src/main/java/com/github/aachartmodel/aainfographics/demo/basiccontent/BasicChartActivity.kt

@@ -39,9 +39,9 @@ import com.github.aachartmodel.aainfographics.aatools.AAGradientColor
 import com.github.aachartmodel.aainfographics.aatools.AALinearGradientDirection
 import com.github.aachartmodel.aainfographics.demo.R
 import com.google.gson.Gson
-import kotlinx.android.synthetic.main.activity_common_chart.*
+import kotlinx.android.synthetic.main.activity_basic_chart.*
 
-class CommonChartActivity : AppCompatActivity(), RadioGroup.OnCheckedChangeListener,
+class BasicChartActivity : AppCompatActivity(), RadioGroup.OnCheckedChangeListener,
     CompoundButton.OnCheckedChangeListener, AAChartView.AAChartViewCallBack {
 
     private var aaChartModel = AAChartModel()
@@ -49,7 +49,7 @@ class CommonChartActivity : AppCompatActivity(), RadioGroup.OnCheckedChangeListe
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_common_chart)
+        setContentView(R.layout.activity_basic_chart)
 
         setUpAAChartView()
         setUpRadioButtonsAndSwitches()
@@ -58,7 +58,6 @@ class CommonChartActivity : AppCompatActivity(), RadioGroup.OnCheckedChangeListe
     private fun setUpAAChartView() {
         aaChartView = findViewById(R.id.AAChartView)
         aaChartView?.setBackgroundColor(0)
-        aaChartView?.background?.alpha = 0
         aaChartView?.callBack = this
         aaChartModel = configureAAChartModel()
         aaChartView?.aa_drawChartWithChartModel(aaChartModel)
@@ -242,11 +241,11 @@ class CommonChartActivity : AppCompatActivity(), RadioGroup.OnCheckedChangeListe
             symbol5.visibility = View.GONE
 
         } else {
-            symbol1.text = AAChartSymbolType.Circle.value
-            symbol2.text = AAChartSymbolType.Square.value
-            symbol3.text = AAChartSymbolType.Diamond.value
-            symbol4.text = AAChartSymbolType.Triangle.value
-            symbol5.text = AAChartSymbolType.TriangleDown.value
+            symbol1.text = "⊙"
+            symbol2.text = "◆"
+            symbol3.text = "■"
+            symbol4.text = "▲"
+            symbol5.text = "▼"
         }
 
 

sample/src/main/java/com/github/aachartmodel/aainfographics/demo/basiccontent/MainActivity.kt

@@ -314,7 +314,7 @@ class MainActivity : AppCompatActivity() {
 
     private fun goToCommonChartActivity(chartType: String?, position: Int) {
         val intent =
-            Intent(this, CommonChartActivity::class.java)
+            Intent(this, BasicChartActivity::class.java)
         intent.putExtra(kChartTypeKey, chartType)
         intent.putExtra("position", position)
         startActivity(intent)

sample/src/main/res/layout/activity_common_chart.xml → sample/src/main/res/layout/activity_basic_chart.xml

@@ -1,62 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".basiccontent.CommonChartActivity">
-
-
-    <LinearLayout
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:orientation="vertical"
         android:background="@color/aaChartCoreThemeColor"
-        android:orientation="vertical">
+        tools:context=".basiccontent.BasicChartActivity">
 
 
-        <LinearLayout
+    <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="130dp"
             android:background="@color/aaChartCoreThemeColor"
             android:orientation="vertical">
 
-            <RadioGroup
+        <RadioGroup
                 android:id="@+id/radioGroup1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-                <RadioButton
+            <RadioButton
                     android:id="@+id/stacking1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:text="no stacking"
+                    android:text="no\nstacking"
                     android:textColor="@color/mediumGray" />
 
-                <RadioButton
+            <RadioButton
                     android:id="@+id/stacking2"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:text="normalStacking"
+                    android:text="normal\nstacking"
                     android:textColor="@color/mediumGray" />
 
-                <RadioButton
+            <RadioButton
                     android:id="@+id/stacking3"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:text="percentStacking"
+                    android:text="percent\nstacking"
                     android:textColor="@color/mediumGray" />
-            </RadioGroup>
+        </RadioGroup>
 
-            <RadioGroup
+        <RadioGroup
                 android:id="@+id/radioGroup2"
                 android:layout_width="match_parent"
                 android:layout_height="38dp"
                 android:orientation="horizontal">
 
-                <RadioButton
+            <RadioButton
                     android:id="@+id/symbol1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -64,7 +59,7 @@
                     android:text="1"
                     android:textColor="@color/mediumGray" />
 
-                <RadioButton
+            <RadioButton
                     android:id="@+id/symbol2"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -72,7 +67,7 @@
                     android:text="2"
                     android:textColor="@color/mediumGray" />
 
-                <RadioButton
+            <RadioButton
                     android:id="@+id/symbol3"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -80,7 +75,7 @@
                     android:text="3"
                     android:textColor="@color/mediumGray" />
 
-                <RadioButton
+            <RadioButton
                     android:id="@+id/symbol4"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -88,57 +83,57 @@
                     android:text="4"
                     android:textColor="@color/mediumGray" />
 
-                <RadioButton
+            <RadioButton
                     android:id="@+id/symbol5"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:text="5"
                     android:textColor="@color/mediumGray" />
-            </RadioGroup>
+        </RadioGroup>
 
-            <LinearLayout
+        <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-                <Switch
+            <Switch
                     android:id="@+id/switch1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1" />
 
-                <Switch
+            <Switch
                     android:id="@+id/switch2"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1" />
 
-                <Switch
+            <Switch
                     android:id="@+id/switch3"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1" />
 
-                <Switch
+            <Switch
                     android:id="@+id/switch4"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1" />
 
-                <Switch
+            <Switch
                     android:id="@+id/switch5"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1" />
-            </LinearLayout>
+        </LinearLayout>
 
-            <LinearLayout
+        <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="horizontal">
 
-                <TextView
+            <TextView
                     android:id="@+id/textView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -146,7 +141,7 @@
                     android:text="xReversed"
                     android:textColor="@color/mediumGray" />
 
-                <TextView
+            <TextView
                     android:id="@+id/textView2"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -154,7 +149,7 @@
                     android:text="yReversed"
                     android:textColor="@color/mediumGray" />
 
-                <TextView
+            <TextView
                     android:id="@+id/textView3"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -162,7 +157,7 @@
                     android:text="xInverted"
                     android:textColor="@color/mediumGray" />
 
-                <TextView
+            <TextView
                     android:id="@+id/textView4"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -170,24 +165,23 @@
                     android:text="polarization"
                     android:textColor="@color/mediumGray" />
 
-                <TextView
+            <TextView
                     android:id="@+id/textView5"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:text="dataShow"
                     android:textColor="@color/mediumGray" />
-            </LinearLayout>
-
         </LinearLayout>
 
+    </LinearLayout>
+
 
-        <com.github.aachartmodel.aainfographics.aachartcreator.AAChartView
+    <com.github.aachartmodel.aainfographics.aachartcreator.AAChartView
             android:id="@+id/AAChartView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@color/aaChartCoreThemeColor" />
-    </LinearLayout>
+</LinearLayout>
 
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>