Update task list activity menu

* Fix search menu missing from action bar
* Remove unused icons
pull/73/head
Alex Baker 12 years ago
parent 0a80b3ba6e
commit a88c0c1ebb

@ -175,14 +175,6 @@ public class ThemeService {
return R.drawable.ic_action_cancel_light; return R.drawable.ic_action_cancel_light;
case R.drawable.ic_action_new_attachment: case R.drawable.ic_action_new_attachment:
return R.drawable.ic_action_new_attachment_light; return R.drawable.ic_action_new_attachment_light;
case R.drawable.ic_action_gear:
return R.drawable.ic_action_gear_light;
case R.drawable.icn_menu_refresh:
return R.drawable.icn_menu_refresh_dark;
case R.drawable.icn_menu_filters:
return R.drawable.icn_menu_filters_dark;
case R.drawable.icn_menu_sort_by_size:
return R.drawable.icn_menu_sort_by_size_dark;
case R.drawable.filter_calendar: case R.drawable.filter_calendar:
return R.drawable.filter_calendar_dark; return R.drawable.filter_calendar_dark;
case R.drawable.filter_inbox: case R.drawable.filter_inbox:

@ -15,9 +15,7 @@ import android.speech.SpeechRecognizer;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ImageButton; import android.widget.ImageButton;
import android.widget.Toast;
import com.todoroo.aacenc.ContextManager;
import com.todoroo.aacenc.RecognizerApi; import com.todoroo.aacenc.RecognizerApi;
import com.todoroo.aacenc.RecognizerApi.RecognizerApiListener; import com.todoroo.aacenc.RecognizerApi.RecognizerApiListener;
import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.AndroidUtilities;
@ -26,7 +24,6 @@ import com.todoroo.astrid.utility.Constants;
import org.tasks.R; import org.tasks.R;
import java.io.IOException;
import java.util.List; import java.util.List;
@TargetApi(8) @TargetApi(8)
@ -115,15 +112,4 @@ public class VoiceRecognizer {
instance.recognizerApi.cancel(); instance.recognizerApi.cancel();
} }
} }
public void convert(String filePath) {
if (instance != null && instance.recognizerApi != null) {
try {
instance.recognizerApi.convert(filePath);
} catch (IOException e) {
Toast.makeText(ContextManager.getContext(), R.string.audio_err_encoding,
Toast.LENGTH_LONG).show();
}
}
}
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 871 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 386 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 419 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 296 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 320 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 805 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 575 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 802 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 787 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 197 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 201 B

@ -1,52 +1,46 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"> <menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tasks="http://schemas.android.com/apk/res-auto">
<item <item
android:id="@+id/menu_search" android:id="@+id/menu_search"
android:showAsAction="ifRoom"
android:title="@string/TLA_menu_search" android:title="@string/TLA_menu_search"
android:icon="?attr/ic_action_search"/> android:icon="?attr/ic_action_search"
tasks:showAsAction="ifRoom" />
<item <item
android:id="@+id/menu_delete_list" android:id="@+id/menu_delete_list"
android:showAsAction="never"
android:title="@string/tag_cm_delete" android:title="@string/tag_cm_delete"
android:icon="?attr/ic_action_discard" android:visible="false"
android:visible="false"/> tasks:showAsAction="never" />
<item <item
android:id="@+id/menu_rename_list" android:id="@+id/menu_rename_list"
android:showAsAction="never"
android:title="@string/tag_cm_rename" android:title="@string/tag_cm_rename"
android:icon="@drawable/filter_pencil" android:icon="@drawable/filter_pencil"
android:visible="false"/> android:visible="false"
tasks:showAsAction="never" />
<item <item
android:id="@+id/menu_sort" android:id="@+id/menu_sort"
android:showAsAction="never"
android:title="@string/TLA_menu_sort" android:title="@string/TLA_menu_sort"
android:icon="@drawable/icn_menu_sort_by_size"/> tasks:showAsAction="never" />
<item <item
android:id="@+id/menu_sync" android:id="@+id/menu_sync"
android:showAsAction="never"
android:title="@string/TLA_menu_sync" android:title="@string/TLA_menu_sync"
android:icon="@drawable/icn_menu_refresh"/> tasks:showAsAction="never" />
<item <item
android:id="@+id/menu_clear_completed" android:id="@+id/menu_clear_completed"
android:showAsAction="never"
android:title="@string/gtasks_GTA_clear_completed" android:title="@string/gtasks_GTA_clear_completed"
android:icon="@android:drawable/ic_input_delete" android:visible="false"
android:visible="false"/> tasks:showAsAction="never" />
<item <item
android:id="@+id/menu_new_list" android:id="@+id/menu_new_list"
android:showAsAction="never"
android:title="@string/FLA_new_list" android:title="@string/FLA_new_list"
android:icon="?attr/ic_action_new"/> tasks:showAsAction="never" />
<item <item
android:id="@+id/menu_new_filter" android:id="@+id/menu_new_filter"
android:showAsAction="never"
android:title="@string/FLA_new_filter" android:title="@string/FLA_new_filter"
android:icon="@drawable/icn_menu_filters"/> tasks:showAsAction="never" />
<item <item
android:id="@+id/menu_settings" android:id="@+id/menu_settings"
android:showAsAction="never"
android:title="@string/TLA_menu_settings" android:title="@string/TLA_menu_settings"
android:icon="?attr/ic_action_gear" /> tasks:showAsAction="never" />
</menu> </menu>

@ -27,12 +27,10 @@
<attr name="asQuickaddBackgroundColor" format="color" /> <attr name="asQuickaddBackgroundColor" format="color" />
<attr name="asFilterSelectedIcon" format="reference"/> <attr name="asFilterSelectedIcon" format="reference"/>
<attr name="asTaskRowSelector" format="reference" /> <attr name="asTaskRowSelector" format="reference" />
<attr name="ic_action_gear" format="reference"/>
<attr name="ic_action_camera" format="reference"/> <attr name="ic_action_camera" format="reference"/>
<attr name="ic_action_new" format="reference"/> <attr name="ic_action_new" format="reference"/>
<attr name="ic_action_mic" format="reference" /> <attr name="ic_action_mic" format="reference" />
<attr name="ic_action_search" format="reference"/> <attr name="ic_action_search" format="reference"/>
<attr name="ic_action_discard" format="reference"/>
<attr name="ic_drawer" format="reference"/> <attr name="ic_drawer" format="reference"/>
<attr name="drawer_background" format="color"/> <attr name="drawer_background" format="color"/>
<attr name="drawer_text" format="color"/> <attr name="drawer_text" format="color"/>

@ -30,12 +30,10 @@
<item name="asTaskRowSelector">@drawable/task_row_bg_dark</item> <item name="asTaskRowSelector">@drawable/task_row_bg_dark</item>
<item name="asHeaderTextColor">?attr/asThemeTextColor</item> <item name="asHeaderTextColor">?attr/asThemeTextColor</item>
<item name="asHeaderTextColorInverse">?attr/asAbBackgroundColor</item> <item name="asHeaderTextColorInverse">?attr/asAbBackgroundColor</item>
<item name="ic_action_gear">@drawable/ic_action_gear_light</item>
<item name="ic_action_camera">@drawable/ic_action_camera_light</item> <item name="ic_action_camera">@drawable/ic_action_camera_light</item>
<item name="ic_action_mic">@drawable/ic_action_mic_light</item> <item name="ic_action_mic">@drawable/ic_action_mic_light</item>
<item name="ic_action_new">@drawable/ic_action_new_light</item> <item name="ic_action_new">@drawable/ic_action_new_light</item>
<item name="ic_action_search">@drawable/ic_action_search_light</item> <item name="ic_action_search">@drawable/ic_action_search_light</item>
<item name="ic_action_discard">@drawable/ic_action_discard_light</item>
<item name="ic_drawer">@drawable/ic_drawer_light</item> <item name="ic_drawer">@drawable/ic_drawer_light</item>
<item name="drawer_background">#303030</item> <item name="drawer_background">#303030</item>
<item name="drawer_text">#ffffff</item> <item name="drawer_text">#ffffff</item>
@ -74,12 +72,10 @@
<item name="asTaskRowSelector">@drawable/task_row_bg_white</item> <item name="asTaskRowSelector">@drawable/task_row_bg_white</item>
<item name="asThemeTextColor">@color/dark_blue_theme_color</item> <item name="asThemeTextColor">@color/dark_blue_theme_color</item>
<item name="asAbBackgroundColor">#e9e9e9</item> <item name="asAbBackgroundColor">#e9e9e9</item>
<item name="ic_action_gear">@drawable/ic_action_gear</item>
<item name="ic_action_camera">@drawable/ic_action_camera</item> <item name="ic_action_camera">@drawable/ic_action_camera</item>
<item name="ic_action_mic">@drawable/ic_action_mic</item> <item name="ic_action_mic">@drawable/ic_action_mic</item>
<item name="ic_action_new">@drawable/ic_action_new</item> <item name="ic_action_new">@drawable/ic_action_new</item>
<item name="ic_action_search">@drawable/ic_action_search</item> <item name="ic_action_search">@drawable/ic_action_search</item>
<item name="ic_action_discard">@drawable/ic_action_discard</item>
<item name="ic_drawer">@drawable/ic_drawer</item> <item name="ic_drawer">@drawable/ic_drawer</item>
<item name="drawer_background">#efefef</item> <item name="drawer_background">#efefef</item>
<item name="drawer_text">#000</item> <item name="drawer_text">#000</item>

Loading…
Cancel
Save