Merge pull request #5 from SapuSeven/develop

Fixed some attributes
thellmund · Nov 14, 2018 · ec4bfe4 · ec4bfe4
2 parents c3b5ae9 + e649a2d
commit ec4bfe4
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/library/src/main/java/com/alamkanak/weekview/BackgroundGridDrawer.java b/library/src/main/java/com/alamkanak/weekview/BackgroundGridDrawer.java
@@ -49,8 +49,10 @@ private float[] getHourLines() {
     }
 
     private void drawGrid(float[] hourLines, float startX, float startPixel, Canvas canvas) {
-        drawHourLines(hourLines, startX, startPixel, canvas);
-        drawDaySeparators(startPixel, canvas);
+        if (config.showHourSeparator)
+            drawHourLines(hourLines, startX, startPixel, canvas);
+        if (config.showDaySeparator)
+            drawDaySeparators(startPixel, canvas);
     }
 
     private void drawDaySeparators(float startPixel, Canvas canvas) {
@@ -64,7 +66,7 @@ private void drawDaySeparators(float startPixel, Canvas canvas) {
 
         for (int i = 0; i < days; i++) {
             final float start = startPixel + widthPerDay * (i + 1);
-            canvas.drawLine(start, top, start, top + height, drawConfig.hourSeparatorPaint);
+            canvas.drawLine(start, top, start, top + height, drawConfig.daySeparatorPaint);
         }
     }
 

diff --git a/library/src/main/java/com/alamkanak/weekview/WeekView.java b/library/src/main/java/com/alamkanak/weekview/WeekView.java
@@ -831,6 +831,7 @@ public int getDaySeparatorColor() {
 
     public void setDaySeparatorColor(int daySeparatorColor) {
         config.daySeparatorColor = daySeparatorColor;
+        config.drawingConfig.daySeparatorPaint.setColor(daySeparatorColor);
         invalidate();
     }
 

diff --git a/library/src/main/java/com/alamkanak/weekview/WeekViewConfig.java b/library/src/main/java/com/alamkanak/weekview/WeekViewConfig.java
@@ -176,7 +176,7 @@ final class WeekViewConfig {
             hourSeparatorStrokeWidth = a.getDimensionPixelSize(R.styleable.WeekView_hourSeparatorStrokeWidth, hourSeparatorStrokeWidth);
 
             // Day separators
-            showDaySeparator = a.getBoolean(R.styleable.WeekView_showHourSeparator, showDaySeparator);
+            showDaySeparator = a.getBoolean(R.styleable.WeekView_showDaySeparator, showDaySeparator);
             daySeparatorColor = a.getColor(R.styleable.WeekView_daySeparatorColor, daySeparatorColor);
             daySeparatorStrokeWidth = a.getDimensionPixelSize(R.styleable.WeekView_daySeparatorStrokeWidth, daySeparatorStrokeWidth);
 

diff --git a/library/src/main/java/com/alamkanak/weekview/WeekViewDrawingConfig.java b/library/src/main/java/com/alamkanak/weekview/WeekViewDrawingConfig.java
@@ -17,7 +17,7 @@
 import static java.util.Calendar.HOUR_OF_DAY;
 
 class WeekViewDrawingConfig {
-    
+
     Paint timeTextPaint;
     float timeTextWidth;
     float timeTextHeight;
@@ -31,6 +31,7 @@ class WeekViewDrawingConfig {
     float widthPerDay;
     Paint dayBackgroundPaint;
     Paint hourSeparatorPaint;
+    Paint daySeparatorPaint;
     float headerMarginBottom;
 
     Paint todayBackgroundPaint;
@@ -52,7 +53,7 @@ class WeekViewDrawingConfig {
     int newHourHeight = -1;
 
     DateTimeInterpreter dateTimeInterpreter;
-    
+
     WeekViewDrawingConfig(Context context, WeekViewConfig config) {
         // Measure settings for time column.
         timeTextPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
@@ -101,6 +102,12 @@ class WeekViewDrawingConfig {
         hourSeparatorPaint.setStrokeWidth(config.hourSeparatorStrokeWidth);
         hourSeparatorPaint.setColor(config.hourSeparatorColor);
 
+        // Prepare day separator color paint.
+        daySeparatorPaint = new Paint();
+        daySeparatorPaint.setStyle(Paint.Style.STROKE);
+        daySeparatorPaint.setStrokeWidth(config.daySeparatorStrokeWidth);
+        daySeparatorPaint.setColor(config.daySeparatorColor);
+
         // Prepare the "now" line color paint
         nowLinePaint = new Paint();
         nowLinePaint.setStrokeWidth(config.nowLineStrokeWidth);
@@ -263,5 +270,5 @@ public String interpretTime(int hour) {
             }
         };
     }
-    
+
 }