Allow user to change score view interval

Closes #10

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

@@ -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>
 

app/src/main/res/values-v21/styles.xml

@@ -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">

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

@@ -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>
 

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

@@ -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>

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

@@ -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">

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

@@ -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">