Fixed widget and added message when there is no activity

pull/14/head
Andrew Shaw 14 years ago
parent 6b24e0a6af
commit 7759ab098a

@ -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_SAVE_ID = R.string.TEA_menu_save;
private static final int MENU_DISCARD_ID = R.string.TEA_menu_discard; 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$ private static final String MEMBERS_IN_PROGRESS = "members"; //$NON-NLS-1$

@ -19,6 +19,7 @@ import android.view.LayoutInflater;
import android.view.MenuInflater; import android.view.MenuInflater;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener;
import android.view.View.OnTouchListener; import android.view.View.OnTouchListener;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.inputmethod.EditorInfo; import android.view.inputmethod.EditorInfo;
@ -213,6 +214,21 @@ public class TagUpdatesFragment extends ListFragment {
View activityContainer = getView().findViewById(R.id.no_activity_container); View activityContainer = getView().findViewById(R.id.no_activity_container);
if (cursor.getCount() == 0) { if (cursor.getCount() == 0) {
activityContainer.setVisibility(View.VISIBLE); 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); listView.setVisibility(View.GONE);
} }
else { else {

@ -11,8 +11,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingTop="2dp" android:paddingLeft="40dp"
android:paddingLeft="40dp"> android:paddingRight="5dp">
<TextView <TextView
android:id="@+id/widget_title" android:id="@+id/widget_title"

@ -11,7 +11,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="40dp"> android:paddingLeft="40dp"
android:paddingRight="5dp">
<TextView <TextView
android:id="@+id/widget_title" android:id="@+id/widget_title"

@ -14,25 +14,31 @@
android:layout_weight="1" android:layout_weight="1"
android:visibility="gone" /> android:visibility="gone" />
<LinearLayout <RelativeLayout
android:id="@+id/no_activity_container" android:id="@+id/no_activity_container"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_weight="100" android:layout_weight="100"
android:orientation="vertical" android:orientation="vertical"
android:layout_gravity="center"
android:visibility="gone"> android:visibility="gone">
<ImageView <ImageView
android:layout_width="wrap_content" android:id="@+id/no_activity_image"
android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_centerInParent="true"
android:src="@drawable/welcome_activity" /> android:src="@drawable/welcome_activity" />
<TextView <TextView
android:id="@+id/no_activity_message" android:id="@+id/no_activity_message"
android:layout_width="wrap_content" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" /> android:layout_gravity="center_horizontal"
</LinearLayout> android:layout_below="@id/no_activity_image"
android:textSize="20dip"
android:gravity="center"
style="@style/TextAppearance" />
</RelativeLayout>
<ListView <ListView
android:id="@android:id/list" android:id="@android:id/list"

@ -11,7 +11,8 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="40dp"> android:paddingLeft="40dp"
android:paddingRight="5dp">
<TextView <TextView
android:id="@+id/widget_title" android:id="@+id/widget_title"

@ -461,6 +461,9 @@
<!-- Updates Window Title --> <!-- Updates Window Title -->
<string name="UpS_updates_title">Latest Astrid News</string> <string name="UpS_updates_title">Latest Astrid News</string>
<!-- Updats No Activity to show for offline users -->
<string name="UpS_no_activity_log_in">Log in to see a record of\nyour progress as well as\nactivity on shared lists.</string>
<!-- ================================================== EditPreferences == --> <!-- ================================================== EditPreferences == -->
<!-- Preference Window Title --> <!-- Preference Window Title -->

Loading…
Cancel
Save