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

Killed hardware acceleration, added search menu item, moved some menu items to settings

Browse Source
pull/14/head
Sam Bosley 12 years ago
parent e6460c0a9f
commit 763f06a38a
8 changed files with 16 additions and 32 deletions
Show Stats Download Patch File Download Diff File

2
astrid/AndroidManifest.xml
Unescape Escape View File

@ -70,7 +70,7 @@
<application android:icon="@drawable/icon" android:label="@string/app_name"
android:theme="@style/Theme"
android:name="greendroid.app.GDApplication"
android:hardwareAccelerated="true"
android:hardwareAccelerated="false"
android:manageSpaceActivity="com.todoroo.astrid.core.OldTaskPreferences">
<!-- ====================================================== Activities = -->

2
astrid/res/layout/main_menu_popover_body.xml
Unescape Escape View File

@ -2,7 +2,7 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<ScrollView
android:layout_width="280dip"
android:layout_height="380dip"
android:layout_height="340dip"
android:layout_below="@+id/gdi_arrow_up"
android:background="?attr/asListPopoverBg">
<LinearLayout

5
astrid/res/values/strings-core.xml
Unescape Escape View File

@ -109,6 +109,9 @@
<!-- Menu: Sync Now -->
<string name="TLA_menu_sync">Sync Now!</string>
<!-- Menu: Search -->
<string name="TLA_menu_search">Search</string>
<!-- Menu: Tasks -->
<string name="TLA_menu_lists">Lists</string>
@ -619,7 +622,7 @@
Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
<!-- Title of "Help" option in settings -->
<string name="p_help">Help</string>
<string name="p_help">Support</string>
<!-- ============================================================= Misc == -->

5
astrid/src/com/todoroo/astrid/activity/EditPreferences.java
Unescape Escape View File

@ -18,7 +18,6 @@ import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.ResolveInfo;
import android.content.res.Resources;
import android.net.Uri;
import android.os.Bundle;
import android.preference.CheckBoxPreference;
import android.preference.Preference;
@ -29,6 +28,7 @@ import android.preference.PreferenceScreen;
import android.text.TextUtils;
import android.widget.Toast;
import com.crittercism.NewFeedbackSpringboardActivity;
import com.crittercism.app.Crittercism;
import com.timsu.astrid.R;
import com.todoroo.andlib.service.Autowired;
@ -165,8 +165,7 @@ public class EditPreferences extends TodorooPreferenceActivity {
private void showHelp() {
StatisticsService.reportEvent(StatisticsConstants.TLA_MENU_HELP);
Intent intent = new Intent(Intent.ACTION_VIEW,
Uri.parse(Constants.HELP_URL));
Intent intent = new Intent(this, NewFeedbackSpringboardActivity.class);
startActivity(intent);
}

15
astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
Unescape Escape View File

@ -26,7 +26,6 @@ import android.widget.TextView;
import com.timsu.astrid.R;
import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.andlib.utility.DialogUtilities;
import com.todoroo.astrid.actfm.ActFmLoginActivity;
import com.todoroo.astrid.actfm.TagSettingsActivity;
import com.todoroo.astrid.actfm.TagUpdatesFragment;
import com.todoroo.astrid.actfm.TagViewFragment;
@ -44,7 +43,6 @@ import com.todoroo.astrid.ui.MainMenuPopover;
import com.todoroo.astrid.ui.MainMenuPopover.MainMenuListener;
import com.todoroo.astrid.utility.Constants;
import com.todoroo.astrid.utility.Flags;
import com.todoroo.astrid.welcome.tutorial.WelcomeWalkthrough;
public class TaskListActivity extends AstridActivity implements MainMenuListener {
@ -466,26 +464,19 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
case MainMenuPopover.MAIN_MENU_ITEM_LISTS:
listsNav.performClick();
return;
case MainMenuPopover.MAIN_MENU_ITEM_SEARCH:
onSearchRequested();
return;
case MainMenuPopover.MAIN_MENU_ITEM_FRIENDS:
// Doesn't exist yet
return;
case MainMenuPopover.MAIN_MENU_ITEM_SUGGESTIONS:
// Doesn't exist yet
return;
case MainMenuPopover.MAIN_MENU_ITEM_TUTORIAL:
Intent showWelcomeLogin = new Intent(this, WelcomeWalkthrough.class);
showWelcomeLogin.putExtra(ActFmLoginActivity.SHOW_TOAST, false);
showWelcomeLogin.putExtra(WelcomeWalkthrough.TOKEN_MANUAL_SHOW, true);
startActivity(showWelcomeLogin);
return;
case MainMenuPopover.MAIN_MENU_ITEM_SETTINGS:
if (tlf != null)
tlf.showSettings();
return;
case MainMenuPopover.MAIN_MENU_ITEM_SUPPORT:
if (tlf != null)
tlf.showSupport();
return;
}
tlf.handleOptionsMenuItemSelected(item, customIntent);
}

7
astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
Unescape Escape View File

@ -44,7 +44,6 @@ import android.widget.AdapterView.AdapterContextMenuInfo;
import android.widget.ListView;
import android.widget.TextView;
import com.crittercism.NewFeedbackSpringboardActivity;
import com.timsu.astrid.R;
import com.todoroo.andlib.data.Property;
import com.todoroo.andlib.data.TodorooCursor;
@ -1163,12 +1162,6 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
transitionForTaskEdit();
}
public void showSupport() {
StatisticsService.reportEvent(StatisticsConstants.TLA_MENU_HELP);
Intent intent = new Intent(getActivity(), NewFeedbackSpringboardActivity.class);
startActivity(intent);
}
public void showSettings() {
StatisticsService.reportEvent(StatisticsConstants.TLA_MENU_SETTINGS);
Intent intent = new Intent(getActivity(), EditPreferences.class);

2
astrid/src/com/todoroo/astrid/service/ThemeService.java
Unescape Escape View File

@ -102,6 +102,8 @@ public class ThemeService {
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.icn_menu_search:
// return R.drawable.icn_menu_search_dark;
case R.drawable.icn_menu_lists:
return R.drawable.icn_menu_lists_dark;
case R.drawable.icn_menu_plugins:

10
astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
Unescape Escape View File

@ -23,10 +23,9 @@ public class MainMenuPopover extends FragmentPopover implements InterceptTouchLi
public static final int MAIN_MENU_ITEM_LISTS = R.string.TLA_menu_lists;
public static final int MAIN_MENU_ITEM_FRIENDS = R.string.TLA_menu_friends;
public static final int MAIN_MENU_ITEM_SEARCH = R.string.TLA_menu_search;
public static final int MAIN_MENU_ITEM_SUGGESTIONS = R.string.TLA_menu_suggestions;
public static final int MAIN_MENU_ITEM_TUTORIAL = R.string.TLA_menu_tutorial;
public static final int MAIN_MENU_ITEM_SETTINGS = R.string.TLA_menu_settings;
public static final int MAIN_MENU_ITEM_SUPPORT = R.string.TLA_menu_support;
public interface MainMenuListener {
public void mainMenuItemSelected(int item, Intent customIntent);
@ -99,15 +98,12 @@ public class MainMenuPopover extends FragmentPopover implements InterceptTouchLi
addMenuItem(R.string.TLA_menu_lists,
ThemeService.getDrawable(R.drawable.icn_menu_lists, themeFlags),
MAIN_MENU_ITEM_LISTS, null, topFixed); // Lists item
addMenuItem(R.string.TLA_menu_tutorial,
addMenuItem(R.string.TLA_menu_search,
ThemeService.getDrawable(R.drawable.icn_menu_tutorial, themeFlags),
MAIN_MENU_ITEM_TUTORIAL, null, bottomFixed); // Tutorial item
MAIN_MENU_ITEM_SEARCH, null, topFixed);
addMenuItem(R.string.TLA_menu_settings,
ThemeService.getDrawable(R.drawable.icn_menu_settings, themeFlags),
MAIN_MENU_ITEM_SETTINGS, null, bottomFixed); // Settings item
addMenuItem(R.string.TLA_menu_support,
ThemeService.getDrawable(R.drawable.icn_menu_support, themeFlags),
MAIN_MENU_ITEM_SUPPORT, null, bottomFixed); // Support item
}
@Override

Write Preview
Loading…
Cancel
Save