diff --git a/app/src/googleplay/res/values/bools.xml b/app/src/googleplay/res/values/bools.xml
index d549726a2..fa6f32e79 100644
--- a/app/src/googleplay/res/values/bools.xml
+++ b/app/src/googleplay/res/values/bools.xml
@@ -1,5 +1,4 @@
true
- true
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8ff7189f7..41303ebb2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -174,11 +174,6 @@
-
-
{
R.drawable.ic_settings_24dp,
new Intent(activity, BasicPreferences.class),
REQUEST_SETTINGS));
- add(
- new NavigationDrawerAction(
- activity.getResources().getString(R.string.help_and_feedback),
- R.drawable.ic_help_24dp,
- new Intent(activity, HelpAndFeedbackActivity.class),
- 0));
}
notifyDataSetChanged();
diff --git a/app/src/main/java/org/tasks/billing/PurchaseActivity.java b/app/src/main/java/org/tasks/billing/PurchaseActivity.java
index c231965f0..cb82f7255 100644
--- a/app/src/main/java/org/tasks/billing/PurchaseActivity.java
+++ b/app/src/main/java/org/tasks/billing/PurchaseActivity.java
@@ -14,6 +14,7 @@ import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.res.Resources;
+import android.net.Uri;
import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
@@ -40,7 +41,6 @@ import org.tasks.billing.row.SkuRowData;
import org.tasks.injection.ActivityComponent;
import org.tasks.injection.ForApplication;
import org.tasks.injection.ThemedInjectingAppCompatActivity;
-import org.tasks.preferences.HelpAndFeedbackActivity;
import org.tasks.ui.MenuColorizer;
import timber.log.Timber;
@@ -233,7 +233,7 @@ public class PurchaseActivity extends ThemedInjectingAppCompatActivity
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_help:
- startActivity(new Intent(this, HelpAndFeedbackActivity.class));
+ startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://tasks.org/help")));
return true;
case R.id.menu_refresh_purchases:
billingClient.queryPurchases();
diff --git a/app/src/main/java/org/tasks/injection/ActivityComponent.java b/app/src/main/java/org/tasks/injection/ActivityComponent.java
index d36f77c1c..1479ff49a 100644
--- a/app/src/main/java/org/tasks/injection/ActivityComponent.java
+++ b/app/src/main/java/org/tasks/injection/ActivityComponent.java
@@ -32,7 +32,6 @@ import org.tasks.locale.ui.activity.TaskerSettingsActivity;
import org.tasks.preferences.AppearancePreferences;
import org.tasks.preferences.BasicPreferences;
import org.tasks.preferences.DateTimePreferences;
-import org.tasks.preferences.HelpAndFeedbackActivity;
import org.tasks.preferences.MiscellaneousPreferences;
import org.tasks.reminders.MissedCallActivity;
import org.tasks.reminders.NotificationActivity;
@@ -116,8 +115,6 @@ public interface ActivityComponent {
void inject(MiscellaneousPreferences miscellaneousPreferences);
- void inject(HelpAndFeedbackActivity helpAndFeedbackActivity);
-
void inject(DateTimePreferences dateTimePreferences);
void inject(AppearancePreferences appearancePreferences);
diff --git a/app/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java b/app/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java
index 90068c6c0..318baca01 100644
--- a/app/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java
+++ b/app/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java
@@ -3,12 +3,15 @@ package org.tasks.injection;
import android.content.ComponentName;
import android.content.Intent;
import android.content.pm.ActivityInfo;
+import android.net.Uri;
import android.os.Bundle;
import android.preference.Preference;
import android.preference.PreferenceCategory;
import android.preference.PreferenceGroup;
import android.support.v4.content.ContextCompat;
import android.support.v7.widget.Toolbar;
+import android.support.v7.widget.Toolbar.OnMenuItemClickListener;
+import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
@@ -20,14 +23,17 @@ import org.tasks.R;
import org.tasks.dialogs.DialogBuilder;
import org.tasks.locale.Locale;
import org.tasks.preferences.AppCompatPreferenceActivity;
+import org.tasks.preferences.Device;
import org.tasks.themes.Theme;
import org.tasks.ui.MenuColorizer;
import timber.log.Timber;
public abstract class InjectingPreferenceActivity extends AppCompatPreferenceActivity
- implements InjectingActivity {
+ implements InjectingActivity, OnMenuItemClickListener {
@Inject DialogBuilder dialogBuilder;
+ @Inject Device device;
+
private ActivityComponent activityComponent;
protected InjectingPreferenceActivity() {
@@ -66,6 +72,8 @@ public abstract class InjectingPreferenceActivity extends AppCompatPreferenceAct
}
toolbar.setNavigationIcon(ContextCompat.getDrawable(this, R.drawable.ic_arrow_back_24dp));
toolbar.setNavigationOnClickListener(v -> finish());
+ toolbar.inflateMenu(R.menu.menu_preferences);
+ toolbar.setOnMenuItemClickListener(this);
MenuColorizer.colorToolbar(this, toolbar);
}
@@ -127,4 +135,28 @@ public abstract class InjectingPreferenceActivity extends AppCompatPreferenceAct
.setNegativeButton(R.string.restart_later, null)
.show();
}
+
+ @Override
+ public boolean onMenuItemClick(MenuItem item) {
+ switch (item.getItemId()) {
+ case R.id.menu_contact:
+ Intent mailto =
+ new Intent(
+ Intent.ACTION_SENDTO,
+ Uri.fromParts("mailto", "Tasks Support ", null));
+ mailto.putExtra(Intent.EXTRA_SUBJECT, "Tasks Feedback");
+ mailto.putExtra(Intent.EXTRA_TEXT, device.getDebugInfo());
+ startActivity(mailto);
+ return true;
+ case R.id.menu_help:
+ startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getHelpUrl())));
+ return true;
+ default:
+ return false;
+ }
+ }
+
+ protected String getHelpUrl() {
+ return "http://tasks.org/help";
+ }
}
diff --git a/app/src/main/java/org/tasks/preferences/BasicPreferences.java b/app/src/main/java/org/tasks/preferences/BasicPreferences.java
index 33cac69b6..a9752ef35 100644
--- a/app/src/main/java/org/tasks/preferences/BasicPreferences.java
+++ b/app/src/main/java/org/tasks/preferences/BasicPreferences.java
@@ -65,7 +65,6 @@ public class BasicPreferences extends InjectingPreferenceActivity
result = savedInstanceState == null ? new Bundle() : savedInstanceState.getBundle(EXTRA_RESULT);
addPreferencesFromResource(R.xml.preferences);
- addPreferencesFromResource(R.xml.preferences_privacy);
if (BuildConfig.DEBUG) {
addPreferencesFromResource(R.xml.preferences_debug);
}
diff --git a/app/src/main/java/org/tasks/preferences/HelpAndFeedbackActivity.java b/app/src/main/java/org/tasks/preferences/HelpAndFeedbackActivity.java
deleted file mode 100644
index 86d399689..000000000
--- a/app/src/main/java/org/tasks/preferences/HelpAndFeedbackActivity.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.tasks.preferences;
-
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import javax.inject.Inject;
-import org.tasks.R;
-import org.tasks.injection.ActivityComponent;
-import org.tasks.injection.InjectingPreferenceActivity;
-
-public class HelpAndFeedbackActivity extends InjectingPreferenceActivity {
-
- @Inject Device device;
- @Inject Preferences preferences;
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- addPreferencesFromResource(R.xml.preferences_help);
-
- Intent mailto =
- new Intent(
- Intent.ACTION_SENDTO,
- Uri.fromParts("mailto", "Tasks Support ", null));
- mailto.putExtra(Intent.EXTRA_SUBJECT, "Tasks Feedback");
- mailto.putExtra(Intent.EXTRA_TEXT, device.getDebugInfo());
- findPreference(getString(R.string.contact_developer)).setIntent(mailto);
- if (!getResources().getBoolean(R.bool.google_play_store_available)) {
- remove(R.string.rate_tasks);
- }
- }
-
- @Override
- public void inject(ActivityComponent component) {
- component.inject(this);
- }
-}
diff --git a/app/src/main/java/org/tasks/preferences/Preferences.java b/app/src/main/java/org/tasks/preferences/Preferences.java
index 4d8410bb5..c86210825 100644
--- a/app/src/main/java/org/tasks/preferences/Preferences.java
+++ b/app/src/main/java/org/tasks/preferences/Preferences.java
@@ -205,7 +205,6 @@ public class Preferences {
PreferenceManager.setDefaultValues(context, R.xml.preferences_defaults, true);
PreferenceManager.setDefaultValues(context, R.xml.preferences_synchronization, true);
PreferenceManager.setDefaultValues(context, R.xml.preferences_misc, true);
- PreferenceManager.setDefaultValues(context, R.xml.preferences_privacy, true);
PreferenceManager.setDefaultValues(context, R.xml.preferences_reminders, true);
BeastModePreferences.setDefaultOrder(this, context);
diff --git a/app/src/main/res/menu/menu_preferences.xml b/app/src/main/res/menu/menu_preferences.xml
new file mode 100644
index 000000000..a6ab3536b
--- /dev/null
+++ b/app/src/main/res/menu/menu_preferences.xml
@@ -0,0 +1,13 @@
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index e00389c1d..749240a61 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -148,8 +148,6 @@
تعديل الشاشه
مصدر الكود
أسهم في الترجمة
- بلغ عن مشكل
- المساعدة والتقييم
الاتصال بالمطورين
تقييم المهمات
لا تذكير أثناء أوقات الراحة
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 91257cbf1..44d3ae7f5 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -324,8 +324,6 @@
Настройване на екрана за редактиране
Source код
Подпомагане с преводи
- Съобщи за проблем
- Помощ & Обратна връзка
Свържи се с разработчика
Гласувайте за Tasks
Без напомняния по време на тихи часове
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index aa0ea1d8b..df6d8a82a 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -117,7 +117,6 @@
Tancar sessió / esborra la informació de sincronització?
Codi font
Contribuir traduccions
- Informa d\'un problema
Contacta amb el desenvolupador
Sense recordatoris durant les hores de silenci
Radi (metres)
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 41861e867..5b3e20661 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -228,8 +228,6 @@
Velikost písma
Zdrojový kód
Přispějte k překladu
- Nahlásit problém
- Pomoc & zpětná vazba
Kontaktuj vývojáře
Ohodnotit Tasks
Žádné připomínky během tichých hodin
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index d8b31751a..fc9c93c85 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -317,8 +317,6 @@
Änderungsbildschirm anpassen
Quelltext
Zur Übersetzung beitragen
- Fehler melden
- Hilfe & Feedback
Entwickler kontaktieren
Bewerte Tasks
Keine Erinnerungen während der Ruhezeit
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index ed57d61e1..d63dca642 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -320,8 +320,6 @@
Personalizar pantalla de edición
Código fuente
Contribuye con la traducción
- Informa de un error
- Ayuda y valoraciones
Contactar con el desarrollador
Valorar Tasks
Sin avisos en horario silencioso
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 258cf784e..21559446c 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -212,8 +212,6 @@
فاصله سطرها
کد مبدا
مشارکت در ترجمه
- گزارش یک مطلب
- کمک و بازخورد
تماس با توسعه دهنده
ارزیابی وظیفه
بدون یادآور در ساعات سکوت
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index a5a248d8d..98887c17d 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -325,8 +325,6 @@
Saadä muokkaus -näkymää
Lähdekoodi
Osallistu kääntämiseen
- Ilmoita virheestä
- Apu & palaute
Ota yhteyttä kehittäjään
Arvostele Tasks
Ei ilmoituksia hiljaisena aikana
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 7a5fce46f..7d517f134 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -308,8 +308,6 @@
Personnaliser l\'écran d\'édition
Code source
Contribuer aux traductions
- Faire part d\'un problème
- Aide et retours
Contacter le développeur
Noter Tasks
Pas de rappels pendant les heures silencieuses
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 86cb0525d..a5756a7cf 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -247,8 +247,6 @@
Personalizar pantalla de edición
Código fonte
Contribúe coa tradución
- Informa dun erro
- Ayuda y valoraciones
Contactar co revelador
Valorar Tasks
Sen avisos en horario silencioso
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 7fe1f288d..95970263f 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -324,8 +324,6 @@
Szerkesztő képernyő testreszabása
Forráskód
Részvétel a fordításban
- Probléma bejelentése
- Súgó és visszajelzés
Kapcsolatfelvétel a fejlesztővel
A Tasks értékelése
Emlékeztetők mellőzése csendes órák alatt
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index a61cf3a80..d52d06d51 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -321,8 +321,6 @@
Personalizza schermata di modifica
Codice sorgente
Contribuisci alla traduzione
- Segnala un problema
- Aiuto & Suggerimenti
Contatta lo sviluppatore
Attività
Non notificare durante le ore di riposo
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 864a50a7a..71374522a 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -272,8 +272,6 @@
התאם אישית את מסך עריכת משימה
קוד מקור
תרום לתרגום
- דווח/י על בעיה
- עזרה ומשוב
צור קשר
דרג אפליקציה
ללא התראות בשעות השקטות
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 54dabf99e..c591adfd0 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -322,8 +322,6 @@
編集画面をカスタマイズ
ソースコード
翻訳に貢献する
- 問題を報告
- ヘルプ & フィードバック
開発者に連絡
Tasks を評価
消音時間の間はリマインダーは動作しません
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 11cb6788d..247c03663 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -326,8 +326,6 @@
일정 편집화면 레이아웃 설정하기
소스 코드
번역 참여하기
- 문제점 보고하기
- 도움말 & 피드백
개발자와 연락
Tasks 평가하기
무음 시간대에는 알림 해제
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 4cd0a1389..6413d5eac 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -321,8 +321,6 @@
Pritaikyti redagavimo ekraną
Pirminis kodas
Padėti išversti
- Pranešti apie problemą
- Pagalba ir atsiliepimai
Susisiekti su programuotoju
Įvertinti Tasks
Tylos valandomis - be priminimų
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 7cecce794..0c04ab4be 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -145,7 +145,6 @@
Vibrering
Radmellomrom
Kildekode
- Rapporter en feil
Kontakt utvikler
Gi Tasks din vurdering
Radius (meter)
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 1a2056c9e..c63642e02 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -319,8 +319,6 @@
Edit scherm aanpassen
Bron code
Help vertalen
- Meld een probleem
- Help & Terugkoppeling
Contact ontwikkelaar
Beoordeel Taken
Geen herinneringen tijdens stille uren
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 880b84a53..de0025586 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -300,8 +300,6 @@
Dostosuj ekran edycji
Kod źródłowy
Wspomóż tłumaczenie
- Zgłoś błąd
- Pomoc i opinia
Skontaktuj się z twórcą
Oceń zadania
Brak przypomnień w czasie wyciszenia
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 51600b8b1..ece5a620a 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -242,8 +242,6 @@
Personalizar tela de edição
Código fonte
Ajude com as traduções
- Relatar um problema
- Ajuda e Feedback
Contatar desenvolvedor
Avaliar o Tasks
Sem lembretes durante as horas calmas
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index b714db8a4..7dbddbb51 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -322,8 +322,6 @@
Personalizar ecrã de edição
Código fonte
Contribuir nas traduções
- Reportar um erro
- Ajuda e comentários
Contacte o programador
Avaliar o Tasks
Sem lembretes nas horas de silêncio
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index c60801dbb..1b1cbba04 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -322,8 +322,6 @@
Порядок полей в задаче...
Исходный код
Участвовать в переводе программы
- Сообщить о проблеме
- Помощь и обратная связь
Связь с разработчиком
Оставить отзыв
Выкл. напоминания в тихие часы
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index a828e534f..829add14f 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -322,8 +322,6 @@
Prispôsobiť zobrazenie úprav
Zdrojový kód
Prispieť prekladom
- Nahlásiť problém
- Pomoc a spätná väzba
Spojiť sa s vývojárom
Ohodnotiť Úlohy
Žiadne upozornenia počas obdobia ticha
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index bd13873cd..3a29a937e 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -246,8 +246,6 @@
Anpassa redigeringsvyn
Källkod
Hjälp till med översättning
- Rapportera ett problem
- Hjälp & Återkoppling
Kontakta utvecklaren
Betygsätt Tasks
Inga påminnelser kommer att göras under under tyst period
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 068471eef..3854cc410 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -326,8 +326,6 @@
Düzenleme ekranını özelleştir
Kaynak kodu
Çeviri katkıları
- Sorun bildir
- Yardım ve geri bildirim
Geliştiriciyle iletişime geç
Tasks\'i Oyla
Sessiz saatlerde hatırlatıcı yok
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index b6881edb5..cf234b99f 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -249,8 +249,6 @@
Налаштувати вікно редагування
Вихідний код
Допомогти перекласти
- Повідомити про помилку
- Допомога і відгуки
Зв\'язатися з розробником
Оцінити Tasks
Без нагадувань під час тихих годин
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 90a2e6ff9..03c096f00 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -321,8 +321,6 @@
自定义编辑屏幕
源代码
贡献翻译
- 报告个问题
- 帮助和反馈
联系开发者
给Tasks打分
静音期间不提醒
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 182b536b6..6dc00a570 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -207,7 +207,6 @@
啟用
行距
貢獻翻譯
- 說明與回饋
為 Tasks 評分
贊助
半徑 (公尺)
diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml
index d4587b7f5..9e0edd086 100644
--- a/app/src/main/res/values/bools.xml
+++ b/app/src/main/res/values/bools.xml
@@ -2,6 +2,5 @@
false
false
- false
false
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 10537255d..d3ff13fd5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -703,8 +703,6 @@ File %1$s contained %2$s.\n\n
Customize edit screen
Source code
Contribute translations
- Report an issue
- Help & feedback
Contact developer
Rate Tasks
No reminders during quiet hours
@@ -764,6 +762,7 @@ File %1$s contained %2$s.\n\n
Back button saves task
Default list
Default sync
+ Donations are greatly appreciated
Filter
Opacity
@@ -888,6 +887,8 @@ File %1$s contained %2$s.\n\n
Billing unavailable. Make sure your Google Play app
is setup correctly
Billing unavailable. Please check your device.
+ About
+ Tasks is free and open-source software, licensed under the GNU General Public License v3.0
Additional themes
CalDAV synchronization
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index cfec4aa4b..8356a6a7a 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -101,4 +101,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences_debug.xml b/app/src/main/res/xml/preferences_debug.xml
index a632e5dfc..c988b7248 100644
--- a/app/src/main/res/xml/preferences_debug.xml
+++ b/app/src/main/res/xml/preferences_debug.xml
@@ -4,12 +4,6 @@
-
-
-
-
diff --git a/app/src/main/res/xml/preferences_help.xml b/app/src/main/res/xml/preferences_help.xml
deleted file mode 100644
index 7a0e0f904..000000000
--- a/app/src/main/res/xml/preferences_help.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences_privacy.xml b/app/src/main/res/xml/preferences_privacy.xml
deleted file mode 100644
index ecaec7606..000000000
--- a/app/src/main/res/xml/preferences_privacy.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file