Revision 4

Added recommended changes
1. Added constructor to IterableInboxFragment. Now setArguments wont overwrite arguments set by newInstance method.
2. Removed `this` while referencing global variable
3. Updated message TextView in XML to have layout below Title textView. No more hardcoded placement of views.
4. Added nullable notations

Author: Ayyanchira

iterableapi-ui/src/main/java/com/iterable/iterableapi/ui/inbox/IterableInboxActivity.java

@@ -5,6 +5,7 @@
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.iterable.iterableapi.IterableConstants;
 import com.iterable.iterableapi.IterableLogger;
 import com.iterable.iterableapi.ui.R;
 
@@ -37,8 +38,14 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
             if (inboxModeExtra instanceof InboxMode) {
                 inboxMode = (InboxMode) inboxModeExtra;
             }
-            inboxFragment = IterableInboxFragment.newInstance(inboxMode, itemLayoutId);
-            inboxFragment.setArguments(intent.getExtras());
+            String noMessageTitle = null;
+            String noMessageBody = null;
+            Bundle extraBundle = getIntent().getExtras();
+            if (extraBundle != null) {
+                noMessageTitle = extraBundle.getString(IterableConstants.NO_MESSAGES_TITLE, null);
+                noMessageBody = extraBundle.getString(IterableConstants.NO_MESSAGES_BODY, null);
+            }
+            inboxFragment = IterableInboxFragment.newInstance(inboxMode, itemLayoutId, noMessageTitle, noMessageBody);
 
             if (intent.getStringExtra(ACTIVITY_TITLE) != null) {
                 setTitle(intent.getStringExtra(ACTIVITY_TITLE));

iterableapi-ui/src/main/java/com/iterable/iterableapi/ui/inbox/IterableInboxFragment.java

@@ -48,19 +48,19 @@ public class IterableInboxFragment extends Fragment implements IterableInAppMana
 
     private InboxMode inboxMode = InboxMode.POPUP;
     private @LayoutRes int itemLayoutId = R.layout.iterable_inbox_item;
+    private String noMessagesTitle;
+    private String noMessagesBody;
+    TextView noMessagesTitleTextView;
+    TextView noMessagesBodyTextView;
+    RecyclerView recyclerView;
 
     private final SessionManager sessionManager = new SessionManager();
     private IterableInboxAdapterExtension adapterExtension = new DefaultAdapterExtension();
     private IterableInboxComparator comparator = new DefaultInboxComparator();
     private IterableInboxFilter filter = new DefaultInboxFilter();
     private IterableInboxDateMapper dateMapper = new DefaultInboxDateMapper();
     private boolean sessionStarted = false;
-    private String noMessagesTitle;
-    private String noMessagesBody;
 
-    TextView noMessagesTitleTextView;
-    TextView noMessagesBodyTextView;
-    RecyclerView recyclerView;
     /**
      * Create an Inbox fragment with default parameters
      *
@@ -80,10 +80,16 @@ public class IterableInboxFragment extends Fragment implements IterableInAppMana
      * @return {@link IterableInboxFragment} instance
      */
     @NonNull public static IterableInboxFragment newInstance(@NonNull InboxMode inboxMode, @LayoutRes int itemLayoutId) {
+        return newInstance(inboxMode, itemLayoutId, null, null);
+    }
+
+    @NonNull public static IterableInboxFragment newInstance(@NonNull InboxMode inboxMode, @LayoutRes int itemLayoutId, @Nullable String noMessagesTitle, @Nullable String noMessagesBody) {
         IterableInboxFragment inboxFragment = new IterableInboxFragment();
         Bundle bundle = new Bundle();
         bundle.putSerializable(INBOX_MODE, inboxMode);
         bundle.putInt(ITEM_LAYOUT_ID, itemLayoutId);
+        bundle.putString(IterableConstants.NO_MESSAGES_TITLE, noMessagesTitle);
+        bundle.putString(IterableConstants.NO_MESSAGES_BODY, noMessagesBody);
         inboxFragment.setArguments(bundle);
 
         return inboxFragment;
@@ -162,10 +168,10 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
                 itemLayoutId = arguments.getInt(ITEM_LAYOUT_ID);
             }
             if (arguments.getString(IterableConstants.NO_MESSAGES_TITLE) != null) {
-                this.noMessagesTitle = arguments.getString(IterableConstants.NO_MESSAGES_TITLE);
+                noMessagesTitle = arguments.getString(IterableConstants.NO_MESSAGES_TITLE);
             }
             if (arguments.getString(IterableConstants.NO_MESSAGES_BODY) != null) {
-                this.noMessagesBody = arguments.getString(IterableConstants.NO_MESSAGES_BODY);
+                noMessagesBody = arguments.getString(IterableConstants.NO_MESSAGES_BODY);
             }
         }
 

iterableapi-ui/src/main/res/layout/iterable_inbox_fragment.xml

@@ -19,16 +19,16 @@
     <TextView
         android:id="@+id/emptyInboxTitle"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
         android:gravity="center"
         android:textSize="18sp"
-        android:textStyle="bold"
-        android:translationY="-16sp" />
+        android:textStyle="bold" />
 
     <TextView
+        android:layout_below="@id/emptyInboxTitle"
         android:id="@+id/emptyInboxMessage"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:translationY="16sp" />
+        android:layout_height="wrap_content"
+        android:gravity="center" />
 </RelativeLayout>