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

Implement dummy history editor; add edit history button

Browse Source
This commit is contained in:
Alinson S. Xavier
2016-03-08 06:58:34 -05:00
parent 0fb8ed0b53
commit 8f37e293b1
8 changed files with 149 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/res/layout/show_habit.xml
View File

@@ -18,8 +18,8 @@
-->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://isoron.org/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@color/windowBackground"
@@ -60,23 +60,31 @@
</LinearLayout>
<LinearLayout style="@style/cardStyle">
<LinearLayout
style="@style/cardStyle"
android:paddingBottom="0dp"
android:clipToPadding="false"
android:orientation="vertical">
<TextView
android:id="@+id/tvHistory"
style="@style/cardHeaderStyle"
android:text="@string/history"/>
<LinearLayout
android:id="@+id/llHistory"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"/>
<org.isoron.uhabits.views.HabitHistoryView
android:id="@+id/historyView"
android:layout_width="match_parent"
android:layout_height="160dp"/>
android:layout_height="160dp" />
<Button
style="?android:borderlessButtonStyle"
android:id="@+id/btEditHistory"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/ic_action_edit_light"
android:textColor="@color/grey_400"
android:text="@string/edit"/>
</LinearLayout>

2
app/src/main/res/values/colors.xml
View File

@@ -316,7 +316,7 @@
<color name="grey_100">#F5F5F5</color>
<!--<color name="grey_200">#EEEEEE</color>-->
<!--<color name="grey_300">#E0E0E0</color>-->
<!--<color name="grey_400">#BDBDBD</color>-->
<color name="grey_400">#BDBDBD</color>
<color name="grey_500">#9E9E9E</color>
<!--<color name="grey_600">#757575</color>-->
<!--<color name="grey_700">#616161</color>-->

3
app/src/main/res/values/dimens.xml
View File

@@ -20,6 +20,9 @@
<resources>
<dimen name="small_square_size">20dp</dimen>
<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>
<string-array name="snooze_interval_names">
<item>@string/interval_15_minutes</item>