Show more information on score overview

This commit is contained in:
2016-04-29 07:35:38 -04:00
parent 30ef75bb45
commit f0534fefbc
2 changed files with 124 additions and 36 deletions

View File

@@ -19,7 +19,6 @@
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:habit="http://isoron.org/android"
xmlns:tools="http://schemas.android.com/tools"
@@ -40,34 +39,34 @@
android:layout_height="wrap_content"
android:background="?headerBackgroundColor"
android:elevation="2dp"
android:paddingTop="15dp"
android:orientation="vertical"
android:paddingBottom="10dp"
android:paddingLeft="60dp"
android:orientation="vertical">
android:paddingTop="15dp">
<TextView
android:id="@+id/questionLabel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:textColor="?mediumContrastTextColor"
android:textSize="@dimen/regularTextSize"
android:layout_marginBottom="8dp"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:layout_marginBottom="5dp">
android:orientation="horizontal">
<ImageView
android:id="@+id/frequencyIcon"
android:layout_width="18dp"
android:layout_height="18dp"
android:src="@drawable/ic_repeat_black"
android:alpha="0.3"
android:layout_marginRight="5dp"
android:alpha="0.3"
android:src="@drawable/ic_repeat_black"
/>
<TextView
@@ -83,10 +82,10 @@
android:id="@+id/reminderIcon"
android:layout_width="18dp"
android:layout_height="18dp"
android:src="@drawable/ic_alarm_black"
android:alpha="0.3"
android:layout_marginRight="5dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="5dp"
android:alpha="0.3"
android:src="@drawable/ic_alarm_black"
/>
<TextView
@@ -104,6 +103,7 @@
<LinearLayout
style="@style/Card"
android:paddingTop="12dp"
android:gravity="start">
<TextView
@@ -116,24 +116,81 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical">
android:orientation="horizontal">
<org.isoron.uhabits.views.RingView
android:id="@+id/scoreRing"
android:layout_width="75dp"
android:layout_height="75dp"
android:layout_margin="10dp"
habit:percentage="0"
habit:textSize="12"
habit:thickness="10"/>
<TextView
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/habit_strength"
android:textColor="?mediumContrastTextColor"
android:textSize="@dimen/smallTextSize"/>
android:minWidth="100dp">
<org.isoron.uhabits.views.RingView
android:id="@+id/scoreRing"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_margin="10dp"
android:layout_gravity="center"
habit:percentage="0"
habit:textSize="12"
habit:thickness="5"/>
</FrameLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="80dp"
android:orientation="vertical">
<TextView
android:id="@+id/scoreLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/score"
android:textColor="?mediumContrastTextColor"/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="80dp"
android:orientation="vertical">
<TextView
android:id="@+id/monthDiffLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/month"
android:textColor="?mediumContrastTextColor"/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="80dp"
android:orientation="vertical">
<TextView
android:id="@+id/yearDiffLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/year"
android:textColor="?mediumContrastTextColor"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>