contact requests: display "0 contact request"
When there is no contact request, the pending contact request screen is
blank. This commit adds the text "0 contact request" to display an
indication for the user.
Change-Id: If803085d6b024d2d9a45edf44cca5f14fc842eeb
Reviewed-by: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
diff --git a/ring-android/app/src/main/java/cx/ring/contactrequests/PendingContactRequestsFragment.java b/ring-android/app/src/main/java/cx/ring/contactrequests/PendingContactRequestsFragment.java
index b0eadfb..e8c7828 100644
--- a/ring-android/app/src/main/java/cx/ring/contactrequests/PendingContactRequestsFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/contactrequests/PendingContactRequestsFragment.java
@@ -56,7 +56,10 @@
protected RecyclerView mRequestsList;
@BindView(R.id.pane_ringID)
- TextView mPaneTextView;
+ protected TextView mPaneTextView;
+
+ @BindView(R.id.emptyTextView)
+ protected TextView mEmptyTextView;
private Unbinder mUnbinder;
private ContactRequestsAdapter mAdapter;
@@ -134,6 +137,8 @@
}
mPaneTextView.setVisibility(viewModel.hasPane() ? View.VISIBLE : View.GONE);
mAdapter.replaceAll(viewModel.getTrustRequests());
+
+ mEmptyTextView.setVisibility(viewModel.getTrustRequests().isEmpty() ? View.VISIBLE : View.GONE);
}
});
}
diff --git a/ring-android/app/src/main/res/layout/frag_pending_contact_requests.xml b/ring-android/app/src/main/res/layout/frag_pending_contact_requests.xml
index 6e43ada..5538621 100644
--- a/ring-android/app/src/main/res/layout/frag_pending_contact_requests.xml
+++ b/ring-android/app/src/main/res/layout/frag_pending_contact_requests.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -11,20 +11,21 @@
android:id="@+id/pane_ringID"
android:layout_width="match_parent"
android:layout_height="48dp"
- android:gravity="center"
android:background="#e3c1c1"
android:ellipsize="middle"
+ android:gravity="center"
android:maxLines="1"
android:singleLine="true"
android:text="@string/contact_request_account"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/text_color_primary"
- android:visibility="gone"/>
+ android:visibility="gone" />
<android.support.v7.widget.RecyclerView
android:id="@+id/requests_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:layout_below="@+id/pane_ringID"
android:layout_marginLeft="0dp"
android:layout_marginStart="0dp"
android:clipToPadding="false"
@@ -33,4 +34,12 @@
android:paddingBottom="8dp"
tools:listitem="@layout/item_contact_request" />
-</LinearLayout>
\ No newline at end of file
+ <TextView
+ android:id="@+id/emptyTextView"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="center"
+ android:gravity="center"
+ android:text="@string/no_requests" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values/strings.xml b/ring-android/app/src/main/res/values/strings.xml
index 59d7294..9466032 100644
--- a/ring-android/app/src/main/res/values/strings.xml
+++ b/ring-android/app/src/main/res/values/strings.xml
@@ -196,6 +196,7 @@
<string name="contact_request_title">Pending contact request</string>
<string name="contact_request_msg">You have %1$s pending requests</string>
<string name="contact_request_account">For %1$s</string>
+ <string name="no_requests">0 contact requests</string>
<!-- Send contact requests -->
<string name="send_request_button">Send</string>