From 48d446a243cfe4d568ea3b1c09239dd800919d8b Mon Sep 17 00:00:00 2001
From: Alinson Xavier <axavier@uwaterloo.ca>
Date: Mon, 29 Feb 2016 07:44:59 -0500
Subject: [PATCH] Minor color changes

---
 .../java/org/isoron/uhabits/views/HabitHistoryView.java     | 2 +-
 .../main/java/org/isoron/uhabits/views/HabitScoreView.java  | 6 +++---
 .../main/java/org/isoron/uhabits/views/HabitStreakView.java | 4 ++--
 app/src/main/res/drawable/widget_background.xml             | 2 +-
 app/src/main/res/layout/widget_graph.xml                    | 2 +-
 app/src/main/res/xml/widget_streak_info.xml                 | 1 -
 6 files changed, 8 insertions(+), 9 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
index 40252b1ef..55a2a249a 100644
--- a/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java
+++ b/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java
@@ -147,7 +147,7 @@ public class HabitHistoryView extends ScrollableDataView
     protected void createPaints()
     {
         pTextHeader = new Paint();
-        pTextHeader.setColor(Color.LTGRAY);
+        pTextHeader.setColor(Color.argb(64, 0, 0, 0));
         pTextHeader.setTextAlign(Align.LEFT);
         pTextHeader.setAntiAlias(true);
 
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 4f253fa6b..0397b78b2 100644
--- a/app/src/main/java/org/isoron/uhabits/views/HabitScoreView.java
+++ b/app/src/main/java/org/isoron/uhabits/views/HabitScoreView.java
@@ -100,7 +100,7 @@ public class HabitScoreView extends ScrollableDataView
     protected void createPaints()
     {
         pText = new Paint();
-        pText.setColor(Color.LTGRAY);
+        pText.setColor(Color.argb(64, 0, 0, 0));
         pText.setTextAlign(Paint.Align.LEFT);
         pText.setAntiAlias(true);
 
@@ -109,7 +109,7 @@ public class HabitScoreView extends ScrollableDataView
         pGraph.setAntiAlias(true);
 
         pGrid = new Paint();
-        pGrid.setColor(Color.LTGRAY);
+        pGrid.setColor(Color.argb(64, 0, 0, 0));
         pGrid.setAntiAlias(true);
 
     }
@@ -240,7 +240,7 @@ public class HabitScoreView extends ScrollableDataView
         int nRows = 5;
         float rowHeight = rGrid.height() / nRows;
 
-        pGrid.setColor(Color.rgb(240, 240, 240));
+        pGrid.setColor(Color.argb(20, 0, 0, 0));
         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 453ac4879..d8691facb 100644
--- a/app/src/main/java/org/isoron/uhabits/views/HabitStreakView.java
+++ b/app/src/main/java/org/isoron/uhabits/views/HabitStreakView.java
@@ -103,7 +103,7 @@ public class HabitStreakView extends ScrollableDataView
         columnWidth = baseSize;
         columnHeight = 8 * baseSize;
         headerHeight = baseSize;
-        nColumns = width / baseSize;
+        nColumns = width / baseSize - 1;
 
         pText.setTextSize(baseSize * 0.5f);
         pBar.setTextSize(baseSize * 0.5f);
@@ -123,7 +123,7 @@ public class HabitStreakView extends ScrollableDataView
     protected void createPaints()
     {
         pText = new Paint();
-        pText.setColor(Color.LTGRAY);
+        pText.setColor(Color.argb(64, 0, 0, 0));
         pText.setTextAlign(Paint.Align.CENTER);
         pText.setAntiAlias(true);
 
diff --git a/app/src/main/res/drawable/widget_background.xml b/app/src/main/res/drawable/widget_background.xml
index 3fb27a0b0..98fd95f07 100644
--- a/app/src/main/res/drawable/widget_background.xml
+++ b/app/src/main/res/drawable/widget_background.xml
@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="#7f000000" />
+    <solid android:color="#3fffffff" />
     <corners android:radius="10dp" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/widget_graph.xml b/app/src/main/res/layout/widget_graph.xml
index 4075bbe8d..0c62235a9 100644
--- a/app/src/main/res/layout/widget_graph.xml
+++ b/app/src/main/res/layout/widget_graph.xml
@@ -16,7 +16,7 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:text="Wake up early"
-        android:textColor="@color/white"/>
+        android:textColor="#3f000000"/>
 
     <ImageView
         android:id="@+id/imageView"
diff --git a/app/src/main/res/xml/widget_streak_info.xml b/app/src/main/res/xml/widget_streak_info.xml
index dd8068375..28ae1a512 100644
--- a/app/src/main/res/xml/widget_streak_info.xml
+++ b/app/src/main/res/xml/widget_streak_info.xml
@@ -11,5 +11,4 @@
                     android:configure="org.isoron.uhabits.widgets.HabitPickerDialog"
                     android:widgetCategory="home_screen">
 
-
 </appwidget-provider>
\ No newline at end of file