Trait labels added

exotic123567 · Sep 16, 2024 · 3b61154 · 3b61154
1 parent 7b117d2
commit 3b61154
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 5 deletions.
diff --git a/app/src/main/java/com/example/fivefactorfinder/AgreeablenessFragment.kt b/app/src/main/java/com/example/fivefactorfinder/AgreeablenessFragment.kt
@@ -14,6 +14,7 @@ import com.github.mikephil.charting.charts.BarChart
 import com.github.mikephil.charting.data.BarData
 import com.github.mikephil.charting.data.BarDataSet
 import com.github.mikephil.charting.data.BarEntry
+import com.github.mikephil.charting.formatter.IndexAxisValueFormatter
 
 // TODO: Rename parameter arguments, choose names that match
 // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
@@ -95,6 +96,10 @@ class AgreeablenessFragment : Fragment() {
         dataEntriesExtroversion.reverse()
         labelsExtroversion.reverse()
 
+        val labels = mutableListOf("AGREEABLENESS",
+            "Trust", "Morality", "Altruism", "Cooperation", "Modesty", "Sympathy"
+        )
+
         val barDataSetExtroversion = BarDataSet(dataEntriesExtroversion, "Agreeableness Traits")
         barDataSetExtroversion.setValueTextColor(color) // Set text color
         barDataSetExtroversion.setColors(color) // Set bar color
@@ -109,7 +114,9 @@ class AgreeablenessFragment : Fragment() {
         extrachart.data = barDataExtroversion
         extrachart.invalidate()
         extrachart.setDrawBorders(false)
-        extrachart.xAxis.isEnabled = false
+        val xAxis = extrachart.xAxis
+        xAxis.valueFormatter = IndexAxisValueFormatter(labels)
+        //extrachart.xAxis.isEnabled = false
         extrachart.axisLeft.isEnabled = false
         extrachart.axisRight.isEnabled = false
         extrachart.description.isEnabled = false

diff --git a/app/src/main/java/com/example/fivefactorfinder/ConscientiousnessFragment.kt b/app/src/main/java/com/example/fivefactorfinder/ConscientiousnessFragment.kt
@@ -14,6 +14,7 @@ import com.github.mikephil.charting.charts.BarChart
 import com.github.mikephil.charting.data.BarData
 import com.github.mikephil.charting.data.BarDataSet
 import com.github.mikephil.charting.data.BarEntry
+import com.github.mikephil.charting.formatter.IndexAxisValueFormatter
 
 // TODO: Rename parameter arguments, choose names that match
 // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
@@ -101,6 +102,11 @@ class ConscientiousnessFragment : Fragment() {
         dataEntriesExtroversion.reverse()
         labelsExtroversion.reverse()
 
+        val labels = mutableListOf("CONSCIENTIOUSNESS",
+            "Self-Efficacy",
+            "Orderliness", "Dutifulness", "Achievement-Striving", "Self-Discipline", "Cautiousness"
+        )
+
         val barDataSetExtroversion = BarDataSet(dataEntriesExtroversion, "Conscientiousness Traits")
         barDataSetExtroversion.setValueTextColor(color) // Set text color
         barDataSetExtroversion.setColors(color) // Set bar color
@@ -109,7 +115,9 @@ class ConscientiousnessFragment : Fragment() {
         extrachart.data = barDataExtroversion
         extrachart.invalidate()
         extrachart.setDrawBorders(false)
-        extrachart.xAxis.isEnabled = false
+        val xAxis = extrachart.xAxis
+        xAxis.valueFormatter = IndexAxisValueFormatter(labels)
+        //extrachart.xAxis.isEnabled = false
         extrachart.axisLeft.isEnabled = false
         extrachart.axisRight.isEnabled = false
         extrachart.description.isEnabled = false

diff --git a/app/src/main/java/com/example/fivefactorfinder/ExtroversionFragment.kt b/app/src/main/java/com/example/fivefactorfinder/ExtroversionFragment.kt
@@ -14,6 +14,7 @@ import com.github.mikephil.charting.charts.BarChart
 import com.github.mikephil.charting.data.BarData
 import com.github.mikephil.charting.data.BarDataSet
 import com.github.mikephil.charting.data.BarEntry
+import com.github.mikephil.charting.formatter.IndexAxisValueFormatter
 
 // TODO: Rename parameter arguments, choose names that match
 // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
@@ -99,6 +100,12 @@ class ExtroversionFragment : Fragment() {
         dataEntriesExtroversion.reverse()
         labelsExtroversion.reverse()
 
+        val labels = mutableListOf("EXTRAVERSION",
+            "Friendliness",
+            "Gregariousness",
+            "Assertiveness", "Activity Level", "Excitement-Seeking", "Cheerfulness"
+        )
+
         val barDataSetExtroversion = BarDataSet(dataEntriesExtroversion, "Extraversion Traits")
         barDataSetExtroversion.setValueTextColor(color) // Set text color
         barDataSetExtroversion.setColors(color) // Set bar color
@@ -113,7 +120,9 @@ class ExtroversionFragment : Fragment() {
         extrachart.data = barDataExtroversion
         extrachart.invalidate()
         extrachart.setDrawBorders(false)
-        extrachart.xAxis.isEnabled = false
+        val xAxis = extrachart.xAxis
+        xAxis.valueFormatter = IndexAxisValueFormatter(labels)
+        //extrachart.xAxis.isEnabled = false
         extrachart.axisLeft.isEnabled = false
         extrachart.axisRight.isEnabled = false
         extrachart.description.isEnabled = false

diff --git a/app/src/main/java/com/example/fivefactorfinder/NeuroticismFragment.kt b/app/src/main/java/com/example/fivefactorfinder/NeuroticismFragment.kt
@@ -14,6 +14,7 @@ import com.github.mikephil.charting.charts.BarChart
 import com.github.mikephil.charting.data.BarData
 import com.github.mikephil.charting.data.BarDataSet
 import com.github.mikephil.charting.data.BarEntry
+import com.github.mikephil.charting.formatter.IndexAxisValueFormatter
 
 // TODO: Rename parameter arguments, choose names that match
 // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
@@ -95,6 +96,10 @@ class NeuroticismFragment : Fragment() {
         dataEntriesExtroversion.reverse()
         labelsExtroversion.reverse()
 
+        val labels = mutableListOf("NEUROTICISM",
+            "Anxiety", "Anger", "Depression", "Self-Consciousness", "Immoderation", "Vulnerability"
+        )
+
         val barDataSetExtroversion = BarDataSet(dataEntriesExtroversion, "Conscientiousness Traits")
         barDataSetExtroversion.setValueTextColor(color) // Set text color
         barDataSetExtroversion.setColors(color) // Set bar color
@@ -109,7 +114,9 @@ class NeuroticismFragment : Fragment() {
         extrachart.data = barDataExtroversion
         extrachart.invalidate()
         extrachart.setDrawBorders(false)
-        extrachart.xAxis.isEnabled = false
+        val xAxis = extrachart.xAxis
+        xAxis.valueFormatter = IndexAxisValueFormatter(labels)
+        //extrachart.xAxis.isEnabled = false
         extrachart.axisLeft.isEnabled = false
         extrachart.axisRight.isEnabled = false
         extrachart.description.isEnabled = false

diff --git a/app/src/main/java/com/example/fivefactorfinder/OpennessFragment.kt b/app/src/main/java/com/example/fivefactorfinder/OpennessFragment.kt
@@ -14,6 +14,7 @@ import com.github.mikephil.charting.charts.BarChart
 import com.github.mikephil.charting.data.BarData
 import com.github.mikephil.charting.data.BarDataSet
 import com.github.mikephil.charting.data.BarEntry
+import com.github.mikephil.charting.formatter.IndexAxisValueFormatter
 
 // TODO: Rename parameter arguments, choose names that match
 // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
@@ -95,6 +96,11 @@ class OpennessFragment : Fragment() {
         dataEntriesExtroversion.reverse()
         labelsExtroversion.reverse()
 
+        val labels = mutableListOf("OPENNESS",
+            "Imagination",
+            "Artistic Interests", "Emotionality", "Adventurousness", "Intellect", "Liberalism"
+        )
+
         val barDataSetExtroversion = BarDataSet(dataEntriesExtroversion, "Conscientiousness Traits")
         barDataSetExtroversion.setValueTextColor(color) // Set text color
         barDataSetExtroversion.setColors(color) // Set bar color
@@ -105,15 +111,20 @@ class OpennessFragment : Fragment() {
             startActivity(intent)
         }
 
+
+
         val barDataExtroversion = BarData(barDataSetExtroversion)
         extrachart.data = barDataExtroversion
         extrachart.invalidate()
         extrachart.setDrawBorders(false)
-        extrachart.xAxis.isEnabled = false
+        //extrachart.xAxis.isEnabled = false
+        val xAxis = extrachart.xAxis
+        xAxis.valueFormatter = IndexAxisValueFormatter(labels)
         extrachart.axisLeft.isEnabled = false
         extrachart.axisRight.isEnabled = false
         extrachart.description.isEnabled = false
         extrachart.legend.isEnabled = false
+
     }
 
     companion object {