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 'feature/import-data' into dev

Browse Source
This commit is contained in:
Alinson S. Xavier
2016-03-25 09:21:47 -04:00
parent 3c6114fc87 d176ea91fb
commit 5115379fdd
74 changed files with 2619 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/res/menu-v21/list_habits_context.xml
View File

@@ -40,11 +40,6 @@
android:title="@string/unarchive"
android:icon="@drawable/ic_action_unarchive_dark"/>
<item
android:id="@+id/action_export_csv"
android:title="@string/export_to_csv"
android:showAsAction="never" />
<item
android:id="@+id/action_delete"
android:title="@string/delete"

4
app/src/main/res/menu/list_habits_context.xml
View File

@@ -40,10 +40,6 @@
android:title="@string/unarchive"
android:icon="@drawable/ic_action_unarchive_light"/>
<item
android:id="@+id/action_export_csv"
android:title="@string/export_to_csv" />
<item
android:id="@+id/action_delete"
android:title="@string/delete" />

12
app/src/main/res/values/strings.xml
View File

@@ -106,7 +106,7 @@
<string name="any_weekday">Monday to Friday</string>
<string name="any_day">Any day of the week</string>
<string name="select_weekdays">Select days</string>
<string name="export_to_csv">Export data</string>
<string name="export_to_csv">Export as CSV</string>
<string name="done_label">Done</string>
<string name="clear_label">Clear</string>
@@ -138,4 +138,14 @@
<string name="five_times_per_week">5 times per week</string>
<string name="custom_frequency">Custom …</string>
<string name="help">Help &amp; FAQ</string>
<string name="could_not_export">Failed to export data.</string>
<string name="could_not_import">Failed to import data.</string>
<string name="file_not_recognized">File not recognized.</string>
<string name="habits_imported">Habits imported successfully.</string>
<string name="full_backup_success">Full backup successfully exported.</string>
<string name="import_data">Import data</string>
<string name="export_full_backup">Export full backup</string>
<string name="import_data_summary">Supports full backups exported by this app, as well as files generated by Tickmate, HabitBull or Rewire. See FAQ for more information.</string>
<string name="export_as_csv_summary">Generates files that can be opened by spreadsheet software such as Microsoft Excel or OpenOffice Calc. This file cannot be imported back.</string>
<string name="export_full_backup_summary">Generates a file that contains all your data. This file can be imported back.</string>
</resources>

27
app/src/main/res/xml/preferences.xml
View File

@@ -36,7 +36,32 @@
android:entries="@array/snooze_interval_names"
android:entryValues="@array/snooze_interval_values"
android:key="pref_snooze_interval"
android:title="@string/pref_snooze_interval_title"/>
android:title="@string/pref_snooze_interval_title"
android:summary="%s"/>
</PreferenceCategory>
<PreferenceCategory
android:key="pref_key_links"
android:title="Database">
<Preference
android:key="exportDB"
android:summary="@string/export_full_backup_summary"
android:title="@string/export_full_backup">
</Preference>
<Preference
android:key="exportCSV"
android:summary="@string/export_as_csv_summary"
android:title="@string/export_to_csv">
</Preference>
<Preference
android:key="importData"
android:summary="@string/import_data_summary"
android:title="@string/import_data">
</Preference>
</PreferenceCategory>