Merge pull request #96 from Team-Beforeget/feature/29-report-graph-in…

…flate [BUG] 디자인 요청 사항
Team-Beforeget · Jan 20, 2022 · ec8fc41 · ec8fc41
2 parents f258325 + 75a5014
commit ec8fc41
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/.idea/sonarlint/issuestore/index.pb b/.idea/sonarlint/issuestore/index.pb
diff --git a/app/src/main/java/before/forget/feature/report/ReportGraphFragment.kt b/app/src/main/java/before/forget/feature/report/ReportGraphFragment.kt
@@ -31,6 +31,7 @@ class ReportGraphFragment : Fragment() {
     private var COUNT_X_LABEL = 5
     private var recordCount = ArrayList<String>()
     private var monthCount = ArrayList<String>()
+    private var isFirst = true
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -82,7 +83,11 @@ class ReportGraphFragment : Fragment() {
     private fun initBarChart(recordCount: ArrayList<String>) {
         val data: BarData = createBarChartData(recordCount)
         // set bar width
-        data.barWidth = 0.1f
+        if (MAX_X_VALUE < 5) {
+            data.barWidth = 0.06f
+        } else {
+            data.barWidth = 0.1f
+        }
         configureChartAppearance()
         prepareChartData(data)
     }
@@ -92,13 +97,15 @@ class ReportGraphFragment : Fragment() {
             tvGraph3Month.setOnClickListener {
                 MAX_X_VALUE = 3
                 COUNT_X_LABEL = 3
+                isFirst = false
                 tvGraph5Month.setTextColor(Color.GRAY)
                 tvGraph3Month.setTextColor(Color.WHITE)
                 initNetwork()
             }
             tvGraph5Month.setOnClickListener {
                 MAX_X_VALUE = 5
                 COUNT_X_LABEL = 5
+                isFirst = false
                 tvGraph5Month.setTextColor(Color.WHITE)
                 tvGraph3Month.setTextColor(Color.GRAY)
                 initNetwork()
@@ -145,13 +152,14 @@ class ReportGraphFragment : Fragment() {
             extraBottomOffset = 20f
 
             // X, Y 바의 애니메이션 효과
-            animateY(2000)
+            if (isFirst) animateY(300)
             // bar background
             setDrawBarShadow(true)
             // bar touch
             setTouchEnabled(false)
+
             // chart label
-            getLegend().isEnabled = false
+            legend.isEnabled = false
         }
     }
 

diff --git a/app/src/main/java/before/forget/feature/report/ReportOnepageFragment.kt b/app/src/main/java/before/forget/feature/report/ReportOnepageFragment.kt
@@ -128,7 +128,7 @@ class ReportOnepageFragment : Fragment() {
             extraBottomOffset = 45f
 
             // X, Y 바의 애니메이션 효과
-            animateY(2000)
+            animateY(1000)
             // bar background
             setDrawBarShadow(true)
             // bar touch