@@ -146,33 +146,35 @@ class WeekView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
146146 private var mStartOriginForScroll = 0f
147147
148148 // Attributes and their default values.
149- private var mHourHeight = 50
149+ private var mHourHeight = TypedValue .applyDimension( TypedValue . COMPLEX_UNIT_DIP , 50f , resources.displayMetrics).toInt()
150150 private var mNewHourHeight = - 1
151- var minHourHeight = 0 // no minimum specified (will be dynamic, based on screen)
152- private var mEffectiveMinHourHeight = minHourHeight // compensates for the fact that you can't keep zooming out.
153- var maxHourHeight = 250
154- private var mColumnGap = 10
151+ var minHourHeight = 0
152+ // no minimum specified (will be dynamic, based on screen)
153+ private var mEffectiveMinHourHeight = minHourHeight
154+ // compensates for the fact that you can't keep zooming out.
155+ var maxHourHeight = TypedValue .applyDimension(TypedValue .COMPLEX_UNIT_DIP , 125f , resources.displayMetrics).toInt()
156+ private var mColumnGap = TypedValue .applyDimension(TypedValue .COMPLEX_UNIT_DIP , 5f , resources.displayMetrics).toInt()
155157 private var mFirstDayOfWeek = Calendar .getInstance().firstDayOfWeek
156158 private var mTextSize = 12
157- private var mHeaderColumnPadding = 10
159+ private var mHeaderColumnPadding = TypedValue .applyDimension( TypedValue . COMPLEX_UNIT_DIP , 10f , resources.displayMetrics).toInt()
158160 private var mHeaderColumnTextColor = Color .BLACK
159161 private var mNumberOfVisibleDays = 3
160- private var mHeaderRowPadding = 10
162+ private var mHeaderRowPadding = TypedValue .applyDimension( TypedValue . COMPLEX_UNIT_DIP , 5f , resources.displayMetrics).toInt()
161163 private var mHeaderRowBackgroundColor = Color .WHITE
162164 private var mDayBackgroundColor = Color .rgb(245 , 245 , 245 )
163165 private var mPastBackgroundColor = Color .rgb(227 , 227 , 227 )
164166 private var mFutureBackgroundColor = Color .rgb(245 , 245 , 245 )
165167 private var mPastWeekendBackgroundColor = 0
166168 private var mFutureWeekendBackgroundColor = 0
167169 private var mNowLineColor = Color .rgb(102 , 102 , 102 )
168- private var mNowLineThickness = 5
170+ private var mNowLineThickness = TypedValue .applyDimension( TypedValue . COMPLEX_UNIT_DIP , 2f , resources.displayMetrics).toInt()
169171 private var mHourSeparatorColor = Color .rgb(230 , 230 , 230 )
170172 private var mTodayBackgroundColor = Color .rgb(239 , 247 , 254 )
171- private var mHourSeparatorHeight = 2
173+ private var mHourSeparatorHeight = TypedValue .applyDimension( TypedValue . COMPLEX_UNIT_DIP , 1f , resources.displayMetrics).toInt()
172174 private var mTodayHeaderTextColor = Color .rgb(39 , 137 , 228 )
173175 private var mEventTextSize = 12
174176 private var mEventTextColor = Color .BLACK
175- private var mEventPadding = 8
177+ private var mEventPadding = TypedValue .applyDimension( TypedValue . COMPLEX_UNIT_DIP , 4f , resources.displayMetrics).toInt()
176178 private var mHeaderColumnBackgroundColor = Color .WHITE
177179 private var mDefaultEventColor: Int = 0
178180 private var mNewEventColor: Int = 0
0 commit comments