Code smells fixed in ImageViewActivity and ChartViewActivity