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

Add ability to add shortcut from list settings page

Browse Source
pull/14/head
Sam Bosley 13 years ago
parent 99b057243a
commit b70f7fd1a3
3 changed files with 104 additions and 52 deletions
Show Stats Download Patch File Download Diff File

18
astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
Unescape Escape View File

@ -37,6 +37,9 @@ import com.todoroo.andlib.utility.Preferences;
import com.todoroo.astrid.actfm.ActFmCameraModule.CameraResultCallback; import com.todoroo.astrid.actfm.ActFmCameraModule.CameraResultCallback;
import com.todoroo.astrid.actfm.sync.ActFmPreferenceService; import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
import com.todoroo.astrid.actfm.sync.ActFmSyncService; import com.todoroo.astrid.actfm.sync.ActFmSyncService;
import com.todoroo.astrid.activity.FilterListFragment;
import com.todoroo.astrid.activity.ShortcutActivity;
import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.data.TagData; import com.todoroo.astrid.data.TagData;
import com.todoroo.astrid.service.StatisticsConstants; import com.todoroo.astrid.service.StatisticsConstants;
import com.todoroo.astrid.service.StatisticsService; import com.todoroo.astrid.service.StatisticsService;
@ -60,6 +63,7 @@ public class TagSettingsActivity extends FragmentActivity {
private static final String MEMBERS_IN_PROGRESS = "members"; //$NON-NLS-1$ private static final String MEMBERS_IN_PROGRESS = "members"; //$NON-NLS-1$
private TagData tagData; private TagData tagData;
private Filter filter; // Used for creating shortcuts, only initialized if necessary
@Autowired TagDataService tagDataService; @Autowired TagDataService tagDataService;
@ -173,6 +177,20 @@ public class TagSettingsActivity extends FragmentActivity {
} }
}); });
if (isNewTag) {
findViewById(R.id.create_shortcut_container).setVisibility(View.GONE);
} else {
findViewById(R.id.create_shortcut).setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
if (filter == null) {
filter = TagFilterExposer.filterFromTagData(TagSettingsActivity.this, tagData);
}
FilterListFragment.showCreateShortcutDialog(TagSettingsActivity.this, ShortcutActivity.createIntent(filter), filter);
}
});
}
refreshSettingsPage(); refreshSettingsPage();
} }

108
astrid/res/layout/tag_settings_activity.xml
Unescape Escape View File

@ -138,46 +138,80 @@
android:layout_marginTop="10dip" android:layout_marginTop="10dip"
android:hint="@string/actfm_TVA_tag_description_hint" /> android:hint="@string/actfm_TVA_tag_description_hint" />
</RelativeLayout>
<!-- Footer -->
<LinearLayout
android:id="@+id/listSettingsMore"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dip"
android:orientation="vertical"
android:visibility="gone">
<View <View
android:id="@+id/divider"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="1dip" android:layout_height="1dip"
android:background="@android:drawable/divider_horizontal_dark" /> android:layout_marginTop="10dip"
android:layout_below="@id/tag_description"
<TextView style="@style/TEA_Separator" />
android:layout_width="fill_parent"
android:layout_height="wrap_content" <!-- Footer -->
android:layout_marginTop="10dip" <LinearLayout
style="@style/TextAppearance.GEN_EditLabel" android:id="@+id/listSettingsMore"
android:text="@string/actfm_TVA_tag_owner_label" /> android:layout_width="wrap_content"
android:layout_height="wrap_content"
<TextView android:layout_alignParentLeft="true"
android:id="@+id/tag_owner" android:layout_below="@id/divider"
android:layout_width="fill_parent" android:orientation="vertical"
android:layout_height="wrap_content" android:visibility="gone">
android:layout_marginBottom="10dip"
android:textSize="20sp"/>
<TextView
<CheckBox android:layout_width="wrap_content"
android:id="@+id/tag_silenced" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_marginTop="10dip"
android:layout_height="wrap_content" style="@style/TextAppearance.GEN_EditLabel"
android:layout_marginTop="10dip" android:text="@string/actfm_TVA_tag_owner_label" />
android:paddingLeft="45dip"
style="@style/TextAppearance" <TextView
android:text="@string/actfm_TVA_silence_label" /> android:id="@+id/tag_owner"
android:layout_width="wrap_content"
</LinearLayout> android:layout_height="wrap_content"
android:layout_marginBottom="10dip"
android:textSize="20sp"/>
<CheckBox
android:id="@+id/tag_silenced"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dip"
android:paddingLeft="45dip"
style="@style/TextAppearance"
android:text="@string/actfm_TVA_silence_label" />
</LinearLayout>
<LinearLayout
android:id="@+id/create_shortcut_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/divider"
android:layout_alignParentRight="true"
android:gravity="right"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dip"
style="@style/TextAppearance.GEN_EditLabel"
android:text="@string/FLA_shortcut_dialog_title" />
<ImageButton
android:id="@+id/create_shortcut"
android:layout_width="75dip"
android:maxWidth="50dip"
android:layout_height="50dip"
android:maxHeight="50dip"
android:background="@android:color/transparent"
android:src="@android:drawable/ic_media_ff"
android:scaleType="fitCenter"/>
</LinearLayout>
</RelativeLayout>
</LinearLayout> </LinearLayout>

30
astrid/src/com/todoroo/astrid/activity/FilterListFragment.java
Unescape Escape View File

@ -322,7 +322,7 @@ public class FilterListFragment extends ListFragment {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
if (which == 0) { if (which == 0) {
showCreateShortcutDialog(ShortcutActivity.createIntent(filter), filter); showCreateShortcutDialog(getActivity(), ShortcutActivity.createIntent(filter), filter);
} else { } else {
startActivityForResult(intents[which - 1], REQUEST_CUSTOM_INTENT); startActivityForResult(intents[which - 1], REQUEST_CUSTOM_INTENT);
} }
@ -390,19 +390,19 @@ public class FilterListFragment extends ListFragment {
* @param shortcutIntent * @param shortcutIntent
* @param label * @param label
*/ */
private void createShortcut(Filter filter, Intent shortcutIntent, String label) { private static void createShortcut(Activity activity, Filter filter, Intent shortcutIntent, String label) {
if(label.length() == 0) if(label.length() == 0)
return; return;
Bitmap emblem = filter.listingIcon; Bitmap emblem = filter.listingIcon;
if(emblem == null) if(emblem == null)
emblem = ((BitmapDrawable) getResources().getDrawable( emblem = ((BitmapDrawable) activity.getResources().getDrawable(
R.drawable.gl_list)).getBitmap(); R.drawable.gl_list)).getBitmap();
// create icon by superimposing astrid w/ icon // create icon by superimposing astrid w/ icon
DisplayMetrics metrics = new DisplayMetrics(); DisplayMetrics metrics = new DisplayMetrics();
getActivity().getWindowManager().getDefaultDisplay().getMetrics(metrics); activity.getWindowManager().getDefaultDisplay().getMetrics(metrics);
Bitmap bitmap = ((BitmapDrawable) getResources().getDrawable( Bitmap bitmap = ((BitmapDrawable) activity.getResources().getDrawable(
R.drawable.icon_blank)).getBitmap(); R.drawable.icon_blank)).getBitmap();
bitmap = bitmap.copy(bitmap.getConfig(), true); bitmap = bitmap.copy(bitmap.getConfig(), true);
Canvas canvas = new Canvas(bitmap); Canvas canvas = new Canvas(bitmap);
@ -417,9 +417,9 @@ public class FilterListFragment extends ListFragment {
createShortcutIntent.putExtra(Intent.EXTRA_SHORTCUT_ICON, bitmap); createShortcutIntent.putExtra(Intent.EXTRA_SHORTCUT_ICON, bitmap);
createShortcutIntent.setAction("com.android.launcher.action.INSTALL_SHORTCUT"); //$NON-NLS-1$ createShortcutIntent.setAction("com.android.launcher.action.INSTALL_SHORTCUT"); //$NON-NLS-1$
getActivity().sendBroadcast(createShortcutIntent); activity.sendBroadcast(createShortcutIntent);
Toast.makeText(getActivity(), Toast.makeText(activity,
getString(R.string.FLA_toast_onCreateShortcut, label), Toast.LENGTH_LONG).show(); activity.getString(R.string.FLA_toast_onCreateShortcut, label), Toast.LENGTH_LONG).show();
} }
@Override @Override
@ -452,7 +452,7 @@ public class FilterListFragment extends ListFragment {
final Intent shortcutIntent = item.getIntent(); final Intent shortcutIntent = item.getIntent();
FilterListItem filter = ((FilterAdapter.ViewHolder)info.targetView.getTag()).item; FilterListItem filter = ((FilterAdapter.ViewHolder)info.targetView.getTag()).item;
if(filter instanceof Filter) if(filter instanceof Filter)
showCreateShortcutDialog(shortcutIntent, (Filter)filter); showCreateShortcutDialog(getActivity(), shortcutIntent, (Filter)filter);
return true; return true;
} }
@ -470,11 +470,11 @@ public class FilterListFragment extends ListFragment {
return false; return false;
} }
private void showCreateShortcutDialog(final Intent shortcutIntent, public static void showCreateShortcutDialog(final Activity activity, final Intent shortcutIntent,
final Filter filter) { final Filter filter) {
FrameLayout frameLayout = new FrameLayout(getActivity()); FrameLayout frameLayout = new FrameLayout(activity);
frameLayout.setPadding(10, 0, 10, 0); frameLayout.setPadding(10, 0, 10, 0);
final EditText editText = new EditText(getActivity()); final EditText editText = new EditText(activity);
if(filter.listingTitle == null) if(filter.listingTitle == null)
filter.listingTitle = ""; //$NON-NLS-1$ filter.listingTitle = ""; //$NON-NLS-1$
editText.setText(filter.listingTitle. editText.setText(filter.listingTitle.
@ -487,7 +487,7 @@ public class FilterListFragment extends ListFragment {
@Override @Override
public void run() { public void run() {
String label = editText.getText().toString(); String label = editText.getText().toString();
createShortcut(filter, shortcutIntent, label); createShortcut(activity, filter, shortcutIntent, label);
} }
}; };
editText.setOnEditorActionListener(new OnEditorActionListener() { editText.setOnEditorActionListener(new OnEditorActionListener() {
@ -501,7 +501,7 @@ public class FilterListFragment extends ListFragment {
} }
}); });
new AlertDialog.Builder(getActivity()) new AlertDialog.Builder(activity)
.setTitle(R.string.FLA_shortcut_dialog_title) .setTitle(R.string.FLA_shortcut_dialog_title)
.setMessage(R.string.FLA_shortcut_dialog) .setMessage(R.string.FLA_shortcut_dialog)
.setView(frameLayout) .setView(frameLayout)
@ -512,7 +512,7 @@ public class FilterListFragment extends ListFragment {
} }
}) })
.setNegativeButton(android.R.string.cancel, null) .setNegativeButton(android.R.string.cancel, null)
.show().setOwnerActivity(getActivity()); .show().setOwnerActivity(activity);
} }
public void clear() { public void clear() {

Write Preview
Loading…
Cancel
Save