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

Merge branch 'dev' into feature/stackview

Browse Source
This commit is contained in:
Alinson S. Xavier
2018-02-04 09:52:16 -06:00
parent b94d2f2fa6 bf8c14fc03
commit 71d559d6d9
29 changed files with 381 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
uhabits-android/src/main/res/values/constants.xml
View File

@@ -35,6 +35,7 @@
<item>@string/interval_4_hour</item>
<item>@string/interval_8_hour</item>
<item>@string/interval_24_hour</item>
<item>@string/interval_always_ask</item>
</string-array>
<string-array name="snooze_interval_values" translatable="false">
@@ -45,8 +46,31 @@
<item>240</item>
<item>480</item>
<item>1440</item>
<item>-1</item>
</string-array>
<string-array name="snooze_picker_names">
<item>@string/interval_15_minutes</item>
<item>@string/interval_30_minutes</item>
<item>@string/interval_1_hour</item>
<item>@string/interval_2_hour</item>
<item>@string/interval_4_hour</item>
<item>@string/interval_8_hour</item>
<item>@string/interval_24_hour</item>
<item>@string/interval_custom</item>
</string-array>
<integer-array name="snooze_picker_values" translatable="false">
<item>15</item>
<item>30</item>
<item>60</item>
<item>120</item>
<item>240</item>
<item>480</item>
<item>1440</item>
<item>-1</item>
</integer-array>
<string-array name="frequencyQuickSelect" translatable="false">
<item>@string/every_day</item>
<item>@string/every_week</item>

5
uhabits-android/src/main/res/values/strings.xml
View File

@@ -83,6 +83,8 @@
<string name="interval_4_hour">4 hours</string>
<string name="interval_8_hour">8 hours</string>
<string name="interval_24_hour">24 hours</string>
<string name="interval_always_ask">Always ask</string>
<string name="interval_custom">Custom...</string>
<string name="pref_toggle_title">Toggle with short press</string>
<string name="pref_toggle_description">Put checkmarks with a single tap instead of press-and-hold. More convenient, but might cause accidental toggles.</string>
<string name="pref_snooze_interval_title">Snooze interval on reminders</string>
@@ -95,6 +97,7 @@
<string name="name">Name</string>
<string name="settings">Settings</string>
<string name="snooze_interval">Snooze interval</string>
<string name="select_snooze_delay">Select snooze delay</string>
<string name="hint_title">Did you know?</string>
<string name="hint_drag">To rearrange the entries, press-and-hold on the name of the habit, then drag it to the correct place.</string>
@@ -225,4 +228,6 @@
<string name="example_question_boolean">e.g. Did you exercise today?</string>
<string name="question">Question</string>
<string name="target">Target</string>
<string name="yes">Yes</string>
<string name="no">No</string>
</resources>