mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 21:55:48 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2794 from nextcloud/notificationsCorrectFormatting

Browse source 
Notifications correct formatting
This commit is contained in:
Andy Scherzinger 2018-07-24 08:28:28 +02:00 committed by GitHub
commit bafd3cb5db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 45 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/main/java/com/owncloud/android/ui/adapter/NotificationListAdapter.java
View file

@ -20,6 +20,7 @@
package com.owncloud.android.ui.adapter;
import android.content.Intent;
import android.graphics.Color;
import android.graphics.PorterDuff;
import android.graphics.Typeface;
import android.graphics.drawable.PictureDrawable;
@ -27,7 +28,11 @@ import android.net.Uri;
import android.os.AsyncTask;
import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView;
import android.text.Spannable;
import android.text.SpannableStringBuilder;
import android.text.TextUtils;
import android.text.style.ForegroundColorSpan;
import android.text.style.StyleSpan;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@ -48,6 +53,7 @@ import com.owncloud.android.lib.common.operations.RemoteOperation;
import com.owncloud.android.lib.common.utils.Log_OC;
import com.owncloud.android.lib.resources.notifications.models.Action;
import com.owncloud.android.lib.resources.notifications.models.Notification;
import com.owncloud.android.lib.resources.notifications.models.RichObject;
import com.owncloud.android.ui.activity.NotificationsActivity;
import com.owncloud.android.utils.DisplayUtils;
import com.owncloud.android.utils.ThemeUtils;
@ -74,6 +80,8 @@ import butterknife.ButterKnife;
*/
public class NotificationListAdapter extends RecyclerView.Adapter<NotificationListAdapter.NotificationViewHolder> {
private static final String TAG = NotificationListAdapter.class.getSimpleName();
private StyleSpan styleSpanBold = new StyleSpan(Typeface.BOLD);
private ForegroundColorSpan foregroundColorSpanBlack = new ForegroundColorSpan(Color.BLACK);
private List<Notification> notificationsList;
private OwnCloudClient client;
@ -109,9 +117,15 @@ public class NotificationListAdapter extends RecyclerView.Adapter<NotificationLi
subject = subject + " ↗";
holder.subject.setTypeface(holder.subject.getTypeface(), Typeface.BOLD);
holder.subject.setOnClickListener(v -> openLink(notification.getLink()));
holder.subject.setText(subject);
} else {
if (!TextUtils.isEmpty(notification.subjectRich)) {
holder.subject.setText(makeSpecialPartsBold(notification));
} else {
holder.subject.setText(subject);
}
}
holder.subject.setText(subject);
holder.message.setText(notification.getMessage());
// Todo set proper action icon (to be clarified how to pick)
@ -139,6 +153,34 @@ public class NotificationListAdapter extends RecyclerView.Adapter<NotificationLi
}
}
private SpannableStringBuilder makeSpecialPartsBold(Notification notification) {
String text = notification.getSubjectRich();
SpannableStringBuilder ssb = new SpannableStringBuilder(text);
int openingBrace = text.indexOf('{');
int closingBrace;
String replaceablePart;
while (openingBrace != -1) {
closingBrace = text.indexOf('}', openingBrace) + 1;
replaceablePart = text.substring(openingBrace + 1, closingBrace - 1);
RichObject richObject = notification.subjectRichParameters.get(replaceablePart);
if (richObject != null) {
String name = richObject.getName();
ssb.replace(openingBrace, closingBrace, name);
text = ssb.toString();
closingBrace = openingBrace + name.length();
ssb.setSpan(styleSpanBold, openingBrace, closingBrace, 0);
ssb.setSpan(foregroundColorSpanBlack, openingBrace, closingBrace,
Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
}
openingBrace = text.indexOf('{', closingBrace);
}
return ssb;
}
private class ExecuteActionTask extends AsyncTask<Action, Void, Boolean> {
private NotificationViewHolder holder;

2
src/main/res/layout/notification_list_item.xml
View file

@ -63,6 +63,7 @@
android:layout_height="wrap_content"
android:ellipsize="end"
android:text="@string/placeholder_sentence"
android:alpha="0.57"
android:textAppearance="?android:attr/textAppearanceListItem"/>
<LinearLayout
@ -82,6 +83,7 @@
android:layout_gravity="end"
android:ellipsize="end"
android:text="@string/placeholder_sentence"
android:alpha="0.5"
android:textColor="?android:attr/textColorSecondary"/>
</LinearLayout>