isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 17:18:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Material redesign

Browse Source
This commit is contained in:
Alinson S. Xavier
2015-03-13 11:57:45 -04:00
parent 7577277425
commit c41e71003b
23 changed files with 148 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
res/layout/edit_habit.xml
View File

@@ -4,6 +4,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingBottom="8dp"
tools:context="org.isoron.uhabits.dialogs.EditHabitFragment"
tools:ignore="MergeRootFrame" >
@@ -13,7 +14,9 @@
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:orientation="vertical"
android:padding="8dp" >
android:paddingLeft="24dp"
android:paddingRight="24dp"
>
<LinearLayout
android:id="@+id/namePanel"
@@ -27,7 +30,6 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="10"
android:background="@drawable/apptheme_edit_text_holo_light"
android:ems="10"
android:hint="Name"
android:textColor="#cc2222" >
@@ -55,6 +57,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minWidth="280dp"
android:orientation="horizontal"
android:gravity="start">
@@ -126,37 +129,36 @@
</LinearLayout>
<LinearLayout
android:id="@+id/buttonPanel"
style="?android:attr/buttonBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:divider="?android:attr/dividerHorizontal"
android:dividerPadding="0dip"
android:orientation="vertical"
android:showDividers="beginning" >
android:layout_height="48dp"
android:gravity="end"
android:onClick="onClick"
android:paddingRight="16dp"
android:paddingLeft="16dp"
android:paddingTop="6dp"
android:paddingBottom="6dp"
android:orientation="horizontal" >
<LinearLayout
style="?android:attr/buttonBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="onClick"
android:orientation="horizontal" >
<Button
style="?android:attr/buttonBarButtonStyle"
android:id="@+id/button_discard"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:padding="8dp"
android:text="Discard" />
<Button
android:id="@+id/button_discard"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="Discard" />
<Button
android:id="@+id/button_save"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="Save" />
</LinearLayout>
<Button
style="?android:attr/buttonBarButtonStyle"
android:id="@+id/button_save"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:padding="8dp"
android:text="Save" />
</LinearLayout>
</LinearLayout>

9
res/layout/show_habits.xml
View File

@@ -17,8 +17,8 @@
android:id="@+id/listView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="#00000000"
android:dividerHeight="0dp"
android:divider="#10000000"
android:dividerHeight="1dp"
dslv:drag_enabled="true"
dslv:drag_handle_id="@drawable/habits_header_check"
dslv:drag_start_mode="onMove"
@@ -31,7 +31,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:background="@drawable/habits_header" >
android:elevation="2dp"
android:background="#ffffff"
android:paddingRight="4dp"
>
<TextView
android:id="@+id/tvStarHeader"

3
res/layout/show_habits_header_check.xml
View File

@@ -7,4 +7,5 @@
android:focusable="false"
android:minHeight="42dp"
android:minWidth="42dp"
android:textSize="10sp" />
android:textSize="10sp"
android:textColor="#606060" />

64
res/layout/show_habits_item.xml
View File

@@ -2,34 +2,48 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/habits_item"
android:background="#10000000"
android:baselineAligned="false"
android:clipToPadding="false"
android:gravity="center_vertical"
android:orientation="horizontal" >
<TextView
android:id="@+id/tvStar"
android:layout_width="30dp"
android:layout_height="match_parent"
android:layout_marginTop="0dp"
android:gravity="center"
android:paddingTop="1dp"
android:textSize="16sp" />
<TextView
android:id="@+id/tvName"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:paddingBottom="6dp"
android:paddingLeft="0dp"
android:paddingRight="6dp"
android:paddingTop="6dp" />
android:orientation="horizontal"
android:paddingTop="0dp"
android:paddingBottom="4dp"
android:paddingLeft="4dp"
android:paddingRight="4dp"
>
<LinearLayout
android:id="@+id/llButtons"
android:layout_width="wrap_content"
android:layout_height="42dp"
android:orientation="horizontal" />
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ripple_background"
android:elevation="1dp" >
<TextView
android:id="@+id/tvStar"
android:layout_width="30dp"
android:layout_height="match_parent"
android:layout_marginTop="0dp"
android:gravity="center"
android:paddingTop="1dp"
android:textSize="16sp" />
<TextView
android:id="@+id/tvName"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:paddingBottom="6dp"
android:paddingLeft="0dp"
android:paddingRight="6dp"
android:paddingTop="10dp" />
<LinearLayout
android:id="@+id/llButtons"
android:layout_width="wrap_content"
android:layout_height="42dp"
android:gravity="center"
android:orientation="horizontal" />
</LinearLayout>
</LinearLayout>

14
res/layout/show_habits_item_check.xml
View File

@@ -1,10 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Button xmlns:android="http://schemas.android.com/apk/res/android"
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/tvCheck"
android:layout_width="42dp"
android:layout_height="match_parent"
android:layout_marginRight="18dp"
android:minHeight="42dp"
android:minWidth="42dp"
android:focusable="false"
android:background="@drawable/habits_item_check" />
android:focusable="false"
android:minHeight="42dp"
android:minWidth="42dp"
android:gravity="center"
android:background="@drawable/ripple_background" />