diff --git a/.idea/sonarlint/issuestore/index.pb b/.idea/sonarlint/issuestore/index.pb index 678a697..0e97cfd 100644 --- a/.idea/sonarlint/issuestore/index.pb +++ b/.idea/sonarlint/issuestore/index.pb @@ -13,8 +13,6 @@ X settings.gradle,0/5/05efc8b1657769a27696d478ded1e95f38737233 t Dapp/src/main/java/before/forget/feature/filter/FilterTermFragment.kt,f/2/f27ed3d2ba875c06dd4bca99ba495dbe7617244d -< - build.gradle,f/0/f07866736216be0ee2aba49e392191aeae700a35 n >app/src/test/java/before/forget/util/RequestInfoWrapperTest.kt,0/5/051fd38ac74d9e3842aa764bbe88dd5d2302f920 P @@ -62,6 +60,4 @@ Bapp/src/main/java/before/forget/data/remote/api/CategoryService.kt,0/9/093ec54 { Kapp/src/main/java/before/forget/data/remote/response/OneLineResponseData.kt,6/7/67a344350fe7797059783ea47a14f1b1772fac15 x -Happ/src/main/java/before/forget/data/remote/response/MainResponseData.kt,2/c/2ce9e2f542c765f4737a0597584a97759004875e -@ -app/build.gradle,f/4/f4a01d6a4fcb971362ec00a83903fd3902f52164 \ No newline at end of file +Happ/src/main/java/before/forget/data/remote/response/MainResponseData.kt,2/c/2ce9e2f542c765f4737a0597584a97759004875e \ No newline at end of file diff --git a/app/src/main/java/before/forget/feature/report/ReportGraphFragment.kt b/app/src/main/java/before/forget/feature/report/ReportGraphFragment.kt index 8180229..93fe523 100644 --- 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() private var monthCount = ArrayList() + private var isFirst = true override fun onCreateView( inflater: LayoutInflater, @@ -82,7 +83,11 @@ class ReportGraphFragment : Fragment() { private fun initBarChart(recordCount: ArrayList) { 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,6 +97,7 @@ class ReportGraphFragment : Fragment() { tvGraph3Month.setOnClickListener { MAX_X_VALUE = 3 COUNT_X_LABEL = 3 + isFirst = false tvGraph5Month.setTextColor(Color.GRAY) tvGraph3Month.setTextColor(Color.WHITE) initNetwork() @@ -99,6 +105,7 @@ class ReportGraphFragment : Fragment() { 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 index e98d696..ec0523e 100644 --- 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