Merge branch 'master' of http://47.96.225.205:8888/r/FirstApp2

zhujie

9 天以前 88b00f3fc74446a1727c93722c7b64179b45a9db

 app/src/main/java/com/example/firstapp/ui/dashboard/DashboardFragment.kt

@@ -850,7 +850,7 @@
                    addView(TextView(context).apply {
                        text = ""
                        textSize = 20f
                        height = resources.getDimensionPixelSize(R.dimen.heatmap_cell_size)
                        height = resources.getDimensionPixelSize(R.dimen.heatmap_cell_week_size)
                    })
                    dayLabels.forEach { label ->
                        val textView = TextView(context).apply {
@@ -962,7 +962,7 @@
                legendLevels.forEach { level ->
                    val colorBox = View(context).apply {
                        setBackgroundColor(getHeatmapColor(level))
                        val size = resources.getDimensionPixelSize(R.dimen.heatmap_cell_size)
                        val size = resources.getDimensionPixelSize(R.dimen.heatmap_cell_legend_size)
                        layoutParams = LinearLayout.LayoutParams(size, size).apply {
                            marginEnd = 4
                        }