sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-18 03:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Redesign habit buttons

Browse source
This commit is contained in:
Phillip Thelen 2015-11-07 15:27:17 +01:00
parent a4e23cbecc
commit afd23a4ae9
3 changed files with 52 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Habitica/res/drawable/btn_habit_background.xml Normal file
View file

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape android:shape="rectangle">
</shape>
</item>
<item android:state_focused="true" >
<shape android:shape="rectangle">
</shape>
</item>
<item>
<shape android:shape="rectangle">
</shape>
</item>
</selector>

18
Habitica/res/drawable/btn_habit_single_background.xml Normal file
View file

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
</shape>
</item>
<item
android:bottom="10dp"
android:left="250dp"
android:right="50dp"
android:top="10dp">
<shape
android:innerRadius="10dp"
android:shape="oval" >
<solid android:color="#8bc34a" />
</shape>
</item>
</selector>

34
Habitica/res/layout/habit_item_card.xml
View file

@ -20,28 +20,30 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="wrap_content"
android:layout_width="80dp"
android:layout_height="match_parent"
android:orientation="vertical"
android:orientation="horizontal"
android:id="@+id/btnLayout">
<Button
android:id="@+id/btnPlus"
android:layout_width="@dimen/button_width"
android:layout_height="0dp"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:visibility="@{habit.up ? View.VISIBLE : View.GONE}"
android:text="+"
android:textSize="15sp"
app:backgroundColor="@{habit.getLightTaskColor}" />
android:background="@{habit.down ? @drawable/btn_habit_background : @drawable/btn_habit_single_background}"
app:backgroundColor="@{habit.getLightTaskColor}"
style="@style/HabitButton" />
<Button
android:id="@+id/btnMinus"
android:layout_width="@dimen/button_width"
android:layout_height="0dp"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:visibility="@{habit.down ? View.VISIBLE : View.GONE}"
app:backgroundColor="@{habit.getLightTaskColor}"
app:backgroundColor="@{habit.up ? habit.getMediumTaskColor : habit.getLightTaskColor}"
android:text="-"
android:textSize="15sp"/>
android:background="@{habit.up ? @drawable/btn_habit_background : @drawable/btn_habit_single_background}"
style="@style/HabitButton"/>
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
@ -50,17 +52,17 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_centerVertical="true">
android:layout_centerVertical="true"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingEnd="16dp"
android:paddingBottom="20dp"
android:paddingTop="20dp">
<TextView
android:id="@+id/checkedTextView"
style="@style/CardTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="5dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:paddingEnd="5dp"
android:paddingTop="5dp"
android:text="@{habit.text}" />
<TextView