Use Dimelo.consumeReceivedRemoteNotification in order to display sample notifications

+ clean

Author: Alexandre Saddour

DimeloSampleApp/app/src/main/java/com/dimelo/sampleapp/NotificationDisplayer.java

@@ -5,30 +5,28 @@
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
-import android.util.DisplayMetrics;
-import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ViewFlipper;
 
 import com.dimelo.dimelosdk.main.Chat;
-import com.dimelo.sampleapp.DimeloWrap;
+import com.dimelo.dimelosdk.main.Dimelo;
 import com.dimelo.sampleapp.R;
 
 public class TabBank extends Fragment implements SampleDimeloTab {
     private Chat mDimeloChat;
-    ViewFlipper mViewFlipper;
+    private ViewFlipper mViewFlipper;
+
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View v = inflater.inflate(R.layout.tab_bank,container,false);
-        return v;
+        return inflater.inflate(R.layout.tab_bank,container,false);
     }
 
     @Override
     public void onViewCreated(final View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        mDimeloChat = DimeloWrap.getDimelo().newChatFragment();
+        mDimeloChat = Dimelo.getInstance().newChatFragment();
         FragmentTransaction fragmentTransaction = getActivity().getSupportFragmentManager().beginTransaction();
         fragmentTransaction.add(R.id.chat_bank_container, mDimeloChat);
         fragmentTransaction.commit();
@@ -46,11 +44,6 @@ public void onClick(View v) {
         customize();
     }
 
-    public int dpToPixel(float dp){
-        DisplayMetrics displayMetrics = mViewFlipper.getResources().getDisplayMetrics();
-        return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, displayMetrics);
-    }
-
     private void customize(){
 
         Chat.Customization customisation = mDimeloChat.getCustomization();
@@ -70,10 +63,9 @@ private void customize(){
 
         customisation.systemMessageBackgroundColor = Color.WHITE;
         customisation.systemMessageTextColor = Color.WHITE;
-
         customisation.dateTextColor = Color.WHITE;
 
-        customisation.apply(); // Always call apply to register your changes
+        customisation.apply();
     }
 
     @Override

DimeloSampleApp/app/src/main/java/com/dimelo/sampleapp/chats/TabBank.java

@@ -8,20 +8,23 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.dimelo.sampleapp.DimeloWrap;
-import com.dimelo.sampleapp.NotificationDisplayer;
+import com.dimelo.dimelosdk.main.Dimelo;
 import com.dimelo.sampleapp.R;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.Date;
 import java.util.Random;
+import java.util.UUID;
 
 public class TabStart extends Fragment implements SampleDimeloTab {
 
     Random random;
 
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View v =inflater.inflate(R.layout.tab_start,container,false);
-        return v;
+        return inflater.inflate(R.layout.tab_start, container, false);
     }
 
     @Override
@@ -30,7 +33,7 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
 
         random = new Random();
 
-        Fragment dimeloChat = DimeloWrap.getDimelo().newChatFragment();
+        Fragment dimeloChat = Dimelo.getInstance().newChatFragment();
 
         FragmentTransaction fragmentTransaction = getActivity().getSupportFragmentManager().beginTransaction();
         fragmentTransaction.add(R.id.chat_start_container, dimeloChat);
@@ -39,39 +42,54 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         setListeners(view);
     }
 
+    private void sendNotificationExample(String message){
+        JSONObject notif = new JSONObject();
+        try {
+            notif.put("t", "m");
+            notif.put("uuid", UUID.randomUUID().toString());
+            notif.put("d", new Date().getTime() / 1000);
+            notif.put("tr", true);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        Bundle payload = new Bundle();
+        payload.putString("appdata", notif.toString());
+        payload.putString("dimelo", "1.0");
+        payload.putString("alert", message);
+        Dimelo.consumeReceivedRemoteNotification(getActivity(), payload, null);
+    }
+
+
     private void setListeners(final View root){
         root.findViewById(R.id.open_full_screen).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                DimeloWrap.getDimelo().openChatActivity(getActivity());
+            Dimelo.getInstance().openChatActivity(getActivity());
             }
         });
         root.findViewById(R.id.short_notif).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                String[] messages = {"Hi!", "Hello", "What's up?", "Thanks!", "Kthanxbye", "Thank you!", "OMG, REALLY?", "I don't think so.", "Maybe tomorrow.", "How about next Tuesday?", "This weekend is fine by me.", "Slightly longer message to be displayed as a non-truncated one."};
-                NotificationDisplayer.show(root.getContext(), messages[random.nextInt(messages.length - 1)]);
+            String[] messages = {"Hi!", "Hello", "What's up?", "Thanks!", "Kthanxbye", "Thank you!", "OMG, REALLY?", "I don't think so.", "Maybe tomorrow.", "How about next Tuesday?", "This weekend is fine by me.", "Slightly longer message to be displayed as a non-truncated one."};
+                sendNotificationExample(messages[random.nextInt(messages.length - 1)]);
             }
         });
 
         root.findViewById(R.id.long_notif).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                String[] messages = {
-                        "In order to activate your account, please follow these simple steps:\n1. Go to www.mybank.example.com.\n2. Click Personal Account.\n3. Find Activate Your Account button on the left of the screen.\n4. Click it and live happily everafter.",
-                        "We are glad to hear from you. One of the available agents will swiftly contact you to respond to your inquiry. Thank you!",
-                        "Unfortunately, time is over. We cannot support this conversation longer. Please leave this chat and try to solve your problem on your own. Thank you for your understanding.",
-                        "This is a rather long message intended to be truncated when displayed on the lock screen. We hope you understand our intention here.",
-                        "Once upon a time there was a little bear-the-pooh who was searching for a pot of honey everywhere."};
-                NotificationDisplayer.show(root.getContext(), messages[random.nextInt(messages.length - 1)]);
+            String[] messages = {
+                    "In order to activate your account, please follow these simple steps:\n1. Go to www.mybank.example.com.\n2. Click Personal Account.\n3. Find Activate Your Account button on the left of the screen.\n4. Click it and live happily everafter.",
+                    "We are glad to hear from you. One of the available agents will swiftly contact you to respond to your inquiry. Thank you!",
+                    "Unfortunately, time is over. We cannot support this conversation longer. Please leave this chat and try to solve your problem on your own. Thank you for your understanding.",
+                    "This is a rather long message intended to be truncated when displayed on the lock screen. We hope you understand our intention here.",
+                    "Once upon a time there was a little bear-the-pooh who was searching for a pot of honey everywhere."};
+                sendNotificationExample(messages[random.nextInt(messages.length - 1)]);
             }
         });
     }
 
-    private void customize(){
-
-    }
-
     @Override
     public boolean isChatDisplayed(){
         return false;

DimeloSampleApp/app/src/main/java/com/dimelo/sampleapp/chats/TabStart.java

@@ -10,23 +10,22 @@
 import android.view.ViewGroup;
 
 import com.dimelo.dimelosdk.main.Chat;
-import com.dimelo.sampleapp.DimeloWrap;
+import com.dimelo.dimelosdk.main.Dimelo;
 import com.dimelo.sampleapp.R;
 
 public class TabSupport extends Fragment implements SampleDimeloTab {
     Chat mDimeloChat;
 
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View v = inflater.inflate(R.layout.tab_support,container,false);
-        return v;
+        return inflater.inflate(R.layout.tab_support,container,false);
     }
 
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
-        mDimeloChat = DimeloWrap.getDimelo().newChatFragment();
+        mDimeloChat = Dimelo.getInstance().newChatFragment();
         FragmentTransaction fragmentTransaction = getActivity().getSupportFragmentManager().beginTransaction();
         fragmentTransaction.add(R.id.chat_support_container, mDimeloChat);
         fragmentTransaction.commit();