diff --git a/drawable_resources/ic_list_empty_upload_backup.svg b/drawable_resources/ic_list_empty_upload_backup.svg new file mode 100644 index 0000000000..02ecad0b38 --- /dev/null +++ b/drawable_resources/ic_list_empty_upload_backup.svg @@ -0,0 +1,57 @@ + + + + + + image/svg+xml + + + + + + + + diff --git a/drawable_resources/ic_notification_light_grey.svg b/drawable_resources/ic_notification_light_grey.svg new file mode 100644 index 0000000000..762dbee58a --- /dev/null +++ b/drawable_resources/ic_notification_light_grey.svg @@ -0,0 +1,58 @@ + + + + + + image/svg+xml + + + + + + + + diff --git a/drawable_resources/notification-icon_backup.svg b/drawable_resources/notification-icon_backup.svg new file mode 100644 index 0000000000..abe3ee0fed --- /dev/null +++ b/drawable_resources/notification-icon_backup.svg @@ -0,0 +1,50 @@ + +image/svg+xml \ No newline at end of file diff --git a/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.java b/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.java index 61466c1140..b59603479a 100644 --- a/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.java +++ b/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.java @@ -21,11 +21,22 @@ package com.owncloud.android.ui.activity; import android.os.Bundle; +import android.support.v7.widget.RecyclerView; import android.view.MenuItem; +import android.view.View; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.ProgressBar; +import android.widget.TextView; import com.owncloud.android.R; import com.owncloud.android.lib.common.utils.Log_OC; +import butterknife.BindString; +import butterknife.BindView; +import butterknife.ButterKnife; +import butterknife.Unbinder; + /** * Activity displaying all server side stored activity items. */ @@ -33,12 +44,39 @@ public class NotificationsActivity extends FileActivity { private static final String TAG = NotificationsActivity.class.getSimpleName(); + @BindView(R.id.empty_list_view) + public LinearLayout emptyContentContainer; + + @BindView(R.id.empty_list_view_text) + public TextView emptyContentMessage; + + @BindView(R.id.empty_list_view_headline) + public TextView emptyContentHeadline; + + @BindView(R.id.empty_list_icon) + public ImageView emptyContentIcon; + + @BindView(R.id.empty_list_progress) + public ProgressBar emptyContentProgressBar; + + @BindView(android.R.id.list) + public RecyclerView recyclerView; + + @BindString(R.string.notifications_no_results_headline) + public String noResultsHeadline; + + @BindString(R.string.notifications_no_results_message) + public String noResultsMessage; + + private Unbinder unbinder; + @Override protected void onCreate(Bundle savedInstanceState) { Log_OC.v(TAG, "onCreate() start"); super.onCreate(savedInstanceState); setContentView(R.layout.notifications_layout); + unbinder = ButterKnife.bind(this); // setup toolbar setupToolbar(); @@ -54,6 +92,9 @@ public class NotificationsActivity extends FileActivity { * sets up the UI elements and loads all activity items. */ private void setupContent() { + emptyContentIcon.setImageResource(R.drawable.ic_notification_light_grey); + setEmptyContent(noResultsHeadline,noResultsMessage); + // TODO add all (recycler) view relevant code + data loading + adapter etc. } @@ -75,4 +116,22 @@ public class NotificationsActivity extends FileActivity { return retval; } + + private void setLoadingMessage() { + emptyContentHeadline.setText(R.string.file_list_loading); + emptyContentMessage.setText(""); + + emptyContentIcon.setVisibility(View.GONE); + emptyContentProgressBar.setVisibility(View.VISIBLE); + } + + private void setEmptyContent(String headline, String message) { + if (emptyContentContainer != null && emptyContentMessage != null) { + emptyContentHeadline.setText(headline); + emptyContentMessage.setText(message); + + emptyContentProgressBar.setVisibility(View.GONE); + emptyContentIcon.setVisibility(View.VISIBLE); + } + } } diff --git a/src/main/res/drawable-hdpi/ic_notification_light_grey.png b/src/main/res/drawable-hdpi/ic_notification_light_grey.png new file mode 100644 index 0000000000..174aef918c Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notification_light_grey.png differ diff --git a/src/main/res/drawable-mdpi/ic_notification_light_grey.png b/src/main/res/drawable-mdpi/ic_notification_light_grey.png new file mode 100644 index 0000000000..5da4e5e8f9 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notification_light_grey.png differ diff --git a/src/main/res/drawable-xhdpi/ic_notification_light_grey.png b/src/main/res/drawable-xhdpi/ic_notification_light_grey.png new file mode 100644 index 0000000000..b930f0aff2 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notification_light_grey.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_notification_light_grey.png b/src/main/res/drawable-xxhdpi/ic_notification_light_grey.png new file mode 100644 index 0000000000..026fb80120 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notification_light_grey.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_notification_light_grey.png b/src/main/res/drawable-xxxhdpi/ic_notification_light_grey.png new file mode 100644 index 0000000000..653be22635 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notification_light_grey.png differ diff --git a/src/main/res/layout/notifications_layout.xml b/src/main/res/layout/notifications_layout.xml index adc1717207..73cccf8b52 100644 --- a/src/main/res/layout/notifications_layout.xml +++ b/src/main/res/layout/notifications_layout.xml @@ -49,39 +49,8 @@ android:layout_marginLeft="-3dp" android:layout_marginBottom="-3dp"/> - + - - - - - - diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index e9f57eb494..2e1680853d 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -583,7 +583,8 @@ No activities found. Loading notifications… - No notifications. + No notifications + Please check back later. Input upload filename and filetype Filename