Finish implementation of habit archival

This commit is contained in:
2016-02-14 18:36:16 -05:00
parent d4152f6b7e
commit d6d7798ae7
12 changed files with 142 additions and 39 deletions

View File

@@ -5,9 +5,15 @@
android:id="@+id/action_edit_habit"
android:title="@string/edit">
</item>
<item
android:id="@+id/action_archive_habit"
android:title="@string/archive">
</item>
<item
android:id="@+id/action_unarchive_habit"
android:title="@string/unarchive">
</item>
</menu>

View File

@@ -2,6 +2,11 @@
xmlns:tools="http://schemas.android.com/tools"
tools:context="org.isoron.uhabits.MainActivity" >
<item android:id="@+id/action_show_archived"
android:title="Show archived"
android:enabled="true"
android:checkable="true" />
<item
android:id="@+id/action_settings"
android:orderInCategory="100"

View File

@@ -2,6 +2,7 @@
xmlns:tools="http://schemas.android.com/tools"
tools:context="org.isoron.uhabits.ShowHabitActivity" >
<item
android:id="@+id/action_settings"
android:orderInCategory="100"

View File

@@ -9,6 +9,10 @@
<item name="android:windowContentTransitions">true</item>
<item name="android:windowAllowEnterTransitionOverlap">true</item>
<item name="android:windowAllowReturnTransitionOverlap">true</item>
<item name="android:actionBarPopupTheme">@style/actionBarStyle</item>
</style>
<style name="actionBarStyle" parent="android:ThemeOverlay.Material.Light">
</style>
<style name="MyDialogStyle" parent="android:Theme.Material.Light.Dialog">

View File

@@ -6,6 +6,7 @@
<string name="edit">Edit</string>
<string name="delete">Delete</string>
<string name="archive">Archive</string>
<string name="unarchive">Unarchive</string>
<string name="add_habit">Add habit</string>
<string name="color_picker_default_title">Select a Color</string>
<string name="color_swatch_description">Color <xliff:g id="color_index" example="14">%1$d</xliff:g></string>