Simplify code for drawing header

codenpk · Mar 14, 2016 · f7f4b5e · f7f4b5e
1 parent 45a7433
commit f7f4b5e
Showing 1 changed file with 11 additions and 31 deletions.
diff --git a/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java b/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java
@@ -240,7 +240,6 @@ private void generateRandomData()
 
     private String previousMonth;
     private String previousYear;
-    private boolean justPrintedYear;
 
     @Override
     protected void onDraw(Canvas canvas)
@@ -250,10 +249,9 @@ protected void onDraw(Canvas canvas)
         baseLocation.set(0, 0, columnWidth - squareSpacing, columnWidth - squareSpacing);
         baseLocation.offset(getPaddingLeft(), getPaddingTop());
 
+        headerOverflow = 0;
         previousMonth = "";
         previousYear = "";
-        justPrintedYear = false;
-
         pTextHeader.setColor(textColor);
 
         updateDate();
@@ -307,44 +305,26 @@ private void drawAxis(Canvas canvas, Rect location)
         }
     }
 
-    private boolean justSkippedColumn = false;
+    private float headerOverflow = 0;
 
     private void drawColumnHeader(Canvas canvas, Rect location, GregorianCalendar date)
     {
         String month = dfMonth.format(date.getTime());
         String year = dfYear.format(date.getTime());
 
+        String text = null;
         if (!month.equals(previousMonth))
-        {
-            int offset = 0;
-            if (justPrintedYear)
-            {
-                offset += columnWidth;
-                justSkippedColumn = true;
-            }
+            text = previousMonth = month;
+        else if(!year.equals(previousYear))
+            text = previousYear = year;
 
-            canvas.drawText(month, location.left + offset, location.bottom - headerTextOffset,
-                    pTextHeader);
-
-            previousMonth = month;
-            justPrintedYear = false;
-        }
-        else if (!year.equals(previousYear))
+        if(text != null)
         {
-            if(!justSkippedColumn)
-            {
-                canvas.drawText(year, location.left, location.bottom - headerTextOffset, pTextHeader);
-                previousYear = year;
-                justPrintedYear = true;
-            }
-
-            justSkippedColumn = false;
-        }
-        else
-        {
-            justSkippedColumn = false;
-            justPrintedYear = false;
+            canvas.drawText(text, location.left + headerOverflow, location.bottom - headerTextOffset, pTextHeader);
+            headerOverflow += pTextHeader.measureText(text) + columnWidth * 0.2f;
         }
+
+        headerOverflow = Math.max(0, headerOverflow - columnWidth);
     }
 
     public void setIsBackgroundTransparent(boolean isBackgroundTransparent)