diff --git a/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java b/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java
index a5f11b5e3..4d841b824 100644
--- a/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java
+++ b/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java
@@ -123,7 +123,7 @@ public class HabitHistoryView extends ScrollableDataView
columnHeight = 8 * baseSize;
nColumns = width / baseSize;
- squareSpacing = baseSize / 10;
+ squareSpacing = (int) Math.floor(baseSize / 15.0);
pSquareFg.setTextSize(baseSize * 0.5f);
pTextHeader.setTextSize(baseSize * 0.5f);
squareTextOffset = pSquareFg.getFontSpacing() * 0.4f;
@@ -138,9 +138,7 @@ public class HabitHistoryView extends ScrollableDataView
this.primaryColor = habit.color;
if(isBackgroundTransparent)
- {
primaryColor = ColorHelper.setMinValue(primaryColor, 0.75f);
- }
int red = Color.red(primaryColor);
int green = Color.green(primaryColor);
@@ -149,7 +147,7 @@ public class HabitHistoryView extends ScrollableDataView
if(isBackgroundTransparent)
{
colors = new int[3];
- colors[0] = Color.argb(64, 0, 0, 0);
+ colors[0] = Color.argb(16, 255, 255, 255);
colors[1] = Color.argb(128, red, green, blue);
colors[2] = primaryColor;
textColor = Color.rgb(255, 255, 255);
@@ -160,7 +158,7 @@ public class HabitHistoryView extends ScrollableDataView
colors[0] = Color.argb(25, 0, 0, 0);
colors[1] = Color.argb(127, red, green, blue);
colors[2] = primaryColor;
- textColor = Color.argb(128, 0, 0, 0);
+ textColor = Color.argb(64, 0, 0, 0);
}
}
diff --git a/app/src/main/java/org/isoron/uhabits/views/HabitScoreView.java b/app/src/main/java/org/isoron/uhabits/views/HabitScoreView.java
index d24e0061d..3405342aa 100644
--- a/app/src/main/java/org/isoron/uhabits/views/HabitScoreView.java
+++ b/app/src/main/java/org/isoron/uhabits/views/HabitScoreView.java
@@ -94,21 +94,18 @@ public class HabitScoreView extends ScrollableDataView
if(habit != null)
this.primaryColor = habit.color;
- if(isBackgroundTransparent)
+ if (isBackgroundTransparent)
{
primaryColor = ColorHelper.setSaturation(primaryColor, 0.75f);
primaryColor = ColorHelper.setValue(primaryColor, 1.0f);
- }
- if(isBackgroundTransparent)
- {
textColor = Color.argb(192, 255, 255, 255);
dimmedTextColor = Color.argb(128, 255, 255, 255);
}
else
{
- textColor = Color.argb(128, 0, 0, 0);
- dimmedTextColor = Color.argb(32, 0, 0, 0);
+ textColor = Color.argb(64, 0, 0, 0);
+ dimmedTextColor = Color.argb(16, 0, 0, 0);
}
colors = new int[4];
@@ -122,12 +119,12 @@ public class HabitScoreView extends ScrollableDataView
protected void createPaints()
{
pText = new Paint();
- pText.setTextAlign(Paint.Align.LEFT);
pText.setAntiAlias(true);
pGraph = new Paint();
pGraph.setTextAlign(Paint.Align.CENTER);
pGraph.setAntiAlias(true);
+
pGrid = new Paint();
pGrid.setAntiAlias(true);
}
@@ -204,6 +201,7 @@ public class HabitScoreView extends ScrollableDataView
String previousMonth = "";
+ pText.setTextAlign(Paint.Align.CENTER);
pText.setColor(textColor);
pGraph.setColor(primaryColor);
prevRect.setEmpty();
@@ -240,6 +238,7 @@ public class HabitScoreView extends ScrollableDataView
rect.set(0, 0, columnWidth, columnHeight);
rect.offset(k * columnWidth, 0);
+
if (!month.equals(previousMonth))
canvas.drawText(month, rect.centerX(), rect.bottom + lineHeight * 1.2f, pText);
else
@@ -255,7 +254,10 @@ public class HabitScoreView extends ScrollableDataView
int nRows = 5;
float rowHeight = rGrid.height() / nRows;
+ pText.setTextAlign(Paint.Align.LEFT);
+ pText.setColor(textColor);
pGrid.setColor(dimmedTextColor);
+
for (int i = 0; i < nRows; i++)
{
canvas.drawText(String.format("%d%%", (100 - i * 100 / nRows)), rGrid.left + 0.5f * em,
diff --git a/app/src/main/java/org/isoron/uhabits/views/HabitStreakView.java b/app/src/main/java/org/isoron/uhabits/views/HabitStreakView.java
index 3869d268e..646ead665 100644
--- a/app/src/main/java/org/isoron/uhabits/views/HabitStreakView.java
+++ b/app/src/main/java/org/isoron/uhabits/views/HabitStreakView.java
@@ -138,7 +138,7 @@ public class HabitStreakView extends ScrollableDataView
colors[2] = Color.argb(192, red, green, blue);
colors[1] = Color.argb(96, red, green, blue);
colors[0] = Color.argb(32, 0, 0, 0);
- textColor = Color.argb(128, 0, 0, 0);
+ textColor = Color.argb(64, 0, 0, 0);
pBarText = pBar;
}
}
diff --git a/app/src/main/res/drawable/widget_background.xml b/app/src/main/res/drawable/widget_background.xml
index 97de8bee1..1c66dd34c 100644
--- a/app/src/main/res/drawable/widget_background.xml
+++ b/app/src/main/res/drawable/widget_background.xml
@@ -3,5 +3,5 @@
android:shape="rectangle">
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/show_habit.xml b/app/src/main/res/layout/show_habit.xml
index aff070c78..2bb897c04 100644
--- a/app/src/main/res/layout/show_habit.xml
+++ b/app/src/main/res/layout/show_habit.xml
@@ -57,7 +57,7 @@
+ android:layout_height="160dp"/>