Add tags and filters from nav drawer

pull/281/head
Alex Baker 11 years ago
parent 4a4ffd7f3c
commit a94f94e71f

@ -375,11 +375,6 @@
android:name="com.todoroo.astrid.actfm.TagSettingsActivity"
android:windowSoftInputMode="stateHidden" />
<activity
android:name="com.todoroo.astrid.actfm.TagSettingsActivityTablet"
android:windowSoftInputMode="stateHidden"
android:theme="@style/Tasks.Dialog" />
<!-- gtasks -->
<activity
android:name="com.todoroo.astrid.gtasks.auth.GtasksLoginActivity"

@ -9,6 +9,7 @@ import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.app.ActionBar;
import android.support.v7.widget.Toolbar;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuItem;
@ -50,6 +51,13 @@ public class TagSettingsActivity extends InjectingAppCompatActivity {
preferences.applyThemeAndStatusBarColor();
setContentView(R.layout.tag_settings_activity);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
ActionBar supportActionBar = getSupportActionBar();
if (supportActionBar != null) {
supportActionBar.setDisplayHomeAsUpEnabled(true);
}
tagData = getIntent().getParcelableExtra(TagViewFragment.EXTRA_TAG_DATA);
if (tagData == null) {
isNewTag = true;

@ -1,14 +0,0 @@
/**
* Copyright (c) 2012 Todoroo Inc
*
* See the file "LICENSE" for the full license governing this code.
*/
package com.todoroo.astrid.actfm;
public class TagSettingsActivityTablet extends TagSettingsActivity {
/**
* This class exists for the sole purpose of being declared separately in the manifest
* so that we don't get crazy bugs with it being Dialog Theme on tablets and normal theme
* on phones.
*/
}

@ -25,13 +25,11 @@ import com.todoroo.andlib.data.Callback;
import com.todoroo.andlib.sql.QueryTemplate;
import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.astrid.actfm.TagSettingsActivity;
import com.todoroo.astrid.actfm.TagSettingsActivityTablet;
import com.todoroo.astrid.actfm.TagViewFragment;
import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.api.FilterListItem;
import com.todoroo.astrid.core.BuiltInFilterExposer;
import com.todoroo.astrid.core.CustomFilterActivity;
import com.todoroo.astrid.core.DeleteFilterActivity;
import com.todoroo.astrid.core.SavedFilter;
import com.todoroo.astrid.dao.TagDataDao;
@ -261,20 +259,12 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList
private void newListFromLaunch() {
Intent thisIntent = getIntent();
Intent newTagIntent = newTagDialog();
Intent newTagIntent = new Intent(this, TagSettingsActivity.class);
newTagIntent.putExtra(TagSettingsActivity.TOKEN_AUTOPOPULATE_NAME, thisIntent.getStringExtra(TOKEN_CREATE_NEW_LIST_NAME));
thisIntent.removeExtra(TOKEN_CREATE_NEW_LIST_NAME);
startActivityForResult(newTagIntent, NavigationDrawerFragment.REQUEST_NEW_LIST);
}
/**
* Create new tag data
*/
private Intent newTagDialog() {
Class<?> settingsComponent = preferences.useTabletLayout() ? TagSettingsActivityTablet.class : TagSettingsActivity.class;
return new Intent(this, settingsComponent);
}
@Override
public void onTaskListItemClicked(long taskId) {
if (fragmentLayout != LAYOUT_SINGLE) {
@ -446,16 +436,6 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList
this, tlf.hasDraggableOption(), preferences, tlf, tlf.getSortFlags(), tlf.getSort());
dialog.show();
return true;
case R.id.menu_new_filter:
Intent intent = new Intent(this, CustomFilterActivity.class);
startActivityForResult(intent, TaskListFragment.ACTIVITY_REQUEST_NEW_FILTER);
return true;
case R.id.menu_new_list:
startActivityForResult(newTagDialog(), NavigationDrawerFragment.REQUEST_NEW_LIST);
if (!preferences.useTabletLayout()) {
AndroidUtilities.callOverridePendingTransition(this, R.anim.slide_left_in, R.anim.slide_left_out);
}
return true;
default:
return super.onOptionsItemSelected(item);
}

@ -18,11 +18,13 @@ import android.widget.ImageView;
import android.widget.ListView;
import android.widget.TextView;
import com.todoroo.astrid.actfm.TagSettingsActivity;
import com.todoroo.astrid.activity.AstridActivity;
import com.todoroo.astrid.activity.TaskListFragment;
import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.api.FilterListItem;
import com.todoroo.astrid.core.CustomFilterActivity;
import org.tasks.R;
import org.tasks.activities.DonationActivity;
@ -33,6 +35,7 @@ import org.tasks.filters.NavigationDrawerSubheader;
import org.tasks.filters.NavigationDrawerSeparator;
import org.tasks.preferences.BasicPreferences;
import org.tasks.preferences.HelpAndFeedbackActivity;
import org.tasks.ui.NavigationDrawerFragment;
import java.util.List;
@ -226,10 +229,12 @@ public class FilterAdapter extends ArrayAdapter<FilterListItem> {
}
public void addSubMenu(final int titleResource, List<Filter> filters) {
if (filters.size() > 0) {
add(new NavigationDrawerSubheader(activity.getResources().getString(titleResource)));
if (filters.isEmpty()) {
return;
}
add(new NavigationDrawerSubheader(activity.getResources().getString(titleResource)));
for (FilterListItem filterListItem : filters) {
add(filterListItem);
}
@ -249,6 +254,20 @@ public class FilterAdapter extends ArrayAdapter<FilterListItem> {
if (navigationDrawer) {
add(new NavigationDrawerSeparator());
add(new NavigationDrawerAction(
activity.getResources().getString(R.string.new_tag),
getResource(activity, R.attr.ic_action_new_tag),
new Intent(activity, TagSettingsActivity.class),
NavigationDrawerFragment.REQUEST_NEW_LIST));
add(new NavigationDrawerAction(
activity.getResources().getString(R.string.FLA_new_filter),
getResource(activity, R.attr.ic_action_new_tag),
new Intent(activity, CustomFilterActivity.class),
TaskListFragment.ACTIVITY_REQUEST_NEW_FILTER));
add(new NavigationDrawerSeparator());
add(new NavigationDrawerAction(
activity.getResources().getString(R.string.TLA_menu_settings),
getResource(activity, R.attr.ic_action_settings),

@ -3,7 +3,6 @@ package org.tasks.injection;
import android.app.Activity;
import com.todoroo.astrid.actfm.TagSettingsActivity;
import com.todoroo.astrid.actfm.TagSettingsActivityTablet;
import com.todoroo.astrid.activity.BeastModePreferences;
import com.todoroo.astrid.activity.FilterShortcutActivity;
import com.todoroo.astrid.activity.ShareLinkActivity;
@ -54,7 +53,6 @@ import dagger.Provides;
TaskEditActivity.class,
ShareLinkActivity.class,
TagSettingsActivity.class,
TagSettingsActivityTablet.class,
CustomFilterActivity.class,
MissedCallActivity.class,
CalendarAlarmListCreator.class,

@ -18,6 +18,9 @@ import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.ListView;
import com.todoroo.astrid.actfm.TagSettingsActivity;
import com.todoroo.astrid.activity.AstridActivity;
import com.todoroo.astrid.activity.TaskListActivity;
import com.todoroo.astrid.activity.TaskListFragment;
import com.todoroo.astrid.adapter.FilterAdapter;
import com.todoroo.astrid.api.AstridApiConstants;
@ -110,6 +113,19 @@ public class NavigationDrawerFragment extends InjectingFragment {
getActivity().finish();
getActivity().startActivity(getActivity().getIntent());
}
} else if ((requestCode == NavigationDrawerFragment.REQUEST_NEW_LIST ||
requestCode == TaskListFragment.ACTIVITY_REQUEST_NEW_FILTER) &&
resultCode == Activity.RESULT_OK) {
if(data == null) {
return;
}
Filter newList = data.getParcelableExtra(TagSettingsActivity.TOKEN_NEW_FILTER);
if (newList != null) {
getActivity().getIntent().putExtra(TaskListActivity.TOKEN_SWITCH_TO_FILTER, newList);
clear();
}
} else {
super.onActivityResult(requestCode, resultCode, data);
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 124 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 127 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 108 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 97 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 114 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 97 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 86 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 88 B

@ -1,60 +1,67 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
** Copyright (c) 2012 Todoroo Inc
**
** See the file "LICENSE" for the full license governing this code.
-->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/settings"
android:background="?attr/asEditBackground"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="100"
android:padding="10dip"
android:paddingTop="0dip" >
<LinearLayout
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/asContentBackground"
android:orientation="vertical">
<include layout="@layout/toolbar" />
<include layout="@layout/toolbar_separator"/>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/settings"
android:background="?attr/asEditBackground"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
android:layout_height="0dp"
android:layout_weight="100"
android:padding="10dip"
android:paddingTop="0dip" >
<RelativeLayout
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingBottom="5dip"
android:paddingTop="5dip" >
<!-- picture -->
<TextView
android:id="@+id/tag_label"
style="@style/TextAppearance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:text="@string/actfm_TVA_tag_label" />
android:orientation="vertical" >
<LinearLayout
android:background="?attr/asEditRowBackground"
<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/tag_label"
android:layout_marginTop="14dip"
android:padding="10dip"
android:paddingBottom="14dip" >
<EditText
android:id="@+id/tag_name"
android:textColor="@android:color/black"
android:paddingBottom="5dip"
android:paddingTop="5dip" >
<!-- picture -->
<TextView
android:id="@+id/tag_label"
style="@style/TextAppearance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:text="@string/actfm_TVA_tag_label" />
<LinearLayout
android:background="?attr/asEditRowBackground"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="#00000000"
android:hint="@string/actfm_TVA_tag_name_hint"
android:singleLine="true"
android:inputType="textCapSentences"
android:imeOptions="flagNoExtractUi"
android:textSize="15sp" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>
</ScrollView>
android:layout_below="@id/tag_label"
android:layout_marginTop="14dip"
android:padding="10dip"
android:paddingBottom="14dip" >
<EditText
android:id="@+id/tag_name"
android:textColor="@android:color/black"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="#00000000"
android:hint="@string/actfm_TVA_tag_name_hint"
android:singleLine="true"
android:inputType="textCapSentences"
android:imeOptions="flagNoExtractUi"
android:textSize="15sp" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>
</ScrollView>
</LinearLayout>

@ -23,12 +23,4 @@
android:title="@string/gtasks_GTA_clear_completed"
android:visible="false"
tasks:showAsAction="never" />
<item
android:id="@+id/menu_new_list"
android:title="@string/FLA_new_list"
tasks:showAsAction="never" />
<item
android:id="@+id/menu_new_filter"
android:title="@string/FLA_new_filter"
tasks:showAsAction="never" />
</menu>

@ -45,7 +45,6 @@
<string name="SSD_sort_modified">بواسطة التعديل الأخير</string>
<string name="SSD_save_temp">مره واحده فقط</string>
<string name="SSD_save_always">دائماً</string>
<string name="FLA_new_list">قائمة جديدة</string>
<string name="FLA_no_filter_selected">لم يتم اختيار فلتر! ارجو اختيار فلتر او قائمة</string>
<string name="TEA_title_hint">اسم المهمة</string>
<string name="TEA_deadline_hint">تعيين تاريخ الاستحقاق</string>

@ -67,7 +67,6 @@
<string name="SSD_save_always">Винаги</string>
<string name="FLA_search_filter">Съвпада с \'%s\'</string>
<string name="FLA_new_filter">Нов филтър</string>
<string name="FLA_new_list">Нов списък</string>
<string name="FLA_no_filter_selected">Няма избран филтър! Моля изберете филтър или списък.</string>
<string name="TEA_title_hint">Име на задачата</string>
<string name="TEA_importance_label">Приоритет</string>

@ -62,7 +62,6 @@
<string name="SSD_save_always">Sempre</string>
<string name="FLA_search_filter">Coincidència \'%s\'</string>
<string name="FLA_new_filter">Filtre nou</string>
<string name="FLA_new_list">Llista nova</string>
<string name="FLA_no_filter_selected">No heu seleccionat cap filtre. Seleccioneu un filtre o una llista.</string>
<string name="TEA_title_hint">Resum de la tasca</string>
<string name="TEA_importance_label">Importància</string>

@ -64,7 +64,6 @@
<string name="SSD_save_always">Vždy</string>
<string name="FLA_search_filter">Hledanému \'%s\' odpovídá:</string>
<string name="FLA_new_filter">Nový Filtr</string>
<string name="FLA_new_list">Nový seznam</string>
<string name="FLA_no_filter_selected">Není vybrán žádný filtr! Vyberte prosím filtr nebo seznam.</string>
<string name="TEA_title_hint">Souhrn úkolu</string>
<string name="TEA_importance_label">Důležitost</string>

@ -57,7 +57,6 @@
<string name="SSD_save_always">Altid</string>
<string name="FLA_search_filter">Matcher \'%s\'</string>
<string name="FLA_new_filter">Nyt filter</string>
<string name="FLA_new_list">Ny liste</string>
<string name="FLA_no_filter_selected">Der er ikke valgt et filter! Vælg venligst et filter eller en liste.</string>
<string name="TEA_title_hint">Opgave Overskrift</string>
<string name="TEA_importance_label">Vigtighed</string>

@ -63,7 +63,6 @@
<string name="SSD_save_always">Immer</string>
<string name="FLA_search_filter">Übereinstimmung mit %s</string>
<string name="FLA_new_filter">Neuer Filter</string>
<string name="FLA_new_list">Neue Liste</string>
<string name="FLA_no_filter_selected">Kein Filter ausgewählt! Bitte Filter oder Liste auswählen.</string>
<string name="TEA_title_hint">Aufgabenname</string>
<string name="TEA_importance_label">Priorität</string>

@ -62,7 +62,6 @@
<string name="SSD_save_always">Πάντα</string>
<string name="FLA_search_filter">Ταιριάζουν \'%s\'</string>
<string name="FLA_new_filter">Νέο φίλτρο</string>
<string name="FLA_new_list">Νέα λίστα</string>
<string name="FLA_no_filter_selected">Δεν επιλέχθηκε φίλτρο! Παρακαλώ επιλέξτε ενα φίλτρο η μια λίστα</string>
<string name="TEA_title_hint">Όνομα καθήκοντος</string>
<string name="TEA_importance_label">Προτεραιότητα</string>

@ -64,7 +64,6 @@
<string name="SSD_save_always">Siempre</string>
<string name="FLA_search_filter">Coincidencias con \'%s\'</string>
<string name="FLA_new_filter">Nuevo filtro</string>
<string name="FLA_new_list">Nueva lista</string>
<string name="FLA_no_filter_selected">No hay filtro seleccionado! Por favor seleccione un filtro o lista.</string>
<string name="TEA_title_hint">Nombre de la tarea</string>
<string name="TEA_importance_label">Prioridad</string>

@ -21,7 +21,6 @@
<string name="SSD_save_always">Aina</string>
<string name="FLA_search_filter">Sopivuus \'%s\'</string>
<string name="FLA_new_filter">Uusi suodin</string>
<string name="FLA_new_list">Uusi lista</string>
<string name="FLA_no_filter_selected">Suodatinta ei valittu! Valitse suodatin tai lista.</string>
<string name="TEA_title_hint">Tehtävän nimi</string>
<string name="TEA_importance_label">Etusija</string>

@ -64,7 +64,6 @@
<string name="SSD_save_always">Toujours</string>
<string name="FLA_search_filter">Correspondant \'%s\'</string>
<string name="FLA_new_filter">Nouveau filtre</string>
<string name="FLA_new_list">Nouvelle liste</string>
<string name="FLA_no_filter_selected">Aucun filtre sélectionné ! Veuillez sélectionner un filtre ou une liste.</string>
<string name="TEA_title_hint">Nom de la tâche</string>
<string name="TEA_importance_label">Priorité</string>

@ -61,7 +61,6 @@
<string name="SSD_save_always">Sempre</string>
<string name="FLA_search_filter">Confrontando \'%s\'</string>
<string name="FLA_new_filter">Nuovo Filtro</string>
<string name="FLA_new_list">Nuova lista</string>
<string name="FLA_no_filter_selected">Filtro non selezionato! Perfavore seleziona un filtro o una lista.</string>
<string name="TEA_importance_label">Priorità</string>
<string name="TEA_note_label">Descrizione</string>

@ -64,7 +64,6 @@
<string name="SSD_save_always">תמיד</string>
<string name="FLA_search_filter">התאים ל\'%s\'</string>
<string name="FLA_new_filter">מַסְנֵן חדש</string>
<string name="FLA_new_list">רשימה חדשה</string>
<string name="FLA_no_filter_selected">לא נבחר מַסְנֵן! אנא בחר מַסְנֵן או רשימה.</string>
<string name="TEA_title_hint">שם המשימה</string>
<string name="TEA_importance_label">עדיפות</string>

@ -64,7 +64,6 @@
<string name="SSD_save_always">設定の保存</string>
<string name="FLA_search_filter">「%s」の検索結果</string>
<string name="FLA_new_filter">新しいフィルタ</string>
<string name="FLA_new_list">新しいリスト</string>
<string name="FLA_no_filter_selected">フィルターが選択されていません! フィルターかリストを選択してください.</string>
<string name="TEA_title_hint">タスク名</string>
<string name="TEA_importance_label">優先順位</string>

@ -67,7 +67,6 @@
<string name="SSD_save_always">항상 정렬</string>
<string name="FLA_search_filter">\'%s\' 검색 중</string>
<string name="FLA_new_filter">새 필터</string>
<string name="FLA_new_list">새 목록</string>
<string name="FLA_no_filter_selected">필터를 선택하지 않았습니다! 필터나 목록을 선택하세요.</string>
<string name="TEA_title_hint">일정 이름</string>
<string name="TEA_importance_label">우선순위</string>

@ -52,7 +52,6 @@
<string name="SSD_save_always">Alltid</string>
<string name="FLA_search_filter">Matcher \'%s\'</string>
<string name="FLA_new_filter">Nytt filter</string>
<string name="FLA_new_list">Ny liste</string>
<string name="TEA_title_hint">Oppgavesammendrag</string>
<string name="TEA_importance_label">Viktighet</string>
<string name="TEA_hideUntil_label">Skjul frem til</string>

@ -64,7 +64,6 @@
<string name="SSD_save_always">Altijd</string>
<string name="FLA_search_filter">Bevat \'%s\'</string>
<string name="FLA_new_filter">Nieuw Filter</string>
<string name="FLA_new_list">Nieuwe lijst</string>
<string name="FLA_no_filter_selected">Geen filter geselecteerd! Selecteer een filter of lijst.</string>
<string name="TEA_title_hint">Taak naam</string>
<string name="TEA_importance_label">Prioriteit</string>

@ -64,7 +64,6 @@
<string name="SSD_save_always">Zawsze</string>
<string name="FLA_search_filter">Pasujących do: %s</string>
<string name="FLA_new_filter">Nowy filtr</string>
<string name="FLA_new_list">Nowa lista</string>
<string name="FLA_no_filter_selected">Nie wybraon filtra! Wybierz filtr lub listę.</string>
<string name="TEA_title_hint">Tytuł zadania</string>
<string name="TEA_importance_label">Priorytet</string>

@ -63,7 +63,6 @@
<string name="SSD_save_always">Sempre</string>
<string name="FLA_search_filter">Encontradas para \'%s\'</string>
<string name="FLA_new_filter">Novo Filtro</string>
<string name="FLA_new_list">Nova lista</string>
<string name="FLA_no_filter_selected">Sem filtro selecionado! Selecione um filtro ou lista.</string>
<string name="TEA_title_hint">Nome da tarefa</string>
<string name="TEA_importance_label">Prioridade</string>

@ -66,7 +66,6 @@
<string name="SSD_save_always">Sempre</string>
<string name="FLA_search_filter">Coincidente com %s</string>
<string name="FLA_new_filter">Novo filtro</string>
<string name="FLA_new_list">Nova lista</string>
<string name="FLA_no_filter_selected">Não selecionou o filtro! Selecione um filtro ou uma lista.</string>
<string name="TEA_title_hint">Nome da tarefa</string>
<string name="TEA_importance_label">Prioridade</string>

@ -64,7 +64,6 @@
<string name="SSD_save_always">Всегда</string>
<string name="FLA_search_filter">Соответствует \'%s\'</string>
<string name="FLA_new_filter">Новый фильтр</string>
<string name="FLA_new_list">Новый список</string>
<string name="FLA_no_filter_selected">Фильтры не выбраны! Пожалуйста, выберите фильтр или список</string>
<string name="TEA_title_hint">Имя задачи</string>
<string name="TEA_importance_label">Приоритет</string>

@ -64,7 +64,6 @@
<string name="SSD_save_always">Vždy</string>
<string name="FLA_search_filter">Zodpovedá \'%s\'</string>
<string name="FLA_new_filter">Nový filter</string>
<string name="FLA_new_list">Nový zoznam</string>
<string name="FLA_no_filter_selected">Nieje vybraný filter! Prosím, zvoľ si filter, alebo zoznam.</string>
<string name="TEA_title_hint">Názov úlohy</string>
<string name="TEA_importance_label">Priorita</string>

@ -67,7 +67,6 @@
<string name="SSD_save_always">Vedno</string>
<string name="FLA_search_filter">Ujemanje za \'%s\'</string>
<string name="FLA_new_filter">Nov filter</string>
<string name="FLA_new_list">Nov seznam</string>
<string name="FLA_no_filter_selected">Noben filter ni izbran. Izberite filter ali seznam.</string>
<string name="TEA_title_hint">Poimenovanje opravka</string>
<string name="TEA_importance_label">Prioriteta</string>

@ -64,7 +64,6 @@
<string name="SSD_save_always">Alltid</string>
<string name="FLA_search_filter">Matchar \'%s\'</string>
<string name="FLA_new_filter">Nytt filter</string>
<string name="FLA_new_list">Ny lista</string>
<string name="FLA_no_filter_selected">Inget filter valt! Välj ett filter eller en lista.</string>
<string name="TEA_title_hint">Uppgiftsnamn</string>
<string name="TEA_importance_label">Prioritet</string>

@ -61,7 +61,6 @@
<string name="SSD_save_always">Her zaman</string>
<string name="FLA_search_filter">\'%s\' ile eşleşenler</string>
<string name="FLA_new_filter">Yeni Filtre</string>
<string name="FLA_new_list">Yeni Liste</string>
<string name="FLA_no_filter_selected">Süzgeç seçilmemiş! Lütfen bir süzgeç ya da liste seçin.</string>
<string name="TEA_note_label">ıklama</string>
<string name="TEA_estimatedDuration_label">Ne kadar sürecek?</string>

@ -67,7 +67,6 @@
<string name="SSD_save_always">Завжди</string>
<string name="FLA_search_filter">Відповідності до %s</string>
<string name="FLA_new_filter">Новий фільтр</string>
<string name="FLA_new_list">Новий список</string>
<string name="FLA_no_filter_selected">Не вибраний жодний фільтр! Будь ласка, виберіть фільтр або список.</string>
<string name="TEA_title_hint">Ім\'я завдання</string>
<string name="TEA_importance_label">Пріоритет</string>

@ -61,7 +61,6 @@
<string name="SSD_save_always">总是</string>
<string name="FLA_search_filter">比对 \'%s\'</string>
<string name="FLA_new_filter">新建过滤器</string>
<string name="FLA_new_list">新建列表</string>
<string name="FLA_no_filter_selected">还没有选定过滤器呢!请选择一个过滤器或列表呗。</string>
<string name="TEA_note_label">描述</string>
<string name="TEA_estimatedDuration_label">要花多久时间?</string>

@ -63,7 +63,6 @@
<string name="SSD_save_always">總是</string>
<string name="FLA_search_filter">比對 \'%s\'</string>
<string name="FLA_new_filter">新建過濾器</string>
<string name="FLA_new_list">新建列表</string>
<string name="FLA_no_filter_selected">還沒有選定過濾器呢!請選擇一個過濾器或列表唄。</string>
<string name="TEA_title_hint">工作名稱</string>
<string name="TEA_importance_label">優先權</string>

@ -57,6 +57,7 @@
<attr name="toolbarSeparatorHeight" format="dimension" />
<attr name="ic_action_filter" format="reference"/>
<attr name="ic_action_cloud" format="reference"/>
<attr name="ic_action_new_tag" format="reference"/>
<declare-styleable name="DateAndTimePicker">
<attr name="shortcutLabels" format="reference" />

@ -133,9 +133,6 @@
<!-- Menu: new filter -->
<string name="FLA_new_filter">New Filter</string>
<!-- slide 10e: Button: new list -->
<string name="FLA_new_list">New List</string>
<!-- Alert when creating a shortcut without selecting a filter -->
<string name="FLA_no_filter_selected">No filter selected! Please select a filter or list.</string>

@ -14,6 +14,8 @@
<!-- slide 25a: Dialog: new list -->
<string name="tag_new_list">New List</string>
<string name="new_tag">New tag</string>
<!-- Dialog: task created without title -->
<string name="tag_no_title_error">Please enter a name for this list first!</string>

@ -67,6 +67,7 @@
<item name="ic_action_label">@drawable/ic_label_black_24dp</item>
<item name="ic_action_filter">@drawable/ic_filter_list_black_24dp</item>
<item name="ic_action_cloud">@drawable/ic_cloud_queue_black_24dp</item>
<item name="ic_action_new_tag">@drawable/ic_add_black_24dp</item>
</style>
<style name="Tasks.Dark">
@ -110,6 +111,7 @@
<item name="ic_action_label">@drawable/ic_label_white_24dp</item>
<item name="ic_action_filter">@drawable/ic_filter_list_white_24dp</item>
<item name="ic_action_cloud">@drawable/ic_cloud_queue_white_24dp</item>
<item name="ic_action_new_tag">@drawable/ic_add_white_24dp</item>
</style>
<style name="ActionBar.TitleText" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">

Loading…
Cancel
Save