First version of BarChart

app/src/main/java/org/isoron/uhabits/activities/common/views/BarChart.java

@@ -0,0 +1,467 @@
+/*
+ * Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+ *
+ * This file is part of Loop Habit Tracker.
+ *
+ * Loop Habit Tracker is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * Loop Habit Tracker is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.isoron.uhabits.activities.common.views;
+
+import android.content.*;
+import android.graphics.*;
+import android.support.annotation.*;
+import android.util.*;
+
+import org.isoron.uhabits.*;
+import org.isoron.uhabits.activities.habits.list.views.*;
+import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.utils.*;
+
+import java.text.*;
+import java.util.*;
+
+import static org.isoron.uhabits.utils.InterfaceUtils.*;
+
+public class BarChart extends ScrollableChart
+{
+    private static final PorterDuffXfermode XFERMODE_CLEAR =
+        new PorterDuffXfermode(PorterDuff.Mode.CLEAR);
+
+    private static final PorterDuffXfermode XFERMODE_SRC =
+        new PorterDuffXfermode(PorterDuff.Mode.SRC);
+
+    private Paint pGrid;
+
+    private float em;
+
+    private SimpleDateFormat dfMonth;
+
+    private SimpleDateFormat dfDay;
+
+    private SimpleDateFormat dfYear;
+
+    private Paint pText, pGraph;
+
+    private RectF rect, prevRect;
+
+    private int baseSize;
+
+    private int paddingTop;
+
+    private float columnWidth;
+
+    private int columnHeight;
+
+    private int nColumns;
+
+    private int textColor;
+
+    private int gridColor;
+
+    @Nullable
+    private List<Checkmark> checkmarks;
+
+    private int primaryColor;
+
+    @Deprecated
+    private int bucketSize = 7;
+
+    private int backgroundColor;
+
+    private Bitmap drawingCache;
+
+    private Canvas cacheCanvas;
+
+    private boolean isTransparencyEnabled;
+
+    private int skipYear = 0;
+
+    private String previousYearText;
+
+    private String previousMonthText;
+
+    private double maxValue;
+
+    private double target;
+
+    public BarChart(Context context)
+    {
+        super(context);
+        init();
+    }
+
+    public BarChart(Context context, AttributeSet attrs)
+    {
+        super(context, attrs);
+        init();
+    }
+
+    public void populateWithRandomData()
+    {
+        Random random = new Random();
+        List<Checkmark> checkmarks = new LinkedList<>();
+
+        long timestamp = DateUtils.getStartOfToday();
+        long day = DateUtils.millisecondsInOneDay;
+
+        for (int i = 1; i < 100; i++)
+        {
+            int value = random.nextInt(1000);
+            checkmarks.add(new Checkmark(timestamp, value));
+            timestamp -= day;
+        }
+
+        setCheckmarks(checkmarks);
+        setTarget(0.5);
+    }
+
+    @Deprecated
+    public void setBucketSize(int bucketSize)
+    {
+        this.bucketSize = bucketSize;
+        postInvalidate();
+    }
+
+    public void setCheckmarks(@NonNull List<Checkmark> checkmarks)
+    {
+        this.checkmarks = checkmarks;
+
+        maxValue = 1.0;
+        for (Checkmark c : checkmarks)
+            maxValue = Math.max(maxValue, c.getValue());
+        maxValue = Math.ceil(maxValue / 1000 * 1.05) * 1000;
+
+        postInvalidate();
+    }
+
+    public void setColor(int primaryColor)
+    {
+        this.primaryColor = primaryColor;
+        postInvalidate();
+    }
+
+    public void setIsTransparencyEnabled(boolean enabled)
+    {
+        this.isTransparencyEnabled = enabled;
+        initColors();
+        requestLayout();
+    }
+
+    public void setTarget(double target)
+    {
+        this.target = target;
+        postInvalidate();
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas)
+    {
+        super.onDraw(canvas);
+        Canvas activeCanvas;
+
+        if (isTransparencyEnabled)
+        {
+            if (drawingCache == null) initCache(getWidth(), getHeight());
+
+            activeCanvas = cacheCanvas;
+            drawingCache.eraseColor(Color.TRANSPARENT);
+        }
+        else
+        {
+            activeCanvas = canvas;
+        }
+
+        if (checkmarks == null) return;
+
+        rect.set(0, 0, nColumns * columnWidth, columnHeight);
+        rect.offset(0, paddingTop);
+
+        drawGrid(activeCanvas, rect);
+
+        pText.setColor(textColor);
+        pGraph.setColor(primaryColor);
+        prevRect.setEmpty();
+
+        previousMonthText = "";
+        previousYearText = "";
+        skipYear = 0;
+
+        for (int k = 0; k < nColumns; k++)
+        {
+            int offset = nColumns - k - 1 + getDataOffset();
+            if (offset >= checkmarks.size()) continue;
+
+            double value = checkmarks.get(offset).getValue();
+            long timestamp = checkmarks.get(offset).getTimestamp();
+            int height = (int) (columnHeight * value / maxValue);
+
+            rect.set(0, 0, baseSize, height);
+            rect.offset(k * columnWidth + (columnWidth - baseSize) / 2,
+                paddingTop + columnHeight - height);
+
+            drawValue(activeCanvas, rect, value);
+            drawBar(activeCanvas, rect, value);
+
+            prevRect.set(rect);
+            rect.set(0, 0, columnWidth, columnHeight);
+            rect.offset(k * columnWidth, paddingTop);
+
+            drawFooter(activeCanvas, rect, timestamp);
+        }
+
+        if (activeCanvas != canvas) canvas.drawBitmap(drawingCache, 0, 0, null);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec)
+    {
+        int width = MeasureSpec.getSize(widthMeasureSpec);
+        int height = MeasureSpec.getSize(heightMeasureSpec);
+        setMeasuredDimension(width, height);
+    }
+
+    @Override
+    protected void onSizeChanged(int width,
+                                 int height,
+                                 int oldWidth,
+                                 int oldHeight)
+    {
+        if (height < 9) height = 200;
+
+        float maxTextSize = getResources().getDimension(R.dimen.tinyTextSize);
+        float textSize = height * 0.06f;
+        pText.setTextSize(Math.min(textSize, maxTextSize));
+        em = pText.getFontSpacing();
+
+        int footerHeight = (int) (3 * em);
+        paddingTop = (int) (em);
+
+        baseSize = (height - footerHeight - paddingTop) / 12;
+        columnWidth = baseSize;
+        columnWidth = Math.max(columnWidth, getMaxDayWidth() * 1.5f);
+        columnWidth = Math.max(columnWidth, getMaxMonthWidth() * 1.2f);
+
+        nColumns = (int) (width / columnWidth);
+        columnWidth = (float) width / nColumns;
+        setScrollerBucketSize((int) columnWidth);
+
+        columnHeight = 12 * baseSize;
+
+        float minStrokeWidth = dpToPixels(getContext(), 1);
+        pGraph.setTextSize(baseSize * 0.5f);
+        pGraph.setStrokeWidth(baseSize * 0.1f);
+        pGrid.setStrokeWidth(Math.min(minStrokeWidth, baseSize * 0.05f));
+
+        if (isTransparencyEnabled) initCache(width, height);
+    }
+
+    private void drawBar(Canvas canvas, RectF rect, double value)
+    {
+        float margin = baseSize * 0.225f;
+        float round = (baseSize * 0.12f);
+        round = Math.min(round, (rect.bottom - rect.top) / 2);
+
+        int color = textColor;
+        if (value / 1000 >= target) color = primaryColor;
+
+        rect.inset(-margin, 0);
+        setModeOrColor(pGraph, XFERMODE_CLEAR, backgroundColor);
+        canvas.drawRoundRect(rect, round, round, pGraph);
+
+        rect.inset(margin, 0);
+        setModeOrColor(pGraph, XFERMODE_SRC, color);
+        canvas.drawRoundRect(rect.left, rect.top, rect.right,
+            Math.min(rect.bottom, rect.top + 2 * round), round, round, pGraph);
+        canvas.drawRect(rect.left, rect.top + round, rect.right, rect.bottom,
+            pGraph);
+
+        if (isTransparencyEnabled) pGraph.setXfermode(XFERMODE_SRC);
+    }
+
+    private void drawFooter(Canvas canvas, RectF rect, long currentDate)
+    {
+        String yearText = dfYear.format(currentDate);
+        String monthText = dfMonth.format(currentDate);
+        String dayText = dfDay.format(currentDate);
+
+        GregorianCalendar calendar = DateUtils.getCalendar(currentDate);
+
+        String text;
+        int year = calendar.get(Calendar.YEAR);
+
+        boolean shouldPrintYear = true;
+        if (yearText.equals(previousYearText)) shouldPrintYear = false;
+        if (bucketSize >= 365 && (year % 2) != 0) shouldPrintYear = false;
+
+        if (skipYear > 0)
+        {
+            skipYear--;
+            shouldPrintYear = false;
+        }
+
+        if (shouldPrintYear)
+        {
+            previousYearText = yearText;
+            previousMonthText = "";
+
+            pText.setTextAlign(Paint.Align.CENTER);
+            canvas.drawText(yearText, rect.centerX(), rect.bottom + em * 2.2f,
+                pText);
+
+            skipYear = 1;
+        }
+
+        if (bucketSize < 365)
+        {
+            if (!monthText.equals(previousMonthText))
+            {
+                previousMonthText = monthText;
+                text = monthText;
+            }
+            else
+            {
+                text = dayText;
+            }
+
+            canvas.drawText(text, rect.centerX(), rect.bottom + em * 1.2f,
+                pText);
+        }
+    }
+
+    private void drawGrid(Canvas canvas, RectF rGrid)
+    {
+        int nRows = 5;
+        float rowHeight = rGrid.height() / nRows;
+
+        pText.setColor(textColor);
+        pGrid.setColor(gridColor);
+
+        for (int i = 0; i < nRows; i++)
+        {
+            canvas.drawLine(rGrid.left, rGrid.top, rGrid.right, rGrid.top,
+                pGrid);
+            rGrid.offset(0, rowHeight);
+        }
+
+        canvas.drawLine(rGrid.left, rGrid.top, rGrid.right, rGrid.top, pGrid);
+    }
+
+    private void drawValue(Canvas canvas, RectF rect, double value)
+    {
+        if(value == 0) return;
+        if (value / 1000 >= target) pText.setColor(primaryColor);
+        String label = NumberButtonView.formatValue(value / 1000);
+        float offset = 0.5f * em;
+        canvas.drawText(label, rect.centerX(), rect.top - offset, pText);
+        pText.setColor(textColor);
+    }
+
+    private float getMaxDayWidth()
+    {
+        float maxDayWidth = 0;
+        GregorianCalendar day = DateUtils.getStartOfTodayCalendar();
+
+        for (int i = 0; i < 28; i++)
+        {
+            day.set(Calendar.DAY_OF_MONTH, i);
+            float monthWidth = pText.measureText(dfMonth.format(day.getTime()));
+            maxDayWidth = Math.max(maxDayWidth, monthWidth);
+        }
+
+        return maxDayWidth;
+    }
+
+    private float getMaxMonthWidth()
+    {
+        float maxMonthWidth = 0;
+        GregorianCalendar day = DateUtils.getStartOfTodayCalendar();
+
+        for (int i = 0; i < 12; i++)
+        {
+            day.set(Calendar.MONTH, i);
+            float monthWidth = pText.measureText(dfMonth.format(day.getTime()));
+            maxMonthWidth = Math.max(maxMonthWidth, monthWidth);
+        }
+
+        return maxMonthWidth;
+    }
+
+    private void init()
+    {
+        initPaints();
+        initColors();
+        initDateFormats();
+        initRects();
+    }
+
+    private void initCache(int width, int height)
+    {
+        if (drawingCache != null) drawingCache.recycle();
+        drawingCache =
+            Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        cacheCanvas = new Canvas(drawingCache);
+    }
+
+    private void initColors()
+    {
+        StyledResources res = new StyledResources(getContext());
+
+        primaryColor = Color.BLACK;
+        textColor = res.getColor(R.attr.mediumContrastTextColor);
+        gridColor = res.getColor(R.attr.lowContrastTextColor);
+        backgroundColor = res.getColor(R.attr.cardBackgroundColor);
+    }
+
+    private void initDateFormats()
+    {
+        if (isInEditMode())
+        {
+            dfYear = new SimpleDateFormat("yyyy", Locale.US);
+            dfMonth = new SimpleDateFormat("MMM", Locale.US);
+            dfDay = new SimpleDateFormat("d", Locale.US);
+            return;
+        }
+
+        dfYear = DateFormats.fromSkeleton("yyyy");
+        dfMonth = DateFormats.fromSkeleton("MMM");
+        dfDay = DateFormats.fromSkeleton("d");
+    }
+
+    private void initPaints()
+    {
+        pText = new Paint();
+        pText.setAntiAlias(true);
+        pText.setTextAlign(Paint.Align.CENTER);
+
+        pGraph = new Paint();
+        pGraph.setTextAlign(Paint.Align.CENTER);
+        pGraph.setAntiAlias(true);
+
+        pGrid = new Paint();
+        pGrid.setAntiAlias(true);
+    }
+
+    private void initRects()
+    {
+        rect = new RectF();
+        prevRect = new RectF();
+    }
+
+    private void setModeOrColor(Paint p, PorterDuffXfermode mode, int color)
+    {
+        if (isTransparencyEnabled) p.setXfermode(mode);
+        else p.setColor(color);
+    }
+}

app/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.java

@@ -94,7 +94,7 @@ public class NumberButtonView extends View
      * @param v
      * @return
      */
-    private static String formatValue(double v)
+    public static String formatValue(double v)
     {
         if (v >= 1e9) return String.format("%.1fG", v / 1e9);
         if (v >= 1e8) return String.format("%.0fM", v / 1e6);

app/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitRootView.java

@@ -59,6 +59,9 @@ public class ShowHabitRootView extends BaseRootView
     @BindView(R.id.historyCard)
     HistoryCard historyCard;
 
+    @BindView(R.id.barCard)
+    BarCard barCard;
+
     @BindView(R.id.toolbar)
     Toolbar toolbar;
 
@@ -149,6 +152,11 @@ public class ShowHabitRootView extends BaseRootView
         historyCard.setHabit(habit);
         streakCard.setHabit(habit);
         frequencyCard.setHabit(habit);
+
+        if(habit.isNumerical())
+            barCard.setHabit(habit);
+        else
+            barCard.setVisibility(GONE);
     }
 
     public interface Controller extends HistoryCard.Controller

app/src/main/java/org/isoron/uhabits/activities/habits/show/views/BarCard.java

@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+ *
+ * This file is part of Loop Habit Tracker.
+ *
+ * Loop Habit Tracker is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * Loop Habit Tracker is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.isoron.uhabits.activities.habits.show.views;
+
+import android.content.*;
+import android.support.annotation.*;
+import android.util.*;
+import android.widget.*;
+
+import org.isoron.uhabits.*;
+import org.isoron.uhabits.R;
+import org.isoron.uhabits.activities.common.views.*;
+import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.tasks.*;
+import org.isoron.uhabits.utils.*;
+
+import java.util.*;
+
+import butterknife.*;
+
+public class BarCard extends HabitCard
+{
+    @BindView(R.id.barChart)
+    BarChart chart;
+
+    @BindView(R.id.title)
+    TextView title;
+
+    @Nullable
+    private TaskRunner taskRunner;
+
+    public BarCard(Context context)
+    {
+        super(context);
+        init();
+    }
+
+    public BarCard(Context context, AttributeSet attrs)
+    {
+        super(context, attrs);
+        init();
+    }
+
+    @Override
+    protected void refreshData()
+    {
+        if(taskRunner == null) return;
+        taskRunner.execute(new RefreshTask(getHabit()));
+    }
+
+    private void init()
+    {
+        inflate(getContext(), R.layout.show_habit_bar, this);
+        ButterKnife.bind(this);
+
+        Context appContext = getContext().getApplicationContext();
+        if (appContext instanceof HabitsApplication)
+        {
+            HabitsApplication app = (HabitsApplication) appContext;
+            taskRunner = app.getComponent().getTaskRunner();
+        }
+
+        if (isInEditMode()) initEditMode();
+    }
+
+    private void initEditMode()
+    {
+        int color = ColorUtils.getAndroidTestColor(1);
+        title.setTextColor(color);
+        chart.setColor(color);
+        chart.populateWithRandomData();
+    }
+
+    private class RefreshTask implements Task
+    {
+        private final Habit habit;
+
+        public RefreshTask(Habit habit) {this.habit = habit;}
+
+        @Override
+        public void doInBackground()
+        {
+            long today = DateUtils.getStartOfToday();
+            List<Checkmark> checkmarks =
+                habit.getCheckmarks().getByInterval(0, today);
+            chart.setCheckmarks(checkmarks);
+        }
+
+        @Override
+        public void onPreExecute()
+        {
+            int color = ColorUtils.getColor(getContext(), habit.getColor());
+            title.setTextColor(color);
+            chart.setColor(color);
+            chart.setTarget(habit.getTargetValue());
+        }
+    }
+}

app/src/main/res/layout/show_habit_bar.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+  ~
+  ~ This file is part of Loop Habit Tracker.
+  ~
+  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by the
+  ~ Free Software Foundation, either version 3 of the License, or (at your
+  ~ option) any later version.
+  ~
+  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
+  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  ~ more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License along
+  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<merge
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:clipToPadding="false"
+    android:orientation="vertical"
+    android:paddingBottom="0dp">
+
+    <TextView
+        android:id="@+id/title"
+        style="@style/CardHeader"
+        android:text="@string/history"/>
+
+    <org.isoron.uhabits.activities.common.views.BarChart
+        android:id="@+id/barChart"
+        android:layout_width="match_parent"
+        android:layout_height="220dp"/>
+
+</merge>

app/src/main/res/layout/show_habit_history.xml

@@ -27,7 +27,7 @@
     <TextView
         android:id="@+id/title"
         style="@style/CardHeader"
-        android:text="@string/history"/>
+        android:text="@string/calendar"/>
 
     <org.isoron.uhabits.activities.common.views.HistoryChart
         android:id="@+id/historyChart"

app/src/main/res/layout/show_habit_inner.xml

@@ -52,6 +52,11 @@
             style="@style/Card"
             android:gravity="center"/>
 
+        <org.isoron.uhabits.activities.habits.show.views.BarCard
+            android:id="@+id/barCard"
+            style="@style/Card"
+            android:gravity="center"/>
+
         <org.isoron.uhabits.activities.habits.show.views.HistoryCard
             android:id="@+id/historyCard"
             style="@style/Card"

app/src/main/res/layout/show_habit_preview.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+  ~
+  ~ This file is part of Loop Habit Tracker.
+  ~
+  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by the
+  ~ Free Software Foundation, either version 3 of the License, or (at your
+  ~ option) any later version.
+  ~
+  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
+  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  ~ more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License along
+  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    >
+
+    <org.isoron.uhabits.activities.habits.show.views.BarCard
+        android:id="@+id/barCard"
+        style="@style/Card"
+        android:gravity="center"/>
+</LinearLayout>

app/src/main/res/layout/show_habit_score.xml

@@ -40,7 +40,7 @@
             android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
             android:layout_alignParentTop="true"
-            android:text="@string/habit_strength"/>
+            android:text="@string/score"/>
 
         <org.isoron.uhabits.activities.common.views.ScoreChart
             android:id="@+id/scoreView"

app/src/main/res/values/strings.xml

@@ -207,4 +207,5 @@
     <string name="long_press_to_edit">Press-and-hold to change the
         value</string>
     <string name="change_value">Change value</string>
+    <string name="calendar">Calendar</string>
 </resources>