Replace star by ring

This commit is contained in:
2016-04-21 20:02:38 -04:00
parent e2bb4371d3
commit aee5d975db
9 changed files with 140 additions and 111 deletions

View File

@@ -19,16 +19,22 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/llOuter"
style="@style/ListHabits.Item">
xmlns:habit="http://isoron.org/android"
android:id="@+id/llOuter"
style="@style/ListHabits.Item">
<LinearLayout
android:id="@+id/llInner"
style="@style/ListHabits.HabitCard">
<TextView
android:id="@+id/tvStar"
style="@style/ListHabits.Star" />
<org.isoron.uhabits.views.RingView
android:layout_height="15dp"
android:layout_width="15dp"
android:id="@+id/scoreRing"
habit:thickness="3"
android:layout_marginTop="0dp"
android:layout_marginRight="10dp"
android:layout_marginLeft="8dp"/>
<TextView
android:id="@+id/label"

View File

@@ -18,7 +18,7 @@
-->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://isoron.org/android"
xmlns:habit="http://isoron.org/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -43,15 +43,23 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal">
android:orientation="vertical">
<org.isoron.uhabits.views.RingView
android:id="@+id/scoreRing"
style="@style/SmallDataView"
android:layout_width="100dp"
app:label="@string/strength"
app:maxDiameter="80"
app:textSize="@dimen/smallTextSize"/>
android:layout_width="75dp"
android:layout_height="75dp"
habit:percentage="0"
habit:thickness="10"
habit:textSize="12"
android:layout_margin="10dp"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/habit_strength"
android:textSize="@dimen/smallTextSize"
android:textColor="?mediumContrastTextColor"/>
</LinearLayout>