Add Help & Feedback to navigation drawer

pull/253/head
Alex Baker 10 years ago
parent d0f97a1354
commit 6c513064d8

@ -177,6 +177,11 @@
android:label="@string/miscellaneous"
android:theme="@style/Tasks" />
<activity
android:name=".preferences.HelpAndFeedbackActivity"
android:label="@string/help_and_feedback"
android:theme="@style/Tasks" />
<!-- Activity that configures widget -->
<activity android:name="com.todoroo.astrid.widget.WidgetConfigActivity">
<intent-filter>

@ -8,7 +8,6 @@ package com.todoroo.astrid.activity;
import android.app.Activity;
import android.app.AlertDialog;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.support.v4.view.MenuItemCompat;
import android.support.v4.view.ViewPager.OnPageChangeListener;
@ -462,9 +461,6 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList
AndroidUtilities.callOverridePendingTransition(this, R.anim.slide_left_in, R.anim.slide_left_out);
}
return true;
case R.id.menu_support:
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://abaker.github.io/tasks/")));
return true;
default:
return super.onOptionsItemSelected(item);
}

@ -5,7 +5,6 @@ import android.app.Activity;
import com.todoroo.astrid.actfm.TagSettingsActivity;
import com.todoroo.astrid.actfm.TagSettingsActivityTablet;
import com.todoroo.astrid.activity.BeastModePreferences;
import org.tasks.preferences.BasicPreferences;
import com.todoroo.astrid.activity.FilterShortcutActivity;
import com.todoroo.astrid.activity.ShareLinkActivity;
import com.todoroo.astrid.activity.TaskEditActivity;
@ -33,6 +32,8 @@ import org.tasks.activities.DeleteCompletedEventsActivity;
import org.tasks.activities.ExportTaskActivity;
import org.tasks.activities.ImportTaskActivity;
import org.tasks.activities.PurgeDeletedActivity;
import org.tasks.preferences.BasicPreferences;
import org.tasks.preferences.HelpAndFeedbackActivity;
import org.tasks.preferences.MiscellaneousPreferences;
import org.tasks.reminders.SnoozeActivity;
import org.tasks.voice.VoiceCommandActivity;
@ -76,7 +77,8 @@ import dagger.Provides;
DeleteCompletedEventsActivity.class,
DeleteAllCalendarEventsActivity.class,
ClearGtaskDataActivity.class,
ReminderPreferences.class
ReminderPreferences.class,
HelpAndFeedbackActivity.class
})
public class ActivityModule {

@ -1,18 +1,12 @@
package org.tasks.preferences;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import org.tasks.R;
import org.tasks.injection.InjectingPreferenceActivity;
import javax.inject.Inject;
public class BasicPreferences extends InjectingPreferenceActivity {
@Inject DeviceInfo deviceInfo;
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@ -20,14 +14,6 @@ public class BasicPreferences extends InjectingPreferenceActivity {
String action = getIntent().getAction();
if (action == null) {
addPreferencesFromResource(R.xml.preferences);
findPreference(getString(R.string.contact_developer)).setIntent(
new Intent(Intent.ACTION_SENDTO, Uri.fromParts("mailto", "Alex Baker<baker.alex+tasks@gmail.com>", null)) {{
putExtra(Intent.EXTRA_SUBJECT, "Tasks Feedback");
putExtra(Intent.EXTRA_TEXT, deviceInfo.getDebugInfo());
}});
if (!deviceInfo.isPlayStoreAvailable()) {
getPreferenceScreen().removePreference(findPreference(getString(R.string.rate_tasks)));
}
} else if (action.equals(getString(R.string.EPr_appearance_header))) {
toolbar.setTitle(getString(R.string.EPr_appearance_header));
addPreferencesFromResource(R.xml.preferences_appearance);

@ -52,7 +52,6 @@ public class DeviceInfo {
private String buildDebugString() {
try {
return Joiner.on("\n").join(asList(
"",
"",
"----------",
"Tasks: " + BuildConfig.VERSION_NAME + " (build " + BuildConfig.VERSION_CODE + ")",
@ -61,7 +60,6 @@ public class DeviceInfo {
"Product: " + Build.PRODUCT + " (" + Build.DEVICE + ")",
"Kernel: " + System.getProperty("os.version") + " (" + Build.VERSION.INCREMENTAL + ")",
"----------",
"",
""
));
} catch(Exception e) {

@ -0,0 +1,31 @@
package org.tasks.preferences;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import org.tasks.R;
import org.tasks.injection.InjectingPreferenceActivity;
import javax.inject.Inject;
public class HelpAndFeedbackActivity extends InjectingPreferenceActivity {
@Inject DeviceInfo deviceInfo;
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
addPreferencesFromResource(R.xml.preferences_help);
findPreference(getString(R.string.contact_developer)).setIntent(
new Intent(Intent.ACTION_SENDTO, Uri.fromParts("mailto", "Alex Baker<baker.alex+tasks@gmail.com>", null)) {{
putExtra(Intent.EXTRA_SUBJECT, "Tasks Feedback");
putExtra(Intent.EXTRA_TEXT, deviceInfo.getDebugInfo());
}});
if (!deviceInfo.isPlayStoreAvailable()) {
getPreferenceScreen().removePreference(findPreference(getString(R.string.rate_tasks)));
}
}
}

@ -29,7 +29,6 @@ import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
import org.tasks.preferences.BasicPreferences;
import com.todoroo.astrid.activity.ShortcutActivity;
import com.todoroo.astrid.activity.TaskListFragment;
import com.todoroo.astrid.adapter.FilterAdapter;
@ -44,6 +43,8 @@ import org.tasks.filters.FilterCounter;
import org.tasks.filters.FilterProvider;
import org.tasks.injection.ForApplication;
import org.tasks.injection.InjectingFragment;
import org.tasks.preferences.BasicPreferences;
import org.tasks.preferences.HelpAndFeedbackActivity;
import org.tasks.preferences.Preferences;
import javax.inject.Inject;
@ -135,8 +136,13 @@ public class NavigationDrawerFragment extends InjectingFragment {
layout.findViewById(R.id.settings_row).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent intent = new Intent(getActivity(), BasicPreferences.class);
startActivityForResult(intent, ACTIVITY_SETTINGS);
startActivityForResult(new Intent(getActivity(), BasicPreferences.class), ACTIVITY_SETTINGS);
}
});
layout.findViewById(R.id.help_row).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
startActivity(new Intent(getActivity(), HelpAndFeedbackActivity.class));
}
});
mDrawerListView.setItemChecked(mCurrentSelectedPosition, true);

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 846 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 882 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 562 B

@ -50,6 +50,24 @@
android:gravity="center_vertical"
android:text="@string/TLA_menu_settings"/>
<TextView
android:id="@+id/help_row"
android:layout_width="match_parent"
android:layout_height="45dp"
android:clickable="true"
android:longClickable="false"
android:background="?attr/asFilterRowSelected"
android:drawableLeft="?attr/ic_action_help"
android:paddingLeft="10dp"
android:drawablePadding="10dp"
android:textAppearance="@style/TextAppearance.FLA_Filter"
android:checked="false"
android:lines="1"
android:singleLine="true"
android:ellipsize="end"
android:gravity="center_vertical"
android:text="@string/help_and_feedback"/>
</LinearLayout>
</LinearLayout>

@ -31,8 +31,4 @@
android:id="@+id/menu_new_filter"
android:title="@string/FLA_new_filter"
tasks:showAsAction="never" />
<item
android:id="@+id/menu_support"
android:title="@string/TLA_menu_support"
tasks:showAsAction="never" />
</menu>

@ -446,7 +446,6 @@
<string name="widget_mini">Задачи</string>
<string name="EPr_use_dark_theme">Тъмна тема</string>
<string name="delete_task">Изтрий задача</string>
<string name="TLA_menu_support">Поддръжка</string>
<string name="voice_command_added_task">Добавена задача</string>
<string name="external_storage_unavailable">Не може да достъпвате до външната памет</string>
<string name="navigation_drawer_open">Отвори панела за навигация</string>

@ -250,7 +250,6 @@
<string name="TEA_timer_comment_started">inici d\'aquesta tasca:</string>
<string name="TEA_timer_comment_stopped">finalització d\'aquesta tasca:</string>
<string name="delete_task">Eliminar tasca</string>
<string name="TLA_menu_support">Assistència</string>
<plurals name="Ntasks">
<item quantity="one">1 tasca</item>
<item quantity="other">%d tasques</item>

@ -430,7 +430,6 @@
<string name="widget_mini">Úkoly</string>
<string name="EPr_use_dark_theme">Tmavé téma</string>
<string name="delete_task">Smazat úkol</string>
<string name="TLA_menu_support">Podpora</string>
<string name="voice_command_added_task">Přidán úkol</string>
<string name="external_storage_unavailable">Není přístup k externí databázi</string>
<plurals name="Ntasks">

@ -441,7 +441,6 @@
<string name="EPr_voiceRemindersEnabled_desc_enabled">Tasks wird Aufgabennamen bei der Erinnerung aussprechen</string>
<string name="EPr_use_dark_theme">Dunkles Theme</string>
<string name="delete_task">Aufgabe löschen</string>
<string name="TLA_menu_support">Unterstützung</string>
<string name="voice_command_added_task">Hinzugefügte Aufgabe</string>
<string name="external_storage_unavailable">Kein Zugriff auf externen Speicher</string>
<string name="navigation_drawer_open">Navigationsmenüpunkt öffnen</string>

@ -439,7 +439,6 @@
<string name="widget_mini">Εργασίες</string>
<string name="EPr_use_dark_theme">Σκοτεινό θέμα</string>
<string name="delete_task">Διαγραφή καθήκοντος</string>
<string name="TLA_menu_support">Υποστήριξη</string>
<string name="voice_command_added_task">Η εργασία προστέθηκε</string>
<string name="external_storage_unavailable">Δεν είναι δυνατή η πρόσβαση σε εξωτερικά μέσα αποθήκευσης</string>
<string name="navigation_drawer_open">Άνοιγμα συρταριού πλοήγησης</string>

@ -440,7 +440,6 @@
<string name="widget_mini">Tareas</string>
<string name="EPr_use_dark_theme">Estilo oscuro</string>
<string name="delete_task">Eliminar tarea</string>
<string name="TLA_menu_support">Soporte</string>
<string name="voice_command_added_task">Tarea agregada</string>
<string name="external_storage_unavailable">Almacenamiento externo inaccesible</string>
<plurals name="Ntasks">

@ -438,7 +438,6 @@
<string name="widget_mini">Tâches</string>
<string name="EPr_use_dark_theme">Thème foncé</string>
<string name="delete_task">Supprimer la tâche ? </string>
<string name="TLA_menu_support">Assistance</string>
<string name="voice_command_added_task">Tâche ajoutée</string>
<string name="external_storage_unavailable">Impossible d\'accéder au stockage externe</string>
<string name="navigation_drawer_open">Ouvrir le panneau de navigation</string>

@ -387,7 +387,6 @@ Se visualizzi questo errore più volte, ti consigliamo di cancellare tutti i dat
<string name="EPr_voiceInputEnabled_title">Voce</string>
<string name="EPr_voiceRemindersEnabled_title">Promemoria vocali</string>
<string name="EPr_voiceRemindersEnabled_desc_enabled">Tasks pronuncerà il nome dell\'attività durante i promemoria</string>
<string name="TLA_menu_support">Supporto</string>
<plurals name="Ntasks">
<item quantity="one">1 attività</item>
<item quantity="other">%d attività</item>

@ -436,7 +436,6 @@
<string name="EPr_voiceRemindersEnabled_desc_enabled">אסטריד תאמר את שם המשימה כחלק מהתזכורת</string>
<string name="widget_mini">משימות</string>
<string name="delete_task">מחק משימה</string>
<string name="TLA_menu_support">תמיכה</string>
<plurals name="Ntasks">
<item quantity="one">משימה אחת</item>
<item quantity="other">%d משימות</item>

@ -448,7 +448,6 @@
<string name="widget_mini">タスク</string>
<string name="EPr_use_dark_theme">ダークテーマ</string>
<string name="delete_task">タスクを削除</string>
<string name="TLA_menu_support">サポート</string>
<string name="voice_command_added_task">追加されたタスク</string>
<string name="external_storage_unavailable">外部メモリーにアクセスできません</string>
<string name="navigation_drawer_open">ナビゲーションドロワーを開く</string>

@ -443,7 +443,6 @@
<string name="EPr_voiceInputEnabled_title">음성 입력</string>
<string name="EPr_voiceRemindersEnabled_title">음성 알림</string>
<string name="EPr_voiceRemindersEnabled_desc_enabled">일정 알림기간 동안 일정 이름을 직접 말해 줍니다</string>
<string name="TLA_menu_support">지원</string>
<plurals name="Ntasks">
<item quantity="one">1 일정</item>
<item quantity="other">%d 일정</item>

@ -441,7 +441,6 @@
<string name="widget_mini">Taken</string>
<string name="EPr_use_dark_theme">Donker thema</string>
<string name="delete_task">Verwijder taak</string>
<string name="TLA_menu_support">Ondersteuning</string>
<string name="voice_command_added_task">Toegevoegde taak</string>
<string name="external_storage_unavailable">Geen toegang tot externe opslag</string>
<plurals name="Ntasks">

@ -444,7 +444,6 @@ i odzyskanie zadań z kopi zapasowej (Settings-&gt;Sync and backup-&gt;Backup-&g
<string name="widget_mini">Zadania</string>
<string name="EPr_use_dark_theme">Ciemny motyw</string>
<string name="delete_task">Usuń zadanie</string>
<string name="TLA_menu_support">Wsparcie</string>
<string name="voice_command_added_task">Dodane zadanie</string>
<string name="external_storage_unavailable">Brak dostępu do pamięci zewnętrznej</string>
<plurals name="Ntasks">

@ -438,7 +438,6 @@
<string name="widget_mini">Tarefas</string>
<string name="EPr_use_dark_theme">Tema escuro</string>
<string name="delete_task">Excluir tarefa</string>
<string name="TLA_menu_support">Suporte</string>
<string name="voice_command_added_task">Tarefa adicionada</string>
<string name="external_storage_unavailable">Não é possível acessar Cartão SD</string>
<string name="navigation_drawer_open">Abrir barra lateral</string>

@ -444,7 +444,6 @@ das tarefas através de um backup em Definições-&gt;Sincronização e backup-&
<string name="widget_mini">Tarefas</string>
<string name="EPr_use_dark_theme">Tema escuro</string>
<string name="delete_task">Eliminar tarefa</string>
<string name="TLA_menu_support">Suporte</string>
<string name="voice_command_added_task">Tarefa adicionada</string>
<string name="external_storage_unavailable">Não foi possível aceder ao disco externo</string>
<string name="navigation_drawer_open">Abrir gaveta de navegação</string>

@ -445,7 +445,6 @@
<string name="widget_mini">Задачи</string>
<string name="EPr_use_dark_theme">Тёмная тема</string>
<string name="delete_task">Удалить задачу</string>
<string name="TLA_menu_support">Поддержка</string>
<string name="voice_command_added_task">Добавленная задача</string>
<string name="external_storage_unavailable">Не могу открыть внешний накопитель</string>
<string name="navigation_drawer_open">Открыть боковую панель</string>

@ -398,7 +398,6 @@
<string name="EPr_voiceInputEnabled_title">Ses Girişi</string>
<string name="EPr_voiceRemindersEnabled_title">Sesli Hatırlatmalar</string>
<string name="EPr_voiceRemindersEnabled_desc_enabled">Tasks görev isimlerini görev hatırlatmaları sırasında söyleyecek</string>
<string name="TLA_menu_support">Destek</string>
<plurals name="Ntasks">
<item quantity="one">1 görev</item>
<item quantity="other">%d görev</item>

@ -427,7 +427,6 @@
<string name="EPr_voiceRemindersEnabled_title">Голосові нагадування</string>
<string name="EPr_voiceRemindersEnabled_desc_enabled">Tasks повинен вимовляти назву завдань під час нагадувань</string>
<string name="delete_task">Видалити завдання</string>
<string name="TLA_menu_support">Підтримка</string>
<plurals name="Ntasks">
<item quantity="one">1 завдання</item>
<item quantity="other">%d завдань</item>

@ -376,7 +376,6 @@
<string name="EPr_voiceInputEnabled_title">语音输入</string>
<string name="EPr_voiceRemindersEnabled_title">语音提醒</string>
<string name="EPr_voiceRemindersEnabled_desc_enabled">Tasks在任务提醒时会以语音说出任务名称</string>
<string name="TLA_menu_support">支持</string>
<plurals name="Ntasks">
<item quantity="one">1 个任务</item>
<item quantity="other">%d 个任务</item>

@ -418,7 +418,6 @@
<string name="EPr_voiceRemindersEnabled_desc_enabled">Tasks在工作提醒時會以語音說出工作名稱</string>
<string name="EPr_use_dark_theme">暗色主題</string>
<string name="delete_task">刪除工作</string>
<string name="TLA_menu_support">支持</string>
<plurals name="Ntasks">
<item quantity="one">1 個工作</item>
<item quantity="other">%d 個工作</item>

@ -48,6 +48,7 @@
<attr name="ic_action_alarm" format="reference" />
<attr name="ic_action_reload" format="reference" />
<attr name="ic_action_calendar_month" format="reference"/>
<attr name="ic_action_help" format="reference"/>
<attr name="drawer_text" format="color"/>
<attr name="importance_background_selected" format="reference"/>
<attr name="asFilterRowSelected" format="reference"/>

@ -2,7 +2,6 @@
<resources>
<string name="EPr_use_dark_theme">Dark theme</string>
<string name="delete_task">Delete task</string>
<string name="TLA_menu_support">Support</string>
<string name="voice_command_added_task">Added task</string>
<string name="external_storage_unavailable">Cannot access external storage</string>

@ -66,6 +66,7 @@
<item name="ic_action_alarm">@drawable/ic_action_alarm</item>
<item name="ic_action_reload">@drawable/ic_action_reload</item>
<item name="ic_action_calendar_month">@drawable/ic_action_calendar_month</item>
<item name="ic_action_help">@drawable/ic_action_help</item>
</style>
<style name="Tasks.Dark">
@ -96,6 +97,7 @@
<item name="ic_action_alarm">@drawable/ic_action_alarm_white</item>
<item name="ic_action_reload">@drawable/ic_action_reload_white</item>
<item name="ic_action_calendar_month">@drawable/ic_action_calendar_month_white</item>
<item name="ic_action_help">@drawable/ic_action_help_white</item>
<item name="asDueDateColor">#c3c3c3</item>
</style>

@ -45,38 +45,4 @@
android:targetPackage="org.tasks" />
</Preference>
<PreferenceCategory android:title="@string/help_and_feedback">
<Preference android:title="@string/source_code">
<intent
android:action="android.intent.action.VIEW"
android:data="https://github.com/abaker/tasks" />
</Preference>
<Preference android:title="@string/translations">
<intent
android:action="android.intent.action.VIEW"
android:data="https://github.com/abaker/tasks/wiki/Translations" />
</Preference>
<Preference android:title="@string/report_an_issue">
<intent
android:action="android.intent.action.VIEW"
android:data="https://github.com/abaker/tasks/issues" />
</Preference>
<Preference
android:title="@string/rate_tasks"
android:key="@string/rate_tasks">
<intent
android:action="android.intent.action.VIEW"
android:data="market://details?id=org.tasks" />
</Preference>
<Preference
android:key="@string/contact_developer"
android:title="@string/contact_developer"/>
</PreferenceCategory>
</PreferenceScreen>

@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<Preference android:title="@string/source_code">
<intent
android:action="android.intent.action.VIEW"
android:data="https://github.com/abaker/tasks" />
</Preference>
<Preference android:title="@string/translations">
<intent
android:action="android.intent.action.VIEW"
android:data="https://github.com/abaker/tasks/wiki/Translations" />
</Preference>
<Preference android:title="@string/report_an_issue">
<intent
android:action="android.intent.action.VIEW"
android:data="https://github.com/abaker/tasks/issues" />
</Preference>
<Preference
android:key="@string/rate_tasks"
android:title="@string/rate_tasks">
<intent
android:action="android.intent.action.VIEW"
android:data="market://details?id=org.tasks" />
</Preference>
<Preference
android:key="@string/contact_developer"
android:title="@string/contact_developer" />
</PreferenceScreen>
Loading…
Cancel
Save