caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #1017 from MilosKozak/notification-height

Browse source 
Tests required: Notification height
This commit is contained in:
Milos Kozak 2018-05-09 10:16:29 +02:00 committed by GitHub
parent e29a590cad 1ac41323e6
commit 8c2d0d80ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
View file

@ -281,7 +281,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
acceptTempLayout = (LinearLayout) view.findViewById(R.id.overview_accepttemplayout);
notificationsView = (RecyclerView) view.findViewById(R.id.overview_notifications);
notificationsView.setHasFixedSize(true);
notificationsView.setHasFixedSize(false);
llm = new LinearLayoutManager(view.getContext());
notificationsView.setLayoutManager(llm);

2
app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/NotificationRecyclerViewAdapter.java
View file

@ -44,7 +44,7 @@ public class NotificationRecyclerViewAdapter extends RecyclerView.Adapter<Notifi
holder.dismiss.setTag(notification);
if (Objects.equals(notification.text, MainApp.gs(R.string.nsalarm_staledata)))
holder.dismiss.setText("snooze");
holder.text.setText(notification.text);
holder.text.setText(notification.text+'\n');
holder.time.setText(DateUtil.timeString(notification.date));
if (notification.level == Notification.URGENT)
holder.cv.setBackgroundColor(ContextCompat.getColor(MainApp.instance(), R.color.notificationUrgent));

3
app/src/main/res/layout/overview_notification_item.xml
View file

@ -5,6 +5,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="1dp"
card_view:cardBackgroundColor="@color/cardColorBackground"
card_view:cardCornerRadius="6dp">
@ -15,7 +16,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView