isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 09:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Allow user to change score view interval

Browse Source 
Closes #10
This commit is contained in:
Alinson S. Xavier
2016-03-20 08:06:12 -04:00
parent e4e8d77acc
commit 7da4ddf91b
9 changed files with 235 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
app/src/main/java/org/isoron/uhabits/fragments/ShowHabitFragment.java
View File

@@ -20,31 +20,36 @@
package org.isoron.uhabits.fragments;
import android.app.Fragment;
import android.content.SharedPreferences;
import android.graphics.Color;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.Button;
import android.widget.LinearLayout;
import android.widget.Spinner;
import android.widget.TextView;
import org.isoron.helpers.ColorHelper;
import org.isoron.uhabits.commands.Command;
import org.isoron.helpers.DialogHelper;
import org.isoron.uhabits.HabitBroadcastReceiver;
import org.isoron.uhabits.R;
import org.isoron.uhabits.ShowHabitActivity;
import org.isoron.uhabits.commands.Command;
import org.isoron.uhabits.dialogs.HistoryEditorDialog;
import org.isoron.uhabits.helpers.ReminderHelper;
import org.isoron.uhabits.models.Habit;
import org.isoron.uhabits.models.Score;
import org.isoron.uhabits.views.HabitDataView;
import org.isoron.uhabits.views.HabitHistoryView;
import org.isoron.uhabits.views.HabitFrequencyView;
import org.isoron.uhabits.views.HabitHistoryView;
import org.isoron.uhabits.views.HabitScoreView;
import org.isoron.uhabits.views.HabitStreakView;
import org.isoron.uhabits.views.RepetitionCountView;
@@ -54,17 +59,24 @@ import java.util.LinkedList;
import java.util.List;
public class ShowHabitFragment extends Fragment
implements DialogHelper.OnSavedListener, HistoryEditorDialog.Listener
implements DialogHelper.OnSavedListener, HistoryEditorDialog.Listener,
Spinner.OnItemSelectedListener
{
@Nullable
protected ShowHabitActivity activity;
private Habit habit;
private HabitStreakView streakView;
private HabitScoreView scoreView;
private HabitHistoryView historyView;
private HabitFrequencyView punchcardView;
@Nullable
private Habit habit;
@Nullable
private List<HabitDataView> dataViews;
@Nullable
private HabitScoreView scoreView;
@Nullable
private SharedPreferences prefs;
@Override
public void onStart()
{
@@ -82,10 +94,16 @@ public class ShowHabitFragment extends Fragment
dataViews = new LinkedList<>();
Button btEditHistory = (Button) view.findViewById(R.id.btEditHistory);
streakView = (HabitStreakView) view.findViewById(R.id.streakView);
Spinner sStrengthInterval = (Spinner) view.findViewById(R.id.sStrengthInterval);
scoreView = (HabitScoreView) view.findViewById(R.id.scoreView);
historyView = (HabitHistoryView) view.findViewById(R.id.historyView);
punchcardView = (HabitFrequencyView) view.findViewById(R.id.punchcardView);
prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
int defaultScoreInterval = prefs.getInt("pref_score_view_interval", 1);
if(defaultScoreInterval > 5 || defaultScoreInterval < 0) defaultScoreInterval = 1;
setScoreBucketSize(defaultScoreInterval);
sStrengthInterval.setSelection(defaultScoreInterval);
sStrengthInterval.setOnItemSelectedListener(this);
dataViews.add((HabitStreakView) view.findViewById(R.id.streakView));
dataViews.add((HabitScoreView) view.findViewById(R.id.scoreView));
@@ -131,6 +149,8 @@ public class ShowHabitFragment extends Fragment
private void updateScoreRing(View view)
{
if(habit == null) return;
RingView scoreRing = (RingView) view.findViewById(R.id.scoreRing);
scoreRing.setColor(habit.color);
scoreRing.setPercentage((float) habit.scores.getTodayValue() / Score.MAX_VALUE);
@@ -138,6 +158,8 @@ public class ShowHabitFragment extends Fragment
private void updateHeaders(View view)
{
if(habit == null | activity == null) return;
if (android.os.Build.VERSION.SDK_INT >= 21)
{
int darkerHabitColor = ColorHelper.mixColors(habit.color, Color.BLACK, 0.75f);
@@ -154,6 +176,8 @@ public class ShowHabitFragment extends Fragment
private void updateColor(View view, int viewId)
{
if(habit == null) return;
TextView textView = (TextView) view.findViewById(viewId);
textView.setTextColor(habit.color);
}
@@ -167,6 +191,8 @@ public class ShowHabitFragment extends Fragment
@Override
public boolean onOptionsItemSelected(MenuItem item)
{
if(habit == null) return false;
switch (item.getItemId())
{
case R.id.action_edit_habit:
@@ -184,6 +210,7 @@ public class ShowHabitFragment extends Fragment
@Override
public void onSaved(Command command, Object savedObject)
{
if(activity == null) return;
Habit h = (Habit) savedObject;
if (h == null) activity.executeCommand(command, null);
@@ -202,7 +229,38 @@ public class ShowHabitFragment extends Fragment
public void refreshData()
{
if(dataViews == null) return;
updateScoreRing(getView());
for(HabitDataView view : dataViews)
view.refreshData();
}
@Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id)
{
if(parent.getId() == R.id.sStrengthInterval)
setScoreBucketSize(position);
}
private void setScoreBucketSize(int position)
{
int sizes[] = { 1, 7, 31, 92, 365 };
int size = sizes[position];
if(scoreView != null)
{
scoreView.setBucketSize(size);
scoreView.refreshData();
}
if(prefs != null)
prefs.edit().putInt("pref_score_view_interval", position).apply();
}
@Override
public void onNothingSelected(AdapterView<?> parent)
{
}
}

125
app/src/main/java/org/isoron/uhabits/views/HabitScoreView.java
View File

@@ -26,20 +26,23 @@ import android.graphics.Paint;
import android.graphics.PorterDuff;
import android.graphics.PorterDuffXfermode;
import android.graphics.RectF;
import android.support.annotation.Nullable;
import android.util.AttributeSet;
import org.isoron.helpers.ColorHelper;
import org.isoron.helpers.DateHelper;
import org.isoron.uhabits.R;
import org.isoron.uhabits.models.Habit;
import org.isoron.uhabits.models.Score;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.Locale;
import java.util.Random;
public class HabitScoreView extends ScrollableDataView implements HabitDataView
{
public static final int BUCKET_SIZE = 7;
public static final PorterDuffXfermode XFERMODE_CLEAR =
new PorterDuffXfermode(PorterDuff.Mode.CLEAR);
public static final PorterDuffXfermode XFERMODE_SRC =
@@ -48,8 +51,10 @@ public class HabitScoreView extends ScrollableDataView implements HabitDataView
private Paint pGrid;
private float em;
private Habit habit;
private SimpleDateFormat dfMonth;
private SimpleDateFormat dfDay;
private SimpleDateFormat dfYear;
private Paint pText, pGraph;
private RectF rect, prevRect;
@@ -62,16 +67,19 @@ public class HabitScoreView extends ScrollableDataView implements HabitDataView
private int textColor;
private int dimmedTextColor;
private int[] colors;
@Nullable
private int[] scores;
private int primaryColor;
private boolean isBackgroundTransparent;
private int bucketSize = 7;
private int footerHeight;
public HabitScoreView(Context context, AttributeSet attrs)
{
super(context, attrs);
this.primaryColor = ColorHelper.palette[7];
this.scores = new int[0];
init();
}
@@ -85,10 +93,11 @@ public class HabitScoreView extends ScrollableDataView implements HabitDataView
private void init()
{
refreshData();
createPaints();
createColors();
if(isInEditMode()) refreshData();
dfYear = new SimpleDateFormat("yyyy", Locale.getDefault());
dfMonth = new SimpleDateFormat("MMM", Locale.getDefault());
dfDay = new SimpleDateFormat("d", Locale.getDefault());
@@ -114,13 +123,6 @@ public class HabitScoreView extends ScrollableDataView implements HabitDataView
textColor = Color.argb(64, 0, 0, 0);
dimmedTextColor = Color.argb(16, 0, 0, 0);
}
colors = new int[4];
colors[0] = Color.rgb(230, 230, 230);
colors[3] = primaryColor;
colors[1] = ColorHelper.mixColors(colors[0], colors[3], 0.66f);
colors[2] = ColorHelper.mixColors(colors[0], colors[3], 0.33f);
}
protected void createPaints()
@@ -149,19 +151,23 @@ public class HabitScoreView extends ScrollableDataView implements HabitDataView
{
if(height < 9) height = 200;
baseSize = height / 9;
int maxTextSize = getResources().getDimensionPixelSize(R.dimen.regularTextSize);
pText.setTextSize(Math.min(height * 0.047f, maxTextSize));
em = pText.getFontSpacing();
footerHeight = (int)(3 * em);
paddingTop = (int) (em);
baseSize = (height - footerHeight - paddingTop) / 8;
setScrollerBucketSize(baseSize);
columnWidth = baseSize;
columnHeight = 8 * baseSize;
nColumns = width / baseSize;
paddingTop = (int) (baseSize * 0.15f);
pText.setTextSize(baseSize * 0.5f);
pGraph.setTextSize(baseSize * 0.5f);
pGraph.setStrokeWidth(baseSize * 0.1f);
pGrid.setStrokeWidth(baseSize * 0.05f);
em = pText.getFontSpacing();
}
public void refreshData()
@@ -171,12 +177,17 @@ public class HabitScoreView extends ScrollableDataView implements HabitDataView
else
{
if (habit == null) return;
scores = habit.scores.getAllValues(BUCKET_SIZE);
scores = habit.scores.getAllValues(bucketSize);
}
invalidate();
}
public void setBucketSize(int bucketSize)
{
this.bucketSize = bucketSize;
}
private void generateRandomData()
{
Random random = new Random();
@@ -195,37 +206,34 @@ public class HabitScoreView extends ScrollableDataView implements HabitDataView
protected void onDraw(Canvas canvas)
{
super.onDraw(canvas);
float lineHeight = pText.getFontSpacing();
if (habit == null || scores == null) return;
rect.set(0, 0, nColumns * columnWidth, columnHeight);
rect.offset(0, paddingTop);
drawGrid(canvas, rect);
String previousMonth = "";
pText.setTextAlign(Paint.Align.CENTER);
pText.setColor(textColor);
pGraph.setColor(primaryColor);
prevRect.setEmpty();
previousMonthText = "";
previousYearText = "";
skipYear = 0;
long currentDate = DateHelper.getStartOfToday();
for(int k = 0; k < nColumns + getDataOffset() - 1; k++)
currentDate -= 7 * DateHelper.millisecondsInOneDay;
currentDate -= bucketSize * DateHelper.millisecondsInOneDay;
for (int k = 0; k < nColumns; k++)
{
String month = dfMonth.format(currentDate);
String day = dfDay.format(currentDate);
int score = 0;
int offset = nColumns - k - 1 + getDataOffset();
if(offset < scores.length) score = scores[offset];
double sRelative = ((double) score) / Score.MAX_VALUE;
int height = (int) (columnHeight * sRelative);
double relativeScore = ((double) score) / Score.MAX_VALUE;
int height = (int) (columnHeight * relativeScore);
rect.set(0, 0, baseSize, baseSize);
rect.offset(k * columnWidth, paddingTop + columnHeight - height - columnWidth / 2);
@@ -239,20 +247,69 @@ public class HabitScoreView extends ScrollableDataView implements HabitDataView
if (k == nColumns - 1) drawMarker(canvas, rect);
prevRect.set(rect);
rect.set(0, 0, columnWidth, columnHeight);
rect.offset(k * columnWidth, paddingTop);
if (!month.equals(previousMonth))
canvas.drawText(month, rect.centerX(), rect.bottom + lineHeight * 1.2f, pText);
else
canvas.drawText(day, rect.centerX(), rect.bottom + lineHeight * 1.2f, pText);
drawFooter(canvas, rect, currentDate);
previousMonth = month;
currentDate += 7 * DateHelper.millisecondsInOneDay;
currentDate += bucketSize * DateHelper.millisecondsInOneDay;
}
}
private int skipYear = 0;
private String previousYearText;
private String previousMonthText;
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 = DateHelper.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;
}
pText.setTextAlign(Paint.Align.CENTER);
canvas.drawText(text, rect.centerX(), rect.bottom + em * 1.2f, pText);
}
}
private void drawGrid(Canvas canvas, RectF rGrid)
{
int nRows = 5;

14
app/src/main/java/org/isoron/uhabits/views/RingView.java
View File

@@ -25,6 +25,7 @@ import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.RectF;
import android.os.Build;
import android.text.Layout;
import android.text.StaticLayout;
import android.text.TextPaint;
@@ -33,6 +34,7 @@ import android.view.View;
import org.isoron.helpers.ColorHelper;
import org.isoron.helpers.DialogHelper;
import org.isoron.uhabits.R;
public class RingView extends View
{
@@ -49,6 +51,7 @@ public class RingView extends View
private float diameter;
private float maxDiameter;
private float textSize;
private int fadedTextColor;
public RingView(Context context, AttributeSet attrs)
@@ -57,10 +60,9 @@ public class RingView extends View
this.label = DialogHelper.getAttribute(context, attrs, "label");
this.maxDiameter = DialogHelper.getFloatAttribute(context, attrs, "maxDiameter");
this.textSize = DialogHelper.getFloatAttribute(context, attrs, "textSize");
this.maxDiameter = DialogHelper.dpToPixels(context, maxDiameter);
this.textSize = DialogHelper.spToPixels(context, textSize);
this.textSize = getResources().getDimension(R.dimen.smallTextSize);
this.color = ColorHelper.palette[7];
this.percentage = 0.75f;
init();
@@ -86,6 +88,8 @@ public class RingView extends View
pRing.setColor(color);
pRing.setTextAlign(Paint.Align.CENTER);
fadedTextColor = getResources().getColor(R.color.fadedTextColor);
rect = new RectF();
}
@@ -122,15 +126,15 @@ public class RingView extends View
rect.offset((width - diameter) / 2, 0);
canvas.drawArc(rect, -90, 360 * percentage, true, pRing);
pRing.setColor(Color.rgb(230, 230, 230));
pRing.setColor(Color.argb(255, 230, 230, 230));
canvas.drawArc(rect, 360 * percentage - 90 + 2, 360 * (1 - percentage) - 4, true, pRing);
pRing.setColor(Color.WHITE);
rect.inset(thickness, thickness);
canvas.drawArc(rect, -90, 360, true, pRing);
pRing.setColor(Color.GRAY);
pRing.setTextSize(diameter * 0.2f);
pRing.setColor(fadedTextColor);
pRing.setTextSize(textSize);
float lineHeight = pRing.getFontSpacing();
canvas.drawText(String.format("%.0f%%", percentage * 100), rect.centerX(),
rect.centerY() + lineHeight / 3, pRing);

41
app/src/main/res/layout/show_habit.xml
View File

@@ -49,8 +49,8 @@
android:id="@+id/scoreRing"
style="@style/smallDataViewStyle"
app:label="@string/habit_strength"
app:maxDiameter="60"
app:textSize="12"/>
app:maxDiameter="70"
app:textSize="@dimen/smallTextSize"/>
</LinearLayout>
@@ -60,7 +60,8 @@
style="@style/cardStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="top|start">
android:gravity="top|start"
android:visibility="gone">
<TextView
android:id="@+id/tvCount"
@@ -77,22 +78,22 @@
<org.isoron.uhabits.views.RepetitionCountView
style="@style/smallDataViewStyle"
app:interval="30"
app:labelValue="30"
app:labelFormat="@string/last_x_days"
app:labelValue="30"
app:textSize="12"/>
<org.isoron.uhabits.views.RepetitionCountView
style="@style/smallDataViewStyle"
app:interval="92"
app:labelValue="4"
app:labelFormat="@string/last_x_months"
app:labelValue="4"
app:textSize="12"/>
<org.isoron.uhabits.views.RepetitionCountView
style="@style/smallDataViewStyle"
app:interval="365"
app:labelValue="12"
app:labelFormat="@string/last_x_months"
app:labelValue="12"
app:textSize="12"/>
<org.isoron.uhabits.views.RepetitionCountView
@@ -105,19 +106,36 @@
</LinearLayout>
<LinearLayout style="@style/cardStyle">
<RelativeLayout
style="@style/cardStyle"
android:gravity="center">
<Spinner
android:id="@+id/sStrengthInterval"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:entries="@array/strengthIntervalNames"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:minWidth="100dp"
/>
<TextView
android:id="@+id/tvStrength"
style="@style/cardHeaderStyle"
android:text="@string/habit_strength"/>
android:text="@string/habit_strength"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"/>
<org.isoron.uhabits.views.HabitScoreView
android:id="@+id/scoreView"
android:layout_width="match_parent"
android:layout_height="200dp"/>
android:layout_height="220dp"
android:layout_below="@id/tvStrength"/>
</LinearLayout>
</RelativeLayout>
<LinearLayout
style="@style/cardStyle"
@@ -143,7 +161,8 @@
android:layout_gravity="center"
android:src="@drawable/ic_action_edit_light"
android:text="@string/edit"
android:textColor="@color/grey_400"/>
android:textColor="@color/grey_400"
android:textSize="@dimen/smallTextSize"/>
</LinearLayout>

1
app/src/main/res/values-v21/styles.xml
View File

@@ -28,6 +28,7 @@
<item name="android:windowContentTransitions">true</item>
<item name="android:windowAllowEnterTransitionOverlap">true</item>
<item name="android:windowAllowReturnTransitionOverlap">true</item>
<item name="android:spinnerItemStyle">@style/dialogFormSmallText</item>
</style>
<style name="MyDialogStyle" parent="android:Theme.Material.Light.Dialog">

5
app/src/main/res/values/colors.xml
View File

@@ -19,8 +19,9 @@
<color name="primary">#37474f</color>
<color name="primary_darker">#263238</color>
<color name="windowBackground">#e6e6e6</color>
<color name="dialogTextColor">@color/grey_800</color>
<color name="dialogFadedTextColor">@color/grey_600</color>
<color name="primaryTextColor">@color/grey_900</color>
<color name="secondaryTextColor">@color/grey_800</color>
<color name="fadedTextColor">@color/grey_600</color>
<color name="white">#ffffff</color>

21
app/src/main/res/values/dimens.xml
View File

@@ -22,7 +22,10 @@
<dimen name="check_square_size">42dp</dimen>
<dimen name="history_editor_max_height">450dp</dimen>
<dimen name="history_editor_padding">8dp</dimen>
<dimen name="history_max_font_size">14sp</dimen>
<dimen name="history_max_font_size">@dimen/regularTextSize</dimen>
<dimen name="regularTextSize">16sp</dimen>
<dimen name="smallTextSize">14sp</dimen>
<dimen name="tinyTextSize">10sp</dimen>
<string-array name="snooze_interval_names">
<item>@string/interval_15_minutes</item>
@@ -50,5 +53,21 @@
<item>@string/custom_frequency</item>
</string-array>
<string-array name="strengthIntervalNames" translatable="false">
<item>Day</item>
<item>Week</item>
<item>Month</item>
<item>Quarter</item>
<item>Year</item>
</string-array>
<string-array name="strenghtIntervalValues" translatable="false">
<item>1</item>
<item>7</item>
<item>31</item>
<item>92</item>
<item>365</item>
</string-array>
<string name="snooze_interval_default" translatable="false">15</string>
</resources>

3
app/src/main/res/values/styles.xml
View File

@@ -67,8 +67,7 @@
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginBottom">12dp</item>
<item name="android:textSize">16sp</item>
<item name="android:textStyle">bold</item>
<item name="android:textSize">@dimen/regularTextSize</item>
</style>
<style name="cardRowStyle">

17
app/src/main/res/values/styles_dialog.xml
View File

@@ -44,15 +44,20 @@
</style>
<style name="dialogFormText">
<item name="android:textSize">16sp</item>
<item name="android:textColor">@color/dialogTextColor</item>
<item name="android:textSize">@dimen/regularTextSize</item>
<item name="android:textColor">@color/secondaryTextColor</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
</style>
<style name="dialogFormSmallText">
<item name="android:textSize">@dimen/smallTextSize</item>
<item name="android:textColor">@color/fadedTextColor</item>
</style>
<style name="dialogFormSpinnerDropDown" parent="dialogFormText">
<item name="android:padding">12dp</item>
<item name="android:textColor">@color/dialogTextColor</item>
<item name="android:textColor">@color/secondaryTextColor</item>
</style>
<style name="dialogFormInput" parent="dialogFormText">
@@ -69,16 +74,16 @@
<item name="android:width">100dp</item>
<item name="android:gravity">left</item>
<item name="android:paddingLeft">6dp</item>
<item name="android:textColor">@color/dialogFadedTextColor</item>
<item name="android:textColor">@color/fadedTextColor</item>
</style>
<style name="dialogFormSpinner" parent="android:Widget.DeviceDefault.Light.Spinner">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:paddingLeft">12dp</item>
<item name="android:textSize">16sp</item>
<item name="android:textSize">@dimen/regularTextSize</item>
<item name="android:minWidth">400dp</item>
<item name="android:textColor">@color/dialogTextColor</item>
<item name="android:textColor">@color/secondaryTextColor</item>
</style>
<style name="dialogFormRow">