archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename DateShortcutPrefs to DateTimePreferences

Browse Source
pull/511/head^2
Alex Baker 9 years ago
parent 9c9034693d
commit 16f2633ad5
28 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File

4
src/amazon/java/org/tasks/injection/ActivityComponent.java
Unescape Escape View File

@ -27,7 +27,7 @@ import org.tasks.files.MyFilePickerActivity;
import org.tasks.locale.ui.activity.TaskerSettingsActivity;
import org.tasks.preferences.AppearancePreferences;
import org.tasks.preferences.BasicPreferences;
import org.tasks.preferences.DateShortcutPreferences;
import org.tasks.preferences.DateTimePreferences;
import org.tasks.preferences.HelpAndFeedbackActivity;
import org.tasks.preferences.MiscellaneousPreferences;
import org.tasks.reminders.MissedCallActivity;
@ -109,7 +109,7 @@ public interface ActivityComponent {
void inject(HelpAndFeedbackActivity helpAndFeedbackActivity);
void inject(DateShortcutPreferences dateShortcutPreferences);
void inject(DateTimePreferences dateTimePreferences);
void inject(AppearancePreferences appearancePreferences);

4
src/generic/java/org/tasks/injection/ActivityComponent.java
Unescape Escape View File

@ -27,7 +27,7 @@ import org.tasks.files.MyFilePickerActivity;
import org.tasks.locale.ui.activity.TaskerSettingsActivity;
import org.tasks.preferences.AppearancePreferences;
import org.tasks.preferences.BasicPreferences;
import org.tasks.preferences.DateShortcutPreferences;
import org.tasks.preferences.DateTimePreferences;
import org.tasks.preferences.HelpAndFeedbackActivity;
import org.tasks.preferences.MiscellaneousPreferences;
import org.tasks.reminders.MissedCallActivity;
@ -109,7 +109,7 @@ public interface ActivityComponent {
void inject(HelpAndFeedbackActivity helpAndFeedbackActivity);
void inject(DateShortcutPreferences dateShortcutPreferences);
void inject(DateTimePreferences dateTimePreferences);
void inject(AppearancePreferences appearancePreferences);

4
src/googleplay/java/org/tasks/injection/ActivityComponent.java
Unescape Escape View File

@ -29,7 +29,7 @@ import org.tasks.files.MyFilePickerActivity;
import org.tasks.locale.ui.activity.TaskerSettingsActivity;
import org.tasks.preferences.AppearancePreferences;
import org.tasks.preferences.BasicPreferences;
import org.tasks.preferences.DateShortcutPreferences;
import org.tasks.preferences.DateTimePreferences;
import org.tasks.preferences.HelpAndFeedbackActivity;
import org.tasks.preferences.MiscellaneousPreferences;
import org.tasks.reminders.MissedCallActivity;
@ -116,7 +116,7 @@ public interface ActivityComponent {
void inject(HelpAndFeedbackActivity helpAndFeedbackActivity);
void inject(DateShortcutPreferences dateShortcutPreferences);
void inject(DateTimePreferences dateTimePreferences);
void inject(AppearancePreferences appearancePreferences);

4
src/main/AndroidManifest.xml
Unescape Escape View File

@ -289,8 +289,8 @@
android:theme="@style/Tasks" />
<activity
android:name=".preferences.DateShortcutPreferences"
android:label="@string/date_shortcuts"
android:name=".preferences.DateTimePreferences"
android:label="@string/date_and_time"
android:theme="@style/Tasks" />
<activity

6
src/main/java/org/tasks/preferences/DateShortcutPreferences.java → src/main/java/org/tasks/preferences/DateTimePreferences.java
Unescape Escape View File

@ -12,7 +12,7 @@ import org.tasks.activities.TimePickerActivity;
import org.tasks.injection.InjectingPreferenceActivity;
import org.tasks.ui.TimePreference;
public class DateShortcutPreferences extends InjectingPreferenceActivity implements Preference.OnPreferenceChangeListener {
public class DateTimePreferences extends InjectingPreferenceActivity implements Preference.OnPreferenceChangeListener {
private static final int REQUEST_MORNING = 10001;
private static final int REQUEST_AFTERNOON = 10002;
@ -23,7 +23,7 @@ public class DateShortcutPreferences extends InjectingPreferenceActivity impleme
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
addPreferencesFromResource(R.xml.preferences_date_shortcuts);
addPreferencesFromResource(R.xml.preferences_date_time);
initializeTimePreference(getMorningPreference(), REQUEST_MORNING);
initializeTimePreference(getAfternoonPreference(), REQUEST_AFTERNOON);
@ -55,7 +55,7 @@ public class DateShortcutPreferences extends InjectingPreferenceActivity impleme
preference.setOnPreferenceChangeListener(this);
preference.setOnPreferenceClickListener(ignored -> {
final DateTime current = new DateTime().withMillisOfDay(preference.getMillisOfDay());
Intent intent = new Intent(DateShortcutPreferences.this, TimePickerActivity.class);
Intent intent = new Intent(DateTimePreferences.this, TimePickerActivity.class);
intent.putExtra(TimePickerActivity.EXTRA_TIMESTAMP, current.getMillis());
startActivityForResult(intent, requestCode);
return true;

2
src/main/java/org/tasks/preferences/Preferences.java
Unescape Escape View File

@ -114,7 +114,7 @@ public class Preferences {
public void setDefaults() {
PreferenceManager.setDefaultValues(context, R.xml.preferences, true);
PreferenceManager.setDefaultValues(context, R.xml.preferences_appearance, true);
PreferenceManager.setDefaultValues(context, R.xml.preferences_date_shortcuts, true);
PreferenceManager.setDefaultValues(context, R.xml.preferences_date_time, true);
PreferenceManager.setDefaultValues(context, R.xml.preferences_defaults, true);
PreferenceManager.setDefaultValues(context, R.xml.preferences_gtasks, true);
PreferenceManager.setDefaultValues(context, R.xml.preferences_misc, true);

1
src/main/res/values-bg-rBG/strings.xml
Unescape Escape View File

@ -293,7 +293,6 @@
<string name="geolocation_reminders">Напомняния за геолокация</string>
<string name="tags">Тагове</string>
<string name="filters">Филтри</string>
<string name="date_shortcuts">Дати - бърз достъп</string>
<string name="date_shortcut_hour">За час</string>
<string name="date_shortcut_morning">Сутрин</string>
<string name="date_shortcut_afternoon">Следобед</string>

1
src/main/res/values-de/strings.xml
Unescape Escape View File

@ -286,7 +286,6 @@
<string name="geolocation_reminders">Geo-/Ortsbasierte Erinnerungen</string>
<string name="tags">Schlagworte</string>
<string name="filters">Filter</string>
<string name="date_shortcuts">Datumsabkürzungen</string>
<string name="date_shortcut_hour">Für eine Stunde</string>
<string name="date_shortcut_morning">Morgen</string>
<string name="date_shortcut_afternoon">Nachmittag</string>

1
src/main/res/values-es/strings.xml
Unescape Escape View File

@ -289,7 +289,6 @@
<string name="geolocation_reminders">Recordatorios de Geolocalización</string>
<string name="tags">Etiquetas</string>
<string name="filters">Filtros</string>
<string name="date_shortcuts">Atajos para fechas</string>
<string name="date_shortcut_hour">Por una hora</string>
<string name="date_shortcut_morning">Mañana</string>
<string name="date_shortcut_afternoon">Tarde</string>

1
src/main/res/values-fi/strings.xml
Unescape Escape View File

@ -293,7 +293,6 @@
<string name="geolocation_reminders">Paikannuksen muistutukset</string>
<string name="tags">Tunniste</string>
<string name="filters">Suodattimet</string>
<string name="date_shortcuts">Päivämäärän pikakuvake</string>
<string name="date_shortcut_hour">Tunnin verran</string>
<string name="date_shortcut_morning">Aamu</string>
<string name="date_shortcut_afternoon">Iltapäivä</string>

1
src/main/res/values-fr/strings.xml
Unescape Escape View File

@ -283,7 +283,6 @@
<string name="geofence_responsiveness_title">Temps de réponse (les valeurs élevées améliorent l\'autonomie)</string>
<string name="geolocation_reminders">Rappels géolocalisés</string>
<string name="filters">Filtres</string>
<string name="date_shortcuts">Raccourcis pour les dates</string>
<string name="date_shortcut_hour">Pour une heure</string>
<string name="date_shortcut_morning">Matin</string>
<string name="date_shortcut_afternoon">Après-midi</string>

1
src/main/res/values-gl/strings.xml
Unescape Escape View File

@ -289,7 +289,6 @@
<string name="geolocation_reminders">Recordatorios de Geolocalización</string>
<string name="tags">Etiquetas</string>
<string name="filters">Filtros</string>
<string name="date_shortcuts">Atajos para fechas</string>
<string name="date_shortcut_hour">Por una hora</string>
<string name="date_shortcut_morning">Mañana</string>
<string name="date_shortcut_afternoon">Tarde</string>

1
src/main/res/values-hu/strings.xml
Unescape Escape View File

@ -293,7 +293,6 @@
<string name="geolocation_reminders">Helyhez kötött Emlékeztetők</string>
<string name="tags">Címkék</string>
<string name="filters">Szűrők</string>
<string name="date_shortcuts">Gyorselérésű időpontok</string>
<string name="date_shortcut_hour">Egy órára</string>
<string name="date_shortcut_morning">Reggel</string>
<string name="date_shortcut_afternoon">Délután</string>

1
src/main/res/values-it/strings.xml
Unescape Escape View File

@ -290,7 +290,6 @@
<string name="geolocation_reminders">Promemoria Geolocalizzazione</string>
<string name="tags">Etichette</string>
<string name="filters">Filtri</string>
<string name="date_shortcuts">Scorciatoie data</string>
<string name="date_shortcut_hour">Per un\'ora</string>
<string name="date_shortcut_morning">Mattina</string>
<string name="date_shortcut_afternoon">Pomeriggio</string>

1
src/main/res/values-iw/strings.xml
Unescape Escape View File

@ -291,7 +291,6 @@
<string name="geolocation_reminders">התראות מיקום</string>
<string name="tags">תגיות</string>
<string name="filters">פילטרים</string>
<string name="date_shortcuts">קיצורי תאריך</string>
<string name="date_shortcut_hour">בעוד שעה</string>
<string name="date_shortcut_morning">בוקר</string>
<string name="date_shortcut_afternoon">אחר הצהריים</string>

1
src/main/res/values-ja/strings.xml
Unescape Escape View File

@ -291,7 +291,6 @@
<string name="geolocation_reminders">位置情報リマインダー</string>
<string name="tags">タグ</string>
<string name="filters">フィルター</string>
<string name="date_shortcuts">日付のショートカット</string>
<string name="date_shortcut_hour">1時間</string>
<string name="date_shortcut_morning">朝</string>
<string name="date_shortcut_afternoon">昼</string>

1
src/main/res/values-ko/strings.xml
Unescape Escape View File

@ -287,7 +287,6 @@
<string name="geolocation_reminders">위치정보 알림</string>
<string name="tags">태그</string>
<string name="filters">필터</string>
<string name="date_shortcuts">날짜 바로가기</string>
<string name="date_shortcut_hour">한 시간동안</string>
<string name="date_shortcut_morning">아침</string>
<string name="date_shortcut_afternoon">오후</string>

1
src/main/res/values-nl/strings.xml
Unescape Escape View File

@ -286,7 +286,6 @@
<string name="geofence_responsiveness_title">Antwoord tijd (hogere waarde verbruikt meer batterij)</string>
<string name="geolocation_reminders">Geolocatie Herinneringen</string>
<string name="tags">Labels</string>
<string name="date_shortcuts">Datum snelkoppelingen</string>
<string name="date_shortcut_hour">Voor een uur</string>
<string name="date_shortcut_morning">Ochtend</string>
<string name="date_shortcut_afternoon">Middag</string>

1
src/main/res/values-pl/strings.xml
Unescape Escape View File

@ -290,7 +290,6 @@
<string name="geolocation_reminders">Przypomnienie geolokacyjne</string>
<string name="tags">Tagi</string>
<string name="filters">Filtry</string>
<string name="date_shortcuts">Skróty dat</string>
<string name="date_shortcut_hour">Na godzinę</string>
<string name="date_shortcut_morning">Rano</string>
<string name="date_shortcut_afternoon">Po południu</string>

1
src/main/res/values-pt/strings.xml
Unescape Escape View File

@ -265,7 +265,6 @@
<string name="geolocation_reminders">Lembretes de geolocalização</string>
<string name="tags">Etiquetas</string>
<string name="filters">Filtros</string>
<string name="date_shortcuts">Atalhos de data</string>
<string name="date_shortcut_hour">Por uma hora</string>
<string name="date_shortcut_morning">Manhã</string>
<string name="date_shortcut_afternoon">Tarde</string>

1
src/main/res/values-ru/strings.xml
Unescape Escape View File

@ -290,7 +290,6 @@
<string name="geolocation_reminders">Напоминания по местонахождению:</string>
<string name="tags">Теги</string>
<string name="filters">Фильтры</string>
<string name="date_shortcuts">Метки по времени</string>
<string name="date_shortcut_hour">Через час</string>
<string name="date_shortcut_morning">Утро</string>
<string name="date_shortcut_afternoon">Обед</string>

1
src/main/res/values-sv/strings.xml
Unescape Escape View File

@ -290,7 +290,6 @@
<string name="geolocation_reminders">Platsbaserade påminnelser</string>
<string name="tags">Etiketter</string>
<string name="filters">Filter</string>
<string name="date_shortcuts">Snabbval tid</string>
<string name="date_shortcut_hour">En timme</string>
<string name="date_shortcut_morning">På morgonen</string>
<string name="date_shortcut_afternoon">På eftermiddagen</string>

1
src/main/res/values-uk/strings.xml
Unescape Escape View File

@ -293,7 +293,6 @@
<string name="geolocation_reminders">Геолокаційні нагадування</string>
<string name="tags">Теги</string>
<string name="filters">Фільтри</string>
<string name="date_shortcuts">Частини дня</string>
<string name="date_shortcut_hour">На годину</string>
<string name="date_shortcut_morning">Зранку</string>
<string name="date_shortcut_afternoon">Опівдні</string>

1
src/main/res/values-zh-rTW/strings.xml
Unescape Escape View File

@ -221,7 +221,6 @@
<string name="TLA_menu_donate">贊助</string>
<string name="tags">標籤</string>
<string name="filters">過濾</string>
<string name="date_shortcuts">日期捷徑</string>
<string name="filter_settings">過濾器設定</string>
<string name="show_hidden">顯示隱藏</string>
<string name="show_completed">顯示已完成</string>

2
src/main/res/values/strings.xml
Unescape Escape View File

@ -692,7 +692,6 @@ File %1$s contained %2$s.\n\n
<string name="geolocation_reminders">Geolocation Reminders</string>
<string name="tags">Tags</string>
<string name="filters">Filters</string>
<string name="date_shortcuts">Date shortcuts</string>
<string name="date_shortcut_hour">For an hour</string>
<string name="date_shortcut_morning">Morning</string>
<string name="date_shortcut_afternoon">Afternoon</string>
@ -819,5 +818,6 @@ File %1$s contained %2$s.\n\n
<string name="delete_multiple_tasks_confirmation">%s deleted</string>
<string name="delete_selected_tasks">Delete selected tasks?</string>
<string name="copy_selected_tasks">Copy selected tasks?</string>
<string name="date_and_time">Date and time</string>
</resources>

4
src/main/res/xml/preferences.xml
Unescape Escape View File

@ -35,9 +35,9 @@
android:targetPackage="org.tasks" />
</Preference>
<Preference android:title="@string/date_shortcuts">
<Preference android:title="@string/date_and_time">
<intent
android:targetClass="org.tasks.preferences.DateShortcutPreferences"
android:targetClass="org.tasks.preferences.DateTimePreferences"
android:targetPackage="org.tasks" />
</Preference>

0
src/main/res/xml/preferences_date_shortcuts.xml → src/main/res/xml/preferences_date_time.xml
Unescape Escape View File

2
src/release/res/xml/google_analytics.xml
Unescape Escape View File

@ -37,7 +37,7 @@
<screenName name="org.tasks.preferences.AppearancePreferences">AppearancePreferences</screenName>
<screenName name="org.tasks.preferences.BackupPreferences">BackupPreferences</screenName>
<screenName name="org.tasks.preferences.BasicPreferences">BasicPreferences</screenName>
<screenName name="org.tasks.preferences.DateShortcutPreferences">DateShortcutPreferences</screenName>
<screenName name="org.tasks.preferences.DateTimePreferences">DateShortcutPreferences</screenName>
<screenName name="org.tasks.preferences.HelpAndFeedbackActivity">HelpAndFeedbackActivity</screenName>
<screenName name="org.tasks.preferences.MiscellaneousPreferences">MiscellaneousPreferences</screenName>
<screenName name="org.tasks.widget.WidgetConfigActivity">WidgetConfigActivity</screenName>

Write Preview
Loading…
Cancel
Save