diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java index 1c05bba52..3d13d8ee9 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java @@ -61,7 +61,7 @@ public class TagSettingsActivity extends FragmentActivity { private static final int MENU_SAVE_ID = R.string.TEA_menu_save; private static final int MENU_DISCARD_ID = R.string.TEA_menu_discard; - protected static final int REQUEST_ACTFM_LOGIN = 3; + public static final int REQUEST_ACTFM_LOGIN = 3; private static final String MEMBERS_IN_PROGRESS = "members"; //$NON-NLS-1$ diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java index 4117e1f98..07b85d4ab 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java @@ -19,6 +19,7 @@ import android.view.LayoutInflater; import android.view.MenuInflater; import android.view.MotionEvent; import android.view.View; +import android.view.View.OnClickListener; import android.view.View.OnTouchListener; import android.view.ViewGroup; import android.view.inputmethod.EditorInfo; @@ -213,6 +214,21 @@ public class TagUpdatesFragment extends ListFragment { View activityContainer = getView().findViewById(R.id.no_activity_container); if (cursor.getCount() == 0) { activityContainer.setVisibility(View.VISIBLE); + TextView textView = (TextView)activityContainer.findViewById(R.id.no_activity_message); + if(actFmPreferenceService.isLoggedIn()) { + textView.setText(getActivity().getString(R.string.ENA_no_comments)); + } + else { + textView.setText(getActivity().getString(R.string.UpS_no_activity_log_in)); + activityContainer.setOnClickListener(new OnClickListener() { + + @Override + public void onClick(View v) { + startActivityForResult(new Intent(getActivity(), ActFmLoginActivity.class), + TagSettingsActivity.REQUEST_ACTFM_LOGIN); + } + }); + } listView.setVisibility(View.GONE); } else { diff --git a/astrid/res/layout-land/widget_initialized.xml b/astrid/res/layout-land/widget_initialized.xml index 64712b499..ab48bd6b5 100644 --- a/astrid/res/layout-land/widget_initialized.xml +++ b/astrid/res/layout-land/widget_initialized.xml @@ -11,8 +11,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" - android:paddingTop="2dp" - android:paddingLeft="40dp"> + android:paddingLeft="40dp" + android:paddingRight="5dp"> + android:paddingLeft="40dp" + android:paddingRight="5dp"> - - + android:layout_gravity="center_horizontal" + android:layout_below="@id/no_activity_image" + android:textSize="20dip" + android:gravity="center" + style="@style/TextAppearance" /> + + android:paddingLeft="40dp" + android:paddingRight="5dp"> Latest Astrid News + + Log in to see a record of\nyour progress as well as\nactivity on shared lists. +